Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/9707 )
Change subject: sysmo: l1if_mute_rf: Declare vars inside ifdef section
......................................................................
sysmo: l1if_mute_rf: Declare vars inside ifdef section
Otherwise sysp variable is unused and compiler triggers a warn.
Change-Id: Ie3a3529442a36bb885ef634b8b49ac801bd263da
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 2 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 7fa82f2..9fde513 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1387,8 +1387,6 @@
/* mute/unmute RF time slots */
int l1if_mute_rf(struct femtol1_hdl *hdl, uint8_t mute[8], l1if_compl_cb *cb)
{
- struct msgb *msg = sysp_msgb_alloc();
- SuperFemto_Prim_t *sysp = msgb_sysprim(msg);
LOGP(DL1C, LOGL_INFO, "Tx RF-MUTE.req (%d, %d, %d, %d, %d, %d, %d,
%d)\n",
mute[0], mute[1], mute[2], mute[3],
@@ -1400,7 +1398,6 @@
struct gsm_bts_trx *trx = hdl->phy_inst->trx;
int i;
LOGP(DL1C, LOGL_ERROR, "RF-MUTE.req not supported by SuperFemto\n");
- msgb_free(msg);
/* always acknowledge an un-MUTE (which is a no-op if MUTE is not
supported */
if (!memcmp(mute, unmuted, ARRAY_SIZE(unmuted))) {
bts_update_status(BTS_STATUS_RF_MUTE, mute[0]);
@@ -1411,6 +1408,8 @@
}
return -ENOTSUP;
#else
+ struct msgb *msg = sysp_msgb_alloc();
+ SuperFemto_Prim_t *sysp = msgb_sysprim(msg);
sysp->id = SuperFemto_PrimId_MuteRfReq;
memcpy(sysp->u.muteRfReq.u8Mute, mute,
sizeof(sysp->u.muteRfReq.u8Mute));
/* save for later use */
--
To view, visit https://gerrit.osmocom.org/9707
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: Ie3a3529442a36bb885ef634b8b49ac801bd263da
Gerrit-Change-Number: 9707
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <[email protected]>
