From da1ee1aa71501665b142cdb64fd4daa02793fbc1 Mon Sep 17 00:00:00 2001 From: Lane Kolbly Date: Mon, 6 Dec 2021 13:53:22 -0600 Subject: host: Make radio_control constants an enum In C++, variables whose address are taken must be defined somewhere. PERIPH_BASE had no such definition, so on some compilers/systems caused a linker error. This commit switches to using enums to prevent this happening again in the future. --- host/lib/rfnoc/radio_control_impl.cpp | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'host/lib/rfnoc/radio_control_impl.cpp') diff --git a/host/lib/rfnoc/radio_control_impl.cpp b/host/lib/rfnoc/radio_control_impl.cpp index 697bb2549..131c879b7 100644 --- a/host/lib/rfnoc/radio_control_impl.cpp +++ b/host/lib/rfnoc/radio_control_impl.cpp @@ -28,34 +28,6 @@ const std::string radio_control::ALL_GAINS = ""; const uint16_t radio_control_impl::MAJOR_COMPAT = 0; const uint16_t radio_control_impl::MINOR_COMPAT = 1; -const uint32_t radio_control_impl::regmap::REG_COMPAT_NUM; -const uint32_t radio_control_impl::regmap::REG_RADIO_WIDTH; -const uint32_t radio_control_impl::regmap::RADIO_BASE_ADDR; -const uint32_t radio_control_impl::regmap::REG_CHAN_OFFSET; -const uint32_t radio_control_impl::regmap::RADIO_ADDR_W; -const uint32_t radio_control_impl::regmap::REG_LOOPBACK_EN; -const uint32_t radio_control_impl::regmap::REG_RX_STATUS; -const uint32_t radio_control_impl::regmap::REG_RX_CMD; -const uint32_t radio_control_impl::regmap::REG_RX_CMD_NUM_WORDS_LO; -const uint32_t radio_control_impl::regmap::REG_RX_CMD_NUM_WORDS_HI; -const uint32_t radio_control_impl::regmap::REG_RX_CMD_TIME_LO; -const uint32_t radio_control_impl::regmap::REG_RX_CMD_TIME_HI; -const uint32_t radio_control_impl::regmap::REG_RX_MAX_WORDS_PER_PKT; -const uint32_t radio_control_impl::regmap::REG_RX_ERR_PORT; -const uint32_t radio_control_impl::regmap::REG_RX_ERR_REM_PORT; -const uint32_t radio_control_impl::regmap::REG_RX_ERR_REM_EPID; -const uint32_t radio_control_impl::regmap::REG_RX_ERR_ADDR; -const uint32_t radio_control_impl::regmap::REG_TX_IDLE_VALUE; -const uint32_t radio_control_impl::regmap::REG_TX_ERROR_POLICY; -const uint32_t radio_control_impl::regmap::REG_TX_ERR_PORT; -const uint32_t radio_control_impl::regmap::REG_TX_ERR_REM_PORT; -const uint32_t radio_control_impl::regmap::REG_TX_ERR_REM_EPID; -const uint32_t radio_control_impl::regmap::REG_TX_ERR_ADDR; -const uint32_t radio_control_impl::regmap::RX_CMD_STOP; -const uint32_t radio_control_impl::regmap::RX_CMD_FINITE; -const uint32_t radio_control_impl::regmap::RX_CMD_CONTINUOUS; -const uint32_t radio_control_impl::regmap::RX_CMD_TIMED_POS; - const uhd::fs_path radio_control_impl::DB_PATH("dboard"); const uhd::fs_path radio_control_impl::FE_PATH("frontends"); -- cgit v1.2.3