fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30240 ) Change subject: trxcon: adjust coding style in l1sched_pull_burst() ...................................................................... trxcon: adjust coding style in l1sched_pull_burst() Change-Id: I96a40fdbea5085999b9aeb98b418ae27132f6fda Related: OS#5599 --- M src/host/trxcon/src/sched_trx.c 1 file changed, 14 insertions(+), 33 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 2ac6904..92f8bf2 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -95,19 +95,15 @@ struct l1sched_lchan_state *lchan; l1sched_lchan_tx_func *handler; enum l1sched_lchan_type chan; - uint8_t offset; + unsigned int offset; - /* Timeslot is not allocated */ - if (ts == NULL) - return; - - /* Timeslot is not configured */ - if (ts->mf_layout == NULL) + /* Check if the given timeslot is configured */ + if (ts == NULL || ts->mf_layout == NULL) return; /* Get frame from multiframe */ offset = br->fn % ts->mf_layout->period; - frame = ts->mf_layout->frames + offset; + frame = &ts->mf_layout->frames[offset]; /* Get required info from frame */ br->bid = frame->ul_bid; @@ -115,41 +111,26 @@ handler = l1sched_lchan_desc[chan].tx_fn; /* Omit lchans without handler */ - if (!handler) + if (handler == NULL) return; - /* Make sure that lchan was allocated and activated */ + /* Make sure that lchan is allocated and active */ lchan = l1sched_find_lchan(ts, chan); - if (lchan == NULL) + if (lchan == NULL || !lchan->active) return; - /* Omit inactive lchans */ - if (!lchan->active) - return; - - /** - * If we aren't processing any primitive yet, - * attempt to obtain a new one from queue - */ + /* If no primitive is being processed, try obtaining one from Tx queue */ if (lchan->prim == NULL) lchan->prim = l1sched_prim_dequeue(&ts->tx_prims, br->fn, lchan); - - /* TODO: report TX buffers health to the higher layers */ - - /* If CBTX (Continuous Burst Transmission) is assumed */ - if (l1sched_lchan_desc[chan].flags & L1SCHED_CH_FLAG_CBTX) { - /** - * Probably, a TX buffer is empty. Nevertheless, - * we shall continuously transmit anything on - * CBTX channels. - */ - if (lchan->prim == NULL) + if (lchan->prim == NULL) { + /* If CBTX (Continuous Burst Transmission) is required */ + if (l1sched_lchan_desc[chan].flags & L1SCHED_CH_FLAG_CBTX) l1sched_prim_dummy(lchan); + if (lchan->prim == NULL) + return; } - /* If there is no primitive, do nothing */ - if (lchan->prim == NULL) - return; + /* TODO: report TX buffers health to the higher layers */ /* Handover RACH needs to be handled regardless of the * current channel type and the associated handler. */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I96a40fdbea5085999b9aeb98b418ae27132f6fda Gerrit-Change-Number: 30240 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: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged