<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12288">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0<br><br>The concept of a return value only makes sense if there's actually ever<br>something non-constant to return, and if the caller actually processes<br>that return value. If we always "return 0" and ignore it on the caller<br>side, functions should be of "void" type.<br><br>Change-Id: I3575a2cef75f3fd4c3f95eddb40719d28a055b54<br>Related: OS#1622, OS#1851<br>---<br>M src/osmo-bts-trx/loops.c<br>M src/osmo-bts-trx/loops.h<br>2 files changed, 35 insertions(+), 54 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c</span><br><span>index fc10c40..6337d87 100644</span><br><span>--- a/src/osmo-bts-trx/loops.c</span><br><span>+++ b/src/osmo-bts-trx/loops.c</span><br><span>@@ -40,9 +40,8 @@</span><br><span> /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan.</span><br><span> * \param lchan logical channel for which to compute (and in which to store) new power value.</span><br><span> * \param[in] chan_nr RSL channel number of the channel, only used for logging purpose.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] diff input delta value (in dB)</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 in all cases */</span><br><span style="color: hsl(0, 100%, 40%);">-static int ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] diff input delta value (in dB) */</span><br><span style="color: hsl(120, 100%, 40%);">+static void ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span> enum gsm_band band = trx->bts->band;</span><br><span>@@ -53,7 +52,7 @@</span><br><span> new_power = lchan->ms_power_ctrl.current - (diff >> 1);</span><br><span> </span><br><span> if (diff == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> /* ms transmit power level cannot become negative */</span><br><span> if (new_power < 0)</span><br><span>@@ -83,7 +82,7 @@</span><br><span> trx->nr, chan_nr, new_power,</span><br><span> ms_pwr_dbm(band, new_power));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span> </span><br><span> LOGP(DLOOP, LOGL_INFO, "%s MS new_power of trx=%u chan_nr=0x%02x from "</span><br><span>@@ -96,18 +95,17 @@</span><br><span> /* store the resulting new MS power level in the lchan */</span><br><span> lchan->ms_power_ctrl.current = new_power;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span> </span><br><span> /*! Input a new RSSI value into the MS power control loop for the given logical channel.</span><br><span> * \param chan_state L1 channel state of the logical channel.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param rssi Received Signal Strength Indication (in dBm)</span><br><span style="color: hsl(0, 100%, 40%);">- * \return 0 in all cases */</span><br><span style="color: hsl(0, 100%, 40%);">-static int ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param rssi Received Signal Strength Indication (in dBm) */</span><br><span style="color: hsl(120, 100%, 40%);">+static void ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi)</span><br><span> {</span><br><span> /* ignore inserted dummy frames, treat as lost frames */</span><br><span> if (rssi < -127)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> LOGP(DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi);</span><br><span> </span><br><span>@@ -118,18 +116,15 @@</span><br><span> /* store and process RSSI */</span><br><span> if (chan_state->meas.rssi_valid_count</span><br><span> == ARRAY_SIZE(chan_state->meas.rssi))</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> chan_state->meas.rssi[chan_state->meas.rssi_valid_count++] = rssi;</span><br><span> chan_state->meas.rssi_valid_count++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span> </span><br><span> /*! Process a single clock tick of the MS power control loop.</span><br><span> * \param lchan Logical channel to which the clock tick applies</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] chan_nr RSL channel number (for logging purpose)</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 in all cases */</span><br><span style="color: hsl(0, 100%, 40%);">-static int ms_power_clock(struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] chan_nr RSL channel number (for logging purpose) */</span><br><span style="color: hsl(120, 100%, 40%);">+static void ms_power_clock(struct gsm_lchan *lchan,</span><br><span> uint8_t chan_nr, struct l1sched_chan_state *chan_state)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span>@@ -140,21 +135,22 @@</span><br><span> /* skip every second clock, to prevent oscillating due to roundtrip</span><br><span> * delay */</span><br><span> if (!(chan_state->meas.clock & 1))</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> LOGP(DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n",</span><br><span> chan_state->meas.rssi_count);</span><br><span> </span><br><span> /* wait for initial burst */</span><br><span> if (!chan_state->meas.rssi_got_burst)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> /* if no burst was received from MS at clock */</span><br><span> if (chan_state->meas.rssi_count == 0) {</span><br><span> LOGP(DLOOP, LOGL_NOTICE, "LOST SACCH frame of trx=%u "</span><br><span> "chan_nr=0x%02x, so we raise MS power\n",</span><br><span> trx->nr, chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- return ms_power_diff(lchan, chan_nr, MS_RAISE_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_diff(lchan, chan_nr, MS_RAISE_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span> </span><br><span> /* reset total counter */</span><br><span>@@ -163,7 +159,7 @@</span><br><span> /* check the minimum level received after MS acknowledged the ordered</span><br><span> * power level */</span><br><span> if (chan_state->meas.rssi_valid_count == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> for (rssi = 999, i = 0; i < chan_state->meas.rssi_valid_count; i++) {</span><br><span> if (rssi > chan_state->meas.rssi[i])</span><br><span> rssi = chan_state->meas.rssi[i];</span><br><span>@@ -179,8 +175,6 @@</span><br><span> ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current),</span><br><span> trx->nr, chan_nr);</span><br><span> ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -191,19 +185,19 @@</span><br><span> * Timing Advance loop</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int ta_val(struct gsm_lchan *lchan, uint8_t chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+void ta_val(struct gsm_lchan *lchan, uint8_t chan_nr,</span><br><span> struct l1sched_chan_state *chan_state, int16_t toa256)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span> </span><br><span> /* check if the current L1 header acks to the current ordered TA */</span><br><span> if (lchan->meas.l1_info[1] != lchan->rqd_ta)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> /* sum measurement */</span><br><span> chan_state->meas.toa256_sum += toa256;</span><br><span> if (++(chan_state->meas.toa_num) < 16)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> /* complete set */</span><br><span> toa256 = chan_state->meas.toa256_sum / chan_state->meas.toa_num;</span><br><span>@@ -228,8 +222,6 @@</span><br><span> </span><br><span> chan_state->meas.toa_num = 0;</span><br><span> chan_state->meas.toa256_sum = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span> </span><br><span> /*! Process a SACCH event as input to the MS power control and TA loop. Function</span><br><span>@@ -238,9 +230,8 @@</span><br><span> * \param chan_nr RSL channel number on which we operate</span><br><span> * \param chan_state L1 scheduler channel state of the channel on which we operate</span><br><span> * \param[in] rssi Receive Signal Strength Indication</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] toa256 Time of Arrival in 1/256 symbol periods</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 in all cases */</span><br><span style="color: hsl(0, 100%, 40%);">-int trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] toa256 Time of Arrival in 1/256 symbol periods */</span><br><span style="color: hsl(120, 100%, 40%);">+void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span> struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa256)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)]</span><br><span>@@ -254,12 +245,10 @@</span><br><span> /* if TA loop is enabled, handle it */</span><br><span> if (pinst->phy_link->u.osmotrx.trx_ta_loop)</span><br><span> ta_val(lchan, chan_nr, chan_state, toa256);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span> </span><br><span> /*! Called once every downlink SACCH block needs to be sent. */</span><br><span style="color: hsl(0, 100%, 40%);">-int trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+void trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span> struct l1sched_chan_state *chan_state)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)]</span><br><span>@@ -271,11 +260,9 @@</span><br><span> </span><br><span> /* count the number of SACCH clocks */</span><br><span> chan_state->meas.clock++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span> struct l1sched_chan_state *chan_state, float ber)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = l1t->trx;</span><br><span>@@ -284,11 +271,11 @@</span><br><span> </span><br><span> /* check if loop is enabled */</span><br><span> if (!chan_state->amr_loop)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> /* wait for MS to use the requested codec */</span><br><span> if (chan_state->ul_ft != chan_state->dl_cmr)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> /* count bit errors */</span><br><span> if (L1SAP_IS_CHAN_TCHH(chan_nr)) {</span><br><span>@@ -301,7 +288,7 @@</span><br><span> </span><br><span> /* count frames */</span><br><span> if (chan_state->ber_num < 48)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> /* calculate average (reuse ber variable) */</span><br><span> ber = chan_state->ber_sum / chan_state->ber_num;</span><br><span>@@ -325,8 +312,7 @@</span><br><span> chan_state->dl_cmr - 1, trx->nr, chan_nr);</span><br><span> chan_state->dl_cmr--;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span> </span><br><span> /* upgrade */</span><br><span>@@ -342,18 +328,15 @@</span><br><span> chan_state->dl_cmr++;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop)</span><br><span style="color: hsl(120, 100%, 40%);">+void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop)</span><br><span> {</span><br><span> if (chan_state->amr_loop && !loop) {</span><br><span> chan_state->amr_loop = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span> </span><br><span> if (!chan_state->amr_loop && loop) {</span><br><span>@@ -363,8 +346,6 @@</span><br><span> chan_state->ber_num = 0;</span><br><span> chan_state->ber_sum = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-trx/loops.h b/src/osmo-bts-trx/loops.h</span><br><span>index f9e69c8..50a658d 100644</span><br><span>--- a/src/osmo-bts-trx/loops.h</span><br><span>+++ b/src/osmo-bts-trx/loops.h</span><br><span>@@ -13,15 +13,15 @@</span><br><span> * loops api</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span> struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+void trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span> struct l1sched_chan_state *chan_state);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span> struct l1sched_chan_state *chan_state, float ber);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop);</span><br><span style="color: hsl(120, 100%, 40%);">+void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop);</span><br><span> </span><br><span> #endif /* _TRX_LOOPS_H */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12288">change 12288</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/12288"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3575a2cef75f3fd4c3f95eddb40719d28a055b54 </div>
<div style="display:none"> Gerrit-Change-Number: 12288 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>