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

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_TC_speech_rtp(): run TCH and SACCH loops

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33071 ) Change subject: BTS_Tests: f_TC_speech_rtp(): run TCH and SACCH loops ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33071 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: Ifb69669b75df5b390d7056cefaf0ef1df69d9bd4 Gerrit-Change-Number: 33071 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: Mon, 29 May 2023 09:30:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: osmo-bts-trx: alloc/free burst buffers in trx_sched_set_lchan()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31672 ) Change subject: osmo-bts-trx: alloc/free burst buffers in trx_sched_set_lchan() ...................................................................... osmo-bts-trx: alloc/free burst buffers in trx_sched_set_lchan() It's a lot cleaner if the Rx/Tx burst buffers are allocated and free()d in one place rather than in each lchan handler individually. Allocate the buffer(s) during the lchan activation, free() on deactivation. Regardless of lchan type, allocate the maximim size of 4 * (3 * 2 * 58) bytes, which is sufficient to store 4 8PSK modulated bursts. This way we reduce the load on the memory allocator at the cost of memory consumption, what should not be a big problem. Change-Id: I6a5f76023fc492786076a63016f81285b3576c33 Depends: libosmocore.git I1c38ccc2b64ba9046bb3b1221d99cc55ec493802 Related: OS#1572 --- M src/common/scheduler.c M src/osmo-bts-trx/sched_lchan_pdtch.c M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/sched_lchan_xcch.c 5 files changed, 58 insertions(+), 129 deletions(-) Approvals: lynxis lazus: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 25aefe8..cacae6c 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -35,6 +35,7 @@ #include <osmocom/core/stats.h> #include <osmocom/gsm/protocol/gsm_08_58.h> +#include <osmocom/gsm/gsm0502.h> #include <osmocom/gsm/a5.h> #include <osmo-bts/gsm_data.h> @@ -542,9 +543,7 @@ .chan_nr = RSL_CHAN_OSMO_PDCH, /* Rx and Tx, multiple coding schemes: CS-2..4 and MCS-1..9 (3GPP TS - * 05.03, chapter 5), regular interleaving as specified for xCCH. - * NOTE: the burst buffer is three times bigger because the - * payload of EDGE bursts is three times longer. */ + * 05.03, chapter 5), regular interleaving as specified for xCCH. */ .rts_fn = rts_data_fn, .dl_fn = tx_pdtch_fn, .ul_fn = rx_pdtch_fn, @@ -1070,26 +1069,24 @@ (active) ? "Activating" : "Deactivating", trx_chan_desc[chan].name); - /* free burst memory, to cleanly start with burst 0 */ - if (chan_state->dl_bursts) { - talloc_free(chan_state->dl_bursts); - chan_state->dl_bursts = NULL; - } - if (chan_state->ul_bursts) { - talloc_free(chan_state->ul_bursts); - chan_state->ul_bursts = NULL; - } - if (chan_state->ul_bursts_prev) { - talloc_free(chan_state->ul_bursts_prev); - chan_state->ul_bursts_prev = NULL; - } - if (active) { /* Clean up everything */ memset(chan_state, 0, sizeof(*chan_state)); /* Bind to generic 'struct gsm_lchan' */ chan_state->lchan = lchan; + + /* Allocate memory for Rx/Tx burst buffers. Use the maximim size + * of 4 * (3 * 2 * 58) bytes, which is sufficient to store 4 8PSK + * modulated bursts. */ + const size_t buf_size = 4 * GSM_NBITS_NB_8PSK_PAYLOAD; + if (trx_chan_desc[chan].dl_fn != NULL) + chan_state->dl_bursts = talloc_zero_size(l1ts, buf_size); + if (trx_chan_desc[chan].ul_fn != NULL) { + chan_state->ul_bursts = talloc_zero_size(l1ts, buf_size); + if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) + chan_state->ul_bursts_prev = talloc_zero_size(l1ts, buf_size); + } } else { chan_state->ho_rach_detect = 0; @@ -1097,6 +1094,11 @@ trx_sched_queue_filter(&l1ts->dl_prims, trx_chan_desc[chan].chan_nr, trx_chan_desc[chan].link_id); + + /* Release memory used by Rx/Tx burst buffers */ + TALLOC_FREE(chan_state->dl_bursts); + TALLOC_FREE(chan_state->ul_bursts); + TALLOC_FREE(chan_state->ul_bursts_prev); } chan_state->active = active; diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 8300bdb..ddb4478 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -60,13 +60,6 @@ if (bi->flags & TRX_BI_F_ACCESS_BURST) return rx_rach_fn(l1ts, bi); - /* allocate burst memory, if not already */ - if (!*bursts_p) { - *bursts_p = talloc_zero_size(l1ts, GSM0503_EGPRS_BURSTS_NBITS); - if (!*bursts_p) - return -ENOMEM; - } - /* clear burst */ if (bi->bid == 0) { memset(*bursts_p, 0, GSM0503_EGPRS_BURSTS_NBITS); @@ -156,11 +149,8 @@ int rc = 0; /* send burst, if we already got a frame */ - if (br->bid > 0) { - if (!*bursts_p) - return -ENODEV; + if (br->bid > 0) goto send_burst; - } /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); @@ -170,18 +160,11 @@ * take care of filling C0 with dummy bursts to keep expected * power transmit levels */ - goto no_msg; + return -ENODEV; } /* BURST BYPASS */ - /* allocate burst memory, if not already */ - if (!*bursts_p) { - *bursts_p = talloc_zero_size(l1ts, GSM0503_EGPRS_BURSTS_NBITS); - if (!*bursts_p) - return -ENOMEM; - } - /* encode bursts */ rc = gsm0503_pdtch_egprs_encode(*bursts_p, msg->l2h, msg->tail - msg->l2h); if (rc < 0) @@ -193,7 +176,7 @@ "(len=%ld)\n", (long)(msg->tail - msg->l2h)); /* free message */ msgb_free(msg); - goto no_msg; + return -EINVAL; } else if (rc == GSM0503_EGPRS_BURSTS_NBITS) { *mod = TRX_MOD_T_8PSK; } else { @@ -226,12 +209,4 @@ LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "Transmitting burst=%u.\n", br->bid); return 0; - -no_msg: - /* free burst memory */ - if (*bursts_p) { - talloc_free(*bursts_p); - *bursts_p = NULL; - } - return -ENODEV; } diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 0d0f52a..3e6bdc2 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -99,13 +99,6 @@ LOGL1SB(DL1P, LOGL_DEBUG, l1ts, bi, "Received TCH/F, bid=%u\n", bi->bid); - /* allocate burst memory, if not already */ - if (!*bursts_p) { - *bursts_p = talloc_zero_size(l1ts, 928); - if (!*bursts_p) - return -ENOMEM; - } - /* shift the buffer by 4 bursts leftwards */ if (bi->bid == 0) { memcpy(*bursts_p, *bursts_p + 464, 464); @@ -460,24 +453,14 @@ struct msgb *msg; /* send burst, if we already got a frame */ - if (br->bid > 0) { - if (!*bursts_p) - return -ENODEV; + if (br->bid > 0) goto send_burst; - } /* BURST BYPASS */ - /* allocate burst memory, if not already, - * otherwise shift buffer by 4 bursts for interleaving */ - if (!*bursts_p) { - *bursts_p = talloc_zero_size(l1ts, 928); - if (!*bursts_p) - return -ENOMEM; - } else { - memcpy(*bursts_p, *bursts_p + 464, 464); - memset(*bursts_p + 464, 0, 464); - } + /* shift buffer by 4 bursts for interleaving */ + memcpy(*bursts_p, *bursts_p + 464, 464); + memset(*bursts_p + 464, 0, 464); /* dequeue a message to be transmitted */ msg = tch_dl_dequeue(l1ts, br); diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index c6c2cd0..f464b56 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -122,13 +122,6 @@ LOGL1SB(DL1P, LOGL_DEBUG, l1ts, bi, "Received TCH/H, bid=%u\n", bi->bid); - /* allocate burst memory, if not already */ - if (!*bursts_p) { - *bursts_p = talloc_zero_size(l1ts, 696); - if (!*bursts_p) - return -ENOMEM; - } - /* shift the buffer by 2 bursts leftwards */ if (bi->bid == 0) { memcpy(*bursts_p, *bursts_p + 232, 232); @@ -361,28 +354,18 @@ struct msgb *msg; /* send burst, if we already got a frame */ - if (br->bid > 0) { - if (!*bursts_p) - return -ENODEV; + if (br->bid > 0) goto send_burst; - } /* BURST BYPASS */ - /* allocate burst memory, if not already, - * otherwise shift buffer by 2 bursts for interleaving */ - if (!*bursts_p) { - *bursts_p = talloc_zero_size(l1ts, 696); - if (!*bursts_p) - return -ENOMEM; + /* shift buffer by 2 bursts for interleaving */ + memcpy(*bursts_p, *bursts_p + 232, 232); + if (chan_state->dl_ongoing_facch) { + memcpy(*bursts_p + 232, *bursts_p + 464, 232); + memset(*bursts_p + 464, 0, 232); } else { - memcpy(*bursts_p, *bursts_p + 232, 232); - if (chan_state->dl_ongoing_facch) { - memcpy(*bursts_p + 232, *bursts_p + 464, 232); - memset(*bursts_p + 464, 0, 232); - } else { - memset(*bursts_p + 232, 0, 232); - } + memset(*bursts_p + 232, 0, 232); } /* dequeue a message to be transmitted */ diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c index e936621..786b509 100644 --- a/src/osmo-bts-trx/sched_lchan_xcch.c +++ b/src/osmo-bts-trx/sched_lchan_xcch.c @@ -69,21 +69,6 @@ LOGL1SB(DL1P, LOGL_DEBUG, l1ts, bi, "Received Data, bid=%u\n", bi->bid); - /* allocate burst memory, if not already */ - if (!*bursts_p) { - *bursts_p = talloc_zero_size(l1ts, 464); - if (!*bursts_p) - return -ENOMEM; - } - - /* UL-SACCH requires additional memory to keep a copy of each previous - * burst set. */ - if (L1SAP_IS_LINK_SACCH(trx_chan_desc[bi->chan].link_id) && !chan_state->ul_bursts_prev) { - chan_state->ul_bursts_prev = talloc_zero_size(l1ts, 464); - if (!chan_state->ul_bursts_prev) - return -ENOMEM; - } - /* clear burst & store frame number of first burst */ if (bi->bid == 0) { memset(*bursts_p, 0, 464); @@ -174,46 +159,27 @@ ubit_t *burst, **bursts_p = &l1ts->chan_state[br->chan].dl_bursts; /* send burst, if we already got a frame */ - if (br->bid > 0) { - if (!*bursts_p) - return -ENODEV; + if (br->bid > 0) goto send_burst; - } /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); - if (msg) - goto got_msg; - - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); - -no_msg: - /* free burst memory */ - if (*bursts_p) { - talloc_free(*bursts_p); - *bursts_p = NULL; + if (msg == NULL) { + LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + return -ENODEV; } - return -ENODEV; -got_msg: /* check validity of message */ if (msgb_l2len(msg) != GSM_MACBLOCK_LEN) { LOGL1SB(DL1P, LOGL_FATAL, l1ts, br, "Prim has odd len=%u != %u\n", msgb_l2len(msg), GSM_MACBLOCK_LEN); /* free message */ msgb_free(msg); - goto no_msg; + return -EINVAL; } /* BURST BYPASS */ - /* allocate burst memory, if not already */ - if (!*bursts_p) { - *bursts_p = talloc_zero_size(l1ts, 464); - if (!*bursts_p) - return -ENOMEM; - } - /* encode bursts */ gsm0503_xcch_encode(*bursts_p, msg->l2h); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6a5f76023fc492786076a63016f81285b3576c33 Gerrit-Change-Number: 31672 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: osmo-bts-trx: use direct pointer to chan_state->{ul,dl}_bursts

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32726 ) Change subject: osmo-bts-trx: use direct pointer to chan_state->{ul,dl}_bursts ...................................................................... osmo-bts-trx: use direct pointer to chan_state->{ul,dl}_bursts There is no more need to access the UL/DL buffers via pointer to pointer thanks to the previous patch [1] moving the memory management routines out of the logical channel specific Rx/Tx handlers. Change-Id: Ib1e8e86ac60a7ac9b0415ef66b609eaa33443c19 Related: [1] c45e03726af8a2b46b7166b3c47bc666ba933a69 --- M src/osmo-bts-trx/sched_lchan_pdtch.c M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/sched_lchan_xcch.c 4 files changed, 70 insertions(+), 56 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index ddb4478..5ff7229 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -42,7 +42,7 @@ int rx_pdtch_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) { struct l1sched_chan_state *chan_state = &l1ts->chan_state[bi->chan]; - sbit_t *burst, **bursts_p = &chan_state->ul_bursts; + sbit_t *burst, *bursts_p = chan_state->ul_bursts; uint32_t first_fn; uint8_t *mask = &chan_state->ul_mask; struct l1sched_meas_set meas_avg; @@ -62,7 +62,7 @@ /* clear burst */ if (bi->bid == 0) { - memset(*bursts_p, 0, GSM0503_EGPRS_BURSTS_NBITS); + memset(bursts_p, 0, GSM0503_EGPRS_BURSTS_NBITS); *mask = 0x0; } @@ -75,20 +75,20 @@ /* copy burst to buffer of 4 bursts */ switch (bi->burst_len) { case EGPRS_BURST_LEN: - burst = *bursts_p + bi->bid * 348; + burst = bursts_p + bi->bid * 348; memcpy(burst, bi->burst + 9, 174); memcpy(burst + 174, bi->burst + 261, 174); n_bursts_bits = GSM0503_EGPRS_BURSTS_NBITS; break; case GSM_BURST_LEN: - burst = *bursts_p + bi->bid * 116; + burst = bursts_p + bi->bid * 116; memcpy(burst, bi->burst + 3, 58); memcpy(burst + 58, bi->burst + 87, 58); n_bursts_bits = GSM0503_GPRS_BURSTS_NBITS; break; case 0: /* NOPE.ind, assume GPRS? */ - burst = *bursts_p + bi->bid * 116; + burst = bursts_p + bi->bid * 116; memset(burst, 0, 116); n_bursts_bits = GSM0503_GPRS_BURSTS_NBITS; } @@ -113,11 +113,11 @@ * then we incur decoding overhead of 31 bits on the Type 3 EGPRS * header, which is tolerable. */ - rc = gsm0503_pdtch_egprs_decode(l2, *bursts_p, n_bursts_bits, + rc = gsm0503_pdtch_egprs_decode(l2, bursts_p, n_bursts_bits, NULL, &n_errors, &n_bits_total); if ((bi->burst_len == GSM_BURST_LEN) && (rc < 0)) { - rc = gsm0503_pdtch_decode(l2, *bursts_p, NULL, + rc = gsm0503_pdtch_decode(l2, bursts_p, NULL, &n_errors, &n_bits_total); } @@ -144,7 +144,7 @@ int tx_pdtch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { struct msgb *msg = NULL; /* make GCC happy */ - ubit_t *burst, **bursts_p = &l1ts->chan_state[br->chan].dl_bursts; + ubit_t *burst, *bursts_p = l1ts->chan_state[br->chan].dl_bursts; enum trx_mod_type *mod = &l1ts->chan_state[br->chan].dl_mod_type; int rc = 0; @@ -166,9 +166,9 @@ /* BURST BYPASS */ /* encode bursts */ - rc = gsm0503_pdtch_egprs_encode(*bursts_p, msg->l2h, msg->tail - msg->l2h); + rc = gsm0503_pdtch_egprs_encode(bursts_p, msg->l2h, msg->tail - msg->l2h); if (rc < 0) - rc = gsm0503_pdtch_encode(*bursts_p, msg->l2h, msg->tail - msg->l2h); + rc = gsm0503_pdtch_encode(bursts_p, msg->l2h, msg->tail - msg->l2h); /* check validity of message */ if (rc < 0) { @@ -189,7 +189,7 @@ send_burst: /* compose burst */ if (*mod == TRX_MOD_T_8PSK) { - burst = *bursts_p + br->bid * 348; + burst = bursts_p + br->bid * 348; memset(br->burst, 1, 9); memcpy(br->burst + 9, burst, 174); memcpy(br->burst + 183, TRX_8PSK_NB_TSC(br), 78); @@ -198,7 +198,7 @@ br->burst_len = EGPRS_BURST_LEN; } else { - burst = *bursts_p + br->bid * 116; + burst = bursts_p + br->bid * 116; memcpy(br->burst + 3, burst, 58); memcpy(br->burst + 61, TRX_GMSK_NB_TSC(br), 26); memcpy(br->burst + 87, burst + 58, 58); diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 3e6bdc2..7c2a05f 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -75,7 +75,7 @@ { struct l1sched_chan_state *chan_state = &l1ts->chan_state[bi->chan]; struct gsm_lchan *lchan = chan_state->lchan; - sbit_t *burst, **bursts_p = &chan_state->ul_bursts; + sbit_t *burst, *bursts_p = chan_state->ul_bursts; uint8_t *mask = &chan_state->ul_mask; uint8_t rsl_cmode = chan_state->rsl_cmode; uint8_t tch_mode = chan_state->tch_mode; @@ -101,8 +101,8 @@ /* shift the buffer by 4 bursts leftwards */ if (bi->bid == 0) { - memcpy(*bursts_p, *bursts_p + 464, 464); - memset(*bursts_p + 464, 0, 464); + memcpy(bursts_p, bursts_p + 464, 464); + memset(bursts_p + 464, 0, 464); *mask = *mask << 4; } @@ -113,7 +113,7 @@ trx_sched_meas_push(chan_state, bi); /* copy burst to end of buffer of 8 bursts */ - burst = *bursts_p + bi->bid * 116 + 464; + burst = bursts_p + bi->bid * 116 + 464; if (bi->burst_len > 0) { memcpy(burst, bi->burst + 3, 58); memcpy(burst + 58, bi->burst + 87, 58); @@ -137,12 +137,12 @@ switch (tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* FR */ - rc = gsm0503_tch_fr_decode(tch_data, *bursts_p, 1, 0, &n_errors, &n_bits_total); + rc = gsm0503_tch_fr_decode(tch_data, bursts_p, 1, 0, &n_errors, &n_bits_total); if (rc == GSM_FR_BYTES) /* only for valid *speech* frames */ lchan_set_marker(osmo_fr_is_any_sid(tch_data), lchan); /* DTXu */ break; case GSM48_CMODE_SPEECH_EFR: /* EFR */ - rc = gsm0503_tch_fr_decode(tch_data, *bursts_p, 1, 1, &n_errors, &n_bits_total); + rc = gsm0503_tch_fr_decode(tch_data, bursts_p, 1, 1, &n_errors, &n_bits_total); if (rc == GSM_EFR_BYTES) /* only for valid *speech* frames */ lchan_set_marker(osmo_efr_is_any_sid(tch_data), lchan); /* DTXu */ break; @@ -168,7 +168,7 @@ * we receive an FACCH frame instead of a voice frame (we * do not know this before we actually decode the frame) */ amr = sizeof(struct amr_hdr); - rc = gsm0503_tch_afs_decode_dtx(tch_data + amr, *bursts_p, + rc = gsm0503_tch_afs_decode_dtx(tch_data + amr, bursts_p, amr_is_cmr, chan_state->codec, chan_state->codecs, &chan_state->ul_ft, &chan_state->ul_cmr, &n_errors, &n_bits_total, &chan_state->amr_last_dtx); @@ -449,7 +449,7 @@ { struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; uint8_t tch_mode = chan_state->tch_mode; - ubit_t *burst, **bursts_p = &chan_state->dl_bursts; + ubit_t *burst, *bursts_p = chan_state->dl_bursts; struct msgb *msg; /* send burst, if we already got a frame */ @@ -459,8 +459,8 @@ /* BURST BYPASS */ /* shift buffer by 4 bursts for interleaving */ - memcpy(*bursts_p, *bursts_p + 464, 464); - memset(*bursts_p + 464, 0, 464); + memcpy(bursts_p, bursts_p + 464, 464); + memset(bursts_p + 464, 0, 464); /* dequeue a message to be transmitted */ msg = tch_dl_dequeue(l1ts, br); @@ -474,27 +474,27 @@ }; LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "No TCH or FACCH prim for transmit.\n"); - gsm0503_tch_fr_encode(*bursts_p, dummy, sizeof(dummy), 1); + gsm0503_tch_fr_encode(bursts_p, dummy, sizeof(dummy), 1); chan_state->dl_facch_bursts = 8; goto send_burst; } /* populate the buffer with bursts */ if (msgb_l2len(msg) == GSM_MACBLOCK_LEN) { - gsm0503_tch_fr_encode(*bursts_p, msg->l2h, msgb_l2len(msg), 1); + gsm0503_tch_fr_encode(bursts_p, msg->l2h, msgb_l2len(msg), 1); chan_state->dl_facch_bursts = 8; } else if (tch_mode == GSM48_CMODE_SPEECH_AMR) { /* the first FN 4,13,21 defines that CMI is included in frame, * the first FN 0,8,17 defines that CMR is included in frame. */ - gsm0503_tch_afs_encode(*bursts_p, msg->l2h + sizeof(struct amr_hdr), + gsm0503_tch_afs_encode(bursts_p, msg->l2h + sizeof(struct amr_hdr), msgb_l2len(msg) - sizeof(struct amr_hdr), !sched_tchf_dl_amr_cmi_map[br->fn % 26], chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); } else { - gsm0503_tch_fr_encode(*bursts_p, msg->l2h, msgb_l2len(msg), 1); + gsm0503_tch_fr_encode(bursts_p, msg->l2h, msgb_l2len(msg), 1); } /* free message */ @@ -502,7 +502,7 @@ send_burst: /* compose burst */ - burst = *bursts_p + br->bid * 116; + burst = bursts_p + br->bid * 116; memcpy(br->burst + 3, burst, 58); memcpy(br->burst + 61, TRX_GMSK_NB_TSC(br), 26); memcpy(br->burst + 87, burst + 58, 58); diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index f464b56..5772e9f 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -97,7 +97,7 @@ { struct l1sched_chan_state *chan_state = &l1ts->chan_state[bi->chan]; struct gsm_lchan *lchan = chan_state->lchan; - sbit_t *burst, **bursts_p = &chan_state->ul_bursts; + sbit_t *burst, *bursts_p = chan_state->ul_bursts; uint8_t *mask = &chan_state->ul_mask; uint8_t rsl_cmode = chan_state->rsl_cmode; uint8_t tch_mode = chan_state->tch_mode; @@ -124,9 +124,9 @@ /* shift the buffer by 2 bursts leftwards */ if (bi->bid == 0) { - memcpy(*bursts_p, *bursts_p + 232, 232); - memcpy(*bursts_p + 232, *bursts_p + 464, 232); - memset(*bursts_p + 464, 0, 232); + memcpy(bursts_p, bursts_p + 232, 232); + memcpy(bursts_p + 232, bursts_p + 464, 232); + memset(bursts_p + 464, 0, 232); *mask = *mask << 2; } @@ -137,7 +137,7 @@ trx_sched_meas_push(chan_state, bi); /* copy burst to end of buffer of 6 bursts */ - burst = *bursts_p + bi->bid * 116 + 464; + burst = bursts_p + bi->bid * 116 + 464; if (bi->burst_len > 0) { memcpy(burst, bi->burst + 3, 58); memcpy(burst + 58, bi->burst + 87, 58); @@ -174,9 +174,9 @@ meas_avg_mode = SCHED_MEAS_AVG_M_S6N6; /* fall-through */ case GSM48_CMODE_SPEECH_V1: /* HR or signalling */ - rc = gsm0503_tch_hr_decode2(tch_data, *bursts_p, - !sched_tchh_ul_facch_map[bi->fn % 26], - &n_errors, &n_bits_total); + rc = gsm0503_tch_hr_decode2(tch_data, bursts_p, + !sched_tchh_ul_facch_map[bi->fn % 26], + &n_errors, &n_bits_total); if (rc == GSM_HR_BYTES) { /* only for valid *speech* frames */ bool is_sid = osmo_hr_check_sid(tch_data, GSM_HR_BYTES); lchan_set_marker(is_sid, lchan); /* DTXu */ @@ -201,7 +201,7 @@ /* See comment in function rx_tchf_fn() */ amr = sizeof(struct amr_hdr); - rc = gsm0503_tch_ahs_decode_dtx(tch_data + amr, *bursts_p, + rc = gsm0503_tch_ahs_decode_dtx(tch_data + amr, bursts_p, !sched_tchh_ul_facch_map[bi->fn % 26], !fn_is_cmi, chan_state->codec, chan_state->codecs, &chan_state->ul_ft, @@ -350,7 +350,7 @@ { struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; uint8_t tch_mode = chan_state->tch_mode; - ubit_t *burst, **bursts_p = &chan_state->dl_bursts; + ubit_t *burst, *bursts_p = chan_state->dl_bursts; struct msgb *msg; /* send burst, if we already got a frame */ @@ -360,12 +360,12 @@ /* BURST BYPASS */ /* shift buffer by 2 bursts for interleaving */ - memcpy(*bursts_p, *bursts_p + 232, 232); + memcpy(bursts_p, bursts_p + 232, 232); if (chan_state->dl_ongoing_facch) { - memcpy(*bursts_p + 232, *bursts_p + 464, 232); - memset(*bursts_p + 464, 0, 232); + memcpy(bursts_p + 232, bursts_p + 464, 232); + memset(bursts_p + 464, 0, 232); } else { - memset(*bursts_p + 232, 0, 232); + memset(bursts_p + 232, 0, 232); } /* dequeue a message to be transmitted */ @@ -396,7 +396,7 @@ goto send_burst; } - gsm0503_tch_hr_encode(*bursts_p, dummy, sizeof(dummy)); + gsm0503_tch_hr_encode(bursts_p, dummy, sizeof(dummy)); chan_state->dl_ongoing_facch = 1; chan_state->dl_facch_bursts = 6; goto send_burst; @@ -404,21 +404,21 @@ /* populate the buffer with bursts */ if (msgb_l2len(msg) == GSM_MACBLOCK_LEN) { - gsm0503_tch_hr_encode(*bursts_p, msg->l2h, msgb_l2len(msg)); + gsm0503_tch_hr_encode(bursts_p, msg->l2h, msgb_l2len(msg)); chan_state->dl_ongoing_facch = 1; /* first of two TCH frames */ chan_state->dl_facch_bursts = 6; } else if (tch_mode == GSM48_CMODE_SPEECH_AMR) { /* the first FN 4,13,21 or 5,14,22 defines that CMI is included * in frame, the first FN 0,8,17 or 1,9,18 defines that CMR is * included in frame. */ - gsm0503_tch_ahs_encode(*bursts_p, msg->l2h + sizeof(struct amr_hdr), + gsm0503_tch_ahs_encode(bursts_p, msg->l2h + sizeof(struct amr_hdr), msgb_l2len(msg) - sizeof(struct amr_hdr), !sched_tchh_dl_amr_cmi_map[br->fn % 26], chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); } else { - gsm0503_tch_hr_encode(*bursts_p, msg->l2h, msgb_l2len(msg)); + gsm0503_tch_hr_encode(bursts_p, msg->l2h, msgb_l2len(msg)); } /* free message */ @@ -426,7 +426,7 @@ send_burst: /* compose burst */ - burst = *bursts_p + br->bid * 116; + burst = bursts_p + br->bid * 116; memcpy(br->burst + 3, burst, 58); memcpy(br->burst + 61, TRX_GMSK_NB_TSC(br), 26); memcpy(br->burst + 87, burst + 58, 58); diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c index 786b509..1945d32 100644 --- a/src/osmo-bts-trx/sched_lchan_xcch.c +++ b/src/osmo-bts-trx/sched_lchan_xcch.c @@ -50,7 +50,7 @@ int rx_data_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) { struct l1sched_chan_state *chan_state = &l1ts->chan_state[bi->chan]; - sbit_t *burst, **bursts_p = &chan_state->ul_bursts; + sbit_t *burst, *bursts_p = chan_state->ul_bursts; uint32_t *first_fn = &chan_state->ul_first_fn; uint8_t *mask = &chan_state->ul_mask; uint8_t l2[GSM_MACBLOCK_LEN], l2_len; @@ -71,7 +71,7 @@ /* clear burst & store frame number of first burst */ if (bi->bid == 0) { - memset(*bursts_p, 0, 464); + memset(bursts_p, 0, 464); *mask = 0x0; *first_fn = bi->fn; } @@ -84,7 +84,7 @@ /* Copy burst to buffer of 4 bursts. If the burst indication contains * no data, ensure that the buffer does not stay uninitialized */ - burst = *bursts_p + bi->bid * 116; + burst = bursts_p + bi->bid * 116; if (bi->burst_len > 0) { memcpy(burst, bi->burst + 3, 58); memcpy(burst + 58, bi->burst + 87, 58); @@ -112,7 +112,7 @@ *mask = 0x0; /* decode */ - rc = gsm0503_xcch_decode(l2, *bursts_p, &n_errors, &n_bits_total); + rc = gsm0503_xcch_decode(l2, bursts_p, &n_errors, &n_bits_total); if (rc) { LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, "Received bad data (%u/%u)\n", bi->fn % l1ts->mf_period, l1ts->mf_period); @@ -123,8 +123,8 @@ * information from the previous SACCH block. See also: * 3GPP TS 44.006, section 11.2 */ if (rep_sacch) { - add_sbits(*bursts_p, chan_state->ul_bursts_prev); - rc = gsm0503_xcch_decode(l2, *bursts_p, &n_errors, &n_bits_total); + add_sbits(bursts_p, chan_state->ul_bursts_prev); + rc = gsm0503_xcch_decode(l2, bursts_p, &n_errors, &n_bits_total); if (rc) { LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, "Combining current SACCH block with previous SACCH block also yields bad data (%u/%u)\n", @@ -143,7 +143,7 @@ /* Keep a copy to ease decoding in the next repetition pass */ if (rep_sacch) - memcpy(chan_state->ul_bursts_prev, *bursts_p, 464); + memcpy(chan_state->ul_bursts_prev, bursts_p, 464); return _sched_compose_ph_data_ind(l1ts, *first_fn, bi->chan, l2, l2_len, @@ -156,7 +156,7 @@ int tx_data_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { struct msgb *msg = NULL; /* make GCC happy */ - ubit_t *burst, **bursts_p = &l1ts->chan_state[br->chan].dl_bursts; + ubit_t *burst, *bursts_p = l1ts->chan_state[br->chan].dl_bursts; /* send burst, if we already got a frame */ if (br->bid > 0) @@ -181,14 +181,14 @@ /* BURST BYPASS */ /* encode bursts */ - gsm0503_xcch_encode(*bursts_p, msg->l2h); + gsm0503_xcch_encode(bursts_p, msg->l2h); /* free message */ msgb_free(msg); send_burst: /* compose burst */ - burst = *bursts_p + br->bid * 116; + burst = bursts_p + br->bid * 116; memcpy(br->burst + 3, burst, 58); memcpy(br->burst + 61, TRX_GMSK_NB_TSC(br), 26); memcpy(br->burst + 87, burst + 58, 58); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib1e8e86ac60a7ac9b0415ef66b609eaa33443c19 Gerrit-Change-Number: 32726 Gerrit-PatchSet: 4 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: setup.py: fix syntax errors (missing commas)

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33070 ) Change subject: setup.py: fix syntax errors (missing commas) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia53a659ad9652d582e2bf4a039a3e18631435072 Gerrit-Change-Number: 33070 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: Mon, 29 May 2023 09:28:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: trx TCH DL: transmit invalid speech frames instead of dummy FACCH

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 ) Change subject: trx TCH DL: transmit invalid speech frames instead of dummy FACCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78106802a0aa4af39859c75d29fe0e77037899fe Gerrit-Change-Number: 33069 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 29 May 2023 09:28:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: Add FPLMN read and program

by pespin

Attention is currently required from: laforge, lynxis lazus, matanp. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32712 ) Change subject: Add FPLMN read and program ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9ce8c1af691c28ea9ed69e7b5f03f0c02d1f029b Gerrit-Change-Number: 32712 Gerrit-PatchSet: 6 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Mon, 29 May 2023 09:24:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: fixup: contrib/jenkins: create workspace.tar.xz on error

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33067 ) Change subject: fixup: contrib/jenkins: create workspace.tar.xz on error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibcb842f32418e66a186d6b21bb5861cf4a0b7c4a Gerrit-Change-Number: 33067 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: Mon, 29 May 2023 09:23:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-msc[master]: fixup: contrib/jenkins: create workspace.tar.xz on error

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33068 ) Change subject: fixup: contrib/jenkins: create workspace.tar.xz on error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibcb842f32418e66a186d6b21bb5861cf4a0b7c4a Gerrit-Change-Number: 33068 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: Mon, 29 May 2023 09:23:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: osmo-bts-trx: use direct pointer to chan_state->{ul,dl}_bursts

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32726 ) Change subject: osmo-bts-trx: use direct pointer to chan_state->{ul,dl}_bursts ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib1e8e86ac60a7ac9b0415ef66b609eaa33443c19 Gerrit-Change-Number: 32726 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 May 2023 09:22:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_TC_speech_rtp(): run TCH and SACCH loops

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33071 ) Change subject: BTS_Tests: f_TC_speech_rtp(): run TCH and SACCH loops ...................................................................... BTS_Tests: f_TC_speech_rtp(): run TCH and SACCH loops All testcases based on f_TC_speech_rtp() consist of two parts: * In the first part we expect to receive a Downlink frame at the MS, and, once received, we echo the received frame back to the BTS. * In the second part we expect to receive an Uplink frame, the one that was echoed back during the first part. Let's keep echoing Downlink TCH frames while executing the second part in order to reduce possibility of race conditions and keep filling-up the Tx queue in the virtual MS (trxcon). Also keep sending dummy Measurement Reports on SACCH. Change-Id: Ifb69669b75df5b390d7056cefaf0ef1df69d9bd4 Related: OS#1572, OS#4396 --- M bts/BTS_Tests.ttcn 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/33071/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 8dcfb01..e715996 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -8270,11 +8270,14 @@ RTPEM_DATA.clear; Tu.start(2.0); alt { + [] as_l1_tch_loop(); + [] as_l1_sacch(); [] RTPEM_DATA.receive(PDU_RTP:?) -> value rtp_pdu { if (rtp_pdu.data != pl) { repeat; } } [] RTPEM_DATA.receive { repeat; } + [] L1CTL.receive { repeat; } [] Tu.timeout { setverdict(fail, "Timeout waiting for Uplink speech frames"); Misc_Helpers.f_shutdown(__BFILE__, __LINE__); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33071 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: Ifb69669b75df5b390d7056cefaf0ef1df69d9bd4 Gerrit-Change-Number: 33071 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023