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

[XS] Change in osmo-ttcn3-hacks[master]: epdg: fix a DTE in as_GSUP_rx_CL_REQ

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745?usp=email ) Change subject: epdg: fix a DTE in as_GSUP_rx_CL_REQ ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I26738c8c2a0a4b9066bfb619149cbdbaf3e3b5e1 Gerrit-Change-Number: 38745 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Nov 2024 11:32:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() In c15084a5 overlooked that in order to ensure alignment to the first FACCH/H block in rx_tchh_fn() we actually need to check if DL FACCH/H can start (not end!) at the current TDMA Fn. This means we cannot use the same mapping as we do below in that function; we need another one. This patch fixes multiple FACCH/H regressions in ttcn3-bts-test. Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Fixes: c15084a5 ("trxcon/l1sched: replace old API with sched_tchh_ul_facch_map[]") --- M src/host/trxcon/src/sched_lchan_tchh.c 1 file changed, 19 insertions(+), 8 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index eff36fd..a158bef 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -81,9 +81,10 @@ }; /* FACCH/H channel mappings for DL and UL (see 3GPP TS 45.002, table 1). - * These mappings are valid for both FACCH/H(0) and FACCH/H(1). - * TDMA frame number of burst 'f' is used as the table index. */ -static const uint8_t sched_tchh_dl_facch_map[26] = { + * These mappings are valid for both FACCH/H(0) and FACCH/H(1). */ + +/* TDMA frame number of burst 'f' is used as the table index. */ +static const uint8_t sched_tchh_dl_facch_f_map[26] = { [15] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ [16] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ [23] = 1, /* FACCH/H(0): B1(13,15,17,19,21,23) */ @@ -93,6 +94,16 @@ }; /* TDMA frame number of burst 'a' is used as the table index. */ +static const uint8_t sched_tchh_dl_facch_a_map[26] = { + [4] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ + [5] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ + [13] = 1, /* FACCH/H(0): B1(13,15,17,19,21,23) */ + [14] = 1, /* FACCH/H(1): B1(14,16,18,20,22,24) */ + [21] = 1, /* FACCH/H(0): B2(21,23,0,2,4,6) */ + [22] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ +}; + +/* TDMA frame number of burst 'a' is used as the table index. */ static const uint8_t sched_tchh_ul_facch_map[26] = { [0] = 1, /* FACCH/H(0): B0(0,2,4,6,8,10) */ [1] = 1, /* FACCH/H(1): B0(1,3,5,7,9,11) */ @@ -189,7 +200,7 @@ /* Align reception of the first FACCH/H frame */ if (lchan->tch_mode == GSM48_CMODE_SIGN) { - if (!sched_tchh_dl_facch_map[bi->fn % 26]) + if (!sched_tchh_dl_facch_a_map[bi->fn % 26]) return 0; } } @@ -246,14 +257,14 @@ case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* HR */ rc = gsm0503_tch_hr_decode(&tch_data[0], BUFTAIL8(bursts_p), - !sched_tchh_dl_facch_map[bi->fn % 26], + !sched_tchh_dl_facch_f_map[bi->fn % 26], &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ /* See comment in function rx_tchf_fn() */ amr = 2; rc = gsm0503_tch_ahs_decode_dtx(&tch_data[amr], BUFTAIL8(bursts_p), - !sched_tchh_dl_facch_map[bi->fn % 26], + !sched_tchh_dl_facch_f_map[bi->fn % 26], !sched_tchh_dl_amr_cmi_map[bi->fn % 26], lchan->amr.codec, lchan->amr.codecs, @@ -281,7 +292,7 @@ /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: /* FACCH/H does not steal TCH/H4.8 frames, but only disturbs some bits */ - if (sched_tchh_dl_facch_map[bi->fn % 26]) + if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); if (!sched_tchh_dl_csd_map[bi->fn % 26]) return 0; @@ -291,7 +302,7 @@ /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: /* FACCH/H does not steal TCH/H2.4 frames, but only disturbs some bits */ - if (sched_tchh_dl_facch_map[bi->fn % 26]) + if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); if (!sched_tchh_dl_csd_map[bi->fn % 26]) return 0; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: check-in trx_sched_tch.txt from osmo-bts.git

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38743?usp=email ) Change subject: trxcon/l1sched: check-in trx_sched_tch.txt from osmo-bts.git ...................................................................... trxcon/l1sched: check-in trx_sched_tch.txt from osmo-bts.git This explains burst processing on full-/half-rate traffic channels. Change-Id: I3582d6f6e489a345ba8fc6580f6bb29da630fc8e --- A src/host/trxcon/doc/l1sched_tch.txt 1 file changed, 98 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/host/trxcon/doc/l1sched_tch.txt b/src/host/trxcon/doc/l1sched_tch.txt new file mode 100644 index 0000000..f8c79ff --- /dev/null +++ b/src/host/trxcon/doc/l1sched_tch.txt @@ -0,0 +1,98 @@ +== rx_tchf_fn(): TCH/FS, TCH/EFS, TCH/AFS, TCH/F2.4, and FACCH/F + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | | | | | a | b | c | d | Rx bid={0,1,2,3}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | g | h | Rx bid={0,1,2,3}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 4 + | + |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame A + | |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame B + @ decoding from here + + +== rx_tchf_fn(): TCH/F14.4, TCH/F9.6, TCH/F4.8 + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | | | | | a | b | c | d | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | g | h | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | w | x | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| +|<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame A +| |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame B +@ decoding from here + + +== rx_tchh_fn(): TCH/HS, TCH/AHS + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | | | a | b | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | a | b | c | d | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 + | + |<~~~~~~~~~~~~~>| frame A + | |<~~~~~~~~~~~~~>| frame B + @ decoding from here + + +== rx_tchh_fn(): FACCH/H + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | | | a | b | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | a | b | c | d | | | Rx bid={0,1} ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 + | + |<~~~~~~~~~~~~~~~~~~~~~>| frame A + | |<~~~~~~~~~~~~~~~~~~~~~>| frame B + @ decoding from here + + +== rx_tchh_fn(): TCH/H4.8, TCH/H2.4 + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | | | a | b | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | a | b | c | d | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | a | b | c | d | e | f | g | h | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | a | b | c | d | e | f | g | h | i | j | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| +|<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame A +| |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame B +@ decoding from here -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38743?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3582d6f6e489a345ba8fc6580f6bb29da630fc8e Gerrit-Change-Number: 38743 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: clarify TDMA Fn (mod 26) maps

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38744?usp=email ) Change subject: trxcon/l1sched: clarify TDMA Fn (mod 26) maps ...................................................................... trxcon/l1sched: clarify TDMA Fn (mod 26) maps * Clarify comments, fix 3GPP spec. references * Remove burst tables, refer to doc/l1sched_tch.txt * Rename mappings: include burst letter Change-Id: Ib664ba643073e7673aa86aa860a1649225c19aa1 --- M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 45 insertions(+), 58 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index 985bea4..598203a 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -47,22 +47,19 @@ #define BUFPOS(buf, n) &buf[(n) * BPLEN] #define BUFTAIL8(buf) BUFPOS(buf, (BUFMAX - 8)) -/* 3GPP TS 45.009, table 3.2.1.3-{1,3}: AMR on Downlink TCH/F. - * - * +---+---+---+---+---+---+---+---+ - * | a | b | c | d | e | f | g | h | Burst 'a' received first - * +---+---+---+---+---+---+---+---+ - * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Speech/FACCH frame (bursts 'a' .. 'h') - * - * TDMA frame number of burst 'h' is always used as the table index. */ -static const uint8_t sched_tchf_dl_amr_cmi_map[26] = { +/* ------------------------------------------------------------------ + * 3GPP TS 45.009, table 3.2.1.3-1 + * "TDMA frames for Codec Mode Indication for TCH/AFS, TCH/WFS and O-TCH/WFS" */ + +/* TDMA frame number (mod 26) of burst 'h' (last) is the table index. */ +static const uint8_t sched_tchf_dl_amr_cmi_h_map[26] = { [11] = 1, /* TCH/F: a=4 / h=11 */ [20] = 1, /* TCH/F: a=13 / h=20 */ [3] = 1, /* TCH/F: a=21 / h=3 (21+7=28, 25 is idle -> 29. 29%26=3) */ }; -/* TDMA frame number of burst 'a' should be used as the table index. */ -static const uint8_t sched_tchf_ul_amr_cmi_map[26] = { +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ +static const uint8_t sched_tchf_ul_amr_cmi_a_map[26] = { [0] = 1, /* TCH/F: a=0 */ [8] = 1, /* TCH/F: a=8 */ [17] = 1, /* TCH/F: a=17 */ @@ -166,7 +163,7 @@ * know this before we actually decode the frame) */ amr = 2; rc = gsm0503_tch_afs_decode_dtx(&tch_data[amr], BUFTAIL8(bursts_p), - !sched_tchf_dl_amr_cmi_map[bi->fn % 26], + !sched_tchf_dl_amr_cmi_h_map[bi->fn % 26], lchan->amr.codec, lchan->amr.codecs, &lchan->amr.dl_ft, @@ -304,7 +301,7 @@ break; case GSM48_CMODE_SPEECH_AMR: { - bool amr_fn_is_cmr = !sched_tchf_ul_amr_cmi_map[br->fn % 26]; + bool amr_fn_is_cmr = !sched_tchf_ul_amr_cmi_a_map[br->fn % 26]; unsigned int offset = 0; if (msg != NULL && msg != msg_facch) { /* TCH/AFS: speech */ diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index a158bef..359ab37 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -50,16 +50,16 @@ #define BUFPOS(buf, n) &buf[(n) * BPLEN] #define BUFTAIL8(buf) BUFPOS(buf, (BUFMAX - 8)) -/* 3GPP TS 45.009, table 3.2.1.3-{2,4}: AMR on Downlink TCH/H. - * - * +---+---+---+---+---+---+ - * | a | b | c | d | e | f | Burst 'a' received first - * +---+---+---+---+---+---+ - * ^^^^^^^^^^^^^^^^^^^^^^^ FACCH frame (bursts 'a' .. 'f') - * ^^^^^^^^^^^^^^^ Speech frame (bursts 'a' .. 'd') - * - * TDMA frame number of burst 'f' is always used as the table index. */ -static const uint8_t sched_tchh_dl_amr_cmi_map[26] = { +/* ------------------------------------------------------------------ + * 3GPP TS 45.009, table 3.2.1.3-2 + * "TDMA frames for Codec Mode Indication for TCH/AHS, O-TCH/AHS and O-TCH/WHS" + * These mappings are valid for both TCH/H(0) and TCH/H(1). */ + +/* TDMA frame number (mod 26) of burst 'f' (see below) is the table index. + * Even though a TCH/AHS block is interleaved over 4 bursts ('a' .. 'd'), + * we need to "think" 2 TDMA slots ahead because of the way we put bursts + * to the DL buffer (see doc/l1sched_tch.txt). */ +static const uint8_t sched_tchh_dl_amr_cmi_f_map[26] = { [15] = 1, /* TCH/H(0): a=4 / d=10 / f=15 */ [23] = 1, /* TCH/H(0): a=13 / d=19 / f=23 */ [6] = 1, /* TCH/H(0): a=21 / d=2 / f=6 */ @@ -69,8 +69,8 @@ [7] = 1, /* TCH/H(1): a=22 / d=3 / f=7 */ }; -/* TDMA frame number of burst 'a' is always used as the table index. */ -static const uint8_t sched_tchh_ul_amr_cmi_map[26] = { +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ +static const uint8_t sched_tchh_ul_amr_cmi_a_map[26] = { [0] = 1, /* TCH/H(0): a=0 */ [8] = 1, /* TCH/H(0): a=8 */ [17] = 1, /* TCH/H(0): a=17 */ @@ -80,10 +80,11 @@ [18] = 1, /* TCH/H(1): a=18 */ }; -/* FACCH/H channel mappings for DL and UL (see 3GPP TS 45.002, table 1). +/* ------------------------------------------------------------------ + * FACCH/H channel mappings for DL and UL (see 3GPP TS 45.002, table 1). * These mappings are valid for both FACCH/H(0) and FACCH/H(1). */ -/* TDMA frame number of burst 'f' is used as the table index. */ +/* TDMA frame number (mod 26) of burst 'f' (last) is the table index. */ static const uint8_t sched_tchh_dl_facch_f_map[26] = { [15] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ [16] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ @@ -93,7 +94,7 @@ [7] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ }; -/* TDMA frame number of burst 'a' is used as the table index. */ +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ static const uint8_t sched_tchh_dl_facch_a_map[26] = { [4] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ [5] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ @@ -103,8 +104,8 @@ [22] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ }; -/* TDMA frame number of burst 'a' is used as the table index. */ -static const uint8_t sched_tchh_ul_facch_map[26] = { +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ +static const uint8_t sched_tchh_ul_facch_a_map[26] = { [0] = 1, /* FACCH/H(0): B0(0,2,4,6,8,10) */ [1] = 1, /* FACCH/H(1): B0(1,3,5,7,9,11) */ [8] = 1, /* FACCH/H(0): B1(8,10,13,15,17,19) */ @@ -113,22 +114,12 @@ [18] = 1, /* FACCH/H(1): B2(18,20,22,24,1,3) */ }; -/* 3GPP TS 45.002, table 2 in clause 7: Mapping tables for TCH/H2.4 and TCH/H4.8. - * - * +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ - * | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | - * +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ - * - * TCH/H(0): B0(0,2,4,6,8,10,13,15,17,19,21,23,0,2,4,6,8,10,13,15,17,19) - * TCH/H(1): B0(1,3,5,7,9,11,14,16,18,20,22,24,1,3,5,7,9,11,14,16,18,20) - * TCH/H(0): B1(8,10,13,15,17,19,21,23,0,2,4,6,8,10,13,15,17,19,21,23,0,2) - * TCH/H(1): B1(9,11,14,16,18,20,22,24,1,3,5,7,9,11,14,16,18,20,22,24,1,3) - * TCH/H(0): B2(17,19,21,23,0,2,4,6,8,10,13,15,17,19,21,23,0,2,4,6,8,10) - * TCH/H(1): B2(18,20,22,24,1,3,5,7,9,11,14,16,18,20,22,24,1,3,5,7,9,11) - * - * TDMA frame number of burst 'a' % 26 is the table index. - * This mapping is valid for both TCH/H(0) and TCH/H(1). */ -static const uint8_t sched_tchh_ul_csd_map[26] = { +/* ------------------------------------------------------------------ + * 3GPP TS 45.002, table 2 in clause 7: Mapping tables for TCH/H2.4 and TCH/H4.8. + * These mappings are valid for both TCH/H(0) and TCH/H(1). */ + +/* TDMA frame number (mod 26) of burst 'a' (first) is the table index. */ +static const uint8_t sched_tchh_ul_csd_a_map[26] = { [0] = 1, /* TCH/H(0): B0(0 ... 19) */ [1] = 1, /* TCH/H(1): B0(1 ... 20) */ [8] = 1, /* TCH/H(0): B1(8 ... 2) */ @@ -137,9 +128,8 @@ [18] = 1, /* TCH/H(1): B2(18 ... 11) */ }; -/* TDMA frame number of burst 'v' % 26 is the table index. - * This mapping is valid for both TCH/H(0) and TCH/H(1). */ -static const uint8_t sched_tchh_dl_csd_map[26] = { +/* TDMA frame number (mod 26) of burst 'v' (last) is the table index. */ +static const uint8_t sched_tchh_dl_csd_v_map[26] = { [19] = 1, /* TCH/H(0): B0(0 ... 19) */ [20] = 1, /* TCH/H(1): B0(1 ... 20) */ [2] = 1, /* TCH/H(0): B1(8 ... 2) */ @@ -265,7 +255,7 @@ amr = 2; rc = gsm0503_tch_ahs_decode_dtx(&tch_data[amr], BUFTAIL8(bursts_p), !sched_tchh_dl_facch_f_map[bi->fn % 26], - !sched_tchh_dl_amr_cmi_map[bi->fn % 26], + !sched_tchh_dl_amr_cmi_f_map[bi->fn % 26], lchan->amr.codec, lchan->amr.codecs, &lchan->amr.dl_ft, @@ -294,7 +284,7 @@ /* FACCH/H does not steal TCH/H4.8 frames, but only disturbs some bits */ if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); - if (!sched_tchh_dl_csd_map[bi->fn % 26]) + if (!sched_tchh_dl_csd_v_map[bi->fn % 26]) return 0; rc = gsm0503_tch_hr48_decode(&tch_data[0], BUFPOS(bursts_p, 0), &n_errors, &n_bits_total); @@ -304,7 +294,7 @@ /* FACCH/H does not steal TCH/H2.4 frames, but only disturbs some bits */ if (sched_tchh_dl_facch_f_map[bi->fn % 26]) decode_hr_facch(lchan); - if (!sched_tchh_dl_csd_map[bi->fn % 26]) + if (!sched_tchh_dl_csd_v_map[bi->fn % 26]) return 0; rc = gsm0503_tch_hr24_decode(&tch_data[0], BUFPOS(bursts_p, 0), &n_errors, &n_bits_total); @@ -373,12 +363,12 @@ /* Align transmission of the first frame */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: - if (!sched_tchh_ul_facch_map[br->fn % 26]) + if (!sched_tchh_ul_facch_a_map[br->fn % 26]) return 0; break; case GSM48_CMODE_DATA_6k0: case GSM48_CMODE_DATA_3k6: - if (!sched_tchh_ul_csd_map[br->fn % 26]) + if (!sched_tchh_ul_csd_a_map[br->fn % 26]) return 0; break; } @@ -400,14 +390,14 @@ case GSM48_CMODE_DATA_6k0: case GSM48_CMODE_DATA_3k6: /* CSD: skip dequeueing/encoding, send 2 more bursts */ - if (!sched_tchh_ul_csd_map[br->fn % 26]) + if (!sched_tchh_ul_csd_a_map[br->fn % 26]) goto send_burst; break; } /* dequeue a pair of TCH and FACCH frames */ msg_tch = l1sched_lchan_prim_dequeue_tch(lchan, false); - if (sched_tchh_ul_facch_map[br->fn % 26]) + if (sched_tchh_ul_facch_a_map[br->fn % 26]) msg_facch = l1sched_lchan_prim_dequeue_tch(lchan, true); else msg_facch = NULL; @@ -417,7 +407,7 @@ /* populate the buffer with bursts */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: - if (!sched_tchh_ul_facch_map[br->fn % 26]) + if (!sched_tchh_ul_facch_a_map[br->fn % 26]) goto send_burst; /* XXX: should not happen */ if (msg == NULL) msg = l1sched_lchan_prim_dummy_lapdm(lchan); @@ -439,7 +429,7 @@ break; case GSM48_CMODE_SPEECH_AMR: { - bool amr_fn_is_cmr = !sched_tchh_ul_amr_cmi_map[br->fn % 26]; + bool amr_fn_is_cmr = !sched_tchh_ul_amr_cmi_a_map[br->fn % 26]; unsigned int offset = 0; if (msg != NULL && msg != msg_facch) { /* TCH/AHS: speech */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38744?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib664ba643073e7673aa86aa860a1649225c19aa1 Gerrit-Change-Number: 38744 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: clarify TDMA Fn (mod 26) maps

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38744?usp=email ) Change subject: trxcon/l1sched: clarify TDMA Fn (mod 26) maps ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38744?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib664ba643073e7673aa86aa860a1649225c19aa1 Gerrit-Change-Number: 38744 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Nov 2024 10:23:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Nov 2024 10:23:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: clarify TDMA Fn (mod 26) maps

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38744?usp=email ) Change subject: trxcon/l1sched: clarify TDMA Fn (mod 26) maps ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38744?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib664ba643073e7673aa86aa860a1649225c19aa1 Gerrit-Change-Number: 38744 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Nov 2024 09:39:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: check-in trx_sched_tch.txt from osmo-bts.git

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38743?usp=email ) Change subject: trxcon/l1sched: check-in trx_sched_tch.txt from osmo-bts.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38743?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3582d6f6e489a345ba8fc6580f6bb29da630fc8e Gerrit-Change-Number: 38743 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Nov 2024 09:38:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn()

by osmith

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email ) Change subject: trxcon/l1sched: fix FACCH/H regression in rx_tchh_fn() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia4b737cf11d4d9ce9847cabb77189e9cbcbb8840 Gerrit-Change-Number: 38740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Nov 2024 09:37:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: epdg: fix a DTE in as_GSUP_rx_CL_REQ

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745?usp=email ) Change subject: epdg: fix a DTE in as_GSUP_rx_CL_REQ ...................................................................... Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745/comment/69aa0b58_736e… : PS1, Line 11: does not properly handle the '*' template kind: > why not making handling the "*" case in this patch properly instead? Because this again brings us to the topic of optional IEs in a `record of`. With the current limitations of TTCN-3, it's not possible to implement handling of `*` properly. See related discussion in https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38586. File epdg/EPDG_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745/comment/6b300970_7ad9… : PS1, Line 948: [] GSUP.receive(tr_GSUP_CL_REQ(g_pars.imsi, dom := omit, ctype := ctype)) -> value rx_gsup; > if it's possible that the domain is not transmitted, why not changing tr_GSUP_CL_REQ() to accept a " […] Please take a chance to read the code yourself a bit... `tr_GSUP_CL_REQ` already does accept a template without any restrictions, so the given parameter can be anything. Otherwise my code passing `omit` here would cause another DTE. The problem is actually in `f_gen_tr_ies()`, which is called by `tr_GSUP_CL_REQ` to generate a `record of` IEs. This is where the violation of `template (present)` was happening: ``` 1300 if (not istemplatekind(cn_domain, "omit")) { 1301 ies[idx] := tr_GSUP_IE_CnDomain(cn_domain); 1302 idx := idx + 1; 1303 } ``` This logic works for `omit`, `?`, and for values, but not for `*`. Before my 51490419 ("library/gsup: improve GSUP_IE templates") this code was passing `*` to `tr_GSUP_IE_CnDomain`, which was wrong and basically eqiovalent to `tr_GSUP_IE_CnDomain(?)`. NOTE: I am not the author of `f_gen_{tr,ts}_ies` and not planning to refactor it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38745?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I26738c8c2a0a4b9066bfb619149cbdbaf3e3b5e1 Gerrit-Change-Number: 38745 Gerrit-PatchSet: 1 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: Wed, 13 Nov 2024 08:44:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024