diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
| commit | fc54c27b48028c9c8139175d40b4b061800f32e3 (patch) | |
| tree | bd4ef22159d5bd65458e50fb3e5050a9b63559bf /host/lib/usrp/usrp1 | |
| parent | 9fe731cc371efee7f0051186697e611571c5b41b (diff) | |
| parent | 33c0b32db12ee154b1090360fbf76634590fdd3e (diff) | |
| download | uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.gz uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.bz2 uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index baecc6081..09352c5e0 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -38,8 +38,6 @@ using namespace uhd::transport; const uint16_t USRP1_VENDOR_ID = 0xfffe; const uint16_t USRP1_PRODUCT_ID = 0x0002; -const uint16_t FX2_VENDOR_ID = 0x04b4; -const uint16_t FX2_PRODUCT_ID = 0x8613; static const boost::posix_time::milliseconds REENUMERATION_TIMEOUT_MS(3000); const std::vector<usrp1_impl::dboard_slot_t> usrp1_impl::_dboard_slots = boost::assign::list_of |