From b9a80a76aa6117ad1ed865accc77004db24d0e42 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Fri, 19 Aug 2016 10:37:37 -0700
Subject: Revert "B200: Adding separate B200 radio control code"

This reverts commit 5d360ab43eca63e3f12f0e5abde5a3186b7f12dc.
---
 host/lib/usrp/b200/b200_impl.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'host/lib/usrp/b200/b200_impl.hpp')

diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp
index 3ca76fce6..130e93891 100644
--- a/host/lib/usrp/b200/b200_impl.hpp
+++ b/host/lib/usrp/b200/b200_impl.hpp
@@ -28,7 +28,7 @@
 #include "tx_vita_core_3000.hpp"
 #include "time_core_3000.hpp"
 #include "gpio_atr_3000.hpp"
-#include "b200_radio_ctrl_core.hpp"
+#include "radio_ctrl_core_3000.hpp"
 #include "rx_dsp_core_3000.hpp"
 #include "tx_dsp_core_3000.hpp"
 #include <uhd/device.hpp>
@@ -131,7 +131,7 @@ private:
 
     //controllers
     b200_iface::sptr _iface;
-    b200_radio_ctrl_core::sptr _local_ctrl;
+    radio_ctrl_core_3000::sptr _local_ctrl;
     uhd::usrp::ad9361_ctrl::sptr _codec_ctrl;
     uhd::usrp::ad936x_manager::sptr _codec_mgr;
     b200_local_spi_core::sptr _spi_iface;
@@ -154,8 +154,8 @@ private:
     struct AsyncTaskData
     {
         boost::shared_ptr<async_md_type> async_md;
-        boost::weak_ptr<b200_radio_ctrl_core> local_ctrl;
-        boost::weak_ptr<b200_radio_ctrl_core> radio_ctrl[2];
+        boost::weak_ptr<radio_ctrl_core_3000> local_ctrl;
+        boost::weak_ptr<radio_ctrl_core_3000> radio_ctrl[2];
         b200_uart::sptr gpsdo_uart;
     };
     boost::shared_ptr<AsyncTaskData> _async_task_data;
@@ -179,7 +179,7 @@ private:
     //perifs in the radio core
     struct radio_perifs_t
     {
-        b200_radio_ctrl_core::sptr ctrl;
+        radio_ctrl_core_3000::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;
-- 
cgit v1.2.3