aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Tsou <tom@tsou.cc>2013-11-09 02:25:41 -0500
committerThomas Tsou <tom@tsou.cc>2013-11-15 23:32:40 -0500
commitacc22fa3ffe30f28d62c41f62152b1f48fa595b4 (patch)
treea671a2f2366fe230f59269ca5cee969e0b1be859
parent7553aa973f352d48abbf5f8fc67530a5a64c108d (diff)
Transceiver52M: Use USRP1 type window for B2xx devices
B2xx is a USB based device so use the USRP1 based adaptive flow control window for transmit bursts. This adds additional stability primarily on ARM platforms. Signed-off-by: Thomas Tsou <tom@tsou.cc>
-rw-r--r--Transceiver52M/UHDDevice.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/Transceiver52M/UHDDevice.cpp b/Transceiver52M/UHDDevice.cpp
index 660bce4..d1f039a 100644
--- a/Transceiver52M/UHDDevice.cpp
+++ b/Transceiver52M/UHDDevice.cpp
@@ -515,26 +515,32 @@ bool uhd_device::parse_dev_type()
if (b100_str != std::string::npos) {
tx_window = TX_WINDOW_USRP1;
- LOG(INFO) << "Using USRP1 type transmit window for "
- << dev_str << " " << mboard_str;
dev_type = B100;
- return true;
} else if (b200_str != std::string::npos) {
+ tx_window = TX_WINDOW_USRP1;
dev_type = B2XX;
} else if (b210_str != std::string::npos) {
+ tx_window = TX_WINDOW_USRP1;
dev_type = B2XX;
} else if (usrp2_str != std::string::npos) {
+ tx_window = TX_WINDOW_FIXED;
dev_type = USRP2;
} else if (umtrx_str != std::string::npos) {
+ tx_window = TX_WINDOW_FIXED;
dev_type = UMTRX;
} else {
LOG(ALERT) << "Unknown UHD device type " << dev_str;
return false;
}
- tx_window = TX_WINDOW_FIXED;
- LOG(INFO) << "Using fixed transmit window for "
- << dev_str << " " << mboard_str;
+ if (tx_window == TX_WINDOW_USRP1) {
+ LOG(INFO) << "Using USRP1 type transmit window for "
+ << dev_str << " " << mboard_str;
+ } else {
+ LOG(INFO) << "Using fixed transmit window for "
+ << dev_str << " " << mboard_str;
+ }
+
return true;
}