diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-29 17:43:26 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-29 17:43:26 -0700 |
| commit | 83596f1feb73a15a1ef8741c1c520e8cae46c2a6 (patch) | |
| tree | 350d32498f4e78b720f4629d47a2e7dd5e353bc4 | |
| parent | b8e62bb9bf86d4804defe738b2a7140cd9417a6f (diff) | |
| download | uhd-83596f1feb73a15a1ef8741c1c520e8cae46c2a6.tar.gz uhd-83596f1feb73a15a1ef8741c1c520e8cae46c2a6.tar.bz2 uhd-83596f1feb73a15a1ef8741c1c520e8cae46c2a6.zip | |
usrp: added get codec rate to dboard iface
| -rw-r--r-- | host/include/uhd/usrp/dboard_iface.hpp | 9 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/dboard_iface.cpp | 5 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/dboard_iface.cpp | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/host/include/uhd/usrp/dboard_iface.hpp b/host/include/uhd/usrp/dboard_iface.hpp index c7db244f2..c430ecd3f 100644 --- a/host/include/uhd/usrp/dboard_iface.hpp +++ b/host/include/uhd/usrp/dboard_iface.hpp @@ -242,6 +242,15 @@ public: * \param enb true for enabled */ virtual void set_clock_enabled(unit_t unit, bool enb) = 0; + + /*! + * Get the rate of the codec. + * For rx, this is the rate the ADC feeds the DSP. + * For tx, this is the rate the DSP feeds the DAC. + * \param unit which unit rx or tx + * \return the codec rate in Hz + */ + virtual double get_codec_rate(unit_t unit) = 0; }; }} //namespace diff --git a/host/lib/usrp/usrp1/dboard_iface.cpp b/host/lib/usrp/usrp1/dboard_iface.cpp index 4791b55ce..4f0549a37 100644 --- a/host/lib/usrp/usrp1/dboard_iface.cpp +++ b/host/lib/usrp/usrp1/dboard_iface.cpp @@ -93,6 +93,7 @@ public: std::vector<double> get_clock_rates(unit_t); double get_clock_rate(unit_t); void set_clock_enabled(unit_t, bool); + double get_codec_rate(unit_t); private: usrp1_iface::sptr _iface; @@ -170,6 +171,10 @@ void usrp1_dboard_iface::set_clock_enabled(unit_t, bool) //TODO we can only enable for special case anyway... } +double usrp1_dboard_iface::get_codec_rate(unit_t){ + return _clock->get_master_clock_freq(); +} + /*********************************************************************** * GPIO **********************************************************************/ diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp index f6d2b718a..fdfbf0d17 100644 --- a/host/lib/usrp/usrp2/dboard_iface.cpp +++ b/host/lib/usrp/usrp2/dboard_iface.cpp @@ -61,6 +61,7 @@ public: double get_clock_rate(unit_t); std::vector<double> get_clock_rates(unit_t); void set_clock_enabled(unit_t, bool); + double get_codec_rate(unit_t); void write_spi( unit_t unit, @@ -158,6 +159,9 @@ void usrp2_dboard_iface::set_clock_enabled(unit_t unit, bool enb){ } } +double usrp2_dboard_iface::get_codec_rate(unit_t){ + return _clock_ctrl->get_master_clock_rate(); +} /*********************************************************************** * GPIO **********************************************************************/ |