fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28672 )

Change subject: trxcon: fix coding style in statements applying inverted mask ......................................................................

trxcon: fix coding style in statements applying inverted mask

Change-Id: I28b9fc34e0d40b02d0ca56e9e0bf4463cf4ff336 --- M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trx_if.c 2 files changed, 8 insertions(+), 8 deletions(-)

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved laforge: Looks good to me, approved

diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index ef88cd9..b279a53 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -88,7 +88,7 @@

LOGP(DL1C, LOGL_DEBUG, "Send PM Conf (%s %d = %d dBm)\n", arfcn2band_name(band_arfcn), - band_arfcn &~ ARFCN_FLAG_MASK, dbm); + band_arfcn & ~ARFCN_FLAG_MASK, dbm);

pmc = (struct l1ctl_pm_conf *) msgb_put(msg, sizeof(*pmc)); pmc->band_arfcn = htons(band_arfcn); @@ -303,7 +303,7 @@ if (msg == NULL) return;

- LOGP(DL1C, LOGL_NOTICE, "FBSB timer fired for ARFCN %u\n", l1l->trx->band_arfcn &~ ARFCN_FLAG_MASK); + LOGP(DL1C, LOGL_NOTICE, "FBSB timer fired for ARFCN %u\n", l1l->trx->band_arfcn & ~ARFCN_FLAG_MASK);

dl = put_dl_info_hdr(msg, NULL);

@@ -340,7 +340,7 @@

LOGP(DL1C, LOGL_NOTICE, "Received FBSB request (%s %d)\n", arfcn2band_name(band_arfcn), - band_arfcn &~ ARFCN_FLAG_MASK); + band_arfcn & ~ARFCN_FLAG_MASK);

/* Reset scheduler and clock counter */ l1sched_reset(l1l->sched, true); @@ -398,8 +398,8 @@ LOGP(DL1C, LOGL_NOTICE, "Received power measurement " "request (%s: %d -> %d)\n", arfcn2band_name(band_arfcn_start), - band_arfcn_start &~ ARFCN_FLAG_MASK, - band_arfcn_stop &~ ARFCN_FLAG_MASK); + band_arfcn_start & ~ARFCN_FLAG_MASK, + band_arfcn_stop & ~ARFCN_FLAG_MASK);

/* Send measurement request to transceiver */ rc = trx_if_cmd_measure(l1l->trx, band_arfcn_start, band_arfcn_stop); @@ -570,7 +570,7 @@ band_arfcn = ntohs(h->band_arfcn);

LOGP(DL1C, LOGL_NOTICE, "L1CTL_DM_EST_REQ indicates a single " - "ARFCN=%u channel\n", band_arfcn &~ ARFCN_FLAG_MASK); + "ARFCN=%u channel\n", band_arfcn & ~ARFCN_FLAG_MASK);

/* Do we need to retune? */ if (trx->band_arfcn == band_arfcn) diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 9984e0e..eec287c 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -379,8 +379,8 @@ if (band_arfcn != trx->pm_band_arfcn_start) { LOGP(DTRX, LOGL_ERROR, "Power measurement error: " "response ARFCN=%u doesn't match expected ARFCN=%u\n", - band_arfcn &~ ARFCN_FLAG_MASK, - trx->pm_band_arfcn_start &~ ARFCN_FLAG_MASK); + band_arfcn & ~ARFCN_FLAG_MASK, + trx->pm_band_arfcn_start & ~ARFCN_FLAG_MASK); return; }

1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one.