diff options
| author | michael-west <michael.west@ettus.com> | 2015-04-17 17:43:07 -0700 |
|---|---|---|
| committer | michael-west <michael.west@ettus.com> | 2015-04-17 17:43:07 -0700 |
| commit | 0a103ba2bad243652e8c57732190a18a2ee31d38 (patch) | |
| tree | 98db4fbf7ae0c887341a348164fe326bda37d6fc /host | |
| parent | 24c370781e7ea2e627ce36d3b102a686eaedcf1b (diff) | |
| download | uhd-0a103ba2bad243652e8c57732190a18a2ee31d38.tar.gz uhd-0a103ba2bad243652e8c57732190a18a2ee31d38.tar.bz2 uhd-0a103ba2bad243652e8c57732190a18a2ee31d38.zip | |
B200: Bumped FPGA compat number to 5
B200: Added bit to SR_MISC_OUT register to control ATR mapping from radio to frontend
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 7 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index f4a124a32..273153c16 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -273,8 +273,9 @@ b200_impl::b200_impl(const device_addr_t &device_addr) : not mb_eeprom["revision"].empty() and boost::lexical_cast<size_t>(mb_eeprom["revision"]) >= 5) { - _fe1 = 0; - _fe2 = 1; + _fe1 = 0; //map radio0 to FE1 + _fe2 = 1; //map radio1 to FE2 + _gpio_state.atr_sel = 1; //map radio0 ATR pins to FE2 } //////////////////////////////////////////////////////////////////// @@ -332,7 +333,6 @@ b200_impl::b200_impl(const device_addr_t &device_addr) : /* Initialize the GPIOs, set the default bandsels to the lower range. Note * that calling update_bandsel calls update_gpio_state(). */ - _gpio_state = gpio_state(); update_bandsel("RX", 800e6); update_bandsel("TX", 850e6); @@ -916,6 +916,7 @@ void b200_impl::update_bandsel(const std::string& which, double freq) void b200_impl::update_gpio_state(void) { const boost::uint32_t misc_word = 0 + | (_gpio_state.atr_sel << 8) | (_gpio_state.tx_bandsel_a << 7) | (_gpio_state.tx_bandsel_b << 6) | (_gpio_state.rx_bandsel_a << 5) diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index b580ff260..8d0c637d7 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -47,7 +47,7 @@ #include "recv_packet_demuxer_3000.hpp" static const boost::uint8_t B200_FW_COMPAT_NUM_MAJOR = 7; static const boost::uint8_t B200_FW_COMPAT_NUM_MINOR = 0; -static const boost::uint16_t B200_FPGA_COMPAT_NUM = 4; +static const boost::uint16_t B200_FPGA_COMPAT_NUM = 5; static const double B200_BUS_CLOCK_RATE = 100e6; static const double B200_DEFAULT_TICK_RATE = 32e6; static const double B200_DEFAULT_FREQ = 100e6; // Hz @@ -177,7 +177,7 @@ private: 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; + boost::uint32_t tx_bandsel_a, tx_bandsel_b, rx_bandsel_a, rx_bandsel_b, rx_bandsel_c, codec_arst, mimo, ref_sel, atr_sel; gpio_state() { tx_bandsel_a = 0; @@ -188,6 +188,7 @@ private: codec_arst = 0; mimo = 0; ref_sel = 0; + atr_sel = 0; } } _gpio_state; |