b200: Move the B200 radio control core into usrp/b200/

This serves two purposes:
- This file no longer goes into the compiled DLL if B200 is disabled
- Discourage use of this file for new devices, making it clear that this
  architecture is no longer used

The file itself is left untouched, only the class is renamed from
radio_ctrl_core_3000 to b200_radio_ctrl_core.

Note: In UHD 3, this file was also used by N230.

1 files changed, 7 insertions, 7 deletions

diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp
index 44205f03a..b280bcc87 100644
--- a/host/lib/usrp/b200/b200_impl.hpp
+++ b/host/lib/usrp/b200/b200_impl.hpp
@@ -10,6 +10,7 @@
 
 #include "b200_cores.hpp"
 #include "b200_iface.hpp"
+#include "b200_radio_ctrl_core.hpp"
 #include "b200_uart.hpp"
 #include <uhd/device.hpp>
 #include <uhd/property_tree.hpp>
@@ -26,20 +27,19 @@
 #include <uhdlib/usrp/common/ad9361_ctrl.hpp>
 #include <uhdlib/usrp/common/ad936x_manager.hpp>
 #include <uhdlib/usrp/common/adf4001_ctrl.hpp>
+#include <uhdlib/usrp/common/pwr_cal_mgr.hpp>
 #include <uhdlib/usrp/common/recv_packet_demuxer_3000.hpp>
 #include <uhdlib/usrp/cores/gpio_atr_3000.hpp>
-#include <uhdlib/usrp/cores/radio_ctrl_core_3000.hpp>
 #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
 #include <uhdlib/usrp/cores/rx_vita_core_3000.hpp>
 #include <uhdlib/usrp/cores/time_core_3000.hpp>
 #include <uhdlib/usrp/cores/tx_dsp_core_3000.hpp>
 #include <uhdlib/usrp/cores/tx_vita_core_3000.hpp>
 #include <uhdlib/usrp/cores/user_settings_core_3000.hpp>
-#include <uhdlib/usrp/common/pwr_cal_mgr.hpp>
+#include <unordered_map>
 #include <boost/assign.hpp>
 #include <memory>
 #include <mutex>
-#include <unordered_map>
 
 static const uint8_t B200_FW_COMPAT_NUM_MAJOR = 8;
 static const uint8_t B200_FW_COMPAT_NUM_MINOR = 0;
@@ -143,7 +143,7 @@ private:
 
     // controllers
     b200_iface::sptr _iface;
-    radio_ctrl_core_3000::sptr _local_ctrl;
+    b200_radio_ctrl_core::sptr _local_ctrl;
     uhd::usrp::ad9361_ctrl::sptr _codec_ctrl;
     uhd::usrp::ad936x_manager::sptr _codec_mgr;
     b200_local_spi_core::sptr _spi_iface;
@@ -166,8 +166,8 @@ private:
     struct AsyncTaskData
     {
         std::shared_ptr<async_md_type> async_md;
-        std::weak_ptr<radio_ctrl_core_3000> local_ctrl;
-        std::weak_ptr<radio_ctrl_core_3000> radio_ctrl[2];
+        std::weak_ptr<b200_radio_ctrl_core> local_ctrl;
+        std::weak_ptr<b200_radio_ctrl_core> radio_ctrl[2];
         b200_uart::sptr gpsdo_uart;
     };
     std::shared_ptr<AsyncTaskData> _async_task_data;
@@ -193,7 +193,7 @@ private:
     // perifs in the radio core
     struct radio_perifs_t
     {
-        radio_ctrl_core_3000::sptr ctrl;
+        b200_radio_ctrl_core::sptr ctrl;
         uhd::usrp::gpio_atr::gpio_atr_3000::sptr atr;
         uhd::usrp::gpio_atr::gpio_atr_3000::sptr fp_gpio;
         time_core_3000::sptr time64;