diff options
author | Ben Hilburn <ben.hilburn@ettus.com> | 2015-04-02 12:42:45 -0700 |
---|---|---|
committer | michael-west <michael.west@ettus.com> | 2015-04-15 17:07:08 -0700 |
commit | 5e3bf468c3e379743ede3b10a70699976ea83b09 (patch) | |
tree | 9e25624ee3f1cf255d1b4da919781e8c02c1e75a | |
parent | 90cc498983facb13f958e30d5662c872f839b356 (diff) | |
download | uhd-5e3bf468c3e379743ede3b10a70699976ea83b09.tar.gz uhd-5e3bf468c3e379743ede3b10a70699976ea83b09.tar.bz2 uhd-5e3bf468c3e379743ede3b10a70699976ea83b09.zip |
B200: UHD now detects loaded FW on NI-USRP devices
Conflicts:
host/lib/transport/libusb1_base.cpp
-rw-r--r-- | host/lib/transport/libusb1_base.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/lib/transport/libusb1_base.cpp b/host/lib/transport/libusb1_base.cpp index 375cfe92d..ae33cc036 100644 --- a/host/lib/transport/libusb1_base.cpp +++ b/host/lib/transport/libusb1_base.cpp @@ -327,6 +327,7 @@ public: bool firmware_loaded() { return (get_manufacturer() == "Ettus Research LLC") or + (get_manufacturer() == "National Instruments Corp.") or (get_manufacturer() == "Free Software Folks"); } |