Change in osmo-bts[master]: sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/9706 )
Change subject: sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0
..
sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0
Fixes following compilation warning:
In file included from l1_if.c:32:0:
l1_if.c: In function ‘l1if_mute_rf’:
/include/osmocom/core/utils.h:13:30: error: ‘sizeof’ on array function
parameter ‘mute’ will return size of ‘uint8_t * {aka unsigned char *}’
[-Werror=sizeof-array-argument]
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
^
l1_if.c:1405:29: note: in expansion of macro ‘ARRAY_SIZE’
if (!memcmp(mute, unmuted, ARRAY_SIZE(mute))) {
^~
l1_if.c:1388:51: note: declared here
int l1if_mute_rf(struct femtol1_hdl *hdl, uint8_t mute[8], l1if_compl_cb *cb)
^~~~
In file included from l1_if.c:32:0:
/include/osmocom/core/utils.h:13:30: error: ‘sizeof’ on array function
parameter ‘mute’ will return size of ‘uint8_t * {aka unsigned char *}’
[-Werror=sizeof-array-argument]
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
^
l1_if.c:1408:19: note: in expansion of macro ‘ARRAY_SIZE’
for (i = 0; i < ARRAY_SIZE(mute); ++i)
^~
l1_if.c:1388:51: note: declared here
int l1if_mute_rf(struct femtol1_hdl *hdl, uint8_t mute[8], l1if_compl_cb *cb)
^~~~
Change-Id: Id040aeb35549ddb75072942be0093064a89092a6
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 2 insertions(+), 2 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 f1c6602..7fa82f2 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1402,10 +1402,10 @@
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(mute))) {
+ if (!memcmp(mute, unmuted, ARRAY_SIZE(unmuted))) {
bts_update_status(BTS_STATUS_RF_MUTE, mute[0]);
oml_mo_rf_lock_chg(>mo, mute, 1);
- for (i = 0; i < ARRAY_SIZE(mute); ++i)
+ for (i = 0; i < ARRAY_SIZE(unmuted); ++i)
mute_handle_ts(>ts[i], mute[i]);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/9706
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: Id040aeb35549ddb75072942be0093064a89092a6
Gerrit-Change-Number: 9706
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy
Change in osmo-bts[master]: sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9706 ) Change subject: sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id040aeb35549ddb75072942be0093064a89092a6 Gerrit-Change-Number: 9706 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 22 Jun 2018 14:02:10 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9706 ) Change subject: sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id040aeb35549ddb75072942be0093064a89092a6 Gerrit-Change-Number: 9706 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 22 Jun 2018 11:08:43 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0
Pau Espin Pedrol has uploaded this change for review. (
https://gerrit.osmocom.org/9706
Change subject: sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0
..
sysmo: Fix memcmp in RF-MUTE.req for superfemto < 3.6.0
Fixes following compilation warning:
In file included from l1_if.c:32:0:
l1_if.c: In function ‘l1if_mute_rf’:
/include/osmocom/core/utils.h:13:30: error: ‘sizeof’ on array function
parameter ‘mute’ will return size of ‘uint8_t * {aka unsigned char *}’
[-Werror=sizeof-array-argument]
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
^
l1_if.c:1405:29: note: in expansion of macro ‘ARRAY_SIZE’
if (!memcmp(mute, unmuted, ARRAY_SIZE(mute))) {
^~
l1_if.c:1388:51: note: declared here
int l1if_mute_rf(struct femtol1_hdl *hdl, uint8_t mute[8], l1if_compl_cb *cb)
^~~~
In file included from l1_if.c:32:0:
/include/osmocom/core/utils.h:13:30: error: ‘sizeof’ on array function
parameter ‘mute’ will return size of ‘uint8_t * {aka unsigned char *}’
[-Werror=sizeof-array-argument]
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
^
l1_if.c:1408:19: note: in expansion of macro ‘ARRAY_SIZE’
for (i = 0; i < ARRAY_SIZE(mute); ++i)
^~
l1_if.c:1388:51: note: declared here
int l1if_mute_rf(struct femtol1_hdl *hdl, uint8_t mute[8], l1if_compl_cb *cb)
^~~~
Change-Id: Id040aeb35549ddb75072942be0093064a89092a6
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/9706/1
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index f1c6602..7fa82f2 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1402,10 +1402,10 @@
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(mute))) {
+ if (!memcmp(mute, unmuted, ARRAY_SIZE(unmuted))) {
bts_update_status(BTS_STATUS_RF_MUTE, mute[0]);
oml_mo_rf_lock_chg(>mo, mute, 1);
- for (i = 0; i < ARRAY_SIZE(mute); ++i)
+ for (i = 0; i < ARRAY_SIZE(unmuted); ++i)
mute_handle_ts(>ts[i], mute[i]);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/9706
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id040aeb35549ddb75072942be0093064a89092a6
Gerrit-Change-Number: 9706
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
