<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9709">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sysmo: calib_file.c: Avoid decl of unused vars and funcs with femtobts_v2.7 build<br><br>Change-Id: I853ff6d3562c5852bff58a07e7c23d49329d9a4f<br>---<br>M src/osmo-bts-sysmo/calib_file.c<br>1 file changed, 19 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-sysmo/calib_file.c b/src/osmo-bts-sysmo/calib_file.c</span><br><span>index 8cb09d9..2f723dd 100644</span><br><span>--- a/src/osmo-bts-sysmo/calib_file.c</span><br><span>+++ b/src/osmo-bts-sysmo/calib_file.c</span><br><span>@@ -111,6 +111,7 @@</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,4,0)</span><br><span> static const unsigned int arrsize_by_band[] = {</span><br><span> [GsmL1_FreqBand_850] = 124,</span><br><span> [GsmL1_FreqBand_900] = 194,</span><br><span>@@ -118,21 +119,6 @@</span><br><span> [GsmL1_FreqBand_1900] = 299</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* determine next calibration file index based on supported bands */</span><br><span style="color: hsl(0, 100%, 40%);">-static int next_calib_file_idx(uint32_t band_mask, int last_idx)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = last_idx+1; i < ARRAY_SIZE(calib_files); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- int band = band_femto2osmo(calib_files[i].band);</span><br><span style="color: hsl(0, 100%, 40%);">- if (band < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (band_mask & band)</span><br><span style="color: hsl(0, 100%, 40%);">- return i;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static float read_float(FILE *in)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -168,7 +154,6 @@</span><br><span> </span><br><span> extern const uint8_t fixup_macs[95][6];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void determine_fixup(struct femtol1_hdl *fl1h)</span><br><span> {</span><br><span> uint8_t macaddr[6];</span><br><span>@@ -212,6 +197,7 @@</span><br><span> </span><br><span> return fl1h->fixup_needed == FIXUP_NEEDED;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* API 2.4.0 */</span><br><span> </span><br><span> static void calib_fixup_rx(struct femtol1_hdl *fl1h, SuperFemto_Prim_t *prim)</span><br><span> {</span><br><span>@@ -228,7 +214,6 @@</span><br><span> {</span><br><span> FILE *in;</span><br><span> char fname[PATH_MAX];</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span> </span><br><span> fname[0] = '\0';</span><br><span> snprintf(fname, sizeof(fname)-1, "%s/%s", path, desc->fname);</span><br><span>@@ -242,6 +227,7 @@</span><br><span> }</span><br><span> </span><br><span> #if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,4,0)</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span> if (desc->rx) {</span><br><span> SuperFemto_SetRxCalibTblReq_t *rx = &prim->u.setRxCalibTblReq;</span><br><span> memset(rx, 0, sizeof(*rx));</span><br><span>@@ -296,10 +282,9 @@</span><br><span> </span><br><span> static int calib_eeprom_read(const struct calib_file_desc *desc, SuperFemto_Prim_t *prim)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,4,0)</span><br><span> eeprom_Error_t eerr;</span><br><span> int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,4,0)</span><br><span> if (desc->rx) {</span><br><span> SuperFemto_SetRxCalibTblReq_t *rx = &prim->u.setRxCalibTblReq;</span><br><span> eeprom_RxCal_t rx_cal;</span><br><span>@@ -379,6 +364,21 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* determine next calibration file index based on supported bands */</span><br><span style="color: hsl(120, 100%, 40%);">+static int next_calib_file_idx(uint32_t band_mask, int last_idx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = last_idx+1; i < ARRAY_SIZE(calib_files); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int band = band_femto2osmo(calib_files[i].band);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (band < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (band_mask & band)</span><br><span style="color: hsl(120, 100%, 40%);">+ return i;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* iteratively download the calibration data into the L1 */</span><br><span> </span><br><span> static int calib_send_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9709">change 9709</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/9709"/><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: I853ff6d3562c5852bff58a07e7c23d49329d9a4f </div>
<div style="display:none"> Gerrit-Change-Number: 9709 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>