diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-23 15:48:00 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-23 15:48:00 -0700 |
| commit | 95681449a363de2b3c4f5c9a12c19cfe2633e85b (patch) | |
| tree | 4bacfb14e4b68a1d1f5b5413ed12545c6a5c2131 /host/lib/transport | |
| parent | 407e30867802fe67bf7fc3c7e5d7e53fb84110c4 (diff) | |
| parent | 0eac5ac12dd92c90921633f89e2228972f74aade (diff) | |
| download | uhd-95681449a363de2b3c4f5c9a12c19cfe2633e85b.tar.gz uhd-95681449a363de2b3c4f5c9a12c19cfe2633e85b.tar.bz2 uhd-95681449a363de2b3c4f5c9a12c19cfe2633e85b.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/b200/b200_impl.cpp
host/lib/usrp/b200/b200_impl.hpp
Diffstat (limited to 'host/lib/transport')
| -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 b1045ffa5..0baf8dc76 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"); } |