diff options
author | Tom Tsou <tom.tsou@ettus.com> | 2015-10-21 17:10:23 -0700 |
---|---|---|
committer | Tom Tsou <tom.tsou@ettus.com> | 2015-10-21 17:13:24 -0700 |
commit | 283b22dbce4d6f7129fd3323a65baa6646619190 (patch) | |
tree | bc09ae3818892a1d0035f0b38eaa8736f00a3fa3 | |
parent | f147b174475171cdf79ccba25a5e66fec282efcd (diff) |
uhd: Remove references to USRP B205
Certain pre-release versions of the B200mini used the B205 naming, which no
longer exists. Update device naming and detection to reflect current UHD
product names.
Signed-off-by: Tom Tsou <tom.tsou@ettus.com>
-rw-r--r-- | Transceiver52M/UHDDevice.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Transceiver52M/UHDDevice.cpp b/Transceiver52M/UHDDevice.cpp index 99e7967..777dab4 100644 --- a/Transceiver52M/UHDDevice.cpp +++ b/Transceiver52M/UHDDevice.cpp @@ -58,7 +58,6 @@ enum uhd_dev_type { USRP2, B100, B200, - B205, B210, E1XX, E3XX, @@ -104,8 +103,6 @@ static struct uhd_dev_offset uhd_offsets[NUM_USRP_TYPES * 2] = { { B100, 4, 7.9307e-5, "B100 4 SPS" }, { B200, 1, B2XX_TIMING_1SPS, "B200 1 SPS" }, { B200, 4, B2XX_TIMING_4SPS, "B200 4 SPS" }, - { B205, 1, B2XX_TIMING_1SPS, "B200-mini 1 SPS" }, - { B205, 4, B2XX_TIMING_4SPS, "B200-mini 4 SPS" }, { B210, 1, B2XX_TIMING_1SPS, "B210 1 SPS" }, { B210, 4, B2XX_TIMING_4SPS, "B210 4 SPS" }, { E1XX, 1, 9.5192e-5, "E1XX 1 SPS" }, @@ -198,7 +195,6 @@ static double select_rate(uhd_dev_type type, int sps, bool diversity = false) case B100: return B100_BASE_RT * sps; case B200: - case B205: case B210: case E1XX: case E3XX: @@ -527,7 +523,7 @@ int uhd_device::set_rates(double tx_rate, double rx_rate) double tx_offset, rx_offset; /* B2XX and E1xx are the only device where we set FPGA clocking */ - if ((dev_type == B200) || (dev_type == B205) || (dev_type == B210) || (dev_type == E3XX)) { + if ((dev_type == B200) || (dev_type == B210) || (dev_type == E3XX)) { if (set_master_clk(B2XX_CLK_RT) < 0) return -1; } @@ -627,7 +623,7 @@ bool uhd_device::parse_dev_type() std::string mboard_str, dev_str; uhd::property_tree::sptr prop_tree; size_t usrp1_str, usrp2_str, e100_str, e110_str, e310_str, - b100_str, b200_str, b205_str, b210_str, x300_str, x310_str, umtrx_str; + b100_str, b200_str, b210_str, x300_str, x310_str, umtrx_str; prop_tree = usrp_dev->get_device()->get_tree(); dev_str = prop_tree->access<std::string>("/name").get(); @@ -637,7 +633,6 @@ bool uhd_device::parse_dev_type() usrp2_str = dev_str.find("USRP2"); b100_str = mboard_str.find("B100"); b200_str = mboard_str.find("B200"); - b205_str = mboard_str.find("B205"); b210_str = mboard_str.find("B210"); e100_str = mboard_str.find("E100"); e110_str = mboard_str.find("E110"); @@ -659,9 +654,6 @@ bool uhd_device::parse_dev_type() } else if (b200_str != std::string::npos) { tx_window = TX_WINDOW_USRP1; dev_type = B200; - } else if (b205_str != std::string::npos) { - tx_window = TX_WINDOW_USRP1; - dev_type = B205; } else if (b210_str != std::string::npos) { tx_window = TX_WINDOW_USRP1; dev_type = B210; @@ -810,7 +802,6 @@ int uhd_device::open(const std::string &args, bool extref, bool swap_channels) case X3XX: return RESAMP_100M; case B200: - case B205: case B210: case E1XX: case E3XX: |