dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29896 ) Change subject: pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic numbers ...................................................................... pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic numbers The number of NSVCs is fixed but lets not use magic numbers to define the sizes of the arrays that hold the config values. In osmo-pcu there is already a define constant, so lets use a define here as well. Change-Id: If7fa44abb86c18900110d7ee81fe6140c8c4635b --- M include/osmo-bts/pcuif_proto.h 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 3e6f651..a5f03e3 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -58,6 +58,8 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +#define PCU_IF_NUM_NSVC 2 + enum gsm_pcu_if_text_type { PCU_VERSION, PCU_OML_ALERT, @@ -169,14 +171,14 @@ uint8_t initial_cs; uint8_t initial_mcs; /* NSVC */ - uint16_t nsvci[2]; - uint16_t local_port[2]; - uint16_t remote_port[2]; - uint8_t address_type[2]; + uint16_t nsvci[PCU_IF_NUM_NSVC]; + uint16_t local_port[PCU_IF_NUM_NSVC]; + uint16_t remote_port[PCU_IF_NUM_NSVC]; + uint8_t address_type[PCU_IF_NUM_NSVC]; union { struct in_addr v4; struct in6_addr v6; - } remote_ip[2]; + } remote_ip[PCU_IF_NUM_NSVC]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7fa44abb86c18900110d7ee81fe6140c8c4635b Gerrit-Change-Number: 29896 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged