laforge
/
openbts-osmo
Archived
1
0
Fork 0
Code Releases Activity

uhd: flush initial receive samples 

Occasionally, the E100 will have errant timestamps at start
related to previous sessions. Early packets will be thrown
out anyways, so do this explicitly so the timestamps don't
royally fuck up the sample timing.

Signed-off-by: Thomas Tsou <ttsou@vt.edu>
This commit is contained in:
Thomas Tsou 2011-05-04 16:41:25 -04:00
parent 90d7633583
commit b4fa0c4074
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public-trunk/Transceiver/UHDDevice.cpp
View File

@ -182,6 +182,7 @@ private:
TIMESTAMP ts_offset;
smpl_buf *rx_smpl_buf;
bool flush_recv(size_t num_pkts);
std::string str_code(uhd::rx_metadata_t metadata);
std::string str_code(uhd::async_metadata_t metadata);
@ -305,6 +306,27 @@ bool uhd_device::open()
return true;
}
bool uhd_device::flush_recv(size_t num_pkts)
{
uhd::rx_metadata_t metadata;
size_t num_smpls;
uint32_t buff[rx_spp];
for (size_t i = 0; i < num_pkts; i++) {
num_smpls = usrp_dev->get_device()->recv(
buff,
rx_spp,
metadata,
uhd::io_type_t::COMPLEX_INT16,
uhd::device::RECV_MODE_ONE_PACKET);
if (!num_smpls)
return false;
}
return true;
}
bool uhd_device::start()
{
LOG(INFO) << "Starting USRP...";
@ -327,6 +349,10 @@ bool uhd_device::start()
if (!skip_rx)
usrp_dev->issue_stream_cmd(cmd);
// Flush out any early garbage
if (!flush_recv(20))
return false;
// Display usrp time
double time_now = usrp_dev->get_time_now().get_real_secs();
LOG(INFO) << "The current time is " << time_now << " seconds";

26
public-trunk/Transceiver52M/UHDDevice.cpp
View File

@ -200,6 +200,7 @@ private:
TIMESTAMP ts_offset;
smpl_buf *rx_smpl_buf;
bool flush_recv(size_t num_pkts);
std::string str_code(uhd::rx_metadata_t metadata);
std::string str_code(uhd::async_metadata_t metadata);
@ -323,6 +324,27 @@ bool uhd_device::open()
return true;
}
bool uhd_device::flush_recv(size_t num_pkts)
{
uhd::rx_metadata_t metadata;
size_t num_smpls;
uint32_t buff[rx_spp];
for (size_t i = 0; i < num_pkts; i++) {
num_smpls = usrp_dev->get_device()->recv(
buff,
rx_spp,
metadata,
uhd::io_type_t::COMPLEX_INT16,
uhd::device::RECV_MODE_ONE_PACKET);
if (!num_smpls)
return false;
}
return true;
}
bool uhd_device::start()
{
LOG(INFO) << "Starting USRP...";
@ -345,6 +367,10 @@ bool uhd_device::start()
if (!skip_rx)
usrp_dev->issue_stream_cmd(cmd);
// Flush out any early garbage
if (!flush_recv(20))
return false;
// Display usrp time
double time_now = usrp_dev->get_time_now().get_real_secs();
LOG(INFO) << "The current time is " << time_now << " seconds";