<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12990">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, approved
  Max: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: count number of measurements<br><br>Instead of counting both RSSI and ToA measurements separately,<br>let's have a single counter in trx_lchan_state.meas struct.<br><br>Change-Id: I45454a3ac92b8cc85dd74092e4ab6eb350f20c9a<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.h<br>6 files changed, 8 insertions(+), 14 deletions(-)<br><br></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 921c466..615d81c 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>@@ -99,9 +99,9 @@</span><br><span>  dl_hdr.num_biterr = bit_error_count;</span><br><span> </span><br><span>     /* Convert average RSSI to RX level */</span><br><span style="color: hsl(0, 100%, 40%);">-  if (lchan->meas.rssi_num) {</span><br><span style="color: hsl(120, 100%, 40%);">+        if (lchan->meas.num) {</span><br><span>            /* RX level: 0 .. 63 in typical GSM notation (dBm + 110) */</span><br><span style="color: hsl(0, 100%, 40%);">-             dbm_avg = lchan->meas.rssi_sum / lchan->meas.rssi_num;</span><br><span style="color: hsl(120, 100%, 40%);">+          dbm_avg = lchan->meas.rssi_sum / lchan->meas.num;</span><br><span>              dl_hdr.rx_level = dbm2rxlev(dbm_avg);</span><br><span>        } else {</span><br><span>             /* No measurements, assuming the worst */</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 aa9cb6a..845ef64 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>@@ -75,8 +75,7 @@</span><br><span>       /* Update measurements */</span><br><span>    lchan->meas.toa256_sum += toa256;</span><br><span>         lchan->meas.rssi_sum += rssi;</span><br><span style="color: hsl(0, 100%, 40%);">-        lchan->meas.toa256_num++;</span><br><span style="color: hsl(0, 100%, 40%);">-    lchan->meas.rssi_num++;</span><br><span style="color: hsl(120, 100%, 40%);">+    lchan->meas.num++;</span><br><span> </span><br><span>    /* Copy burst to buffer of 4 bursts */</span><br><span>       offset = buffer + bid * 116;</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 5bebe49..cec7daf 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>@@ -77,8 +77,7 @@</span><br><span>        /* Update mask and RSSI */</span><br><span>   lchan->meas.rssi_sum += rssi;</span><br><span>     lchan->meas.toa256_sum += toa256;</span><br><span style="color: hsl(0, 100%, 40%);">-    lchan->meas.rssi_num++;</span><br><span style="color: hsl(0, 100%, 40%);">-      lchan->meas.toa256_num++;</span><br><span style="color: hsl(120, 100%, 40%);">+  lchan->meas.num++;</span><br><span> </span><br><span>    /* Copy burst to end of buffer of 8 bursts */</span><br><span>        offset = buffer + bid * 116 + 464;</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 5b7daa3..172f54b 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>@@ -243,8 +243,7 @@</span><br><span>         */</span><br><span>  lchan->meas.rssi_sum += rssi;</span><br><span>     lchan->meas.toa256_sum += toa256;</span><br><span style="color: hsl(0, 100%, 40%);">-    lchan->meas.rssi_num++;</span><br><span style="color: hsl(0, 100%, 40%);">-      lchan->meas.toa256_num++;</span><br><span style="color: hsl(120, 100%, 40%);">+  lchan->meas.num++;</span><br><span> </span><br><span>    /* Copy burst to the end of buffer of 6 bursts */</span><br><span>    offset = buffer + bid * 116 + 464;</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 825fc58..71eb38d 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>@@ -74,8 +74,7 @@</span><br><span>  /* Update measurements */</span><br><span>    lchan->meas.rssi_sum += rssi;</span><br><span>     lchan->meas.toa256_sum += toa256;</span><br><span style="color: hsl(0, 100%, 40%);">-    lchan->meas.rssi_num++;</span><br><span style="color: hsl(0, 100%, 40%);">-      lchan->meas.toa256_num++;</span><br><span style="color: hsl(120, 100%, 40%);">+  lchan->meas.num++;</span><br><span> </span><br><span>    /* Copy burst to buffer of 4 bursts */</span><br><span>       offset = buffer + bid * 116;</span><br><span>diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h</span><br><span>index f914eee..72d9549 100644</span><br><span>--- a/src/host/trxcon/sched_trx.h</span><br><span>+++ b/src/host/trxcon/sched_trx.h</span><br><span>@@ -181,12 +181,10 @@</span><br><span>        uint8_t ul_facch_blocks;</span><br><span> </span><br><span>         struct {</span><br><span style="color: hsl(0, 100%, 40%);">-                /*! \brief Number of RSSI values */</span><br><span style="color: hsl(0, 100%, 40%);">-             uint8_t rssi_num;</span><br><span style="color: hsl(120, 100%, 40%);">+             /*! \brief Number of measurements */</span><br><span style="color: hsl(120, 100%, 40%);">+          unsigned int num;</span><br><span>            /*! \brief Sum of RSSI values */</span><br><span>             float rssi_sum;</span><br><span style="color: hsl(0, 100%, 40%);">-         /*! \brief Number of TOA values */</span><br><span style="color: hsl(0, 100%, 40%);">-              uint8_t toa256_num;</span><br><span>          /*! \brief Sum of TOA values */</span><br><span>              int32_t toa256_sum;</span><br><span>  } meas;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12990">change 12990</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/12990"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I45454a3ac92b8cc85dd74092e4ab6eb350f20c9a </div>
<div style="display:none"> Gerrit-Change-Number: 12990 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>