diff options
| -rw-r--r-- | host/lib/usrp/usrp_e/clock_ctrl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp_e/clock_ctrl.hpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp_e/codec_ctrl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp_e/codec_ctrl.hpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp_e/dboard_iface.cpp | 28 | ||||
| -rw-r--r-- | host/lib/usrp/usrp_e/usrp_e_impl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp_e/usrp_e_impl.hpp | 8 |
7 files changed, 28 insertions, 28 deletions
diff --git a/host/lib/usrp/usrp_e/clock_ctrl.cpp b/host/lib/usrp/usrp_e/clock_ctrl.cpp index 7947930a0..e37b17a54 100644 --- a/host/lib/usrp/usrp_e/clock_ctrl.cpp +++ b/host/lib/usrp/usrp_e/clock_ctrl.cpp @@ -29,7 +29,7 @@ using namespace uhd; /*********************************************************************** * Clock Control Implementation **********************************************************************/ -class usrp_e_clock_ctrl_impl : public clock_ctrl{ +class usrp_e_clock_ctrl_impl : public usrp_e_clock_ctrl{ public: //structors usrp_e_clock_ctrl_impl(usrp_e_iface::sptr iface); @@ -170,6 +170,6 @@ void usrp_e_clock_ctrl_impl::send_reg(boost::uint16_t addr){ /*********************************************************************** * Clock Control Make **********************************************************************/ -clock_ctrl::sptr clock_ctrl::make(usrp_e_iface::sptr iface){ +usrp_e_clock_ctrl::sptr usrp_e_clock_ctrl::make(usrp_e_iface::sptr iface){ return sptr(new usrp_e_clock_ctrl_impl(iface)); } diff --git a/host/lib/usrp/usrp_e/clock_ctrl.hpp b/host/lib/usrp/usrp_e/clock_ctrl.hpp index 994b83564..692b9eb0e 100644 --- a/host/lib/usrp/usrp_e/clock_ctrl.hpp +++ b/host/lib/usrp/usrp_e/clock_ctrl.hpp @@ -27,9 +27,9 @@ * - Setup system clocks. * - Disable/enable clock lines. */ -class clock_ctrl : boost::noncopyable{ +class usrp_e_clock_ctrl : boost::noncopyable{ public: - typedef boost::shared_ptr<clock_ctrl> sptr; + typedef boost::shared_ptr<usrp_e_clock_ctrl> sptr; /*! * Make a new clock control object. diff --git a/host/lib/usrp/usrp_e/codec_ctrl.cpp b/host/lib/usrp/usrp_e/codec_ctrl.cpp index e86fde346..b19606020 100644 --- a/host/lib/usrp/usrp_e/codec_ctrl.cpp +++ b/host/lib/usrp/usrp_e/codec_ctrl.cpp @@ -34,7 +34,7 @@ static const bool codec_debug = true; /*********************************************************************** * Codec Control Implementation **********************************************************************/ -class usrp_e_codec_ctrl_impl : public codec_ctrl{ +class usrp_e_codec_ctrl_impl : public usrp_e_codec_ctrl{ public: //structors usrp_e_codec_ctrl_impl(usrp_e_iface::sptr iface); @@ -242,6 +242,6 @@ void usrp_e_codec_ctrl_impl::recv_reg(boost::uint8_t addr){ /*********************************************************************** * Codec Control Make **********************************************************************/ -codec_ctrl::sptr codec_ctrl::make(usrp_e_iface::sptr iface){ +usrp_e_codec_ctrl::sptr usrp_e_codec_ctrl::make(usrp_e_iface::sptr iface){ return sptr(new usrp_e_codec_ctrl_impl(iface)); } diff --git a/host/lib/usrp/usrp_e/codec_ctrl.hpp b/host/lib/usrp/usrp_e/codec_ctrl.hpp index efdcd7142..b9005a82d 100644 --- a/host/lib/usrp/usrp_e/codec_ctrl.hpp +++ b/host/lib/usrp/usrp_e/codec_ctrl.hpp @@ -27,9 +27,9 @@ * - Init/power down codec. * - Read aux adc, write aux dac. */ -class codec_ctrl : boost::noncopyable{ +class usrp_e_codec_ctrl : boost::noncopyable{ public: - typedef boost::shared_ptr<codec_ctrl> sptr; + typedef boost::shared_ptr<usrp_e_codec_ctrl> sptr; /*! * Make a new clock control object. diff --git a/host/lib/usrp/usrp_e/dboard_iface.cpp b/host/lib/usrp/usrp_e/dboard_iface.cpp index 23255b58c..594f2a23e 100644 --- a/host/lib/usrp/usrp_e/dboard_iface.cpp +++ b/host/lib/usrp/usrp_e/dboard_iface.cpp @@ -34,8 +34,8 @@ public: usrp_e_dboard_iface( usrp_e_iface::sptr iface, - clock_ctrl::sptr clock, - codec_ctrl::sptr codec + usrp_e_clock_ctrl::sptr clock, + usrp_e_codec_ctrl::sptr codec ){ _iface = iface; _clock = clock; @@ -77,8 +77,8 @@ public: private: usrp_e_iface::sptr _iface; - clock_ctrl::sptr _clock; - codec_ctrl::sptr _codec; + usrp_e_clock_ctrl::sptr _clock; + usrp_e_codec_ctrl::sptr _codec; }; /*********************************************************************** @@ -86,8 +86,8 @@ private: **********************************************************************/ dboard_iface::sptr make_usrp_e_dboard_iface( usrp_e_iface::sptr iface, - clock_ctrl::sptr clock, - codec_ctrl::sptr codec + usrp_e_clock_ctrl::sptr clock, + usrp_e_codec_ctrl::sptr codec ){ return dboard_iface::sptr(new usrp_e_dboard_iface(iface, clock, codec)); } @@ -214,24 +214,24 @@ byte_vector_t usrp_e_dboard_iface::read_i2c(boost::uint8_t addr, size_t num_byte **********************************************************************/ void usrp_e_dboard_iface::write_aux_dac(dboard_iface::unit_t, int which, float value){ //same aux dacs for each unit - static const uhd::dict<int, codec_ctrl::aux_dac_t> which_to_aux_dac = map_list_of - (0, codec_ctrl::AUX_DAC_A) (1, codec_ctrl::AUX_DAC_B) - (2, codec_ctrl::AUX_DAC_C) (3, codec_ctrl::AUX_DAC_D) + static const uhd::dict<int, usrp_e_codec_ctrl::aux_dac_t> which_to_aux_dac = map_list_of + (0, usrp_e_codec_ctrl::AUX_DAC_A) (1, usrp_e_codec_ctrl::AUX_DAC_B) + (2, usrp_e_codec_ctrl::AUX_DAC_C) (3, usrp_e_codec_ctrl::AUX_DAC_D) ; _codec->write_aux_dac(which_to_aux_dac[which], value); } float usrp_e_dboard_iface::read_aux_adc(dboard_iface::unit_t unit, int which){ static const uhd::dict< - unit_t, uhd::dict<int, codec_ctrl::aux_adc_t> + unit_t, uhd::dict<int, usrp_e_codec_ctrl::aux_adc_t> > unit_to_which_to_aux_adc = map_list_of (UNIT_RX, map_list_of - (0, codec_ctrl::AUX_ADC_A1) - (1, codec_ctrl::AUX_ADC_B1) + (0, usrp_e_codec_ctrl::AUX_ADC_A1) + (1, usrp_e_codec_ctrl::AUX_ADC_B1) ) (UNIT_TX, map_list_of - (0, codec_ctrl::AUX_ADC_A2) - (1, codec_ctrl::AUX_ADC_B2) + (0, usrp_e_codec_ctrl::AUX_ADC_A2) + (1, usrp_e_codec_ctrl::AUX_ADC_B2) ) ; return _codec->read_aux_adc(unit_to_which_to_aux_adc[unit][which]); diff --git a/host/lib/usrp/usrp_e/usrp_e_impl.cpp b/host/lib/usrp/usrp_e/usrp_e_impl.cpp index f9af36887..226825510 100644 --- a/host/lib/usrp/usrp_e/usrp_e_impl.cpp +++ b/host/lib/usrp/usrp_e/usrp_e_impl.cpp @@ -77,8 +77,8 @@ usrp_e_impl::usrp_e_impl(const std::string &node){ //setup various interfaces into hardware _iface = usrp_e_iface::make(node); - _clock_ctrl = clock_ctrl::make(_iface); - _codec_ctrl = codec_ctrl::make(_iface); + _clock_ctrl = usrp_e_clock_ctrl::make(_iface); + _codec_ctrl = usrp_e_codec_ctrl::make(_iface); //initialize the mboard mboard_init(); diff --git a/host/lib/usrp/usrp_e/usrp_e_impl.hpp b/host/lib/usrp/usrp_e/usrp_e_impl.hpp index 12d4c9d9e..bdb1a675b 100644 --- a/host/lib/usrp/usrp_e/usrp_e_impl.hpp +++ b/host/lib/usrp/usrp_e/usrp_e_impl.hpp @@ -36,8 +36,8 @@ */ uhd::usrp::dboard_iface::sptr make_usrp_e_dboard_iface( usrp_e_iface::sptr iface, - clock_ctrl::sptr clock, - codec_ctrl::sptr codec + usrp_e_clock_ctrl::sptr clock, + usrp_e_codec_ctrl::sptr codec ); /*! @@ -96,10 +96,10 @@ private: //TODO otw type recv/send //ad9522 clock control - clock_ctrl::sptr _clock_ctrl; + usrp_e_clock_ctrl::sptr _clock_ctrl; //ad9862 codec control - codec_ctrl::sptr _codec_ctrl; + usrp_e_codec_ctrl::sptr _codec_ctrl; //device functions and settings void get(const wax::obj &, wax::obj &); |