pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/14988 )
Change subject: usrp1: don't check for non-null underrun pointer
......................................................................
usrp1: don't check for non-null underrun pointer
The pointer can't never be null, so avoid checking it.
Change-Id: I12e14641713a6494bc89570f02cecfc6f8fd4b5e
---
M Transceiver52M/device/usrp1/USRPDevice.cpp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp
b/Transceiver52M/device/usrp1/USRPDevice.cpp
index af0b3de..63debee 100644
--- a/Transceiver52M/device/usrp1/USRPDevice.cpp
+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp
@@ -377,7 +377,7 @@
return len;
}
- if (underrun) *underrun = false;
+ *underrun = false;
uint32_t readBuf[2000];
@@ -427,7 +427,7 @@
continue;
}
if ((word0 >> 28) & 0x04) {
- if (underrun) *underrun = true;
+ *underrun = true;
LOGC(DDEV, DEBUG) << "UNDERRUN in TRX->USRP interface";
}
if (RSSI) *RSSI = (word0 >> 21) & 0x3f;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14988
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I12e14641713a6494bc89570f02cecfc6f8fd4b5e
Gerrit-Change-Number: 14988
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <lafo...@gnumonks.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
