diff options
Diffstat (limited to 'openbsc/src/libbsc')
| -rw-r--r-- | openbsc/src/libbsc/abis_nm.c | 4 | ||||
| -rw-r--r-- | openbsc/src/libbsc/bsc_vty.c | 5 | ||||
| -rw-r--r-- | openbsc/src/libbsc/bts_sysmobts.c | 2 | ||||
| -rw-r--r-- | openbsc/src/libbsc/e1_config.c | 2 | ||||
| -rw-r--r-- | openbsc/src/libbsc/system_information.c | 8 |
5 files changed, 12 insertions, 9 deletions
diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index 651ca02f3..56b6fcf2a 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -738,7 +738,7 @@ static int abis_nm_rcvmsg_manuf(struct msgb *mb) switch (bts_type) { case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMO_SYSMO: + case GSM_BTS_TYPE_OSMOBTS: rc = abis_nm_rx_ipacc(mb); abis_nm_queue_send_next(sign_link->trx->bts); break; @@ -1723,7 +1723,7 @@ static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb, } *reason = "Unknown combination"; return -EINVAL; - case GSM_BTS_TYPE_OSMO_SYSMO: + case GSM_BTS_TYPE_OSMOBTS: /* no known restrictions */ return 0; default: diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 66b30cd6e..c1882fcf4 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -245,6 +245,9 @@ static void bts_dump_vty(struct vty *vty, struct gsm_bts *bts) bts->num_trx, VTY_NEWLINE); vty_out(vty, "Description: %s%s", bts->description ? bts->description : "(null)", VTY_NEWLINE); + if (strnlen(bts->pcu_version, MAX_VERSION_LENGTH)) + vty_out(vty, "PCU version %s connected%s", bts->pcu_version, + VTY_NEWLINE); vty_out(vty, "MS Max power: %u dBm%s", bts->ms_max_power, VTY_NEWLINE); vty_out(vty, "Minimum Rx Level for Access: %i dBm%s", rxlev2dbm(bts->si_common.cell_sel_par.rxlev_acc_min), @@ -649,7 +652,7 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) bts->early_classmark_allowed ? "allowed" : "forbidden", VTY_NEWLINE); switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMO_SYSMO: + case GSM_BTS_TYPE_OSMOBTS: vty_out(vty, " ip.access unit_id %u %u%s", bts->ip_access.site_id, bts->ip_access.bts_id, VTY_NEWLINE); if (bts->ip_access.rsl_ip) { diff --git a/openbsc/src/libbsc/bts_sysmobts.c b/openbsc/src/libbsc/bts_sysmobts.c index e1bf661fc..e4b6cdc78 100644 --- a/openbsc/src/libbsc/bts_sysmobts.c +++ b/openbsc/src/libbsc/bts_sysmobts.c @@ -46,7 +46,7 @@ int bts_model_sysmobts_init(void) { model_sysmobts = bts_model_nanobts; model_sysmobts.name = "sysmobts"; - model_sysmobts.type = GSM_BTS_TYPE_OSMO_SYSMO; + model_sysmobts.type = GSM_BTS_TYPE_OSMOBTS; model_sysmobts.features.data = &model_sysmobts._features_data[0]; model_sysmobts.features.data_len = diff --git a/openbsc/src/libbsc/e1_config.c b/openbsc/src/libbsc/e1_config.c index 8910d217f..d57dec57e 100644 --- a/openbsc/src/libbsc/e1_config.c +++ b/openbsc/src/libbsc/e1_config.c @@ -179,7 +179,7 @@ int e1_reconfig_bts(struct gsm_bts *bts) /* skip signal link initialization, this is done later for these BTS. */ if (bts->type == GSM_BTS_TYPE_NANOBTS || - bts->type == GSM_BTS_TYPE_OSMO_SYSMO) + bts->type == GSM_BTS_TYPE_OSMOBTS) return e1inp_line_update(line); /* OML link */ diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index a2dd8279a..261033147 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -830,7 +830,7 @@ static int generate_si5(uint8_t *output, struct gsm_bts *bts) /* ip.access nanoBTS needs l2_plen!! */ switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMO_SYSMO: + case GSM_BTS_TYPE_OSMOBTS: *output++ = GSM48_LEN2PLEN(l2_plen); l2_plen++; break; @@ -865,7 +865,7 @@ static int generate_si5bis(uint8_t *output, struct gsm_bts *bts) /* ip.access nanoBTS needs l2_plen!! */ switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMO_SYSMO: + case GSM_BTS_TYPE_OSMOBTS: *output++ = GSM48_LEN2PLEN(l2_plen); l2_plen++; break; @@ -909,7 +909,7 @@ static int generate_si5ter(uint8_t *output, struct gsm_bts *bts) /* ip.access nanoBTS needs l2_plen!! */ switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMO_SYSMO: + case GSM_BTS_TYPE_OSMOBTS: *output++ = GSM48_LEN2PLEN(l2_plen); l2_plen++; break; @@ -946,7 +946,7 @@ static int generate_si6(uint8_t *output, struct gsm_bts *bts) /* ip.access nanoBTS needs l2_plen!! */ switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMO_SYSMO: + case GSM_BTS_TYPE_OSMOBTS: *output++ = GSM48_LEN2PLEN(l2_plen); l2_plen++; break; |