[S] Change in osmo-bsc[master]: cosmetic: Clarify language ip.access nanoBTS vs. all IPA Abis/IP
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32180 )
Change subject: cosmetic: Clarify language ip.access nanoBTS vs. all IPA Abis/IP ......................................................................
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 --- M doc/manuals/chapters/bts.adoc M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ctrl.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/system_information.c 6 files changed, 32 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/32180/1
diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc index 9107aa1..5371745 100644 --- a/doc/manuals/chapters/bts.adoc +++ b/doc/manuals/chapters/bts.adoc @@ -47,7 +47,7 @@ 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 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 2f220c1..ac21ace 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1269,7 +1269,7 @@ }
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 @@ 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; } @@ -1529,7 +1529,7 @@ }
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; } @@ -2063,7 +2063,7 @@ 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; }
diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 2147231..3f5c114 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -253,7 +253,7 @@ 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; }
diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index ab642a4..385336b 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -754,7 +754,7 @@ 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); diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 378568d..11d8345 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -341,7 +341,7 @@ 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 @@ 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 @@ 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 @@ { 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; } diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index a5f46c8..19b46ef 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1069,7 +1069,7 @@
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++; @@ -1100,7 +1100,7 @@
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++; @@ -1139,7 +1139,7 @@
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++; @@ -1174,7 +1174,7 @@ 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++;
-
laforge