- gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: firmware/layer1: fix unused variable 'l1h' [-Wunused-variable]
by fixeria 25 Apr '22

25 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27870 ) Change subject: firmware/layer1: fix unused variable 'l1h' [-Wunused-variable] ...................................................................... firmware/layer1: fix unused variable 'l1h' [-Wunused-variable] Change-Id: If8c3da3908c1dab7a93e69daee13426f9bdbccad --- M src/target/firmware/layer1/l23_api.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index 2bd57d2..275043b 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -346,8 +346,6 @@ /* receive a L1CTL_DM_REL_REQ from L23 */ static void l1ctl_rx_dm_rel_req(struct msgb *msg) { - struct l1ctl_hdr *l1h = (struct l1ctl_hdr *) msg->data; - printd("L1CTL_DM_REL_REQ\n"); l1a_mftask_set(0); l1s.dedicated.type = GSM_DCHAN_NONE; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8c3da3908c1dab7a93e69daee13426f9bdbccad Gerrit-Change-Number: 27870 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmocom-bb[master]: firmware/apps/rssi: fix -Wmaybe-uninitialized in handle_pm()
by fixeria 25 Apr '22

25 Apr '22

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27871 ) Change subject: firmware/apps/rssi: fix -Wmaybe-uninitialized in handle_pm() ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: 1+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86d241c41d4de135f4cd79f56f7fdd18696b7890 Gerrit-Change-Number: 27871 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 15:25:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: transport/pcsc: throw ReaderError with a message
by fixeria 25 Apr '22

25 Apr '22

Attention is currently required from: laforge, dexter. Hello Jenkins Builder, laforge, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/27882 to look at the new patch set (#3). Change subject: transport/pcsc: throw ReaderError with a message ...................................................................... transport/pcsc: throw ReaderError with a message Before this patch: $ ./pySim-shell.py -p 0 Card reader initialization failed with an exception of type: <class 'pySim.exceptions.ReaderError'> after: $ ./pySim-shell.py -p 0 Card reader initialization failed with exception: No reader found for number 0 Change-Id: Id08c4990857f7083a8d1cefc90ff85fc20ab6fef --- M pySim/transport/pcsc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/27882/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id08c4990857f7083a8d1cefc90ff85fc20ab6fef Gerrit-Change-Number: 27882 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in pysim[master]: transport/pcsc: throw ReaderError with a message
by fixeria 25 Apr '22

25 Apr '22

Attention is currently required from: laforge, dexter. Hello Jenkins Builder, laforge, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/27882 to look at the new patch set (#2). Change subject: transport/pcsc: throw ReaderError with a message ...................................................................... transport/pcsc: throw ReaderError with a message Before this patch: $ ./pySim-shell.py -p 0 Card reader initialization failed with an exception of type: <class 'pySim.exceptions.ReaderError'> after: $ ./pySim-shell.py -p 0 Card reader initialization failed with exception: No reader found with number 0 Change-Id: Id08c4990857f7083a8d1cefc90ff85fc20ab6fef --- M pySim/transport/pcsc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/27882/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id08c4990857f7083a8d1cefc90ff85fc20ab6fef Gerrit-Change-Number: 27882 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in pysim[master]: transport/pcsc: throw ReaderError with a message
by fixeria 25 Apr '22

25 Apr '22

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27882 ) Change subject: transport/pcsc: throw ReaderError with a message ...................................................................... Patch Set 1: (1 comment) File pySim/transport/pcsc.py: https://gerrit.osmocom.org/c/pysim/+/27882/comment/fd14dd43_9e352a68 PS1, Line 37: with > language-wise "No reader found for number X" would make more sense, IMHO. Thanks! Changed in the next patchset. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id08c4990857f7083a8d1cefc90ff85fc20ab6fef Gerrit-Change-Number: 27882 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 15:24:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: Introduce VTY command 'ccch load-indication-period <0-256>'
by pespin 25 Apr '22

25 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27933 ) Change subject: Introduce VTY command 'ccch load-indication-period <0-256>' ...................................................................... Introduce VTY command 'ccch load-indication-period <0-256>' Change-Id: Id9d23238863c02a72bcf32942f6b0d40be127904 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_vty.c 4 files changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/27933/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 4c1127b..a3c7025 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -471,8 +471,10 @@ } pwr_ctrl; /* TS 44.060 Table 12.9.1 */ } gprs; - /* threshold (in percent) when BTS shall send CCCH LOAD IND */ + /* CCCH Load Threshold: threshold (in percent) when BTS shall send CCCH LOAD IND */ uint8_t ccch_load_ind_thresh; + /* CCCH Load Indication Period: how often (secs) to send CCCH LOAD IND when over CCCH Load Threshold. */ + uint8_t ccch_load_ind_period; /* RACH NM values */ int rach_b_thresh; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 87ed44f..a596523 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -266,6 +266,7 @@ bts->c0->ts[0].pchan_from_config = GSM_PCHAN_CCCH_SDCCH4; /* TODO: really?? */ bts->ccch_load_ind_thresh = 10; /* 10% of Load: Start sending CCCH LOAD IND */ + bts->ccch_load_ind_period = 1; /* Send CCCH LOAD IND every 1 second */ bts->rach_b_thresh = -1; bts->rach_ldavg_slots = -1; diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index 4f7a487..0c08616 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -71,7 +71,7 @@ msgb_tv_put(msgb, NM_ATT_CCCH_L_T, bts->ccch_load_ind_thresh); /* CCCH Load Indication Period (3GPP TS 12.21 sec 9.4.11), seconds */ - msgb_tv_put(msgb, NM_ATT_CCCH_L_I_P, 1); + msgb_tv_put(msgb, NM_ATT_CCCH_L_I_P, bts->ccch_load_ind_period); /* RACH Busy Threshold (3GPP TS 12.21 sec 9.4.44), -dBm */ buf[0] = 90; /* -90 dBm as default "busy" threshold */ diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 1411cd3..50ad57f 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -926,6 +926,19 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_bts_ccch_load_ind_period, + cfg_bts_ccch_load_ind_period_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), + "ccch load-indication-period <0-256>", + CCCH_STR + "Period of time at which BTS sends RSL CCCH LOAD IND\n" + "CCCH Load Indication Period in seconds (Default: 1)\n") +{ + struct gsm_bts *bts = vty->index; + bts->ccch_load_ind_period = atoi(argv[0]); + return CMD_SUCCESS; +} + #define NM_STR "Network Management\n" DEFUN_USRATTR(cfg_bts_rach_nm_b_thresh, @@ -4166,6 +4179,9 @@ if (bts->ccch_load_ind_thresh != 10) vty_out(vty, " ccch load-indication-threshold %u%s", bts->ccch_load_ind_thresh, VTY_NEWLINE); + if (bts->ccch_load_ind_period != 1) + vty_out(vty, " ccch load-indication-period %u%s", + bts->ccch_load_ind_period, VTY_NEWLINE); if (bts->rach_b_thresh != -1) vty_out(vty, " rach nm busy threshold %u%s", bts->rach_b_thresh, VTY_NEWLINE); @@ -4479,6 +4495,7 @@ install_element(BTS_NODE, &cfg_bts_chan_desc_bs_ag_blks_res_cmd); install_element(BTS_NODE, &cfg_bts_chan_dscr_bs_ag_blks_res_cmd); install_element(BTS_NODE, &cfg_bts_ccch_load_ind_thresh_cmd); + install_element(BTS_NODE, &cfg_bts_ccch_load_ind_period_cmd); install_element(BTS_NODE, &cfg_bts_rach_nm_b_thresh_cmd); install_element(BTS_NODE, &cfg_bts_rach_nm_ldavg_cmd); install_element(BTS_NODE, &cfg_bts_cell_barred_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9d23238863c02a72bcf32942f6b0d40be127904 Gerrit-Change-Number: 27933 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmocom-bb[master]: firmware/apps/rssi: fix -Wmaybe-uninitialized in handle_pm()
by pespin 25 Apr '22

25 Apr '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27871 ) Change subject: firmware/apps/rssi: fix -Wmaybe-uninitialized in handle_pm() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I86d241c41d4de135f4cd79f56f7fdd18696b7890 Gerrit-Change-Number: 27871 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 15:17:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: bts: Use uint8_t instead of int for ccch_load_ind_thresh
by pespin 25 Apr '22

25 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27932 ) Change subject: bts: Use uint8_t instead of int for ccch_load_ind_thresh ...................................................................... bts: Use uint8_t instead of int for ccch_load_ind_thresh The range used for this variable is 0-100, so no need to use a signed integer. Morever, uint8_it is enough for the range. Change-Id: I863d9531baf5308b45a2ebe60266ba02d1041cc3 --- M include/osmocom/bsc/bts.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/32/27932/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 95d9b05..4c1127b 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -472,7 +472,7 @@ } gprs; /* threshold (in percent) when BTS shall send CCCH LOAD IND */ - int ccch_load_ind_thresh; + uint8_t ccch_load_ind_thresh; /* RACH NM values */ int rach_b_thresh; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I863d9531baf5308b45a2ebe60266ba02d1041cc3 Gerrit-Change-Number: 27932 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: Rename functions generating OML SetAttr messages
by pespin 25 Apr '22

25 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27931 ) Change subject: Rename functions generating OML SetAttr messages ...................................................................... Rename functions generating OML SetAttr messages Its name is totally misleading, since they seem to be related to GetAttributes messages rather than SetAttributes. Change-Id: I306cb407dbd9b98e301b5d93046bdadcb466b82b --- M include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/nm_bts_fsm.c M src/osmo-bsc/nm_gprs_cell_fsm.c M src/osmo-bsc/nm_gprs_nse_fsm.c M src/osmo-bsc/nm_gprs_nsvc_fsm.c M src/osmo-bsc/nm_rcarrier_fsm.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.ok 9 files changed, 47 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/31/27931/1 diff --git a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h index 687f16a..d6933fc 100644 --- a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h +++ b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h @@ -28,9 +28,9 @@ struct gsm_bts; struct gsm_bts_trx; -struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts); -struct msgb *nanobts_attr_nse_get(struct gsm_bts_sm *bts_sm); -struct msgb *nanobts_attr_cell_get(struct gsm_bts *bts); -struct msgb *nanobts_attr_nsvc_get(struct gsm_bts *bts); -struct msgb *nanobts_attr_radio_get(struct gsm_bts *bts, +struct msgb *nanobts_gen_set_bts_attr(struct gsm_bts *bts); +struct msgb *nanobts_gen_set_nse_attr(struct gsm_bts_sm *bts_sm); +struct msgb *nanobts_gen_set_cell_attr(struct gsm_bts *bts); +struct msgb *nanobts_gen_set_nsvc_attr(struct gsm_bts *bts); +struct msgb *nanobts_gen_set_radio_attr(struct gsm_bts *bts, struct gsm_bts_trx *trx); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index 517cfd3..4f7a487 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -27,7 +27,7 @@ #include <osmocom/gsm/bts_features.h> /* 3GPP TS 52.021 section 8.6.1 Set BTS Attributes */ -struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts) +struct msgb *nanobts_gen_set_bts_attr(struct gsm_bts *bts) { struct msgb *msgb; uint8_t buf[256]; @@ -108,7 +108,7 @@ return msgb; } -struct msgb *nanobts_attr_nse_get(struct gsm_bts_sm *bts_sm) +struct msgb *nanobts_gen_set_nse_attr(struct gsm_bts_sm *bts_sm) { struct msgb *msgb; uint8_t buf[256]; @@ -147,7 +147,7 @@ return msgb; } -struct msgb *nanobts_attr_cell_get(struct gsm_bts *bts) +struct msgb *nanobts_gen_set_cell_attr(struct gsm_bts *bts) { struct msgb *msgb; uint8_t buf[256]; @@ -206,7 +206,7 @@ return msgb; } -struct msgb *nanobts_attr_nsvc_get(struct gsm_bts *bts) +struct msgb *nanobts_gen_set_nsvc_attr(struct gsm_bts *bts) { struct msgb *msgb; uint8_t buf[256]; @@ -251,7 +251,7 @@ return msgb; } -struct msgb *nanobts_attr_radio_get(struct gsm_bts *bts, +struct msgb *nanobts_gen_set_radio_attr(struct gsm_bts *bts, struct gsm_bts_trx *trx) { struct msgb *msgb; diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index b9ed5a0..bb4fe3e 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -105,7 +105,7 @@ if (bts->mo.get_attr_rep_received && !bts->mo.set_attr_sent && !bts->mo.set_attr_ack_received) { bts->mo.set_attr_sent = true; - msgb = nanobts_attr_bts_get(bts); + msgb = nanobts_gen_set_bts_attr(bts); abis_nm_set_bts_attr(bts, msgb->data, msgb->len); msgb_free(msgb); } diff --git a/src/osmo-bsc/nm_gprs_cell_fsm.c b/src/osmo-bsc/nm_gprs_cell_fsm.c index 4df3a3e..b3f960c 100644 --- a/src/osmo-bsc/nm_gprs_cell_fsm.c +++ b/src/osmo-bsc/nm_gprs_cell_fsm.c @@ -95,7 +95,7 @@ if (!cell->mo.set_attr_sent && !cell->mo.set_attr_ack_received) { cell->mo.set_attr_sent = true; - msgb = nanobts_attr_cell_get(bts); + msgb = nanobts_gen_set_cell_attr(bts); OSMO_ASSERT(msgb); abis_nm_ipaccess_set_attr(bts, NM_OC_GPRS_CELL, bts->bts_nr, 0, 0xff, msgb->data, msgb->len); diff --git a/src/osmo-bsc/nm_gprs_nse_fsm.c b/src/osmo-bsc/nm_gprs_nse_fsm.c index 8a63f56..5994f32 100644 --- a/src/osmo-bsc/nm_gprs_nse_fsm.c +++ b/src/osmo-bsc/nm_gprs_nse_fsm.c @@ -94,7 +94,7 @@ if (!nse->mo.set_attr_sent && !nse->mo.set_attr_ack_received) { nse->mo.set_attr_sent = true; - msgb = nanobts_attr_nse_get(bts_sm); + msgb = nanobts_gen_set_nse_attr(bts_sm); abis_nm_ipaccess_set_attr(bts, NM_OC_GPRS_NSE, bts->bts_nr, 0xff, 0xff, msgb->data, msgb->len); diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index 5f0c5de..b11c2a6 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -107,7 +107,7 @@ return; } nsvc->mo.set_attr_sent = true; - msgb = nanobts_attr_nsvc_get(nsvc->bts); + msgb = nanobts_gen_set_nsvc_attr(nsvc->bts); OSMO_ASSERT(msgb); abis_nm_ipaccess_set_attr(nsvc->bts, NM_OC_GPRS_NSVC, nsvc->bts->bts_nr, nsvc->id, 0xff, msgb->data, msgb->len); diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index b9e67c1..325ec56 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -92,7 +92,7 @@ if (!trx->mo.set_attr_sent && !trx->mo.set_attr_ack_received) { trx->mo.set_attr_sent = true; - msgb = nanobts_attr_radio_get(trx->bts, trx); + msgb = nanobts_gen_set_radio_attr(trx->bts, trx); abis_nm_set_radio_attr(trx, msgb->data, msgb->len); msgb_free(msgb); } diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index ecf5f82..32e2c53 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -34,13 +34,13 @@ extern struct gsm_bts_model bts_model_nanobts; -static void test_nanobts_attr_bts_get(struct gsm_bts *bts, uint8_t *expected) +static void test_nanobts_gen_set_bts_attr(struct gsm_bts *bts, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_bts_get()...\n"); + printf("Testing nanobts_gen_set_bts_attr()...\n"); - msgb = nanobts_attr_bts_get(bts); + msgb = nanobts_gen_set_bts_attr(bts); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -50,13 +50,13 @@ printf("\n"); } -static void test_nanobts_attr_nse_get(struct gsm_bts *bts, uint8_t *expected) +static void test_nanobts_gen_set_nse_attr(struct gsm_bts *bts, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_nse_get()...\n"); + printf("Testing nanobts_gen_set_nse_attr()...\n"); - msgb = nanobts_attr_nse_get(bts->site_mgr); + msgb = nanobts_gen_set_nse_attr(bts->site_mgr); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -66,13 +66,13 @@ printf("\n"); } -static void test_nanobts_attr_cell_get(struct gsm_bts *bts, uint8_t *expected) +static void test_nanobts_gen_set_cell_attr(struct gsm_bts *bts, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_cell_get()...\n"); + printf("Testing nanobts_gen_set_cell_attr()...\n"); - msgb = nanobts_attr_cell_get(bts); + msgb = nanobts_gen_set_cell_attr(bts); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -82,13 +82,13 @@ printf("\n"); } -static void test_nanobts_attr_nsvc_get(struct gsm_bts *bts, uint8_t *expected) +static void test_nanobts_gen_set_nsvc_attr(struct gsm_bts *bts, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_nsvc_get()...\n"); + printf("Testing nanobts_gen_set_nsvc_attr()...\n"); - msgb = nanobts_attr_nsvc_get(bts); + msgb = nanobts_gen_set_nsvc_attr(bts); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -98,15 +98,15 @@ printf("\n"); } -static void test_nanobts_attr_radio_get(struct gsm_bts *bts, +static void test_nanobts_gen_set_radio_attr(struct gsm_bts *bts, struct gsm_bts_trx *trx, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_nsvc_get()...\n"); + printf("Testing nanobts_gen_set_nsvc_attr()...\n"); - msgb = nanobts_attr_radio_get(bts, trx); + msgb = nanobts_gen_set_radio_attr(bts, trx); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(msgb_eq_data_print(msgb, expected, msgb->len)); @@ -154,7 +154,7 @@ bts->network = net; trx = talloc_zero(ctx, struct gsm_bts_trx); - /* Parameters needed by nanobts_attr_bts_get() */ + /* Parameters needed by nanobts_gen_set_bts_attr() */ bts->rach_b_thresh = -1; bts->rach_ldavg_slots = -1; bts->c0->arfcn = 866; @@ -173,7 +173,7 @@ 0x01, 0x05, 0x39 }; - /* Parameters needed to test nanobts_attr_nse_get() */ + /* Parameters needed to test nanobts_gen_set_nse_attr() */ bts->site_mgr->gprs.nse.nsei = 101; uint8_t attr_nse_expected[] = { 0x9d, 0x00, 0x02, 0x00, 0x65, 0xa0, 0x00, 0x07, 0x03, 0x03, 0x03, @@ -182,7 +182,7 @@ 0x0a, 0x03, 0x0a, 0x03 }; - /* Parameters needed to test nanobts_attr_cell_get() */ + /* Parameters needed to test nanobts_gen_set_cell_attr() */ bts->gprs.rac = 0x00; bts->gprs.cell.bvci = 2; bts->gprs.mode = BTS_GPRS_GPRS; @@ -194,7 +194,7 @@ 0xfa, 0x00, 0xfa, 0x02 }; - /* Parameters needed to test nanobts_attr_nsvc_get() */ + /* Parameters needed to test nanobts_gen_set_nsvc_attr() */ struct osmo_sockaddr_str addr; osmo_sockaddr_str_from_str(&addr, "10.9.1.101", 23000); osmo_sockaddr_str_to_sockaddr(&addr, &bts->site_mgr->gprs.nsvc[0].remote.u.sas); @@ -205,7 +205,7 @@ 0x09, 0x01, 0x65, 0x5a, 0x3c }; - /* Parameters needed to test nanobts_attr_radio_get() */ + /* Parameters needed to test nanobts_gen_set_radio_attr() */ trx->arfcn = 866; trx->max_power_red = 22; bts->c0->max_power_red = 22; @@ -213,11 +213,11 @@ { 0x2d, 0x0b, 0x05, 0x00, 0x02, 0x03, 0x62 }; /* Run tests */ - test_nanobts_attr_bts_get(bts, attr_bts_expected); - test_nanobts_attr_nse_get(bts, attr_nse_expected); - test_nanobts_attr_cell_get(bts, attr_cell_expected); - test_nanobts_attr_nsvc_get(bts, attr_nscv_expected); - test_nanobts_attr_radio_get(bts, trx, attr_radio_expected); + test_nanobts_gen_set_bts_attr(bts, attr_bts_expected); + test_nanobts_gen_set_nse_attr(bts, attr_nse_expected); + test_nanobts_gen_set_cell_attr(bts, attr_cell_expected); + test_nanobts_gen_set_nsvc_attr(bts, attr_nscv_expected); + test_nanobts_gen_set_radio_attr(bts, trx, attr_radio_expected); /* NSVC IPv6 test */ struct osmo_sockaddr_str addr6; @@ -234,7 +234,7 @@ 0xfd, 0x00, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, }; - test_nanobts_attr_nsvc_get(bts, attr_nscv6_expected); + test_nanobts_gen_set_nsvc_attr(bts, attr_nscv6_expected); printf("Done\n"); diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.ok b/tests/nanobts_omlattr/nanobts_omlattr_test.ok index faeac7b..b011ed4 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.ok +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.ok @@ -1,29 +1,29 @@ -Testing nanobts_attr_bts_get()... +Testing nanobts_gen_set_bts_attr()... result= 19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a01230a080362093f99000700f11000010539 expected=19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a01230a080362093f99000700f11000010539 ok. -Testing nanobts_attr_nse_get()... +Testing nanobts_gen_set_nse_attr()... result= 9d00020065a00007030303031e030aa1000b03030303030a030a030a03 expected=9d00020065a00007030303031e030aa1000b03030303030a030a030a03 ok. -Testing nanobts_attr_cell_get()... +Testing nanobts_gen_set_cell_attr()... result= 9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02 expected=9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02 ok. -Testing nanobts_attr_nsvc_get()... +Testing nanobts_gen_set_nsvc_attr()... result= 9f00020065a2000859d80a0901655a3c expected=9f00020065a2000859d80a0901655a3c ok. -Testing nanobts_attr_nsvc_get()... +Testing nanobts_gen_set_nsvc_attr()... result= 2d0b0500020362 expected=2d0b0500020362 ok. -Testing nanobts_attr_nsvc_get()... +Testing nanobts_gen_set_nsvc_attr()... result= 9f00020065fd001629005a3c59e2fd005678901234567890123456789012 expected=9f00020065fd001629005a3c59e2fd005678901234567890123456789012 ok. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I306cb407dbd9b98e301b5d93046bdadcb466b82b Gerrit-Change-Number: 27931 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: cosmetic:: Document TLVs in nanobts_attr_bts_get()
by pespin 25 Apr '22

25 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27930 ) Change subject: cosmetic:: Document TLVs in nanobts_attr_bts_get() ...................................................................... cosmetic:: Document TLVs in nanobts_attr_bts_get() Change-Id: I7e9cbf84edb6bdcbaf38f03552103236ea1cef6c --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 1 file changed, 15 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/30/27930/1 diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index d5b4215..517cfd3 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -26,6 +26,7 @@ #include <osmocom/bsc/bts.h> #include <osmocom/gsm/bts_features.h> +/* 3GPP TS 52.021 section 8.6.1 Set BTS Attributes */ struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts) { struct msgb *msgb; @@ -35,13 +36,14 @@ if (!msgb) return NULL; - /* Interference level Boundaries: 0 .. X5 (3GPP TS 52.021, section 9.4.25) */ + /* Interference level Boundaries: 0 .. X5 (3GPP TS 52.021 sec 9.4.25) */ msgb_tv_fixed_put(msgb, NM_ATT_INTERF_BOUND, sizeof(bts->interf_meas_params_cfg.bounds_dbm), &bts->interf_meas_params_cfg.bounds_dbm[0]); - /* Intave: Interference Averaging period (3GPP TS 52.021, section 9.4.24) */ + /* Intave: Interference Averaging period (3GPP TS 52.021 sec 9.4.24) */ msgb_tv_put(msgb, NM_ATT_INTAVE_PARAM, bts->interf_meas_params_cfg.avg_period); + /* Connection Failure Criterion (3GPP TS 52.021 sec 9.4.14) */ rlt = gsm_bts_get_radio_link_timeout(bts); if (rlt == -1) { /* Osmocom extension: Use infinite radio link timeout */ @@ -54,28 +56,30 @@ } msgb_tl16v_put(msgb, NM_ATT_CONN_FAIL_CRIT, 2, buf); + /* T200 (3GPP TS 52.021 sec 9.4.53) */ memcpy(buf, "\x1e\x24\x24\xa8\x34\x21\xa8", 7); msgb_tv_fixed_put(msgb, NM_ATT_T200, 7, buf); + /* Max Timing Advance (3GPP TS 52.021 sec 9.4.31) */ msgb_tv_put(msgb, NM_ATT_MAX_TA, 0x3f); - /* seconds */ + /* Overload Period (3GPP TS 52.021 sec 9.4.39), seconds */ memcpy(buf, "\x00\x01\x0a", 3); msgb_tv_fixed_put(msgb, NM_ATT_OVERL_PERIOD, 3, buf); - /* percent */ + /* CCCH Load Threshold (3GPP TS 12.21 sec 9.4.12), percent */ msgb_tv_put(msgb, NM_ATT_CCCH_L_T, bts->ccch_load_ind_thresh); - /* seconds */ + /* CCCH Load Indication Period (3GPP TS 12.21 sec 9.4.11), seconds */ msgb_tv_put(msgb, NM_ATT_CCCH_L_I_P, 1); - /* busy threshold in - dBm */ + /* RACH Busy Threshold (3GPP TS 12.21 sec 9.4.44), -dBm */ buf[0] = 90; /* -90 dBm as default "busy" threshold */ if (bts->rach_b_thresh != -1) buf[0] = bts->rach_b_thresh & 0xff; msgb_tv_put(msgb, NM_ATT_RACH_B_THRESH, buf[0]); - /* rach load averaging 1000 slots */ + /* RACH Load Averaging Slots (3GPP TS 12.21 sec 9.4.45), 1000 slots */ buf[0] = 0x03; buf[1] = 0xe8; if (bts->rach_ldavg_slots != -1) { @@ -84,16 +88,18 @@ } msgb_tv_fixed_put(msgb, NM_ATT_LDAVG_SLOTS, 2, buf); - /* 10 milliseconds */ + /* BTS Air Timer (3GPP TS 12.21 sec 9.4.10), 10 milliseconds */ msgb_tv_put(msgb, NM_ATT_BTS_AIR_TIMER, osmo_tdef_get(bts->network->T_defs, 3105, OSMO_TDEF_MS, -1)/10); - /* 10 retransmissions of physical config */ + /* NY1 (3GPP TS 12.21 sec 9.4.37), 10 retransmissions of physical config */ msgb_tv_put(msgb, NM_ATT_NY1, 10); + /* BCCH ARFCN (3GPP TS 12.21 sec 9.4.8) */ buf[0] = (bts->c0->arfcn >> 8) & 0x0f; buf[1] = bts->c0->arfcn & 0xff; msgb_tv_fixed_put(msgb, NM_ATT_BCCH_ARFCN, 2, buf); + /* BSIC (3GPP TS 12.21 sec 9.4.9) */ msgb_tv_put(msgb, NM_ATT_BSIC, bts->bsic); abis_nm_ipaccess_cgi(buf, bts); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7e9cbf84edb6bdcbaf38f03552103236ea1cef6c Gerrit-Change-Number: 27930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2025

2024

2023

2022

gerrit-log