<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10655">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: rename *_meas_rep_fn10* to *_meas_re_fn10*_by_*s<br><br>The lookup table that control the measurement interval endings do not<br>make clear what their indexes refer to. Lets give them more distinct<br>names.<br><br>rename sdcch8_meas_rep_fn102 to sdcch8_meas_re_fn102_by_ss<br>rename sdcch4_meas_rep_fn102 to sdcch4_meas_re_fn102_by_ss<br>rename tchf_meas_rep_fn104 to tchf_meas_re_fn104_by_ts<br>rename tchh0_meas_rep_fn104 to tchh0_meas_re_fn104_by_ts<br>rename tchh1_meas_rep_fn104 to tchh1_meas_re_fn104_by_ts<br><br>Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9<br>Related: OS#2975<br>---<br>M src/common/measurement.c<br>1 file changed, 16 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/55/10655/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index 2a7d7de..3ce7882 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -119,7 +119,7 @@</span><br><span> * Note: The array index of the following three lookup tables refes to a</span><br><span> * timeslot number. */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const uint8_t tchf_meas_rep_fn104[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t tchf_meas_re_fn104_by_ts[] = {</span><br><span> [0] = 90,</span><br><span> [1] = 103,</span><br><span> [2] = 12,</span><br><span>@@ -129,7 +129,7 @@</span><br><span> [6] = 64,</span><br><span> [7] = 77,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-static const uint8_t tchh0_meas_rep_fn104[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t tchh0_meas_re_fn104_by_ts[] = {</span><br><span> [0] = 90,</span><br><span> [1] = 90,</span><br><span> [2] = 12,</span><br><span>@@ -139,7 +139,7 @@</span><br><span> [6] = 64,</span><br><span> [7] = 64,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-static const uint8_t tchh1_meas_rep_fn104[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t tchh1_meas_re_fn104_by_ts[] = {</span><br><span> [0] = 103,</span><br><span> [1] = 103,</span><br><span> [2] = 25,</span><br><span>@@ -164,7 +164,7 @@</span><br><span> * subslot number. */</span><br><span> </span><br><span> /* FN of the first burst whose block completes before reaching fn%102=11 */</span><br><span style="color: hsl(0, 100%, 40%);">-static const uint8_t sdcch8_meas_rep_fn102[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t sdcch8_meas_re_fn102_by_ss[] = {</span><br><span> [0] = 66, /* 15(SDCCH), 47(SACCH), 66(SDCCH) */</span><br><span> [1] = 70, /* 19(SDCCH), 51(SACCH), 70(SDCCH) */</span><br><span> [2] = 74, /* 23(SDCCH), 55(SACCH), 74(SDCCH) */</span><br><span>@@ -176,7 +176,7 @@</span><br><span> };</span><br><span> </span><br><span> /* FN of the first burst whose block completes before reaching fn%102=37 */</span><br><span style="color: hsl(0, 100%, 40%);">-static const uint8_t sdcch4_meas_rep_fn102[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t sdcch4_meas_re_fn102_by_ss[] = {</span><br><span> [0] = 88, /* 37(SDCCH), 57(SACCH), 88(SDCCH) */</span><br><span> [1] = 92, /* 41(SDCCH), 61(SACCH), 92(SDCCH) */</span><br><span> [2] = 6, /* 6(SACCH), 47(SDCCH), 98(SDCCH) */</span><br><span>@@ -195,7 +195,7 @@</span><br><span> * Table 1 of 9) what value we need to feed into the lookup tables in order to</span><br><span> * detect the measurement period ending. In this example the "real" ending</span><br><span> * was on FN%104=12. This is the value we have to look for in</span><br><span style="color: hsl(0, 100%, 40%);">- * tchf_meas_rep_fn104 to know that a measurement period has just ended. */</span><br><span style="color: hsl(120, 100%, 40%);">+ * tchf_meas_re_fn104_by_ts to know that a measurement period has just ended. */</span><br><span> </span><br><span> /* See also 3GPP TS 05.02 Clause 7 Table 1 of 9:</span><br><span> * Mapping of logical channels onto physical channels (see subclauses 6.3, 6.4, 6.5) */</span><br><span>@@ -266,28 +266,28 @@</span><br><span> switch (pchan) {</span><br><span> case GSM_PCHAN_TCH_F:</span><br><span> fn_mod = translate_tch_meas_rep_fn104(fn % 104);</span><br><span style="color: hsl(0, 100%, 40%);">- if (tchf_meas_rep_fn104[lchan->ts->nr] == fn_mod)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tchf_meas_re_fn104_by_ts[lchan->ts->nr] == fn_mod)</span><br><span> rc = 1;</span><br><span> break;</span><br><span> case GSM_PCHAN_TCH_H:</span><br><span> fn_mod = translate_tch_meas_rep_fn104(fn % 104);</span><br><span> if (lchan->nr == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- tbl = tchh0_meas_rep_fn104;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbl = tchh0_meas_re_fn104_by_ts;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- tbl = tchh1_meas_rep_fn104;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbl = tchh1_meas_re_fn104_by_ts;</span><br><span> if (tbl[lchan->ts->nr] == fn_mod)</span><br><span> rc = 1;</span><br><span> break;</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span> fn_mod = fn % 102;</span><br><span style="color: hsl(0, 100%, 40%);">- if (sdcch8_meas_rep_fn102[lchan->nr] == fn_mod)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sdcch8_meas_re_fn102_by_ss[lchan->nr] == fn_mod)</span><br><span> rc = 1;</span><br><span> break;</span><br><span> case GSM_PCHAN_CCCH_SDCCH4:</span><br><span> case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span> fn_mod = fn % 102;</span><br><span style="color: hsl(0, 100%, 40%);">- if (sdcch4_meas_rep_fn102[lchan->nr] == fn_mod)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sdcch4_meas_re_fn102_by_ss[lchan->nr] == fn_mod)</span><br><span> rc = 1;</span><br><span> break;</span><br><span> default:</span><br><span>@@ -330,27 +330,27 @@</span><br><span> switch (pchan) {</span><br><span> case GSM_PCHAN_TCH_F:</span><br><span> modulus = 104;</span><br><span style="color: hsl(0, 100%, 40%);">- interval_end = tchf_meas_rep_fn104[lchan->ts->nr];</span><br><span style="color: hsl(120, 100%, 40%);">+ interval_end = tchf_meas_re_fn104_by_ts[lchan->ts->nr];</span><br><span> interval_end = translate_tch_meas_rep_fn104_inv(interval_end);</span><br><span> break;</span><br><span> case GSM_PCHAN_TCH_H:</span><br><span> modulus = 104;</span><br><span> if (lchan->nr == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- tbl = tchh0_meas_rep_fn104;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbl = tchh0_meas_re_fn104_by_ts;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- tbl = tchh1_meas_rep_fn104;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbl = tchh1_meas_re_fn104_by_ts;</span><br><span> interval_end = tbl[lchan->ts->nr];</span><br><span> interval_end = translate_tch_meas_rep_fn104_inv(interval_end);</span><br><span> break;</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span> modulus = 102;</span><br><span style="color: hsl(0, 100%, 40%);">- interval_end = sdcch8_meas_rep_fn102[lchan->nr];</span><br><span style="color: hsl(120, 100%, 40%);">+ interval_end = sdcch8_meas_re_fn102_by_ss[lchan->nr];</span><br><span> break;</span><br><span> case GSM_PCHAN_CCCH_SDCCH4:</span><br><span> case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span> modulus = 102;</span><br><span style="color: hsl(0, 100%, 40%);">- interval_end = sdcch4_meas_rep_fn102[lchan->nr];</span><br><span style="color: hsl(120, 100%, 40%);">+ interval_end = sdcch4_meas_re_fn102_by_ss[lchan->nr];</span><br><span> break;</span><br><span> default:</span><br><span> return false;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10655">change 10655</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/10655"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 </div>
<div style="display:none"> Gerrit-Change-Number: 10655 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>