[Openbts-public-commits] r6748 - software/public/openbts/trunk/Transceiver52M

[<do_...@wu...>]

Author: ttsou
Date: 2013-10-17 01:19:08 -0500 (Thu, 17 Oct 2013)
New Revision: 6748

Modified:
   software/public/openbts/trunk/Transceiver52M/UHDDevice.cpp
Log:
Transceiver52M: Add B210 support

Identical to B200 support, but explicitly check for the device type
name.

Signed-off-by: Thomas Tsou <to...@ts...>

Modified: software/public/openbts/trunk/Transceiver52M/UHDDevice.cpp
===================================================================
--- software/public/openbts/trunk/Transceiver52M/UHDDevice.cpp	2013-10-17 06:19:05 UTC (rev 6747)
+++ software/public/openbts/trunk/Transceiver52M/UHDDevice.cpp	2013-10-17 06:19:08 UTC (rev 6748)
@@ -42,7 +42,7 @@
 	USRP1,
 	USRP2,
 	B100,
-	B200,
+	B2XX,
 	UMTRX,
 	NUM_USRP_TYPES,
 };
@@ -70,8 +70,8 @@
 	{ USRP2, 4, 7.7538e-5 },
 	{ B100,  1, 9.9692e-5 },
 	{ B100,  4, 6.5545e-5 },
-	{ B200,  1, 9.6000e-5 },
-	{ B200,  4, 6.4615e-5 },
+	{ B2XX,  1, 9.9692e-5 },
+	{ B2XX,  4, 6.9248e-5 },
 	{ UMTRX, 1, 9.9692e-5 },
 	{ UMTRX, 4, 7.3846e-5 },
 };
@@ -108,7 +108,7 @@
 	case USRP2:
 		return USRP2_BASE_RT * sps;
 	case B100:
-	case B200:
+	case B2XX:
 	case UMTRX:
 		return GSMRATE * sps;
 	default:
@@ -413,7 +413,7 @@
 	double tx_offset, rx_offset;
 
 	// B100/200 are the only device where we set FPGA clocking
-	if ((dev_type == B100) || (dev_type == B200)) {
+	if ((dev_type == B100) || (dev_type == B2XX)) {
 		if (set_master_clk(BXXX_CLK_RT) < 0)
 			return -1;
 	}
@@ -472,7 +472,7 @@
 {
 	std::string mboard_str, dev_str;
 	uhd::property_tree::sptr prop_tree;
-	size_t usrp1_str, usrp2_str, b100_str, b200_str, umtrx_str;
+	size_t usrp1_str, usrp2_str, b100_str, b200_str, b210_str, umtrx_str;
 
 	prop_tree = usrp_dev->get_device()->get_tree();
 	dev_str = prop_tree->access<std::string>("/name").get();
@@ -482,6 +482,7 @@
 	usrp2_str = dev_str.find("USRP2");
 	b100_str = mboard_str.find("B100");
 	b200_str = mboard_str.find("B200");
+	b210_str = mboard_str.find("B210");
 	umtrx_str = dev_str.find("UmTRX");
 
 	if (usrp1_str != std::string::npos) {
@@ -498,7 +499,9 @@
 		dev_type = B100;
 		return true;
 	} else if (b200_str != std::string::npos) {
-		dev_type = B200;
+		dev_type = B2XX;
+	} else if (b210_str != std::string::npos) {
+		dev_type = B2XX;
 	} else if (usrp2_str != std::string::npos) {
 		dev_type = USRP2;
 	} else if (umtrx_str != std::string::npos) {