aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-07-22 12:03:58 -0700
committerMartin Braun <martin.braun@ettus.com>2019-11-26 11:49:32 -0800
commitc0dc3bb8a108c3afd6dfcdf9e0001078dcd87f1e (patch)
treea5b7672efcdb50b79c47b628c5d8165d4892d9e3 /host
parent0ea553475ee58664e61dd26113059857c7df1f21 (diff)
downloaduhd-c0dc3bb8a108c3afd6dfcdf9e0001078dcd87f1e.tar.gz
uhd-c0dc3bb8a108c3afd6dfcdf9e0001078dcd87f1e.tar.bz2
uhd-c0dc3bb8a108c3afd6dfcdf9e0001078dcd87f1e.zip
rfnoc: radio: Remove async message registers for timestamp
These are no longer used.
Diffstat (limited to 'host')
-rw-r--r--host/lib/rfnoc/radio_control_impl.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/host/lib/rfnoc/radio_control_impl.cpp b/host/lib/rfnoc/radio_control_impl.cpp
index 9ce1d83ec..018f54d9e 100644
--- a/host/lib/rfnoc/radio_control_impl.cpp
+++ b/host/lib/rfnoc/radio_control_impl.cpp
@@ -811,13 +811,16 @@ void radio_control_impl::async_message_handler(
const uint32_t addr_base = (addr >= regmap::SWREG_RX_ERR) ? regmap::SWREG_RX_ERR
: regmap::SWREG_TX_ERR;
const uint32_t chan = (addr - addr_base) / regmap::SWREG_CHAN_OFFSET;
+ // Note: addr_offset is always going to be zero for now, because we only
+ // have one "register" that gets hit for either RX or TX, but we'll keep it
+ // in case we add other regs in the future
const uint32_t addr_offset = addr % regmap::SWREG_CHAN_OFFSET;
const uint32_t code = data[0];
RFNOC_LOG_TRACE(
str(boost::format("Received async message to addr 0x%08X, data length %d words, "
- "%s channel %d, addr_offset %d")
+ "%s channel %d, addr_offset %d, has timestamp %d")
% addr % data.size() % (addr_base == regmap::SWREG_TX_ERR ? "TX" : "RX")
- % chan % addr_offset));
+ % chan % addr_offset % int(bool(timestamp))));
if (timestamp) {
RFNOC_LOG_TRACE(
str(boost::format("Async message timestamp: %ul") % timestamp.get()));
@@ -851,12 +854,6 @@ void radio_control_impl::async_message_handler(
}
break;
}
- case regmap::SWREG_TX_ERR + 8:
- case regmap::SWREG_TX_ERR + 12:
- case regmap::SWREG_RX_ERR + 8:
- case regmap::SWREG_RX_ERR + 12:
- RFNOC_LOG_TRACE("Dropping timestamp info for async message.");
- break;
default:
RFNOC_LOG_WARNING(str(
boost::format("Received async message to invalid addr 0x%08X!") % addr));