aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-11-24 10:08:24 -0800
committerJosh Blum <josh@joshknows.com>2010-11-24 10:08:24 -0800
commit2568efd1ead77cd6c459e8f2580466a923bb4ba7 (patch)
tree987d291e677d13727716d0c5ae3e182b1a1905f1
parentb33c109889cc01b064f09655c4bed69c179cdf85 (diff)
downloaduhd-2568efd1ead77cd6c459e8f2580466a923bb4ba7.tar.gz
uhd-2568efd1ead77cd6c459e8f2580466a923bb4ba7.tar.bz2
uhd-2568efd1ead77cd6c459e8f2580466a923bb4ba7.zip
usrp2: cover both rev3 cases for usrp2 revision numbers
-rw-r--r--host/lib/usrp/usrp2/usrp2_iface.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index 81bc80c88..257c1daa9 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -48,11 +48,14 @@ public:
regs = usrp2_get_regs(false);
break;
- case USRP_NXXX:
case USRP_N200:
case USRP_N210:
regs = usrp2_get_regs(true);
break;
+
+ case USRP_NXXX: //fallthough case is old register map (USRP2)
+ regs = usrp2_get_regs(false);
+ break;
}
//check the fpga compatibility number
@@ -262,7 +265,8 @@ public:
rev_type get_rev(void){
switch (boost::lexical_cast<boost::uint16_t>(mb_eeprom["rev"])){
- case 0x0300: return USRP2_REV3;
+ case 0x0300:
+ case 0x0301: return USRP2_REV3;
case 0x0400: return USRP2_REV4;
case 0x0A00: return USRP_N200;
case 0x0A01: return USRP_N210;