aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-05-03 14:38:36 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-05-03 14:38:51 +0200
commit580c48b7d5ae931b5ceb7ffa2a1ae39f89b31080 (patch)
treebd269a55172d4a3107b41817d5bd2278f5aed1c0
parent7214fde085adca0d8c1ee280085c169f05b90eb5 (diff)
smpl_buf: Remove unused clk_rt variable
During 87b7d098e517470fec53ac13a28d1d0fa7b16bb4 we dropped support for UHD specific functionalitites, and so clk_rt is not needed anymore. Change-Id: I37403e085ed6a541bbdecf64f1f9a821ff2753a4
-rw-r--r--Transceiver52M/device/smpl_buf.cpp10
-rw-r--r--Transceiver52M/device/smpl_buf.h3
-rw-r--r--Transceiver52M/device/uhd/UHDDevice.cpp2
3 files changed, 7 insertions, 8 deletions
diff --git a/Transceiver52M/device/smpl_buf.cpp b/Transceiver52M/device/smpl_buf.cpp
index f3fc323..e3c5af5 100644
--- a/Transceiver52M/device/smpl_buf.cpp
+++ b/Transceiver52M/device/smpl_buf.cpp
@@ -25,9 +25,9 @@
#include "smpl_buf.h"
#include <inttypes.h>
-smpl_buf::smpl_buf(size_t len, double rate)
- : buf_len(len), clk_rt(rate),
- time_start(0), time_end(0), data_start(0), data_end(0)
+smpl_buf::smpl_buf(size_t len)
+ : buf_len(len), time_start(0), time_end(0),
+ data_start(0), data_end(0)
{
data = new uint32_t[len];
}
@@ -100,12 +100,12 @@ ssize_t smpl_buf::write(void *buf, size_t len, TIMESTAMP timestamp)
if (timestamp < time_end) {
LOGC(DDEV, ERR) << "Overwriting old buffer data: timestamp="<<timestamp<<" time_end="<<time_end;
- LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp << " rate=" << clk_rt;
+ LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp;
// Do not return error here, because it's a rounding error and is not fatal
}
if (timestamp > time_end && time_end != 0) {
LOGC(DDEV, ERR) << "Skipping buffer data: timestamp="<<timestamp<<" time_end="<<time_end;
- LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp << " rate=" << clk_rt;
+ LOGC(DDEV, DEBUG) << "Requested timestamp = " << timestamp;
// Do not return error here, because it's a rounding error and is not fatal
}
diff --git a/Transceiver52M/device/smpl_buf.h b/Transceiver52M/device/smpl_buf.h
index e58eb38..e007ae5 100644
--- a/Transceiver52M/device/smpl_buf.h
+++ b/Transceiver52M/device/smpl_buf.h
@@ -37,10 +37,9 @@ class smpl_buf {
public:
/** Sample buffer constructor
@param len number of 32-bit samples the buffer should hold
- @param rate sample clockrate
@param timestamp
*/
- smpl_buf(size_t len, double rate);
+ smpl_buf(size_t len);
~smpl_buf();
/** Query number of samples available for reading
diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp
index 79e5855..4e6f49d 100644
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -514,7 +514,7 @@ int uhd_device::open(const std::string &args, int ref, bool swap_channels)
// Create receive buffer
size_t buf_len = SAMPLE_BUF_SZ / sizeof(uint32_t);
for (size_t i = 0; i < rx_buffers.size(); i++)
- rx_buffers[i] = new smpl_buf(buf_len, rx_rate);
+ rx_buffers[i] = new smpl_buf(buf_len);
// Create vector buffer
pkt_bufs = std::vector<std::vector<short> >(chans, std::vector<short>(2 * rx_spp));