November 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: tests: update expected stderr for loggingrb test
by fixeria 09 Nov '23

09 Nov '23

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34994?usp=email ) Change subject: tests: update expected stderr for loggingrb test ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34994?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4fc4f3be428e040f5ac88dacfc865e7bae9b8b96 Gerrit-Change-Number: 34994 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-MessageType: abandon

1 0

[S] Change in libosmocore[master]: tests: update expected stderr for loggingrb test
by fixeria 09 Nov '23

09 Nov '23

Attention is currently required from: laforge, manawyrm. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34994?usp=email ) Change subject: tests: update expected stderr for loggingrb test ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Interestingly enough, this unit test fails for me with the current master. And this patch makes it pass locally. Somehow this patch makes it fail on Jenkins, and somehow the related change passed Jenkins build... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34994?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4fc4f3be428e040f5ac88dacfc865e7bae9b8b96 Gerrit-Change-Number: 34994 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 09 Nov 2023 20:44:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: tests: update expected stderr for loggingrb test
by fixeria 09 Nov '23

09 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34994?usp=email ) Change subject: tests: update expected stderr for loggingrb test ...................................................................... tests: update expected stderr for loggingrb test Change-Id: I4fc4f3be428e040f5ac88dacfc865e7bae9b8b96 Fixes: 11a41682 "logging: ensure ANSI color escape is sent in same line/before newline" Related: OS#6249 --- M tests/loggingrb/logging_test.err 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/34994/1 diff --git a/tests/loggingrb/logging_test.err b/tests/loggingrb/logging_test.err index e070561..b59d2e8 100644 --- a/tests/loggingrb/logging_test.err +++ b/tests/loggingrb/logging_test.err @@ -1,2 +1,3 @@ -[1;31mYou should see this[0;m -[1;32mYou should see this[0;m +[1;31mYou should see this +[0;m[1;32mYou should see this +[0;m \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34994?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4fc4f3be428e040f5ac88dacfc865e7bae9b8b96 Gerrit-Change-Number: 34994 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-trx[ewild/1.6.1]: Bump version: 1.6.0 → 1.6.1
by Hoernchen 09 Nov '23

09 Nov '23

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34989?usp=email ) Change subject: Bump version: 1.6.0 → 1.6.1 ...................................................................... Bump version: 1.6.0 → 1.6.1 Change-Id: I345ba6569ae0765b3d33e4024d07fc5d925bdf80 --- M debian/changelog 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 90f554e..ac6e089 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-trx (1.6.1) unstable; urgency=medium + + [ Eric Wild ] + * devices: fix wrong gain to power mapping + + -- Eric Wild <ewild(a)sysmocom.de> Thu, 09 Nov 2023 14:16:21 +0200 + osmo-trx (1.6.0) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34989?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: ewild/1.6.1 Gerrit-Change-Id: I345ba6569ae0765b3d33e4024d07fc5d925bdf80 Gerrit-Change-Number: 34989 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-trx[ewild/1.6.1]: devices: fix wrong gain to power mapping
by Hoernchen 09 Nov '23

09 Nov '23

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34988?usp=email ) Change subject: devices: fix wrong gain to power mapping ...................................................................... devices: fix wrong gain to power mapping The dev type was set too early, but the actual dev is only being discovered during open, so update it. This broke the gain to power mapping by defaulting to a wrong device. Change-Id: I1dda6023ca6f15bc063c3dfbc704db2410ff7c98 --- M Transceiver52M/device/bladerf/bladerf.cpp M Transceiver52M/device/common/bandmanager.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/uhd/UHDDevice.cpp 4 files changed, 22 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/Transceiver52M/device/bladerf/bladerf.cpp b/Transceiver52M/device/bladerf/bladerf.cpp index 3e830b1..2f3c86a 100644 --- a/Transceiver52M/device/bladerf/bladerf.cpp +++ b/Transceiver52M/device/bladerf/bladerf.cpp @@ -279,6 +279,7 @@ dev_type = blade_dev_type::BLADE2; tx_window = TX_WINDOW_FIXED; + update_band_dev(dev_key(dev_type, tx_sps, rx_sps)); struct bladerf_devinfo info; bladerf_get_devinfo(dev, &info); diff --git a/Transceiver52M/device/common/bandmanager.h b/Transceiver52M/device/common/bandmanager.h index a198937..d07f21d 100644 --- a/Transceiver52M/device/common/bandmanager.h +++ b/Transceiver52M/device/common/bandmanager.h @@ -34,7 +34,7 @@ using powerkeyt = typename powermapt::key_type; using powermappedt = typename powermapt::mapped_type; using devkeyt = typename devmapt::key_type; - const devkeyt &m_dev_type; + devkeyt m_dev_type; const powermapt &m_power_map; const devmapt &m_dev_map; powerkeyt m_fallback; @@ -102,6 +102,10 @@ band_ass_curr_sess = false; } + void update_band_dev(devkeyt dev_type) { + m_dev_type = dev_type; + } + void get_dev_band_desc(powermappedt &desc) { if (m_band == 0) { diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 451d2b9..7c220d2 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -245,6 +245,7 @@ m_dev_type = parse_dev_type(m_lms_dev); dev_desc = dev_param_map.at(m_dev_type); + update_band_dev(m_dev_type); if ((cfg->clock_ref != REF_EXTERNAL) && (cfg->clock_ref != REF_INTERNAL)) { LOGC(DDEV, ERROR) << "Invalid reference type"; diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index ec772aa..85e9e38 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -530,6 +530,8 @@ if (!parse_dev_type()) return -1; + update_band_dev(dev_key(dev_type, tx_sps, rx_sps)); + if ((dev_type == E3XX) && !uhd_e3xx_version_chk()) { LOGC(DDEV, ALERT) << "E3XX requires UHD 003.009.000 or greater"; return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34988?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: ewild/1.6.1 Gerrit-Change-Id: I1dda6023ca6f15bc063c3dfbc704db2410ff7c98 Gerrit-Change-Number: 34988 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-trx[ewild/1.6.1]: Bump version: 1.6.0 → 1.6.1
by fixeria 09 Nov '23

09 Nov '23

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34989?usp=email ) Change subject: Bump version: 1.6.0 → 1.6.1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34989?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: ewild/1.6.1 Gerrit-Change-Id: I345ba6569ae0765b3d33e4024d07fc5d925bdf80 Gerrit-Change-Number: 34989 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Nov 2023 20:08:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[ewild/1.6.1]: devices: fix wrong gain to power mapping
by fixeria 09 Nov '23

09 Nov '23

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34988?usp=email ) Change subject: devices: fix wrong gain to power mapping ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34988?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: ewild/1.6.1 Gerrit-Change-Id: I1dda6023ca6f15bc063c3dfbc704db2410ff7c98 Gerrit-Change-Number: 34988 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Nov 2023 20:07:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: tx_tch[fh]_fn(): fix sending idle CSD frames
by fixeria 09 Nov '23

09 Nov '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34993?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: trxcon/l1sched: tx_tch[fh]_fn(): fix sending idle CSD frames ...................................................................... trxcon/l1sched: tx_tch[fh]_fn(): fix sending idle CSD frames In accordance with 3GPP TS 44.021, sections 8.1.6 and 10.2.3, the transmission of idle frames to the DTE is mandated when no data is received from the radio interface. An idle frame has all data, status, and E-bits to binary '1' (excluding the alignment pattern). This requirement is currently implemented by osmo-bts for the Uplink, and is going to be adopted for the Downlink (see the related patch). This patch brings trxcon/l1sched in sync with osmo-bts-trx. Change-Id: I7dea3dde46bc02814e99c3e873298cc7ed045a51 Related: osmo-bts.git I0b25cfac41b6d8dcf3bfd9d46d51a9665f1b047a Related: OS#1572, OS#4396 --- M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 53 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/34993/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34993?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7dea3dde46bc02814e99c3e873298cc7ed045a51 Gerrit-Change-Number: 34993 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: tx_tch[fh]_fn(): fix sending idle CSD frames
by fixeria 09 Nov '23

09 Nov '23

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34993?usp=email ) Change subject: trxcon/l1sched: tx_tch[fh]_fn(): fix sending idle CSD frames ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34993?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7dea3dde46bc02814e99c3e873298cc7ed045a51 Gerrit-Change-Number: 34993 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Nov 2023 20:01:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: tx_tch[fh]_fn(): fix sending idle CSD frames
by fixeria 09 Nov '23

09 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34993?usp=email ) Change subject: trxcon/l1sched: tx_tch[fh]_fn(): fix sending idle CSD frames ...................................................................... trxcon/l1sched: tx_tch[fh]_fn(): fix sending idle CSD frames In accordance with 3GPP TS 44.021, sections 8.1.6 and 10.2.3, the transmission of idle frames to the DTE is mandated when no data is received from the radio interface. An idle frame has all data, status, and E-bits to binary '1' (excluding the alignment pattern). This requirement is currently implemented by osmo-bts for the Uplink, and is going to be adopted for the Downlink (see the related patch). This patch brings trxcon/l1sched in sync with osmo-bts-trx. Change-Id: I7dea3dde46bc02814e99c3e873298cc7ed045a51 Related: osmo-bts.git I0b25cfac41b6d8dcf3bfd9d46d51a9665f1b047a Related: OS#1572, OS#4396 --- M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 52 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/34993/1 diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index ac9ee6b..909804e 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -335,7 +335,11 @@ gsm0503_tch_fr144_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm data sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); - } /* else: all bits of this frame are set to zero */ + } else { + ubit_t idle[290]; + memset(&idle[0], 0x01, sizeof(idle)); + gsm0503_tch_fr144_encode(BUFPOS(bursts_p, 0), &idle[0]); + } if ((msg = msg_facch) != NULL) { gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm FACCH sending (pass ownership of the msgb/prim) */ @@ -349,7 +353,11 @@ gsm0503_tch_fr96_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm data sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); - } /* else: all bits of this frame are set to zero */ + } else { + ubit_t idle[4 * 60]; + memset(&idle[0], 0x01, sizeof(idle)); + gsm0503_tch_fr96_encode(BUFPOS(bursts_p, 0), &idle[0]); + } if ((msg = msg_facch) != NULL) { gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm FACCH sending (pass ownership of the msgb/prim) */ @@ -363,7 +371,11 @@ gsm0503_tch_fr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm data sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); - } /* else: all bits of this frame are set to zero */ + } else { + ubit_t idle[2 * 60]; + memset(&idle[0], 0x01, sizeof(idle)); + gsm0503_tch_fr48_encode(BUFPOS(bursts_p, 0), &idle[0]); + } if ((msg = msg_facch) != NULL) { gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm FACCH sending (pass ownership of the msgb/prim) */ @@ -372,14 +384,16 @@ goto send_burst; /* CSD (TCH/F2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: - if (msg == NULL) - goto send_burst; - if (msg == msg_facch) { + if (msg_facch != NULL) { /* FACCH/F does steal a TCH/F2.4 frame completely */ rc = gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); - } else { + } else if (msg_tch != NULL) { OSMO_ASSERT(msgb_l2len(msg) == 2 * 36); rc = gsm0503_tch_fr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + } else { + ubit_t idle[2 * 36]; + memset(&idle[0], 0x01, sizeof(idle)); + gsm0503_tch_fr24_encode(BUFPOS(bursts_p, 0), &idle[0]); } break; default: diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index 0932cce..99e2680 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -542,7 +542,11 @@ gsm0503_tch_hr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm data sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); - } /* else: all bits of this frame are set to zero */ + } else { + ubit_t idle[4 * 60]; + memset(&idle[0], 0x01, sizeof(idle)); + gsm0503_tch_hr48_encode(BUFPOS(bursts_p, 0), &idle[0]); + } if ((msg = msg_facch) != NULL) { gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm FACCH sending (pass ownership of the msgb/prim) */ @@ -556,7 +560,11 @@ gsm0503_tch_hr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm data sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); - } /* else: all bits of this frame are set to zero */ + } else { + ubit_t idle[4 * 36]; + memset(&idle[0], 0x01, sizeof(idle)); + gsm0503_tch_hr24_encode(BUFPOS(bursts_p, 0), &idle[0]); + } if ((msg = msg_facch) != NULL) { gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); /* Confirm FACCH sending (pass ownership of the msgb/prim) */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34993?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7dea3dde46bc02814e99c3e873298cc7ed045a51 Gerrit-Change-Number: 34993 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0