aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/b200/b200_impl.hpp
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2018-10-12 17:34:06 -0700
committerBrent Stapleton <bstapleton@g.hmc.edu>2018-10-17 15:59:08 -0700
commit20f061689c9eb3024d8579331e5ba790320425f2 (patch)
tree98af37ec828c0b0b5e7d544ef226f3fb4be6674a /host/lib/usrp/b200/b200_impl.hpp
parentb7b6af75212de0886afc4c68042e9ed65e72058b (diff)
downloaduhd-20f061689c9eb3024d8579331e5ba790320425f2.tar.gz
uhd-20f061689c9eb3024d8579331e5ba790320425f2.tar.bz2
uhd-20f061689c9eb3024d8579331e5ba790320425f2.zip
B200: Restore asynchronous reset of AD936x.
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.hpp')
-rw-r--r--host/lib/usrp/b200/b200_impl.hpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp
index 12678c13d..f691b371f 100644
--- a/host/lib/usrp/b200/b200_impl.hpp
+++ b/host/lib/usrp/b200/b200_impl.hpp
@@ -41,8 +41,8 @@
static const uint8_t B200_FW_COMPAT_NUM_MAJOR = 8;
static const uint8_t B200_FW_COMPAT_NUM_MINOR = 0;
-static const uint16_t B200_FPGA_COMPAT_NUM = 15;
-static const uint16_t B205_FPGA_COMPAT_NUM = 6;
+static const uint16_t B200_FPGA_COMPAT_NUM = 16;
+static const uint16_t B205_FPGA_COMPAT_NUM = 7;
static const double B200_BUS_CLOCK_RATE = 100e6;
static const uint32_t B200_GPSDO_ST_NONE = 0x83;
static const size_t B200_MAX_RATE_USB2 = 53248000; // bytes/s
@@ -175,6 +175,7 @@ private:
void sync_times(void);
void update_clock_source(const std::string &);
void update_bandsel(const std::string& which, double freq);
+ void reset_codec(void);
void update_antenna_sel(const size_t which, const std::string &ant);
uhd::sensor_value_t get_ref_locked(void);
uhd::sensor_value_t get_fe_pll_locked(const bool is_tx);
@@ -211,7 +212,7 @@ private:
void handle_overflow(const size_t radio_index);
struct gpio_state {
- uint32_t tx_bandsel_a, tx_bandsel_b, rx_bandsel_a, rx_bandsel_b, rx_bandsel_c, mimo, ref_sel, swap_atr;
+ uint32_t tx_bandsel_a, tx_bandsel_b, rx_bandsel_a, rx_bandsel_b, rx_bandsel_c, codec_arst, mimo, ref_sel, swap_atr;
gpio_state() {
tx_bandsel_a = 0;
@@ -219,6 +220,7 @@ private:
rx_bandsel_a = 0;
rx_bandsel_b = 0;
rx_bandsel_c = 0;
+ codec_arst = 0;
mimo = 0;
ref_sel = 0;
swap_atr = 0;