From c0dc3bb8a108c3afd6dfcdf9e0001078dcd87f1e Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 22 Jul 2019 12:03:58 -0700 Subject: rfnoc: radio: Remove async message registers for timestamp These are no longer used. --- host/lib/rfnoc/radio_control_impl.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'host/lib') 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)); -- cgit v1.2.3