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

cosmetic: Clarify language ip.access nanoBTS vs. all IPA Abis/IP 

Don't explicitly mention ip.access/nanoBTS if we actually want to refer
to all BTSs implementing an IPA-style Abis/IP interface.

Also, remove some bogus "is_ipa_abisip_bts(bts) || is_osmobts(bts)".
is_ipa_abisip_bts includes osmobts.

Change-Id: I31696d9a21a799511741a561085686cfa0728f93
changes/80/32180/3
Harald Welte 2023-03-31 16:44:02 +02:00
parent ceccba70a9
commit ea7b53850b
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manuals/chapters/bts.adoc
View File

@ -47,7 +47,7 @@ Description: (null)
RF Nominal Power: 23 dBm, reduced by 0 dB, resulting BS power: 23 dBm
NM State: Oper 'Enabled', Admin 2, Avail 'OK'
Baseband Transceiver NM State: Oper 'Enabled', Admin 2, Avail 'OK'
ip.access stream ID: 0x00
IPA Abis/IP stream ID: 0x00
----
The output can be restricted to the TRXs of one specified BTS number

10
src/osmo-bsc/bsc_vty.c
View File

@ -1269,7 +1269,7 @@ DEFUN(drop_bts,
}
if (!is_ipa_abisip_bts(bts)) {
vty_out(vty, "%% This command only works for ipaccess.%s", VTY_NEWLINE);
vty_out(vty, "%% This command only works for IPA Abis/IP.%s", VTY_NEWLINE);
return CMD_WARNING;
}
@ -1315,8 +1315,8 @@ DEFUN(restart_bts, restart_bts_cmd,
return CMD_WARNING;
}
if (!is_ipa_abisip_bts(bts) || is_osmobts(bts)) {
vty_out(vty, "%% This command only works for ipaccess nanoBTS.%s",
if (!is_ipa_abisip_bts(bts)) {
vty_out(vty, "%% This command only works for IPA Abis/IP.%s",
VTY_NEWLINE);
return CMD_WARNING;
}
@ -1533,7 +1533,7 @@ DEFUN(pdch_act, pdch_act_cmd,
}
if (!is_ipa_abisip_bts(ts->trx->bts)) {
vty_out(vty, "%% This command only works for ipaccess BTS%s",
vty_out(vty, "%% This command only works for IPA Abis/IP BTS%s",
VTY_NEWLINE);
return CMD_WARNING;
}
@ -2067,7 +2067,7 @@ DEFUN(lchan_mdcx, lchan_mdcx_cmd,
lchan = &ts->lchan[ss_nr];
if (!is_ipa_abisip_bts(lchan->ts->trx->bts)) {
vty_out(vty, "%% BTS is not of ip.access type%s", VTY_NEWLINE);
vty_out(vty, "%% BTS is not of IPA Abis/IP type%s", VTY_NEWLINE);
return CMD_WARNING;
}

2
src/osmo-bsc/bts_ctrl.c
View File

@ -254,7 +254,7 @@ static int set_bts_apply_config(struct ctrl_cmd *cmd, void *data)
struct gsm_bts *bts = cmd->node;
if (!is_ipa_abisip_bts(bts)) {
cmd->reply = "BTS is not IP based";
cmd->reply = "BTS is not IPA Abis/IP based";
return CTRL_CMD_ERROR;
}

2
src/osmo-bsc/bts_trx_vty.c
View File

@ -754,7 +754,7 @@ void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx, bool print_rsl, bool
net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state);
if (is_ipa_abisip_bts(trx->bts)) {
vty_out(vty, " ip.access stream ID: 0x%02x ", trx->rsl_tei_primary);
vty_out(vty, " IPA Abis/IP stream ID: 0x%02x ", trx->rsl_tei_primary);
e1isl_dump_vty_tcp(vty, trx->rsl_link_primary);
} else {
vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE);

10
src/osmo-bsc/bts_vty.c
View File

@ -341,7 +341,7 @@ DEFUN_USRATTR(cfg_bts_unit_id,
int bts_id = atoi(argv[1]);
if (!is_ipa_abisip_bts(bts)) {
vty_out(vty, "%% BTS is not of ip.access type%s", VTY_NEWLINE);
vty_out(vty, "%% BTS is not of IPA Abis/IP type%s", VTY_NEWLINE);
return CMD_WARNING;
}
@ -371,7 +371,7 @@ DEFUN_USRATTR(cfg_bts_rsl_ip,
struct in_addr ia;
if (!is_ipa_abisip_bts(bts)) {
vty_out(vty, "%% BTS is not of ip.access type%s", VTY_NEWLINE);
vty_out(vty, "%% BTS is not of IPA Abis/IP type%s", VTY_NEWLINE);
return CMD_WARNING;
}
@ -467,7 +467,7 @@ DEFUN_USRATTR(cfg_bts_stream_id,
int stream_id = atoi(argv[0]), linenr = atoi(argv[1]);
if (!is_ipa_abisip_bts(bts)) {
vty_out(vty, "%% BTS is not of ip.access type%s", VTY_NEWLINE);
vty_out(vty, "%% BTS is not of IPA Abis/IP type%s", VTY_NEWLINE);
return CMD_WARNING;
}
@ -1919,8 +1919,8 @@ DEFUN_USRATTR(cfg_bts_no_si_unused_send_empty,
{
struct gsm_bts *bts = vty->index;
if (!is_ipa_abisip_bts(bts) || is_osmobts(bts)) {
vty_out(vty, "%% This command is only intended for ipaccess nanoBTS. See OS#3707.%s",
if (!is_ipa_abisip_bts(bts)) {
vty_out(vty, "%% This command is only intended for IPA Abis/IP BTS. See OS#3707.%s",
VTY_NEWLINE);
return CMD_WARNING;
}

8
src/osmo-bsc/system_information.c
View File

@ -1083,7 +1083,7 @@ static int generate_si5(enum osmo_sysinfo_type t, struct gsm_bts *bts)
memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
/* ip.access nanoBTS needs l2_plen!! */
/* Abis/IP needs l2_plen!! */
if (is_ipa_abisip_bts(bts)) {
*output++ = GSM48_LEN2PLEN(l2_plen);
l2_plen++;
@ -1114,7 +1114,7 @@ static int generate_si5bis(enum osmo_sysinfo_type t, struct gsm_bts *bts)
memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
/* ip.access nanoBTS needs l2_plen!! */
/* Abis/IP needs l2_plen!! */
if (is_ipa_abisip_bts(bts)) {
*output++ = GSM48_LEN2PLEN(l2_plen);
l2_plen++;
@ -1153,7 +1153,7 @@ static int generate_si5ter(enum osmo_sysinfo_type t, struct gsm_bts *bts)
memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
/* ip.access nanoBTS needs l2_plen!! */
/* Abis/IP needs l2_plen!! */
if (is_ipa_abisip_bts(bts)) {
*output++ = GSM48_LEN2PLEN(l2_plen);
l2_plen++;
@ -1188,7 +1188,7 @@ static int generate_si6(enum osmo_sysinfo_type t, struct gsm_bts *bts)
memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
memset(&si6_ro_info, 0, sizeof(si6_ro_info));
/* ip.access nanoBTS needs l2_plen!! */
/* Abis/IP needs l2_plen!! */
if (is_ipa_abisip_bts(bts)) {
*output++ = GSM48_LEN2PLEN(l2_plen);
l2_plen++;