From 9215f76443c95c287c6bd0f83a56c015f07d5e60 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 22 Jun 2018 11:52:24 +0200 Subject: sysmo: calib_file.c: Avoid decl of unused vars and funcs with femtobts_v2.7 build Change-Id: I853ff6d3562c5852bff58a07e7c23d49329d9a4f --- src/osmo-bts-sysmo/calib_file.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/osmo-bts-sysmo') diff --git a/src/osmo-bts-sysmo/calib_file.c b/src/osmo-bts-sysmo/calib_file.c index 8cb09d93..2f723dd0 100644 --- a/src/osmo-bts-sysmo/calib_file.c +++ b/src/osmo-bts-sysmo/calib_file.c @@ -111,6 +111,7 @@ static const struct calib_file_desc calib_files[] = { }, }; +#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 @@ static const unsigned int arrsize_by_band[] = { [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 @@ static const float delta_by_band[Num_GsmL1_FreqBand] = { extern const uint8_t fixup_macs[95][6]; - static void determine_fixup(struct femtol1_hdl *fl1h) { uint8_t macaddr[6]; @@ -212,6 +197,7 @@ static int fixup_needed(struct femtol1_hdl *fl1h) 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 @@ static int calib_file_read(const char *path, const struct calib_file_desc *desc, { 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 @@ static int calib_file_read(const char *path, const struct calib_file_desc *desc, } #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_file_read(const char *path, const struct calib_file_desc *desc, 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 @@ static int calib_eeprom_read(const struct calib_file_desc *desc, SuperFemto_Prim 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, -- cgit v1.2.3