<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17351">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: refactor TDMA frame number calculation<br><br>Change-Id: I9221957297a6154edc1767a0e3753f5ee383173f<br>---<br>M src/host/trxcon/sched_lchan_common.c<br>M src/host/trxcon/sched_lchan_pdtch.c<br>M src/host/trxcon/sched_lchan_tchf.c<br>M src/host/trxcon/sched_lchan_tchh.c<br>M src/host/trxcon/sched_lchan_xcch.c<br>M src/host/trxcon/sched_trx.c<br>M src/host/trxcon/sched_trx.h<br>M src/host/trxcon/trx_if.c<br>8 files changed, 32 insertions(+), 46 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/17351/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c</span><br><span>index 55ec7e9..ae43ca9 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_common.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_common.c</span><br><span>@@ -137,9 +137,11 @@</span><br><span> dl_hdr.chan_nr = lchan_desc->chan_nr | ts->index;</span><br><span> dl_hdr.link_id = lchan_desc->link_id;</span><br><span> dl_hdr.band_arfcn = htons(trx->band_arfcn);</span><br><span style="color: hsl(0, 100%, 40%);">- dl_hdr.frame_nr = htonl(lchan->rx_first_fn);</span><br><span> dl_hdr.num_biterr = bit_error_count;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* sched_trx_meas_avg() gives us TDMA frame number of the first burst */</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_hdr.frame_nr = htonl(meas->fn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* RX level: 0 .. 63 in typical GSM notation (dBm + 110) */</span><br><span> dl_hdr.rx_level = dbm2rxlev(meas->rssi);</span><br><span> </span><br><span>@@ -154,7 +156,7 @@</span><br><span> </span><br><span> /* Optional GSMTAP logging */</span><br><span> if (l2_len > 0 && (!traffic || lchan_desc->chan_nr == RSL_CHAN_OSMO_PDCH)) {</span><br><span style="color: hsl(0, 100%, 40%);">- sched_gsmtap_send(lchan->type, lchan->rx_first_fn, ts->index,</span><br><span style="color: hsl(120, 100%, 40%);">+ sched_gsmtap_send(lchan->type, meas->fn, ts->index,</span><br><span> trx->band_arfcn, meas->rssi, 0, l2, l2_len);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>index 4fd7d35..b625d2f 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>@@ -48,12 +48,10 @@</span><br><span> uint8_t l2[GPRS_L2_MAX_LEN], *mask;</span><br><span> int n_errors, n_bits_total, rc;</span><br><span> sbit_t *buffer, *offset;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t *first_fn;</span><br><span> size_t l2_len;</span><br><span> </span><br><span> /* Set up pointers */</span><br><span> lchan_desc = &trx_lchan_desc[lchan->type];</span><br><span style="color: hsl(0, 100%, 40%);">- first_fn = &lchan->rx_first_fn;</span><br><span> mask = &lchan->rx_burst_mask;</span><br><span> buffer = lchan->rx_bursts;</span><br><span> </span><br><span>@@ -61,10 +59,8 @@</span><br><span> "fn=%u ts=%u bid=%u\n", lchan_desc->name, fn, ts->index, bid);</span><br><span> </span><br><span> /* Reset internal state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bid == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- *first_fn = fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bid == 0)</span><br><span> *mask = 0x0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> /* Update mask */</span><br><span> *mask |= (1 << bid);</span><br><span>@@ -88,8 +84,8 @@</span><br><span> if ((*mask & 0xf) != 0xf) {</span><br><span> LOGP(DSCHD, LOGL_ERROR, "Received incomplete (%s) data frame at "</span><br><span> "fn=%u (%u/%u) for %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- burst_mask2str(mask, 4), *first_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- (*first_fn) % ts->mf_layout->period,</span><br><span style="color: hsl(120, 100%, 40%);">+ burst_mask2str(mask, 4), lchan->meas_avg.fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->meas_avg.fn % ts->mf_layout->period,</span><br><span> ts->mf_layout->period,</span><br><span> lchan_desc->name);</span><br><span> </span><br><span>@@ -101,8 +97,8 @@</span><br><span> NULL, &n_errors, &n_bits_total);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DSCHD, LOGL_ERROR, "Received bad packet data frame "</span><br><span style="color: hsl(0, 100%, 40%);">- "at fn=%u (%u/%u) for %s\n", *first_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- (*first_fn) % ts->mf_layout->period,</span><br><span style="color: hsl(120, 100%, 40%);">+ "at fn=%u (%u/%u) for %s\n", lchan->meas_avg.fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->meas_avg.fn % ts->mf_layout->period,</span><br><span> ts->mf_layout->period,</span><br><span> lchan_desc->name);</span><br><span> }</span><br><span>diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>index d34085b..e909151 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_tchf.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>@@ -50,12 +50,10 @@</span><br><span> int n_errors = -1, n_bits_total, rc;</span><br><span> sbit_t *buffer, *offset;</span><br><span> uint8_t l2[128], *mask;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t *first_fn;</span><br><span> size_t l2_len;</span><br><span> </span><br><span> /* Set up pointers */</span><br><span> lchan_desc = &trx_lchan_desc[lchan->type];</span><br><span style="color: hsl(0, 100%, 40%);">- first_fn = &lchan->rx_first_fn;</span><br><span> mask = &lchan->rx_burst_mask;</span><br><span> buffer = lchan->rx_bursts;</span><br><span> </span><br><span>@@ -63,10 +61,8 @@</span><br><span> lchan_desc->name, fn, ts->index, bid);</span><br><span> </span><br><span> /* Reset internal state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bid == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- *first_fn = fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bid == 0)</span><br><span> *mask = 0x00;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> /* Update mask */</span><br><span> *mask |= (1 << bid);</span><br><span>@@ -90,8 +86,8 @@</span><br><span> if ((*mask & 0xf) != 0xf) {</span><br><span> LOGP(DSCHD, LOGL_ERROR, "Received incomplete (%s) traffic frame at "</span><br><span> "fn=%u (%u/%u) for %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- burst_mask2str(mask, 8), *first_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- (*first_fn) % ts->mf_layout->period,</span><br><span style="color: hsl(120, 100%, 40%);">+ burst_mask2str(mask, 8), lchan->meas_avg.fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->meas_avg.fn % ts->mf_layout->period,</span><br><span> ts->mf_layout->period,</span><br><span> lchan_desc->name);</span><br><span> </span><br><span>diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c</span><br><span>index 9aa7cd7..29abb42 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_tchh.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_tchh.c</span><br><span>@@ -291,23 +291,19 @@</span><br><span> </span><br><span> /* Check decoding result */</span><br><span> if (rc < 4) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame (%s) ending at "</span><br><span style="color: hsl(0, 100%, 40%);">- "fn=%u on %s (rc=%d)\n", burst_mask2str(mask, 6),</span><br><span style="color: hsl(0, 100%, 40%);">- fn, lchan_desc->name, rc);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Calculate AVG of the measurements (assuming 4 bursts) */</span><br><span> sched_trx_meas_avg(lchan, 4);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame (%s) "</span><br><span style="color: hsl(120, 100%, 40%);">+ "at fn=%u on %s (rc=%d)\n", burst_mask2str(mask, 6),</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->meas_avg.fn, lchan_desc->name, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Send BFI */</span><br><span> goto bfi;</span><br><span> } else if (rc == GSM_MACBLOCK_LEN) {</span><br><span> /* Skip decoding of the next 2 stolen bursts */</span><br><span> lchan->dl_ongoing_facch = true;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Calculate TDMA frame number of the first burst */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rx_first_fn = sched_tchh_block_dl_first_fn(lchan->type,</span><br><span style="color: hsl(0, 100%, 40%);">- fn, true); /* FACCH/H */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Calculate AVG of the measurements (FACCH/H takes 6 bursts) */</span><br><span> sched_trx_meas_avg(lchan, 6);</span><br><span> </span><br><span>@@ -326,10 +322,6 @@</span><br><span> sched_trx_meas_avg(lchan, 4);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Calculate TDMA frame number of the first burst */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rx_first_fn = sched_tchh_block_dl_first_fn(lchan->type,</span><br><span style="color: hsl(0, 100%, 40%);">- fn, false); /* TCH/H */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Send a traffic frame to the higher layers */</span><br><span> return sched_send_dt_ind(trx, ts, lchan, l2, l2_len,</span><br><span> n_errors, false, true);</span><br><span>@@ -346,16 +338,13 @@</span><br><span> /* Didn't try to decode, fake measurements */</span><br><span> if (n_errors < 0) {</span><br><span> lchan->meas_avg = (struct trx_meas_set) {</span><br><span style="color: hsl(120, 100%, 40%);">+ .fn = sched_tchh_block_dl_first_fn(lchan->type, fn, false),</span><br><span> .toa256 = 0,</span><br><span> .rssi = -110,</span><br><span> };</span><br><span> n_errors = 116 * 2;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Calculate TDMA frame number of the first burst */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rx_first_fn = sched_tchh_block_dl_first_fn(lchan->type,</span><br><span style="color: hsl(0, 100%, 40%);">- fn, false); /* TCH/H */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* BFI is not applicable in signalling mode */</span><br><span> if (lchan->tch_mode == GSM48_CMODE_SIGN)</span><br><span> return sched_send_dt_ind(trx, ts, lchan, NULL, 0,</span><br><span>diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c</span><br><span>index aa8d4dd..cc14d2f 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_xcch.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_xcch.c</span><br><span>@@ -48,11 +48,9 @@</span><br><span> uint8_t l2[GSM_MACBLOCK_LEN], *mask;</span><br><span> int n_errors, n_bits_total, rc;</span><br><span> sbit_t *buffer, *offset;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t *first_fn;</span><br><span> </span><br><span> /* Set up pointers */</span><br><span> lchan_desc = &trx_lchan_desc[lchan->type];</span><br><span style="color: hsl(0, 100%, 40%);">- first_fn = &lchan->rx_first_fn;</span><br><span> mask = &lchan->rx_burst_mask;</span><br><span> buffer = lchan->rx_bursts;</span><br><span> </span><br><span>@@ -60,10 +58,8 @@</span><br><span> lchan_desc->name, fn, ts->index, bid);</span><br><span> </span><br><span> /* Reset internal state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bid == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- *first_fn = fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bid == 0)</span><br><span> *mask = 0x0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> /* Update mask */</span><br><span> *mask |= (1 << bid);</span><br><span>@@ -87,8 +83,8 @@</span><br><span> if ((*mask & 0xf) != 0xf) {</span><br><span> LOGP(DSCHD, LOGL_ERROR, "Received incomplete (%s) data frame at "</span><br><span> "fn=%u (%u/%u) for %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- burst_mask2str(mask, 4), *first_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- (*first_fn) % ts->mf_layout->period,</span><br><span style="color: hsl(120, 100%, 40%);">+ burst_mask2str(mask, 4), lchan->meas_avg.fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->meas_avg.fn % ts->mf_layout->period,</span><br><span> ts->mf_layout->period,</span><br><span> lchan_desc->name);</span><br><span> /* NOTE: xCCH has an insane amount of redundancy for error</span><br><span>@@ -101,8 +97,8 @@</span><br><span> rc = gsm0503_xcch_decode(l2, buffer, &n_errors, &n_bits_total);</span><br><span> if (rc) {</span><br><span> LOGP(DSCHD, LOGL_ERROR, "Received bad data frame at fn=%u "</span><br><span style="color: hsl(0, 100%, 40%);">- "(%u/%u) for %s\n", *first_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- (*first_fn) % ts->mf_layout->period,</span><br><span style="color: hsl(120, 100%, 40%);">+ "(%u/%u) for %s\n", lchan->meas_avg.fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->meas_avg.fn % ts->mf_layout->period,</span><br><span> ts->mf_layout->period,</span><br><span> lchan_desc->name);</span><br><span> </span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index 47107c7..95839f7 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -464,7 +464,6 @@</span><br><span> /* Reset internal state variables */</span><br><span> lchan->rx_burst_mask = 0x00;</span><br><span> lchan->tx_burst_mask = 0x00;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rx_first_fn = 0;</span><br><span> </span><br><span> /* Free burst memory */</span><br><span> talloc_free(lchan->rx_bursts);</span><br><span>@@ -747,6 +746,10 @@</span><br><span> toa256_sum += meas->toa256;</span><br><span> rssi_sum += meas->rssi;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Do not go below the first burst */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (i + 1 == n)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (meas == MEAS_HIST_FIRST(hist))</span><br><span> meas = MEAS_HIST_LAST(hist);</span><br><span> else</span><br><span>@@ -756,4 +759,7 @@</span><br><span> /* Calculate the AVG */</span><br><span> lchan->meas_avg.toa256 = toa256_sum / n;</span><br><span> lchan->meas_avg.rssi = rssi_sum / n;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* As a bonus, store TDMA frame number of the first burst */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->meas_avg.fn = meas->fn;</span><br><span> }</span><br><span>diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h</span><br><span>index a4fc90f..44f502c 100644</span><br><span>--- a/src/host/trxcon/sched_trx.h</span><br><span>+++ b/src/host/trxcon/sched_trx.h</span><br><span>@@ -159,6 +159,8 @@</span><br><span> };</span><br><span> </span><br><span> struct trx_meas_set {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! \brief TDMA frame number of the first burst this set belongs to */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn;</span><br><span> /*! \brief ToA256 (Timing of Arrival, 1/256 of a symbol) */</span><br><span> int16_t toa256;</span><br><span> /*! \brief RSSI (Received Signal Strength Indication) */</span><br><span>@@ -182,8 +184,6 @@</span><br><span> </span><br><span> /*! \brief Burst type: GMSK or 8PSK */</span><br><span> enum trx_burst_type burst_type;</span><br><span style="color: hsl(0, 100%, 40%);">- /*! \brief Frame number of first burst */</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t rx_first_fn;</span><br><span> /*! \brief Mask of received bursts */</span><br><span> uint8_t rx_burst_mask;</span><br><span> /*! \brief Mask of transmitted bursts */</span><br><span>diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c</span><br><span>index 343c6ca..20c64ec 100644</span><br><span>--- a/src/host/trxcon/trx_if.c</span><br><span>+++ b/src/host/trxcon/trx_if.c</span><br><span>@@ -600,6 +600,7 @@</span><br><span> meas = (struct trx_meas_set) {</span><br><span> .toa256 = toa256,</span><br><span> .rssi = rssi,</span><br><span style="color: hsl(120, 100%, 40%);">+ .fn = fn,</span><br><span> };</span><br><span> </span><br><span> /* Poke scheduler */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17351">change 17351</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/17351"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9221957297a6154edc1767a0e3753f5ee383173f </div>
<div style="display:none"> Gerrit-Change-Number: 17351 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>