diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-03-14 11:18:48 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-03-14 11:18:48 -0700 |
| commit | 79e038bc8691d838891377cf6b6123b1ab57a4ca (patch) | |
| tree | e4a622025d5249aaa00bcb6a2ee76b18de396ec8 /host/lib/usrp/b200/b200_impl.hpp | |
| parent | 012e71cad30c663b186a903dc5c48018f544a507 (diff) | |
| parent | fd1e2f8fc1b481b1f0c80798172a601a507914f3 (diff) | |
| download | uhd-79e038bc8691d838891377cf6b6123b1ab57a4ca.tar.gz uhd-79e038bc8691d838891377cf6b6123b1ab57a4ca.tar.bz2 uhd-79e038bc8691d838891377cf6b6123b1ab57a4ca.zip | |
Merging fixes for subdev specs in B2xx.
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.hpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index c88d14ad5..a370e54f9 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -127,8 +127,7 @@ private: void set_mb_eeprom(const uhd::usrp::mboard_eeprom_t &); void check_fw_compat(void); void check_fpga_compat(void); - void update_rx_subdev_spec(const uhd::usrp::subdev_spec_t &); - void update_tx_subdev_spec(const uhd::usrp::subdev_spec_t &); + void update_subdev_spec(const std::string &tx_rx, const uhd::usrp::subdev_spec_t &); void update_time_source(const std::string &); void update_clock_source(const std::string &); void update_bandsel(const std::string& which, double freq); @@ -150,8 +149,12 @@ private: bool ant_rx2; }; std::vector<radio_perifs_t> _radio_perifs; - void setup_radio(const size_t which_radio); - void handle_overflow(const size_t index); + + /*! \brief Setup the DSP chain for one radio front-end. + * + */ + void setup_radio(const size_t radio_index); + void handle_overflow(const size_t radio_index); struct gpio_state { boost::uint32_t tx_bandsel_a, tx_bandsel_b, rx_bandsel_a, rx_bandsel_b, rx_bandsel_c, codec_arst, mimo, ref_sel; |