Change in osmo-bts[master]: sysmo: calib_file.c: Avoid decl of unused vars and funcs with femtobt...

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/9709 )

Change subject: sysmo: calib_file.c: Avoid decl of unused vars and funcs with 
femtobts_v2.7 build
......................................................................

sysmo: calib_file.c: Avoid decl of unused vars and funcs with femtobts_v2.7 
build

Change-Id: I853ff6d3562c5852bff58a07e7c23d49329d9a4f
---
M src/osmo-bts-sysmo/calib_file.c
1 file changed, 19 insertions(+), 19 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/osmo-bts-sysmo/calib_file.c b/src/osmo-bts-sysmo/calib_file.c
index 8cb09d9..2f723dd 100644
--- a/src/osmo-bts-sysmo/calib_file.c
+++ b/src/osmo-bts-sysmo/calib_file.c
@@ -111,6 +111,7 @@
        },
 };

+#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,4,0)
 static const unsigned int arrsize_by_band[] = {
        [GsmL1_FreqBand_850] = 124,
        [GsmL1_FreqBand_900] = 194,
@@ -118,21 +119,6 @@
        [GsmL1_FreqBand_1900] = 299
 };

-/* determine next calibration file index based on supported bands */
-static int next_calib_file_idx(uint32_t band_mask, int last_idx)
-{
-       int i;
-
-       for (i = last_idx+1; i < ARRAY_SIZE(calib_files); i++) {
-               int band = band_femto2osmo(calib_files[i].band);
-               if (band < 0)
-                       continue;
-               if (band_mask & band)
-                       return i;
-       }
-       return -1;
-}
-
 static float read_float(FILE *in)
 {
        int rc;
@@ -168,7 +154,6 @@

 extern const uint8_t fixup_macs[95][6];

-
 static void determine_fixup(struct femtol1_hdl *fl1h)
 {
        uint8_t macaddr[6];
@@ -212,6 +197,7 @@

        return fl1h->fixup_needed == FIXUP_NEEDED;
 }
+#endif /* API 2.4.0 */

 static void calib_fixup_rx(struct femtol1_hdl *fl1h, SuperFemto_Prim_t *prim)
 {
@@ -228,7 +214,6 @@
 {
        FILE *in;
        char fname[PATH_MAX];
-       int i;

        fname[0] = '\0';
        snprintf(fname, sizeof(fname)-1, "%s/%s", path, desc->fname);
@@ -242,6 +227,7 @@
        }

 #if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,4,0)
+       int i;
        if (desc->rx) {
                SuperFemto_SetRxCalibTblReq_t *rx = &prim->u.setRxCalibTblReq;
                memset(rx, 0, sizeof(*rx));
@@ -296,10 +282,9 @@

 static int calib_eeprom_read(const struct calib_file_desc *desc, 
SuperFemto_Prim_t *prim)
 {
+#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,4,0)
        eeprom_Error_t eerr;
        int i;
-
-#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,4,0)
        if (desc->rx) {
                SuperFemto_SetRxCalibTblReq_t *rx = &prim->u.setRxCalibTblReq;
                eeprom_RxCal_t rx_cal;
@@ -379,6 +364,21 @@
        return 0;
 }

+/* determine next calibration file index based on supported bands */
+static int next_calib_file_idx(uint32_t band_mask, int last_idx)
+{
+       int i;
+
+       for (i = last_idx+1; i < ARRAY_SIZE(calib_files); i++) {
+               int band = band_femto2osmo(calib_files[i].band);
+               if (band < 0)
+                       continue;
+               if (band_mask & band)
+                       return i;
+       }
+       return -1;
+}
+
 /* iteratively download the calibration data into the L1 */

 static int calib_send_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg,

--
To view, visit https://gerrit.osmocom.org/9709
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I853ff6d3562c5852bff58a07e7c23d49329d9a4f
Gerrit-Change-Number: 9709
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pes...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder