fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35261?usp=email )

Change subject: trxcon/{l1sched,l1gprs}: prepare for independent USF decoding ......................................................................

trxcon/{l1sched,l1gprs}: prepare for independent USF decoding

Change-Id: I6953e7335e8d39af166d320290e9edfcd06ef141 Related: libosmocore.git I43e8bfb4003f34766ace7c5c6080ca583ce5efbb Related: libosmocore.git I61a3628741c0ac68374fc7f077cf3a07e51277c3 --- M src/host/trxcon/src/sched_lchan_pdtch.c M src/host/trxcon/src/trxcon_fsm.c M src/shared/l1gprs.c 3 files changed, 15 insertions(+), 4 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/35261/1

diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index 915b060..ee51005 100644 --- a/src/host/trxcon/src/sched_lchan_pdtch.c +++ b/src/host/trxcon/src/sched_lchan_pdtch.c @@ -37,6 +37,7 @@ int rx_pdtch_fn(struct l1sched_lchan_state *lchan, const struct l1sched_burst_ind *bi) { + uint8_t usf = 0xff; /* invalid value */ uint8_t l2[GPRS_L2_MAX_LEN]; int n_errors, n_bits_total, rc; sbit_t *bursts_p, *burst; @@ -86,8 +87,7 @@ *mask = *mask << 4;

/* Attempt to decode */ - rc = gsm0503_pdtch_decode(l2, bursts_p, - NULL, &n_errors, &n_bits_total); + rc = gsm0503_pdtch_decode(l2, bursts_p, &usf, &n_errors, &n_bits_total); if (rc < 0) { LOGP_LCHAND(lchan, LOGL_ERROR, "Received bad frame (rc=%d, ber=%d/%d) at fn=%u\n", diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index f6c9a05..8acc9b7 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -615,7 +615,7 @@ const struct trxcon_param_rx_data_ind *ind = data; struct l1gprs_prim_dl_block_ind block_ind; struct msgb *msg; - uint8_t usf = 0xff; + uint8_t usf = 0xff; /* TODO: get from l1sched */

block_ind = (struct l1gprs_prim_dl_block_ind) { .hdr = { diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index 3294a42..20017a7 100644 --- a/src/shared/l1gprs.c +++ b/src/shared/l1gprs.c @@ -714,7 +714,7 @@ .ci_cb = htons(ind->meas.ci_cb), .rx_lev = ind->meas.rx_lev, }, - .usf = 0xff, + .usf = *usf, };

if (ind->data_len == 0)