Prepend usrp2 onto the helper classes in usrp2 impl to avoid symbol conflicts.

9 files changed, 35 insertions, 32 deletions

diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp
index 4c5207203..94920143d 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.cpp
@@ -25,9 +25,9 @@ using namespace uhd;
 /*!
  * A usrp2 clock control specific to the ad9510 ic.
  */
-class clock_ctrl_impl : public clock_ctrl{
+class usrp2_clock_ctrl_impl : public usrp2_clock_ctrl{
 public:
-    clock_ctrl_impl(usrp2_iface::sptr iface){
+    usrp2_clock_ctrl_impl(usrp2_iface::sptr iface){
         _iface = iface;
 
         _ad9510_regs.cp_current_setting = ad9510_regs_t::CP_CURRENT_SETTING_3_0MA;
@@ -68,7 +68,7 @@ public:
 
     }
 
-    ~clock_ctrl_impl(void){
+    ~usrp2_clock_ctrl_impl(void){
         /* private clock enables, must be set here */
         this->enable_dac_clock(false);
         this->enable_adc_clock(false);
@@ -158,6 +158,6 @@ private:
 /***********************************************************************
  * Public make function for the ad9510 clock control
  **********************************************************************/
-clock_ctrl::sptr clock_ctrl::make(usrp2_iface::sptr iface){
-    return sptr(new clock_ctrl_impl(iface));
+usrp2_clock_ctrl::sptr usrp2_clock_ctrl::make(usrp2_iface::sptr iface){
+    return sptr(new usrp2_clock_ctrl_impl(iface));
 }
diff --git a/host/lib/usrp/usrp2/clock_ctrl.hpp b/host/lib/usrp/usrp2/clock_ctrl.hpp
index 706bf4246..122b5e633 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.hpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.hpp
@@ -22,9 +22,9 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 
-class clock_ctrl : boost::noncopyable{
+class usrp2_clock_ctrl : boost::noncopyable{
 public:
-    typedef boost::shared_ptr<clock_ctrl> sptr;
+    typedef boost::shared_ptr<usrp2_clock_ctrl> sptr;
 
     /*!
      * Make a clock config for the ad9510 ic.
diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp
index d698216ba..abd840027 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.cpp
@@ -29,9 +29,9 @@ using namespace uhd;
 /*!
  * A usrp2 codec control specific to the ad9777 ic.
  */
-class codec_ctrl_impl : public codec_ctrl{
+class usrp2_codec_ctrl_impl : public usrp2_codec_ctrl{
 public:
-    codec_ctrl_impl(usrp2_iface::sptr iface){
+    usrp2_codec_ctrl_impl(usrp2_iface::sptr iface){
         _iface = iface;
 
         //setup the ad9777 dac
@@ -60,7 +60,7 @@ public:
         _iface->poke32(FR_MISC_CTRL_ADC, FRF_MISC_CTRL_ADC_ON);
     }
 
-    ~codec_ctrl_impl(void){
+    ~usrp2_codec_ctrl_impl(void){
         //power-down dac
         _ad9777_regs.power_down_mode = 1;
         this->send_ad9777_reg(0);
@@ -86,6 +86,6 @@ private:
 /***********************************************************************
  * Public make function for the usrp2 codec control
  **********************************************************************/
-codec_ctrl::sptr codec_ctrl::make(usrp2_iface::sptr iface){
-    return sptr(new codec_ctrl_impl(iface));
+usrp2_codec_ctrl::sptr usrp2_codec_ctrl::make(usrp2_iface::sptr iface){
+    return sptr(new usrp2_codec_ctrl_impl(iface));
 }
diff --git a/host/lib/usrp/usrp2/codec_ctrl.hpp b/host/lib/usrp/usrp2/codec_ctrl.hpp
index 0ee52f476..ad014e0e1 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.hpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.hpp
@@ -22,9 +22,9 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 
-class codec_ctrl : boost::noncopyable{
+class usrp2_codec_ctrl : boost::noncopyable{
 public:
-    typedef boost::shared_ptr<codec_ctrl> sptr;
+    typedef boost::shared_ptr<usrp2_codec_ctrl> sptr;
 
     /*!
      * Make a codec control for the DAC and ADC.
diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp
index 2621d43b4..5933f8e40 100644
--- a/host/lib/usrp/usrp2/dboard_iface.cpp
+++ b/host/lib/usrp/usrp2/dboard_iface.cpp
@@ -33,7 +33,7 @@ using namespace boost::assign;
 
 class usrp2_dboard_iface : public dboard_iface{
 public:
-    usrp2_dboard_iface(usrp2_iface::sptr iface, clock_ctrl::sptr clock_ctrl);
+    usrp2_dboard_iface(usrp2_iface::sptr iface, usrp2_clock_ctrl::sptr clock_ctrl);
     ~usrp2_dboard_iface(void);
 
     void write_aux_dac(unit_t, int, float);
@@ -68,7 +68,7 @@ public:
 
 private:
     usrp2_iface::sptr _iface;
-    clock_ctrl::sptr _clock_ctrl;
+    usrp2_clock_ctrl::sptr _clock_ctrl;
     boost::uint32_t _ddr_shadow;
     boost::uint32_t _gpio_shadow;
 
@@ -81,7 +81,7 @@ private:
  **********************************************************************/
 dboard_iface::sptr make_usrp2_dboard_iface(
     usrp2_iface::sptr iface,
-    clock_ctrl::sptr clock_ctrl
+    usrp2_clock_ctrl::sptr clock_ctrl
 ){
     return dboard_iface::sptr(new usrp2_dboard_iface(iface, clock_ctrl));
 }
@@ -89,7 +89,10 @@ dboard_iface::sptr make_usrp2_dboard_iface(
 /***********************************************************************
  * Structors
  **********************************************************************/
-usrp2_dboard_iface::usrp2_dboard_iface(usrp2_iface::sptr iface, clock_ctrl::sptr clock_ctrl){
+usrp2_dboard_iface::usrp2_dboard_iface(
+    usrp2_iface::sptr iface,
+    usrp2_clock_ctrl::sptr clock_ctrl
+){
     _iface = iface;
     _clock_ctrl = clock_ctrl;
     _ddr_shadow = 0;
diff --git a/host/lib/usrp/usrp2/serdes_ctrl.cpp b/host/lib/usrp/usrp2/serdes_ctrl.cpp
index dde22b499..31708d377 100644
--- a/host/lib/usrp/usrp2/serdes_ctrl.cpp
+++ b/host/lib/usrp/usrp2/serdes_ctrl.cpp
@@ -23,14 +23,14 @@ using namespace uhd;
 /*!
  * A usrp2 serdes control implementation
  */
-class serdes_ctrl_impl : public serdes_ctrl{
+class usrp2_serdes_ctrl_impl : public usrp2_serdes_ctrl{
 public:
-    serdes_ctrl_impl(usrp2_iface::sptr iface){
+    usrp2_serdes_ctrl_impl(usrp2_iface::sptr iface){
         _iface = iface;
         _iface->poke32(FR_MISC_CTRL_SERDES, FRF_MISC_CTRL_SERDES_ENABLE | FRF_MISC_CTRL_SERDES_RXEN);
     }
 
-    ~serdes_ctrl_impl(void){
+    ~usrp2_serdes_ctrl_impl(void){
         _iface->poke32(FR_MISC_CTRL_SERDES, 0); //power-down
     }
 
@@ -41,6 +41,6 @@ private:
 /***********************************************************************
  * Public make function for the usrp2 serdes control
  **********************************************************************/
-serdes_ctrl::sptr serdes_ctrl::make(usrp2_iface::sptr iface){
-    return sptr(new serdes_ctrl_impl(iface));
+usrp2_serdes_ctrl::sptr usrp2_serdes_ctrl::make(usrp2_iface::sptr iface){
+    return sptr(new usrp2_serdes_ctrl_impl(iface));
 }
diff --git a/host/lib/usrp/usrp2/serdes_ctrl.hpp b/host/lib/usrp/usrp2/serdes_ctrl.hpp
index 586238739..3c909c531 100644
--- a/host/lib/usrp/usrp2/serdes_ctrl.hpp
+++ b/host/lib/usrp/usrp2/serdes_ctrl.hpp
@@ -22,9 +22,9 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 
-class serdes_ctrl : boost::noncopyable{
+class usrp2_serdes_ctrl : boost::noncopyable{
 public:
-    typedef boost::shared_ptr<serdes_ctrl> sptr;
+    typedef boost::shared_ptr<usrp2_serdes_ctrl> sptr;
 
     /*!
      * Make a serdes control object for the usrp2 serdes port.
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 1e6e02dd1..58f0696b5 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -148,9 +148,9 @@ usrp2_impl::usrp2_impl(
 
     //make a new interface for usrp2 stuff
     _iface = usrp2_iface::make(ctrl_transport);
-    _clock_ctrl = clock_ctrl::make(_iface);
-    _codec_ctrl = codec_ctrl::make(_iface);
-    _serdes_ctrl = serdes_ctrl::make(_iface);
+    _clock_ctrl = usrp2_clock_ctrl::make(_iface);
+    _codec_ctrl = usrp2_codec_ctrl::make(_iface);
+    _serdes_ctrl = usrp2_serdes_ctrl::make(_iface);
 
     //load the allowed decim/interp rates
     //_USRP2_RATES = range(4, 128+1, 1) + range(130, 256+1, 2) + range(260, 512+1, 4)
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 40c193866..90306a85f 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -43,7 +43,7 @@
  */
 uhd::usrp::dboard_iface::sptr make_usrp2_dboard_iface(
     usrp2_iface::sptr iface,
-    clock_ctrl::sptr clk_ctrl
+    usrp2_clock_ctrl::sptr clk_ctrl
 );
 
 /*!
@@ -134,9 +134,9 @@ private:
 
     //interfaces
     usrp2_iface::sptr _iface;
-    clock_ctrl::sptr _clock_ctrl;
-    codec_ctrl::sptr _codec_ctrl;
-    serdes_ctrl::sptr _serdes_ctrl;
+    usrp2_clock_ctrl::sptr _clock_ctrl;
+    usrp2_codec_ctrl::sptr _codec_ctrl;
+    usrp2_serdes_ctrl::sptr _serdes_ctrl;
 
     /*******************************************************************
      * Deal with the rx and tx packet sizes