cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

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
This commit is contained in:
Philipp Maier 2023-10-05 11:44:31 +02:00 committed by dexter
parent c25f4fb9c9
commit 26dca56db7
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/osmocom/pcu/pcuif_proto.h
View File

@ -8,7 +8,7 @@
#define PCU_SOCK_DEFAULT "/tmp/pcu_bts"
#define PCU_IF_VERSION 0x0b
#define PCU_IF_VERSION 0x0c
#define TXT_MAX_LEN 128
/* msg_type */
@ -63,6 +63,17 @@
#define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */
#define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */
/* BTS model */
enum gsm_pcuif_bts_model {
PCU_IF_BTS_MODEL_UNSPEC,
PCU_IF_BTS_MODEL_LC15,
PCU_IF_BTS_MODEL_OC2G,
PCU_IF_BTS_MODEL_OCTPHY,
PCU_IF_BTS_MODEL_SYSMO,
PCU_IF_BTS_MODEL_TRX,
PCU_IF_BTS_MODEL_RBS,
};
#define PCU_IF_NUM_NSVC 2
#define PCU_IF_NUM_TRX 8
@ -176,6 +187,7 @@ struct gsm_pcu_if_info_ind {
struct in_addr v4;
struct in6_addr v6;
} remote_ip[PCU_IF_NUM_NSVC];
uint8_t bts_model; /* enum gsm_pcuif_bts_model */
} __attribute__ ((packed));
/* E1 CCU connection parameters */

3
src/bts.h
View File

@ -275,6 +275,9 @@ struct gprs_rlcmac_bts {
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 {

14
src/pcu_l1_if.cpp
View File

@ -724,6 +724,17 @@ static int pcu_info_ind_ns(struct gprs_rlcmac_bts *bts,
return gprs_ns_update_config(bts, info_ind->nsei, local, remote, nsvci, valid);
}
const struct value_string gsm_pcuif_bts_model_names[] = {
{ PCU_IF_BTS_MODEL_UNSPEC, "(unspecified)" },
{ PCU_IF_BTS_MODEL_LC15, "osmo-bts-lc15" },
{ PCU_IF_BTS_MODEL_OC2G, "osmo-bts-oc2g" },
{ PCU_IF_BTS_MODEL_OCTPHY, "osmo-bts-octphy" },
{ PCU_IF_BTS_MODEL_SYSMO, "osmo-bts-sysmo" },
{ PCU_IF_BTS_MODEL_TRX, "osmo-bts-trx" },
{ PCU_IF_BTS_MODEL_RBS, "ericsson-rbs" },
{ 0, NULL }
};
static int pcu_rx_info_ind(struct gprs_rlcmac_bts *bts, const struct gsm_pcu_if_info_ind *info_ind)
{
struct gprs_bssgp_pcu *pcu;
@ -933,6 +944,9 @@ bssgp_failed:
}
}
LOGP(DL1IF, LOGL_INFO, "BTS model: %s\n", get_value_string(gsm_pcuif_bts_model_names, info_ind->bts_model));
bts->bts_model = info_ind->bts_model;
bts->active = true;
return rc;
}