From f8c0c464b84f6ca44c7a50623909e1a4aace0a1e Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 12 Mar 2020 19:08:46 +0100 Subject: radioDevice: Drop unused RSSI param from readSamples API The out "RSSI" parameter is only filled by USRPDevice, and not used at all by any user of the API (radioInterface*.cpp). RSSI seems to be computed nowadays in the common path in Transceiver::pullRadioVector(). Change-Id: I06c2ea5a9891d170bc468f952bbf2a7e64d95784 --- Transceiver52M/device/common/radioDevice.h | 4 +--- Transceiver52M/device/lms/LMSDevice.cpp | 2 +- Transceiver52M/device/lms/LMSDevice.h | 3 +-- Transceiver52M/device/uhd/UHDDevice.cpp | 2 +- Transceiver52M/device/uhd/UHDDevice.h | 2 +- Transceiver52M/device/usrp1/USRPDevice.cpp | 8 +++++--- Transceiver52M/device/usrp1/USRPDevice.h | 4 +--- 7 files changed, 11 insertions(+), 14 deletions(-) (limited to 'Transceiver52M/device') diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h index 26903e8..c504b3a 100644 --- a/Transceiver52M/device/common/radioDevice.h +++ b/Transceiver52M/device/common/radioDevice.h @@ -77,12 +77,10 @@ class RadioDevice { @param overrun Set if read buffer has been overrun, e.g. data not being read fast enough @param timestamp The timestamp of the first samples to be read @param underrun Set if radio does not have data to transmit, e.g. data not being sent fast enough - @param RSSI The received signal strength of the read result @return The number of samples actually read */ virtual int readSamples(std::vector &bufs, int len, bool *overrun, - TIMESTAMP timestamp = 0xffffffff, bool *underrun = 0, - unsigned *RSSI = 0) = 0; + TIMESTAMP timestamp = 0xffffffff, bool *underrun = 0) = 0; /** Write samples to the radio. @param buf Contains the data to be written. diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 884cc28..0cd8002 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -739,7 +739,7 @@ void LMSDevice::update_stream_stats_rx(size_t chan, bool *overrun) // NOTE: Assumes sequential reads int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun, - TIMESTAMP timestamp, bool * underrun, unsigned *RSSI) + TIMESTAMP timestamp, bool * underrun) { int rc, num_smpls, expect_smpls; ssize_t avail_smpls; diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 755f6c4..c2fd2f6 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -106,12 +106,11 @@ public: @param overrun Set if read buffer has been overrun, e.g. data not being read fast enough @param timestamp The timestamp of the first samples to be read @param underrun Set if LMS does not have data to transmit, e.g. data not being sent fast enough - @param RSSI The received signal strength of the read result @return The number of samples actually read */ int readSamples(std::vector < short *>&buf, int len, bool * overrun, TIMESTAMP timestamp = 0xffffffff, bool * underrun = - NULL, unsigned *RSSI = NULL); + NULL); /** Write samples to the LMS. @param buf Contains the data to be written. diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 5d267c8..ddb6631 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -721,7 +721,7 @@ int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls) } int uhd_device::readSamples(std::vector &bufs, int len, bool *overrun, - TIMESTAMP timestamp, bool *underrun, unsigned *RSSI) + TIMESTAMP timestamp, bool *underrun) { ssize_t rc; uhd::time_spec_t ts; diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h index d485a8e..4809b25 100644 --- a/Transceiver52M/device/uhd/UHDDevice.h +++ b/Transceiver52M/device/uhd/UHDDevice.h @@ -74,7 +74,7 @@ public: enum TxWindowType getWindowType() { return tx_window; } int readSamples(std::vector &bufs, int len, bool *overrun, - TIMESTAMP timestamp, bool *underrun, unsigned *RSSI); + TIMESTAMP timestamp, bool *underrun); int writeSamples(std::vector &bufs, int len, bool *underrun, TIMESTAMP timestamp, bool isControl); diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 766a228..5eaca07 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -365,7 +365,7 @@ GSM::Time USRPDevice::minLatency() { // NOTE: Assumes sequential reads int USRPDevice::readSamples(std::vector &bufs, int len, bool *overrun, - TIMESTAMP timestamp, bool *underrun, unsigned *RSSI) + TIMESTAMP timestamp, bool *underrun) { #ifndef SWLOOPBACK if (!m_uRx) @@ -433,8 +433,10 @@ int USRPDevice::readSamples(std::vector &bufs, int len, bool *overrun, *underrun = true; LOGC(DDEV, DEBUG) << "UNDERRUN in TRX->USRP interface"; } - if (RSSI) *RSSI = (word0 >> 21) & 0x3f; - +#if 0 + /* FIXME: Do something with this ? */ + unsigned RSSI = (word0 >> 21) & 0x3f; +#endif if (!isAligned) continue; unsigned cursorStart = pktTimestamp - timeStart + dataStart; diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 47f2a43..0cf5ec3 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -117,12 +117,10 @@ private: @param overrun Set if read buffer has been overrun, e.g. data not being read fast enough @param timestamp The timestamp of the first samples to be read @param underrun Set if USRP does not have data to transmit, e.g. data not being sent fast enough - @param RSSI The received signal strength of the read result @return The number of samples actually read */ int readSamples(std::vector &buf, int len, bool *overrun, - TIMESTAMP timestamp = 0xffffffff, bool *underrun = NULL, - unsigned *RSSI = NULL); + TIMESTAMP timestamp = 0xffffffff, bool *underrun = NULL); /** Write samples to the USRP. @param buf Contains the data to be written. -- cgit v1.2.3