dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email ) Change subject: pcu_l1_if: signal BTS model via PCUIF ...................................................................... pcu_l1_if: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU and store this information in struct gprs_rlcmac_bts Related: OS#6191 Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.h M src/pcu_l1_if.cpp 3 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/47/34647/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index 9df85d9..066ef47 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -66,6 +66,17 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +/* BTS model */ +#define PCU_IF_BTS_MODEL_UNSPEC 0x00 +#define PCU_IF_BTS_MODEL_LC15 0x01 +#define PCU_IF_BTS_MODEL_OC2G 0x02 +#define PCU_IF_BTS_MODEL_OCTPHY 0x03 +#define PCU_IF_BTS_MODEL_SYSMO 0x04 +#define PCU_IF_BTS_MODEL_TRX 0x05 +#define PCU_IF_BTS_MODEL_VIRTUAL 0x06 +#define PCU_IF_BTS_MODEL_OMLDUMMY 0x07 +#define PCU_IF_BTS_MODEL_RBS 0x08 + #define PCU_IF_NUM_NSVC 2 #define PCU_IF_NUM_TRX 8 @@ -179,6 +190,7 @@ struct in_addr v4; struct in6_addr v6; } remote_ip[PCU_IF_NUM_NSVC]; + uint8_t bts_model; } __attribute__ ((packed)); /* E1 CCU connection parameters */ diff --git a/src/bts.h b/src/bts.h index 3fe4503..1d88cb5 100644 --- a/src/bts.h +++ b/src/bts.h @@ -275,6 +275,9 @@ struct llist_head pch_timer; struct osmo_time_cc all_allocated_pdch; + + /* BTS hardware model, see pcuif_proto.h */ + uint8_t bts_model; }; struct paging_req_cs { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 4fcec31..ef11105 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -1013,6 +1013,9 @@ } } + LOGP(DL1IF, LOGL_INFO, "BTS model: %02x\n", info_ind->bts_model); + bts->bts_model = info_ind->bts_model; + bts->active = true; return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Gerrit-Change-Number: 34647 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange