cellular-infrastructure
/
osmo-trx
mirror of https://gerrit.osmocom.org/osmo-trx
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

uhd: Fix USRP2/N200/N210 device detection 

Commit 1fb0ce67 "uhd: Use map container for for device parameter access"
inadvertently removed the string identifier for the USRP2 and derived
devices (N200/N210).

Add the missing USRP2 string identifier. Also search for partial string
matches in the UHD provided device and mboard stings. This is necessary
to guarantee that strings such as "N200r3" instead of just "N200" are
sucessfully found.

Tested with N200, X310, B200mini and B210 devices.

Change-Id: Ide4e22418e2cc469418cba018970cb0eb9906697
This commit is contained in:
Tom Tsou 2017-06-15 09:16:53 -07:00 committed by Tom Tsou
parent 1b6ab7d7ee
commit 988a464d5d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Transceiver52M/UHDDevice.cpp
View File

@ -526,25 +526,25 @@ bool uhd_device::parse_dev_type()
{ "E3XX", { E3XX, TX_WINDOW_FIXED } },
{ "X300", { X3XX, TX_WINDOW_FIXED } },
{ "X310", { X3XX, TX_WINDOW_FIXED } },
{ "USRP2", { USRP2, TX_WINDOW_FIXED } },
{ "UmTRX", { UMTRX, TX_WINDOW_FIXED } },
{ "STREAM", { LIMESDR, TX_WINDOW_USRP1 } },
};
// Compare UHD motherboard and device strings */
std::string found;
if (devStringMap.find(devString) != devStringMap.end())
found = devString;
else if (devStringMap.find(mboardString) != devStringMap.end())
found = mboardString;
if (found.empty()) {
LOG(ALERT) << "Unsupported device " << devString;
return false;
auto mapIter = devStringMap.begin();
while (mapIter != devStringMap.end()) {
if (devString.find(mapIter->first) != std::string::npos ||
mboardString.find(mapIter->first) != std::string::npos) {
dev_type = std::get<0>(mapIter->second);
tx_window = std::get<1>(mapIter->second);
return true;
}
mapIter++;
}
dev_type = devStringMap.at(found).first;
tx_window = devStringMap.at(found).second;
return true;
LOG(ALERT) << "Unsupported device " << devString;
return false;
}
/*