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

[M] Change in osmocom-bb[master]: trxcon/l1sched: rework burst buffer shifting for TCH/[FH]

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32921 ) Change subject: trxcon/l1sched: rework burst buffer shifting for TCH/[FH] ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb6e415f37f41b8ab92a3864962dac0a40c2fbaa Gerrit-Change-Number: 32921 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 May 2023 11:06:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in osmo-bts[master]: measurement: suppress unsupported tch_mode warnings for CSD

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33074 ) Change subject: measurement: suppress unsupported tch_mode warnings for CSD ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If6896b420d0fa50fa6622d24ef679ca65ef2dc50 Gerrit-Change-Number: 33074 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 May 2023 11:05:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-bts[master]: osmo-bts-trx: visualize rx_tch[fh]_fn() functions

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33076 ) Change subject: osmo-bts-trx: visualize rx_tch[fh]_fn() functions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I373dbbc3d427858f76d07ff85633e07fe2600770 Gerrit-Change-Number: 33076 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 May 2023 11:05:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-trx: tch_dl_dequeue(): do not drop CSD frames

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33073 ) Change subject: osmo-bts-trx: tch_dl_dequeue(): do not drop CSD frames ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I382b9994db01d58515c89c8de6250cd3239b8861 Gerrit-Change-Number: 33073 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 May 2023 11:05:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

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

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33085 ) Change subject: trxcon/l1sched: fix UL FACCH regression in tx_tchh_fn() ...................................................................... trxcon/l1sched: fix UL FACCH regression in tx_tchh_fn() In ad8f7794 I introduced a regression by removing the line setting lchan->ul_facch_blocks, breaking transmission of Uplink FACCH/H. Change-Id: I4f2bbbd30c7d5dbb979b54455561df3c0cc12aac Fixes: ad8f7794 "trxcon/l1sched: remove redundant TCH/[FH] prim length checks" --- M src/host/trxcon/src/sched_lchan_tchh.c 1 file changed, 16 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/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index acf362e..3832deb 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -456,6 +456,9 @@ goto send_burst; } + if (msgb_l2len(lchan->prim) == GSM_MACBLOCK_LEN) + lchan->ul_facch_blocks = 6; + /* populate the buffer with bursts */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4f2bbbd30c7d5dbb979b54455561df3c0cc12aac Gerrit-Change-Number: 33085 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: do not align Tx burst transmission

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33006 ) Change subject: trxcon/l1sched: do not align Tx burst transmission ...................................................................... trxcon/l1sched: do not align Tx burst transmission This is no longer needed thanks to recent patch b0be904b. Change-Id: Ia397cbe16f719729a814b7ef0b7035c7fe8ba165 Related: b0be904b "trxcon: do not call l1sched_prim_dequeue() at ul_bid != 0" --- M src/host/trxcon/src/sched_lchan_pdtch.c M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c M src/host/trxcon/src/sched_lchan_xcch.c 4 files changed, 18 insertions(+), 25 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/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index b6c3b4c..4b5ffdf 100644 --- a/src/host/trxcon/src/sched_lchan_pdtch.c +++ b/src/host/trxcon/src/sched_lchan_pdtch.c @@ -114,13 +114,8 @@ mask = &lchan->tx_burst_mask; bursts_p = lchan->tx_bursts; - if (br->bid > 0) { - /* If we have encoded bursts */ - if (*mask) - goto send_burst; - else - return 0; - } + if (br->bid > 0) + goto send_burst; /* Encode payload */ rc = gsm0503_pdtch_encode(bursts_p, msgb_l2(lchan->prim), msgb_l2len(lchan->prim)); diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index f38c82a..691ad5a 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -224,13 +224,8 @@ mask = &lchan->tx_burst_mask; bursts_p = lchan->tx_bursts; - /* If we have encoded bursts */ - if (*mask) - goto send_burst; - - /* Wait until a first burst in period */ if (br->bid > 0) - return 0; + goto send_burst; /* Shift buffer by 4 bursts back for interleaving */ memcpy(bursts_p, bursts_p + 464, 464); diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index f3b7877..bff9b1b 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -431,12 +431,8 @@ mask = &lchan->tx_burst_mask; bursts_p = lchan->tx_bursts; - if (br->bid > 0) { - /* Align to the first burst */ - if (*mask == 0x00) - return 0; + if (br->bid > 0) goto send_burst; - } if (*mask == 0x00) { /* Align transmission of the first FACCH/H frame */ diff --git a/src/host/trxcon/src/sched_lchan_xcch.c b/src/host/trxcon/src/sched_lchan_xcch.c index b246a17..f76d518 100644 --- a/src/host/trxcon/src/sched_lchan_xcch.c +++ b/src/host/trxcon/src/sched_lchan_xcch.c @@ -110,13 +110,8 @@ mask = &lchan->tx_burst_mask; bursts_p = lchan->tx_bursts; - if (br->bid > 0) { - /* If we have encoded bursts */ - if (*mask) - goto send_burst; - else - return 0; - } + if (br->bid > 0) + goto send_burst; /* Check the prim payload length */ if (msgb_l2len(lchan->prim) != GSM_MACBLOCK_LEN) { -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia397cbe16f719729a814b7ef0b7035c7fe8ba165 Gerrit-Change-Number: 33006 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: cosmetic: use variable names like in osmo-bts-trx

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32920 ) Change subject: trxcon/l1sched: cosmetic: use variable names like in osmo-bts-trx ...................................................................... trxcon/l1sched: cosmetic: use variable names like in osmo-bts-trx This way it's easier to keep trxcon in sync with osmo-bts-trx. Change-Id: I8138a45cca4e9063bf7d36ebc920b20b755138dd Related: OS#4396 --- M src/host/trxcon/src/sched_lchan_pdtch.c M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c M src/host/trxcon/src/sched_lchan_xcch.c 4 files changed, 93 insertions(+), 79 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/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index 6702d9d..b6c3b4c 100644 --- a/src/host/trxcon/src/sched_lchan_pdtch.c +++ b/src/host/trxcon/src/sched_lchan_pdtch.c @@ -38,12 +38,12 @@ { uint8_t l2[GPRS_L2_MAX_LEN], *mask; int n_errors, n_bits_total, rc; - sbit_t *buffer, *offset; + sbit_t *bursts_p, *burst; size_t l2_len; /* Set up pointers */ mask = &lchan->rx_burst_mask; - buffer = lchan->rx_bursts; + bursts_p = lchan->rx_bursts; LOGP_LCHAND(lchan, LOGL_DEBUG, "Packet data received: fn=%u bid=%u\n", bi->fn, bi->bid); @@ -59,9 +59,9 @@ l1sched_lchan_meas_push(lchan, bi); /* Copy burst to buffer of 4 bursts */ - offset = buffer + bi->bid * 116; - memcpy(offset, bi->burst + 3, 58); - memcpy(offset + 58, bi->burst + 87, 58); + burst = bursts_p + bi->bid * 116; + memcpy(burst, bi->burst + 3, 58); + memcpy(burst + 58, bi->burst + 87, 58); /* Wait until complete set of bursts */ if (bi->bid != 3) @@ -84,7 +84,7 @@ *mask = *mask << 4; /* Attempt to decode */ - rc = gsm0503_pdtch_decode(l2, buffer, + rc = gsm0503_pdtch_decode(l2, bursts_p, NULL, &n_errors, &n_bits_total); if (rc < 0) { LOGP_LCHAND(lchan, LOGL_ERROR, @@ -105,14 +105,14 @@ int tx_pdtch_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br) { - ubit_t *buffer, *offset; + ubit_t *bursts_p, *burst; const uint8_t *tsc; uint8_t *mask; int rc; /* Set up pointers */ mask = &lchan->tx_burst_mask; - buffer = lchan->tx_bursts; + bursts_p = lchan->tx_bursts; if (br->bid > 0) { /* If we have encoded bursts */ @@ -123,7 +123,7 @@ } /* Encode payload */ - rc = gsm0503_pdtch_encode(buffer, msgb_l2(lchan->prim), msgb_l2len(lchan->prim)); + rc = gsm0503_pdtch_encode(bursts_p, msgb_l2(lchan->prim), msgb_l2len(lchan->prim)); if (rc < 0) { LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload (len=%u): %s\n", msgb_l2len(lchan->prim), msgb_hexdump_l2(lchan->prim)); @@ -133,7 +133,7 @@ send_burst: /* Determine which burst should be sent */ - offset = buffer + br->bid * 116; + burst = bursts_p + br->bid * 116; /* Update mask */ *mask |= (1 << br->bid); @@ -143,9 +143,9 @@ /* Compose a new burst */ memset(br->burst, 0, 3); /* TB */ - memcpy(br->burst + 3, offset, 58); /* Payload 1/2 */ + memcpy(br->burst + 3, burst, 58); /* Payload 1/2 */ memcpy(br->burst + 61, tsc, 26); /* TSC */ - memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */ + memcpy(br->burst + 87, burst + 58, 58); /* Payload 2/2 */ memset(br->burst + 145, 0, 3); /* TB */ br->burst_len = GSM_NBITS_NB_GMSK_BURST; diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index 3674bb7..f38c82a 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -61,15 +61,16 @@ const struct l1sched_burst_ind *bi) { int n_errors = -1, n_bits_total = 0, rc; - sbit_t *buffer, *offset; - uint8_t l2[128], *mask; - size_t l2_len; + sbit_t *bursts_p, *burst; + uint8_t tch_data[128]; + size_t tch_data_len; + uint8_t *mask; int amr = 0; uint8_t ft; /* Set up pointers */ mask = &lchan->rx_burst_mask; - buffer = lchan->rx_bursts; + bursts_p = lchan->rx_bursts; LOGP_LCHAND(lchan, LOGL_DEBUG, "Traffic received: fn=%u bid=%u\n", bi->fn, bi->bid); @@ -85,9 +86,9 @@ l1sched_lchan_meas_push(lchan, bi); /* Copy burst to end of buffer of 8 bursts */ - offset = buffer + bi->bid * 116 + 464; - memcpy(offset, bi->burst + 3, 58); - memcpy(offset + 58, bi->burst + 87, 58); + burst = bursts_p + bi->bid * 116 + 464; + memcpy(burst, bi->burst + 3, 58); + memcpy(burst + 58, bi->burst + 87, 58); /* Wait until complete set of bursts */ if (bi->bid != 3) @@ -113,11 +114,11 @@ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* FR */ - rc = gsm0503_tch_fr_decode(l2, buffer, + rc = gsm0503_tch_fr_decode(&tch_data[0], bursts_p, 1, 0, &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_EFR: /* EFR */ - rc = gsm0503_tch_fr_decode(l2, buffer, + rc = gsm0503_tch_fr_decode(&tch_data[0], bursts_p, 1, 1, &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ @@ -126,7 +127,7 @@ * receive an FACCH frame instead of a voice frame (we do not * know this before we actually decode the frame) */ amr = 2; - rc = gsm0503_tch_afs_decode_dtx(l2 + amr, buffer, + rc = gsm0503_tch_afs_decode_dtx(&tch_data[amr], bursts_p, !sched_tchf_dl_amr_cmi_map[bi->fn % 26], lchan->amr.codec, lchan->amr.codecs, @@ -143,9 +144,9 @@ /* SID frames will always get Frame Type Index 8 (AMR_SID) */ ft = AMR_SID; } - rc = osmo_amr_rtp_enc(l2, - lchan->amr.codec[lchan->amr.dl_cmr], - ft, AMR_GOOD); + rc = osmo_amr_rtp_enc(&tch_data[0], + lchan->amr.codec[lchan->amr.dl_cmr], + ft, AMR_GOOD); if (rc < 0) LOGP_LCHAND(lchan, LOGL_ERROR, "osmo_amr_rtp_enc() returned rc=%d\n", rc); @@ -157,7 +158,7 @@ } /* Shift buffer by 4 bursts for interleaving */ - memcpy(buffer, buffer + 464, 464); + memcpy(bursts_p, bursts_p + 464, 464); /* Check decoding result */ if (rc < 4) { @@ -169,7 +170,7 @@ goto bfi; } else if (rc == GSM_MACBLOCK_LEN) { /* FACCH received, forward it to the higher layers */ - l1sched_lchan_emit_data_ind(lchan, l2 + amr, GSM_MACBLOCK_LEN, + l1sched_lchan_emit_data_ind(lchan, &tch_data[amr], GSM_MACBLOCK_LEN, n_errors, n_bits_total, false); /* Send BFI substituting a stolen TCH frame */ @@ -177,11 +178,11 @@ goto bfi; } else { /* A good TCH frame received */ - l2_len = rc; + tch_data_len = rc; } /* Send a traffic frame to the higher layers */ - return l1sched_lchan_emit_data_ind(lchan, l2, l2_len, + return l1sched_lchan_emit_data_ind(lchan, &tch_data[0], tch_data_len, n_errors, n_bits_total, true); bfi: @@ -204,24 +205,24 @@ } /* Bad frame indication */ - l2_len = l1sched_bad_frame_ind(l2, lchan); + tch_data_len = l1sched_bad_frame_ind(&tch_data[0], lchan); /* Send a BFI frame to the higher layers */ - return l1sched_lchan_emit_data_ind(lchan, l2, l2_len, + return l1sched_lchan_emit_data_ind(lchan, &tch_data[0], tch_data_len, n_errors, n_bits_total, true); } int tx_tchf_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br) { - ubit_t *buffer, *offset; + ubit_t *bursts_p, *burst; const uint8_t *tsc; uint8_t *mask; int rc; /* Set up pointers */ mask = &lchan->tx_burst_mask; - buffer = lchan->tx_bursts; + bursts_p = lchan->tx_bursts; /* If we have encoded bursts */ if (*mask) @@ -232,14 +233,14 @@ return 0; /* Shift buffer by 4 bursts back for interleaving */ - memcpy(buffer, buffer + 464, 464); + memcpy(bursts_p, bursts_p + 464, 464); /* populate the buffer with bursts */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: - rc = gsm0503_tch_fr_encode(buffer, + rc = gsm0503_tch_fr_encode(bursts_p, msgb_l2(lchan->prim), msgb_l2len(lchan->prim), 1); break; @@ -290,7 +291,7 @@ } else { lchan->amr.ul_cmr = cmr; } - rc = gsm0503_tch_afs_encode(buffer, + rc = gsm0503_tch_afs_encode(bursts_p, msgb_l2(lchan->prim) + 2, msgb_l2len(lchan->prim) - 2, amr_fn_is_cmr, @@ -317,7 +318,7 @@ send_burst: /* Determine which burst should be sent */ - offset = buffer + br->bid * 116; + burst = bursts_p + br->bid * 116; /* Update mask */ *mask |= (1 << br->bid); @@ -327,9 +328,9 @@ /* Compose a new burst */ memset(br->burst, 0, 3); /* TB */ - memcpy(br->burst + 3, offset, 58); /* Payload 1/2 */ + memcpy(br->burst + 3, burst, 58); /* Payload 1/2 */ memcpy(br->burst + 61, tsc, 26); /* TSC */ - memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */ + memcpy(br->burst + 87, burst + 58, 58); /* Payload 2/2 */ memset(br->burst + 145, 0, 3); /* TB */ br->burst_len = GSM_NBITS_NB_GMSK_BURST; diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index 3832deb..f3b7877 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -238,15 +238,16 @@ const struct l1sched_burst_ind *bi) { int n_errors = -1, n_bits_total = 0, rc; - sbit_t *buffer, *offset; - uint8_t l2[128], *mask; - size_t l2_len; + sbit_t *bursts_p, *burst; + uint8_t tch_data[128]; + size_t tch_data_len; + uint8_t *mask; int amr = 0; uint8_t ft; /* Set up pointers */ mask = &lchan->rx_burst_mask; - buffer = lchan->rx_bursts; + bursts_p = lchan->rx_bursts; LOGP_LCHAND(lchan, LOGL_DEBUG, "Traffic received: fn=%u bid=%u\n", bi->fn, bi->bid); @@ -273,9 +274,9 @@ l1sched_lchan_meas_push(lchan, bi); /* Copy burst to the end of buffer of 6 bursts */ - offset = buffer + bi->bid * 116 + 464; - memcpy(offset, bi->burst + 3, 58); - memcpy(offset + 58, bi->burst + 87, 58); + burst = bursts_p + bi->bid * 116 + 464; + memcpy(burst, bi->burst + 3, 58); + memcpy(burst + 58, bi->burst + 87, 58); /* Wait until the second burst */ if (bi->bid != 1) @@ -301,14 +302,14 @@ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* HR */ - rc = gsm0503_tch_hr_decode(l2, buffer, + rc = gsm0503_tch_hr_decode(&tch_data[0], bursts_p, !sched_tchh_dl_facch_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(l2 + amr, buffer, + rc = gsm0503_tch_ahs_decode_dtx(&tch_data[amr], bursts_p, !sched_tchh_dl_facch_map[bi->fn % 26], !sched_tchh_dl_amr_cmi_map[bi->fn % 26], lchan->amr.codec, @@ -326,7 +327,7 @@ /* SID frames will always get Frame Type Index 8 (AMR_SID) */ ft = AMR_SID; } - rc = osmo_amr_rtp_enc(l2, + rc = osmo_amr_rtp_enc(&tch_data[0], lchan->amr.codec[lchan->amr.dl_cmr], ft, AMR_GOOD); if (rc < 0) @@ -340,8 +341,8 @@ } /* Shift buffer by 4 bursts for interleaving */ - memcpy(buffer, buffer + 232, 232); - memcpy(buffer + 232, buffer + 464, 232); + memcpy(bursts_p, bursts_p + 232, 232); + memcpy(bursts_p + 232, bursts_p + 464, 232); /* Shift burst mask */ *mask = *mask << 2; @@ -365,7 +366,7 @@ l1sched_lchan_meas_avg(lchan, 6); /* FACCH/H received, forward to the higher layers */ - l1sched_lchan_emit_data_ind(lchan, l2 + amr, GSM_MACBLOCK_LEN, + l1sched_lchan_emit_data_ind(lchan, &tch_data[amr], GSM_MACBLOCK_LEN, n_errors, n_bits_total, false); /* Send BFI substituting 1/2 stolen TCH frames */ @@ -373,20 +374,20 @@ goto bfi; } else { /* A good TCH frame received */ - l2_len = rc; + tch_data_len = rc; /* Calculate AVG of the measurements (traffic takes 4 bursts) */ l1sched_lchan_meas_avg(lchan, 4); } /* Send a traffic frame to the higher layers */ - return l1sched_lchan_emit_data_ind(lchan, l2, l2_len, + return l1sched_lchan_emit_data_ind(lchan, &tch_data[0], tch_data_len, n_errors, n_bits_total, true); bfi_shift: /* Shift buffer */ - memcpy(buffer, buffer + 232, 232); - memcpy(buffer + 232, buffer + 464, 232); + memcpy(bursts_p, bursts_p + 232, 232); + memcpy(bursts_p + 232, bursts_p + 464, 232); /* Shift burst mask */ *mask = *mask << 2; @@ -411,24 +412,24 @@ } /* Bad frame indication */ - l2_len = l1sched_bad_frame_ind(l2, lchan); + tch_data_len = l1sched_bad_frame_ind(&tch_data[0], lchan); /* Send a BFI frame to the higher layers */ - return l1sched_lchan_emit_data_ind(lchan, l2, l2_len, + return l1sched_lchan_emit_data_ind(lchan, &tch_data[0], tch_data_len, n_errors, n_bits_total, true); } int tx_tchh_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br) { - ubit_t *buffer, *offset; + ubit_t *bursts_p, *burst; const uint8_t *tsc; uint8_t *mask; int rc; /* Set up pointers */ mask = &lchan->tx_burst_mask; - buffer = lchan->tx_bursts; + bursts_p = lchan->tx_bursts; if (br->bid > 0) { /* Align to the first burst */ @@ -445,14 +446,14 @@ } /* Shift buffer by 2 bursts back for interleaving */ - memcpy(buffer, buffer + 232, 232); + memcpy(bursts_p, bursts_p + 232, 232); /* Also shift TX burst mask */ *mask = *mask << 2; /* If FACCH/H blocks are still pending */ if (lchan->ul_facch_blocks > 2) { - memcpy(buffer + 232, buffer + 464, 232); + memcpy(bursts_p + 232, bursts_p + 464, 232); goto send_burst; } @@ -463,7 +464,7 @@ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: - rc = gsm0503_tch_hr_encode(buffer, + rc = gsm0503_tch_hr_encode(bursts_p, msgb_l2(lchan->prim), msgb_l2len(lchan->prim)); break; @@ -514,7 +515,7 @@ } else { lchan->amr.ul_cmr = cmr; } - rc = gsm0503_tch_ahs_encode(buffer, + rc = gsm0503_tch_ahs_encode(bursts_p, msgb_l2(lchan->prim) + 2, msgb_l2len(lchan->prim) - 2, amr_fn_is_cmr, @@ -541,7 +542,7 @@ send_burst: /* Determine which burst should be sent */ - offset = buffer + br->bid * 116; + burst = bursts_p + br->bid * 116; /* Update mask */ *mask |= (1 << br->bid); @@ -551,9 +552,9 @@ /* Compose a new burst */ memset(br->burst, 0, 3); /* TB */ - memcpy(br->burst + 3, offset, 58); /* Payload 1/2 */ + memcpy(br->burst + 3, burst, 58); /* Payload 1/2 */ memcpy(br->burst + 61, tsc, 26); /* TSC */ - memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */ + memcpy(br->burst + 87, burst + 58, 58); /* Payload 2/2 */ memset(br->burst + 145, 0, 3); /* TB */ br->burst_len = GSM_NBITS_NB_GMSK_BURST; diff --git a/src/host/trxcon/src/sched_lchan_xcch.c b/src/host/trxcon/src/sched_lchan_xcch.c index 0dca098..b246a17 100644 --- a/src/host/trxcon/src/sched_lchan_xcch.c +++ b/src/host/trxcon/src/sched_lchan_xcch.c @@ -38,11 +38,11 @@ { uint8_t l2[GSM_MACBLOCK_LEN], *mask; int n_errors, n_bits_total, rc; - sbit_t *buffer, *offset; + sbit_t *bursts_p, *burst; /* Set up pointers */ mask = &lchan->rx_burst_mask; - buffer = lchan->rx_bursts; + bursts_p = lchan->rx_bursts; LOGP_LCHAND(lchan, LOGL_DEBUG, "Data received: fn=%u bid=%u\n", bi->fn, bi->bid); @@ -58,9 +58,9 @@ l1sched_lchan_meas_push(lchan, bi); /* Copy burst to buffer of 4 bursts */ - offset = buffer + bi->bid * 116; - memcpy(offset, bi->burst + 3, 58); - memcpy(offset + 58, bi->burst + 87, 58); + burst = bursts_p + bi->bid * 116; + memcpy(burst, bi->burst + 3, 58); + memcpy(burst + 58, bi->burst + 87, 58); /* Wait until complete set of bursts */ if (bi->bid != 3) @@ -86,7 +86,7 @@ *mask = *mask << 4; /* Attempt to decode */ - rc = gsm0503_xcch_decode(l2, buffer, &n_errors, &n_bits_total); + rc = gsm0503_xcch_decode(l2, bursts_p, &n_errors, &n_bits_total); if (rc) { LOGP_LCHAND(lchan, LOGL_ERROR, "Received bad frame (rc=%d, ber=%d/%d) at fn=%u\n", @@ -101,14 +101,14 @@ int tx_data_fn(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br) { - ubit_t *buffer, *offset; + ubit_t *bursts_p, *burst; const uint8_t *tsc; uint8_t *mask; int rc; /* Set up pointers */ mask = &lchan->tx_burst_mask; - buffer = lchan->tx_bursts; + bursts_p = lchan->tx_bursts; if (br->bid > 0) { /* If we have encoded bursts */ @@ -128,7 +128,7 @@ } /* Encode payload */ - rc = gsm0503_xcch_encode(buffer, msgb_l2(lchan->prim)); + rc = gsm0503_xcch_encode(bursts_p, msgb_l2(lchan->prim)); if (rc) { LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload (len=%u): %s\n", msgb_l2len(lchan->prim), msgb_hexdump_l2(lchan->prim)); @@ -138,7 +138,7 @@ send_burst: /* Determine which burst should be sent */ - offset = buffer + br->bid * 116; + burst = bursts_p + br->bid * 116; /* Update mask */ *mask |= (1 << br->bid); @@ -148,9 +148,9 @@ /* Compose a new burst */ memset(br->burst, 0, 3); /* TB */ - memcpy(br->burst + 3, offset, 58); /* Payload 1/2 */ + memcpy(br->burst + 3, burst, 58); /* Payload 1/2 */ memcpy(br->burst + 61, tsc, 26); /* TSC */ - memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */ + memcpy(br->burst + 87, burst + 58, 58); /* Payload 2/2 */ memset(br->burst + 145, 0, 3); /* TB */ br->burst_len = GSM_NBITS_NB_GMSK_BURST; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8138a45cca4e9063bf7d36ebc920b20b755138dd Gerrit-Change-Number: 32920 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: rework burst buffer shifting for TCH/[FH]

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32921 ) Change subject: trxcon/l1sched: rework burst buffer shifting for TCH/[FH] ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb6e415f37f41b8ab92a3864962dac0a40c2fbaa Gerrit-Change-Number: 32921 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 May 2023 11:04:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: cosmetic: use variable names like in osmo-bts-trx

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32920 ) Change subject: trxcon/l1sched: cosmetic: use variable names like in osmo-bts-trx ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8138a45cca4e9063bf7d36ebc920b20b755138dd Gerrit-Change-Number: 32920 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 May 2023 11:03:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

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

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33085 ) Change subject: trxcon/l1sched: fix UL FACCH regression in tx_tchh_fn() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4f2bbbd30c7d5dbb979b54455561df3c0cc12aac Gerrit-Change-Number: 33085 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 May 2023 11:03:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023