diff options
| author | Thomas Tsou <tom@tsou.cc> | 2013-11-09 21:48:45 -0500 |
|---|---|---|
| committer | Thomas Tsou <tom@tsou.cc> | 2013-11-15 23:35:07 -0500 |
| commit | f8bc7c351ff96ffca57ad30535de315cf7e1c8ae (patch) | |
| tree | dee4400c6c523266dedd6aa5be5fe5f79ffab797 | |
| parent | a4cf48cf8bc26049e7d637c6fe0ce20698d4ece7 (diff) | |
Transceiver52M: UHD: Continue on receive and send timeouts
With testing on current UHD releases, currently 003.005.xxx series,
timeout errors on both receive and transmit are recoverable on network
and USB based devices. Remove the fatal error conditions.
Signed-off-by: Thomas Tsou <tom@tsou.cc>
| -rw-r--r-- | Transceiver52M/UHDDevice.cpp | 4 | ||||
| -rw-r--r-- | Transceiver52M/radioInterface.cpp | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/Transceiver52M/UHDDevice.cpp b/Transceiver52M/UHDDevice.cpp index d1f039a..a2c2471 100644 --- a/Transceiver52M/UHDDevice.cpp +++ b/Transceiver52M/UHDDevice.cpp @@ -725,7 +725,6 @@ int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls) switch (md.error_code) { case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT: LOG(ALERT) << "UHD: Receive timed out"; - return ERROR_UNRECOVERABLE; case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW: case uhd::rx_metadata_t::ERROR_CODE_LATE_COMMAND: case uhd::rx_metadata_t::ERROR_CODE_BROKEN_CHAIN: @@ -887,9 +886,6 @@ int uhd_device::writeSamples(std::vector<short *> &bufs, int len, bool *underrun size_t num_smpls = tx_stream->send(bufs, len, metadata); if (num_smpls != (unsigned) len) { LOG(ALERT) << "UHD: Device send timed out"; - LOG(ALERT) << "UHD: Version " << uhd::get_version_string(); - LOG(ALERT) << "UHD: Unrecoverable error, exiting..."; - exit(-1); } return num_smpls; diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 6e82c8a..d05dcf2 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -362,10 +362,6 @@ void RadioInterface::pushBuffer() sendCursor, &underrun, writeTimestamp); - if (num_sent != sendCursor) { - LOG(ALERT) << "Transmit error " << num_sent; - } - writeTimestamp += num_sent; sendCursor = 0; } |