diff options
| -rw-r--r-- | openbsc/src/libbsc/bsc_ctrl_commands.c | 2 | ||||
| -rw-r--r-- | openbsc/src/libcommon/gsm_data_shared.c | 4 | ||||
| -rw-r--r-- | openbsc/tests/ctrl_test_runner.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/openbsc/src/libbsc/bsc_ctrl_commands.c b/openbsc/src/libbsc/bsc_ctrl_commands.c index 36eda352b..aea4a9bc8 100644 --- a/openbsc/src/libbsc/bsc_ctrl_commands.c +++ b/openbsc/src/libbsc/bsc_ctrl_commands.c @@ -248,6 +248,8 @@ static int get_bts_chan_load(struct ctrl_cmd *cmd, void *data) continue; if (i == GSM_PCHAN_PDCH) continue; + if (i == GSM_PCHAN_UNKNOWN) + continue; cmd->reply = talloc_asprintf_append(cmd->reply, "%s%s,%u,%u", diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c index ad3d7cba9..89d13fd83 100644 --- a/openbsc/src/libcommon/gsm_data_shared.c +++ b/openbsc/src/libcommon/gsm_data_shared.c @@ -62,7 +62,7 @@ const struct value_string gsm_pchant_names[12] = { { GSM_PCHAN_TCH_F_PDCH, "TCH/F_PDCH" }, { GSM_PCHAN_UNKNOWN, "UNKNOWN" }, { GSM_PCHAN_CCCH_SDCCH4_CBCH, "CCCH+SDCCH4+CBCH" }, - { GSM_PCHAN_SDCCH8_SACCH8C, "SDCCH8+CBCH" }, + { GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "SDCCH8+CBCH" }, { 0, NULL } }; @@ -78,7 +78,7 @@ const struct value_string gsm_pchant_descs[12] = { { GSM_PCHAN_TCH_F_PDCH, "Dynamic TCH/F or GPRS PDCH" }, { GSM_PCHAN_UNKNOWN, "Unknown / Unsupported channel combination" }, { GSM_PCHAN_CCCH_SDCCH4_CBCH, "FCCH + SCH + BCCH + CCCH + CBCH + 3 SDCCH + 2 SACCH (Comb. V)" }, - { GSM_PCHAN_SDCCH8_SACCH8C, "7 SDCCH + 4 SACCH + CBCH (Comb. VII)" }, + { GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "7 SDCCH + 4 SACCH + CBCH (Comb. VII)" }, { 0, NULL } }; diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py index df2e66c85..a1e1d4dc6 100644 --- a/openbsc/tests/ctrl_test_runner.py +++ b/openbsc/tests/ctrl_test_runner.py @@ -234,7 +234,7 @@ class TestCtrlBSC(TestCtrlBase): # No RSL link so everything is 0 r = self.do_get('bts.0.channel-load') self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0 TCH/F_PDCH,0,0') + self.assertEquals(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0 TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0 SDCCH8+CBCH,0,0') def testBtsOmlConnectionState(self): """Check OML state. It will not be connected""" |