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

[M] Change in osmo-bts[master]: osmo-bts-trx: 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/osmo-bts/+/34992?usp=email ) Change subject: osmo-bts-trx: tx_tch[fh]_fn(): fix sending idle CSD frames ...................................................................... osmo-bts-trx: 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 for the Uplink, see function csd_v110_rtp_encode(). However, 3GPP TS 44.021 does not explicitly specify whether the same rule is applicable to the Downlink, perhaps assuming a continuous stream of bits on the CSD-over-TDM link. Currently, we transmit a sequence of binary '0' on the Downlink instead of idle frames. * In non-transparent (RLP) mode, whether all bits in a block are set to binary '0' or '1' has no impact, as both scenarios lead to an incorrect FCS. * In transparent sync mode, any filling be it binary '0' or '1' is perceived as incorrect or unexpected. * In transparent async mode, it is more logical to transmit a sequence of binary '1,' which will be interpreted as a sequence of stop bits. Let's align the Downlink with the Uplink for consistency and transmit idle frames when no data is available for transmission. The modified 60-bit V.110 frames exclude the alignment pattern, so sending a sequence of binary '1' is enough to achieve the intended goal. Change-Id: I0b25cfac41b6d8dcf3bfd9d46d51a9665f1b047a Related: OS#1572 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 80 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/34992/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index c0dfd47..0138a2a 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -535,16 +535,25 @@ int rc; LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "No TCH or FACCH prim for transmit.\n"); - /* If the channel mode is TCH/FS or TCH/EFS, transmit a dummy - * speech block with inverted CRC3, designed to induce a BFI - * condition in the MS receiver. In all other channel modes, - * transmit dummy FACCH like we always did before. + /* - If the channel mode is TCH/FS or TCH/EFS, transmit a dummy + * speech block with inverted CRC3, designed to induce a BFI + * condition in the MS receiver. + * - If the channel mode is one of the CSD modes, transmit an + * idle frame as described in 3GPP TS 44.021, sections 8.1.6 + * and 10.2.3 (all data, status and E-bits set to binary '1'). + * - In all other channel modes, transmit dummy FACCH + * like we always did before. * * FIXME: someone who knows AMR needs to look at this problem * and decide what is the correct BTS Tx behavior for frame * gaps in TCH/AFS. See OS#6049. */ switch (tch_mode) { + case GSM48_CMODE_DATA_12k0: + case GSM48_CMODE_DATA_6k0: + case GSM48_CMODE_DATA_3k6: + case GSM48_CMODE_DATA_14k5: + break; /* see below */ case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: rc = gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), NULL, 0, 1); @@ -591,30 +600,36 @@ break; /* CSD (TCH/F9.6): 12.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_12k0: - if (msg_tch != NULL) - gsm0503_tch_fr96_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(4 * 60, 0x01); + gsm0503_tch_fr96_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; /* CSD (TCH/F4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: - if (msg_tch != NULL) - gsm0503_tch_fr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(2 * 60, 0x01); + gsm0503_tch_fr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; /* CSD (TCH/F2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: /* FACCH/F does steal a TCH/F2.4 frame completely */ - if (msg == msg_facch) + if (msg_facch != NULL) { gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); - else + } else { + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(2 * 36, 0x01); gsm0503_tch_fr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + } break; /* CSD (TCH/F14.4): 14.5 kbit/s radio interface rate */ case GSM48_CMODE_DATA_14k5: - if (msg_tch != NULL) - gsm0503_tch_fr144_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(290, 0x01); + gsm0503_tch_fr144_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 96ee5e8..e0d7aca 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -450,16 +450,23 @@ int rc; LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for transmit.\n"); - /* If the channel mode is TCH/HS, transmit a dummy speech block - * with inverted CRC3, designed to induce a BFI condition in - * the MS receiver. In all other channel modes, transmit - * dummy FACCH like we always did before. + /* - If the channel mode is TCH/HS, transmit a dummy speech block + * with inverted CRC3, designed to induce a BFI condition in + * the MS receiver. + * - If the channel mode is one of the CSD modes, transmit an + * idle frame as described in 3GPP TS 44.021, sections 8.1.6 + * and 10.2.3 (all data, status and E-bits set to binary '1'). + * - In all other channel modes, transmit dummy FACCH + * like we always did before. * * FIXME: someone who knows AMR needs to look at this problem * and decide what is the correct BTS Tx behavior for frame * gaps in TCH/AHS. See OS#6049. */ switch (tch_mode) { + case GSM48_CMODE_DATA_6k0: + case GSM48_CMODE_DATA_3k6: + break; /* see below */ case GSM48_CMODE_SPEECH_V1: rc = gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), NULL, 0); if (rc == 0) @@ -515,15 +522,17 @@ break; /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: - if (msg_tch != NULL) - gsm0503_tch_hr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(4 * 60, 0x01); + gsm0503_tch_hr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: - if (msg_tch != NULL) - gsm0503_tch_hr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(4 * 36, 0x01); + gsm0503_tch_hr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34992?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b25cfac41b6d8dcf3bfd9d46d51a9665f1b047a Gerrit-Change-Number: 34992 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: osmo-bts-trx: tx_tch[fh]_fn(): rework generation of dummy FACCH
by fixeria 09 Nov '23

09 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34991?usp=email ) Change subject: osmo-bts-trx: tx_tch[fh]_fn(): rework generation of dummy FACCH ...................................................................... osmo-bts-trx: tx_tch[fh]_fn(): rework generation of dummy FACCH Even though it might have a somewhat higher performance impact, opting for the common code path for FACCH by allocating a msgb on heap is more favorable for both readability and maintainability. This choice is preferred over directly calling gsm0503_tch_fr_encode() and then using a 'goto' statement. A similar strategy will be adopted in an follow up patch for CSD. Change-Id: I67cb5c6f4d15149996e17c78a59d66db396da8ff Related: OS#1572 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 61 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/34991/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 34af8a1..c0dfd47 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -490,6 +490,19 @@ } } +struct msgb *tch_dummy_msgb(size_t size, uint8_t pad) +{ + struct msgb *msg; + + msg = msgb_alloc(size, __func__); + OSMO_ASSERT(msg != NULL); + + msg->l2h = msgb_put(msg, size); + memset(msg->l2h, pad, size); + + return msg; +} + /* obtain a to-be-transmitted TCH/F (Full Traffic Channel) burst */ int tx_tchf_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { @@ -519,11 +532,6 @@ /* dequeue a TCH and/or a FACCH message to be transmitted */ tch_dl_dequeue(l1ts, br, &msg_tch, &msg_facch); if (msg_tch == NULL && msg_facch == NULL) { - static const uint8_t dummy[GSM_MACBLOCK_LEN] = { - 0x03, 0x03, 0x01, /* TODO: use randomized padding */ - 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, - 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, - }; int rc; LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "No TCH or FACCH prim for transmit.\n"); @@ -541,13 +549,18 @@ case GSM48_CMODE_SPEECH_EFR: rc = gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), NULL, 0, 1); if (rc == 0) - break; + goto send_burst; /* fall-through */ + case GSM48_CMODE_SIGN: default: - gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), dummy, sizeof(dummy), 1); - chan_state->dl_facch_bursts = 8; + /* TODO: use randomized padding */ + msg_facch = tch_dummy_msgb(GSM_MACBLOCK_LEN, GSM_MACBLOCK_PADDING); + /* dummy LAPDm func=UI frame */ + msg_facch->l2h[0] = 0x03; + msg_facch->l2h[1] = 0x03; + msg_facch->l2h[2] = 0x01; + break; } - goto send_burst; } /* Unlike SACCH, FACCH has no dedicated slots on the multiframe layout. diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 77309cf..96ee5e8 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -399,6 +399,8 @@ extern void tch_dl_dequeue(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br, struct msgb **msg_tch, struct msgb **msg_facch); +struct msgb *tch_dummy_msgb(size_t size, uint8_t pad); + /* obtain a to-be-transmitted TCH/H (Half Traffic Channel) burst */ int tx_tchh_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { @@ -445,11 +447,6 @@ /* no message at all, send a dummy L2 frame on FACCH */ if (msg_tch == NULL && msg_facch == NULL) { - static const uint8_t dummy[GSM_MACBLOCK_LEN] = { - 0x03, 0x03, 0x01, /* TODO: use randomized padding */ - 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, - 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, - }; int rc; LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for transmit.\n"); @@ -462,25 +459,30 @@ * and decide what is the correct BTS Tx behavior for frame * gaps in TCH/AHS. See OS#6049. */ - if (tch_mode == GSM48_CMODE_SPEECH_V1) { + switch (tch_mode) { + case GSM48_CMODE_SPEECH_V1: rc = gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), NULL, 0); if (rc == 0) goto send_burst; - } + /* fall-through */ + case GSM48_CMODE_SIGN: + default: + /* FACCH/H can only be scheduled at specific TDMA offset */ + if (!sched_tchh_dl_facch_map[br->fn % 26]) { + /* FACCH/H is not allowed, send half-filled bursts with even numbered + * bits contaning 232 encoded bits of the previous L2 frame, and 232 + * odd numbered bits all set to 0. */ + goto send_burst; + } - /* FACCH/H can only be scheduled at specific TDMA offset */ - if (!sched_tchh_dl_facch_map[br->fn % 26]) { - /* FACCH/H is not allowed, send half-filled bursts with even numbered - * bits contaning 232 encoded bits of the previous L2 frame, and 232 - * odd numbered bits all set to 0. */ - goto send_burst; + /* TODO: use randomized padding */ + msg_facch = tch_dummy_msgb(GSM_MACBLOCK_LEN, GSM_MACBLOCK_PADDING); + /* dummy LAPDm func=UI frame */ + msg_facch->l2h[0] = 0x03; + msg_facch->l2h[1] = 0x03; + msg_facch->l2h[2] = 0x01; + break; } - - gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), dummy, sizeof(dummy)); - if (chan_state->rsl_cmode != RSL_CMOD_SPD_DATA) - chan_state->dl_ongoing_facch = 1; - chan_state->dl_facch_bursts = 6; - goto send_burst; } /* Unlike SACCH, FACCH has no dedicated slots on the multiframe layout. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I67cb5c6f4d15149996e17c78a59d66db396da8ff Gerrit-Change-Number: 34991 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: osmo-bts-trx: tx_tch[fh]_fn(): use BUFPOS macro everywhere
by fixeria 09 Nov '23

09 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34990?usp=email ) Change subject: osmo-bts-trx: tx_tch[fh]_fn(): use BUFPOS macro everywhere ...................................................................... osmo-bts-trx: tx_tch[fh]_fn(): use BUFPOS macro everywhere For the sake of consistency. Change-Id: I16ce4c979c5b44fd67324eb2ed3da28a4b78221b Related: OS#1572 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/34990/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index ae800a9..34af8a1 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -539,12 +539,12 @@ switch (tch_mode) { case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: - rc = gsm0503_tch_fr_encode(bursts_p, NULL, 0, 1); + rc = gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), NULL, 0, 1); if (rc == 0) break; /* fall-through */ default: - gsm0503_tch_fr_encode(bursts_p, dummy, sizeof(dummy), 1); + gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), dummy, sizeof(dummy), 1); chan_state->dl_facch_bursts = 8; } goto send_burst; diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 23e59cf..77309cf 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -463,7 +463,7 @@ * gaps in TCH/AHS. See OS#6049. */ if (tch_mode == GSM48_CMODE_SPEECH_V1) { - rc = gsm0503_tch_hr_encode(bursts_p, NULL, 0); + rc = gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), NULL, 0); if (rc == 0) goto send_burst; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I16ce4c979c5b44fd67324eb2ed3da28a4b78221b Gerrit-Change-Number: 34990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

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

09 Nov '23

Attention is currently required from: Hoernchen. osmith 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+2 -- 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: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Nov 2023 16:46:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

09 Nov '23

Attention is currently required from: Hoernchen. osmith 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+2 -- 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: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Nov 2023 16:46:43 +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 osmith 09 Nov '23

09 Nov '23

Attention is currently required from: Hoernchen. osmith 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: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Nov 2023 16:46:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/89/34989/1 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-MessageType: newchange

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/34988/1 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-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: osmo-hnbgw.cfg: reduce X31 to 5s
by neels 09 Nov '23

09 Nov '23

Attention is currently required from: fixeria, laforge, osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34980?usp=email ) Change subject: hnbgw: osmo-hnbgw.cfg: reduce X31 to 5s ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34980?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1c275a1d10cfe0fe67d71e900881b0c4891af0be Gerrit-Change-Number: 34980 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Nov 2023 16:23:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: runtime: fix tracking of selected_adf
by laforge 09 Nov '23

09 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34897?usp=email ) Change subject: runtime: fix tracking of selected_adf ...................................................................... runtime: fix tracking of selected_adf The class property selected_adf is not updated in all locations where an ADF is selected, this means that we may loose track of the currently selected ADF in some locations Change-Id: I4cc0c58ff887422b4f3954d35c8380ddc00baa1d Related: OS#5418 --- M pySim/runtime.py 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/pySim/runtime.py b/pySim/runtime.py index 8660724..58df22d 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -111,6 +111,7 @@ for f in sorted(set(apps_profile) - set(apps_taken), key=str): try: data, sw = self.card.select_adf_by_aid(f.aid) + self.selected_adf = f if sw == "9000": print(" %s: %s" % (f.name, f.aid)) apps_taken.append(f) @@ -344,6 +345,7 @@ try: if isinstance(f, CardADF): (data, sw) = self.rs.card.select_adf_by_aid(f.aid, scc=self.scc) + self.selected_adf = f else: (data, sw) = self.scc.select_file(f.fid) self.selected_file = f -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4cc0c58ff887422b4f3954d35c8380ddc00baa1d Gerrit-Change-Number: 34897 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0