April 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: firmware/layer1: fix unused variable 'l1h' [-Wunused-variable]

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27870 ) Change subject: firmware/layer1: fix unused variable 'l1h' [-Wunused-variable] ...................................................................... Patch Set 1: (1 comment) File src/target/firmware/layer1/l23_api.c: https://gerrit.osmocom.org/c/osmocom-bb/+/27870/comment/d708cea8_08c7fa6c PS1, Line 347: static void l1ctl_rx_dm_rel_req(void) > I'd rather keep passing msg here, as in all other functions. […] Done -- 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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 13:16:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmocom-bb[master]: firmware/layer1: fix 'MFNONE' not handled in switch [-Wswitch]

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27869 ) Change subject: firmware/layer1: fix 'MFNONE' not handled in switch [-Wswitch] ...................................................................... firmware/layer1: fix 'MFNONE' not handled in switch [-Wswitch] Change-Id: I4c38599b29de73e26e9b603564f63b88e65e16b9 --- M src/target/firmware/layer1/l23_api.c 1 file changed, 3 insertions(+), 0 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 afcf9f5..2bd57d2 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -133,6 +133,9 @@ case MF26ODD: TASK_SET(MF_TASK_NEIGH_PM26O); break; + default: + /* no neighbor measurement */ + break; } break; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c38599b29de73e26e9b603564f63b88e65e16b9 Gerrit-Change-Number: 27869 Gerrit-PatchSet: 1 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

3 years, 2 months

1
0
0 0

Change in osmocom-bb[master]: firmware/abb: fix missing 'break' in twl3025_unit_enable()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27867 ) Change subject: firmware/abb: fix missing 'break' in twl3025_unit_enable() ...................................................................... firmware/abb: fix missing 'break' in twl3025_unit_enable() Change-Id: I8224f8c2dba6891ef3fffcb6eed6572d35132d2e --- M src/target/firmware/abb/twl3025.c 1 file changed, 1 insertion(+), 0 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/abb/twl3025.c b/src/target/firmware/abb/twl3025.c index 1c099dc..4f495bc 100644 --- a/src/target/firmware/abb/twl3025.c +++ b/src/target/firmware/abb/twl3025.c @@ -373,6 +373,7 @@ togbr1 = (1 << 5); else togbr1 = (1 << 4); + break; case TWL3025_UNIT_VDL: if (on) togbr1 = (1 << 3); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8224f8c2dba6891ef3fffcb6eed6572d35132d2e Gerrit-Change-Number: 27867 Gerrit-PatchSet: 1 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

3 years, 2 months

1
0
0 0

Change in osmocom-bb[master]: firmware/layer1: fix -Wtype-limits in chan_nr2mf_task_mask()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27868 ) Change subject: firmware/layer1: fix -Wtype-limits in chan_nr2mf_task_mask() ...................................................................... firmware/layer1: fix -Wtype-limits in chan_nr2mf_task_mask() arm-none-eabi-gcc versions 11.2.0 shows the following warning: layer1/l23_api.c: In function 'chan_nr2mf_task_mask': layer1/l23_api.c:123:25: warning: comparison is always true due to limited range of data type [-Wtype-limits] 123 | if (second_task >= 0) /* optional */ Let's get rid of {master,second}_task by using a macro. Change-Id: I00bd3e11a14f10b78fd91f0e6915ca4fc0817d6a --- M src/target/firmware/layer1/l23_api.c 1 file changed, 20 insertions(+), 20 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 735d92a..afcf9f5 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -73,72 +73,72 @@ uint8_t cbits = chan_nr >> 3; uint8_t tn = chan_nr & 0x7; uint8_t lch_idx; - enum mframe_task master_task = MF_TASK_BCCH_NORM; - enum mframe_task second_task = -1; /* optional */ enum mf_type multiframe = 0; uint32_t task_mask = 0x00; +#define TASK_SET(task) \ + task_mask |= (1 << (task)) + if (cbits == 0x01) { lch_idx = 0; - master_task = (tn & 1) ? MF_TASK_TCH_F_ODD : MF_TASK_TCH_F_EVEN; + TASK_SET((tn & 1) ? MF_TASK_TCH_F_ODD : MF_TASK_TCH_F_EVEN); multiframe = (tn & 1) ? MF26ODD : MF26EVEN; } else if ((cbits & 0x1e) == 0x02) { lch_idx = cbits & 0x1; - master_task = MF_TASK_TCH_H_0 + lch_idx; + TASK_SET(MF_TASK_TCH_H_0 + lch_idx); multiframe = (lch_idx & 1) ? MF26ODD : MF26EVEN; } else if ((cbits & 0x1c) == 0x04) { lch_idx = cbits & 0x3; - master_task = MF_TASK_SDCCH4_0 + lch_idx; + TASK_SET(MF_TASK_SDCCH4_0 + lch_idx); multiframe = MF51; } else if ((cbits & 0x18) == 0x08) { lch_idx = cbits & 0x7; - master_task = MF_TASK_SDCCH8_0 + lch_idx; + TASK_SET(MF_TASK_SDCCH8_0 + lch_idx); multiframe = MF51; } else if ((cbits & 0x1f) == 0x18) { /* Osmocom specific extension for PDTCH and PTCCH */ - master_task = MF_TASK_GPRS_PDTCH; - second_task = MF_TASK_GPRS_PTCCH; + TASK_SET(MF_TASK_GPRS_PDTCH); + TASK_SET(MF_TASK_GPRS_PTCCH); /* FIXME: PDCH has different multiframe structure */ multiframe = MFNONE; } else if ((cbits & 0x1f) == 0x19) { /* Osmocom specific extension for CBCH on SDCCH/4 */ - master_task = MF_TASK_SDCCH4_CBCH; + TASK_SET(MF_TASK_SDCCH4_CBCH); multiframe = MF51; } else if ((cbits & 0x1f) == 0x1a) { /* Osmocom specific extension for CBCH on SDCCH/8 */ - master_task = MF_TASK_SDCCH8_CBCH; + TASK_SET(MF_TASK_SDCCH8_CBCH); multiframe = MF51; #if 0 } else if (cbits == 0x10) { /* FIXME: when to do extended BCCH? */ - master_task = MF_TASK_BCCH_NORM; + TASK_SET(MF_TASK_BCCH_NORM); } else if (cbits == 0x11 || cbits == 0x12) { /* FIXME: how to decide CCCH norm/extd? */ - master_task = MF_TASK_BCCH_CCCH; + TASK_SET(MF_TASK_BCCH_CCCH); #endif + } else { + TASK_SET(MF_TASK_BCCH_NORM); } - /* Primary and secondary tasks */ - task_mask |= (1 << master_task); - if (second_task >= 0) /* optional */ - task_mask |= (1 << second_task); - switch (neigh_mode) { case NEIGH_MODE_PM: switch (multiframe) { case MF51: - task_mask |= (1 << MF_TASK_NEIGH_PM51); + TASK_SET(MF_TASK_NEIGH_PM51); break; case MF26EVEN: - task_mask |= (1 << MF_TASK_NEIGH_PM26E); + TASK_SET(MF_TASK_NEIGH_PM26E); break; case MF26ODD: - task_mask |= (1 << MF_TASK_NEIGH_PM26O); + TASK_SET(MF_TASK_NEIGH_PM26O); break; } break; } +#undef TASK_SET + return task_mask; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I00bd3e11a14f10b78fd91f0e6915ca4fc0817d6a Gerrit-Change-Number: 27868 Gerrit-PatchSet: 1 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

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: utils/meas_pcap2db: fix -Wpointer-sign in pcap_cb()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27863 ) Change subject: utils/meas_pcap2db: fix -Wpointer-sign in pcap_cb() ...................................................................... Patch Set 2: (1 comment) File src/utils/meas_pcap2db.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27863/comment/c8351f3f_62cf80ec PS1, Line 64: const char *cur = (const char *)bytes; > why not simply change "cur" to be u_char or uint8_t? Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I84d8e6f290bda0f03476f182f292ecc7a9e520f2 Gerrit-Change-Number: 27863 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 13:09:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: utils/meas_pcap2db: fix -Wpointer-sign in pcap_cb()

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27863 to look at the new patch set (#2). Change subject: utils/meas_pcap2db: fix -Wpointer-sign in pcap_cb() ...................................................................... utils/meas_pcap2db: fix -Wpointer-sign in pcap_cb() When building with CFLAGS="-flto -Wall", I get the following: meas_pcap2db.c: In function ‘pcap_cb’: meas_pcap2db.c:64:27: warning: pointer targets in initialization of ‘const char *’ from ‘const u_char *’ {aka ‘const unsigned char *’} differ in signedness [-Wpointer-sign] 64 | const char *cur = bytes; Change-Id: I84d8e6f290bda0f03476f182f292ecc7a9e520f2 --- M src/utils/meas_pcap2db.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/27863/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I84d8e6f290bda0f03476f182f292ecc7a9e520f2 Gerrit-Change-Number: 27863 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: Cosmetic: bts_model_osmobts_init: update comment

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27918 ) Change subject: Cosmetic: bts_model_osmobts_init: update comment ...................................................................... Cosmetic: bts_model_osmobts_init: update comment Mention bts_init too. Related: SYS#5922, OS#5538 Change-Id: I885c7e294051627064a763fca6dae08daca4b650 --- M src/osmo-bsc/bts_osmobts.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index f909c61..ca5ddb2 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -205,8 +205,8 @@ sizeof(model_osmobts._features_data); memset(model_osmobts.features.data, 0, model_osmobts.features.data_len); - /* Order alphabetically and remember to adjust bts_model_init in - * OsmoBTS to report new features. */ + /* Order alphabetically and remember to adjust bts_init/bts_model_init + * in OsmoBTS to report new features. */ osmo_bts_set_feature(&model_osmobts.features, BTS_FEAT_CCN); osmo_bts_set_feature(&model_osmobts.features, BTS_FEAT_EGPRS); osmo_bts_set_feature(&model_osmobts.features, BTS_FEAT_GPRS); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I885c7e294051627064a763fca6dae08daca4b650 Gerrit-Change-Number: 27918 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: gsm_data: use llist_for_each_entry() in gsm_bts_by_lac()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27861 ) Change subject: gsm_data: use llist_for_each_entry() in gsm_bts_by_lac() ...................................................................... gsm_data: use llist_for_each_entry() in gsm_bts_by_lac() Change-Id: I55c8067dc377aaccb63e8d5f8d2ca89cbb74b11a --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 28b2a1d..b52b3ff 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -62,16 +62,13 @@ struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac, struct gsm_bts *start_bts) { - int i; struct gsm_bts *bts; int skip = 0; if (start_bts) skip = 1; - for (i = 0; i < net->num_bts; i++) { - bts = gsm_bts_num(net, i); - + llist_for_each_entry(bts, &net->bts_list, list) { if (skip) { if (start_bts == bts) skip = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I55c8067dc377aaccb63e8d5f8d2ca89cbb74b11a Gerrit-Change-Number: 27861 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

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: fix NULL pointer dereference in abis_rsl_rx_rll()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27860 ) Change subject: abis_rsl: fix NULL pointer dereference in abis_rsl_rx_rll() ...................................................................... abis_rsl: fix NULL pointer dereference in abis_rsl_rx_rll() Found with GCC's static analyzer (-fanalyzer). Change-Id: I620538388f6971418980b03a6a1b2384e7c87e15 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index b5375e0..94b6349 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2520,6 +2520,8 @@ sapi = rllh->link_id & 0x7; msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx RLL: "); + if (OSMO_UNLIKELY(msg->lchan == NULL)) + return -1; switch (rllh->c.msg_type) { case RSL_MT_DATA_IND: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I620538388f6971418980b03a6a1b2384e7c87e15 Gerrit-Change-Number: 27860 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

3 years, 2 months

1
0
0 0

Change in pysim[master]: ts_102_222: Set number of records when creating linear files

by laforge

Attention is currently required from: Christian Amsüss. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27825 ) Change subject: ts_102_222: Set number of records when creating linear files ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: the question now is: does this break on SJA2 cards, or do we need a card-specific workaround? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8aeb869c601ee5d1c8b02da6d72eb3c50e347982 Gerrit-Change-Number: 27825 Gerrit-PatchSet: 1 Gerrit-Owner: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Comment-Date: Mon, 25 Apr 2022 13:01:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022