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

[Harald Welte]

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

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

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

Change-Id: I4e6d97114289027fbcff00f77cd42db5277a54ab
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 9fde513..3adb442 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1259,6 +1259,7 @@
 #endif
 }
 
+#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,2,0)
 /*
  * RevC was the last HW revision without an external
  * attenuator. Check for that.
@@ -1268,13 +1269,13 @@
 	/* older version doesn't have an attenuator */
 	return hdl->hw_info.ver_major > 2;
 }
+#endif /* 2.2.0 */
 
 /* activate or de-activate the entire RF-Frontend */
 int l1if_activate_rf(struct femtol1_hdl *hdl, int on)
 {
 	struct msgb *msg = sysp_msgb_alloc();
 	SuperFemto_Prim_t *sysp = msgb_sysprim(msg);
-	struct gsm_bts_trx *trx = hdl->phy_inst->trx;
 
 	if (on) {
 		sysp->id = SuperFemto_PrimId_ActivateRfReq;
@@ -1302,6 +1303,7 @@
 		sysp->u.activateRfReq.rfRx.iClkCor = get_clk_cal(hdl);
 #endif /* API 2.4.0 */
 #if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,2,0)
+		struct gsm_bts_trx *trx = hdl->phy_inst->trx;
 		if (has_external_atten(hdl)) {
 			LOGP(DL1C, LOGL_INFO, "Using external attenuator.\n");
 			sysp->u.activateRfReq.rfTrx.u8UseExtAtten = 1;
@@ -1426,7 +1428,6 @@
 	SuperFemto_Prim_t *sysp = msgb_sysprim(resp);
 	SuperFemto_SystemInfoCnf_t *sic = &sysp->u.systemInfoCnf;
 	struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx);
-	int rc;
 
 	fl1h->hw_info.dsp_version[0] = sic->dspVersion.major;
 	fl1h->hw_info.dsp_version[1] = sic->dspVersion.minor;
@@ -1469,7 +1470,7 @@
 
 #if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,4,0)
 	/* load calibration tables (if we know their path) */
-	rc = calib_load(fl1h);
+	int rc = calib_load(fl1h);
 	if (rc < 0)
 		LOGP(DL1C, LOGL_ERROR, "Operating without calibration; "
 			"unable to load tables!\n");

-- 
To view, visit https://gerrit.osmocom.org/9708
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: I4e6d97114289027fbcff00f77cd42db5277a54ab
Gerrit-Change-Number: 9708
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180622/211fc113/attachment.htm>