diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-03-30 16:56:01 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-03-30 16:56:01 -0700 |
| commit | 700bf99bdc483fdcc9deb54abc29bd7f81e16089 (patch) | |
| tree | 42d4f30e7a4abc9e47dcd01300a2f44ab1b91510 /host/lib/transport/libusb1_base.cpp | |
| parent | 6a34824ad10eaa2d2b642b959f278f6c4e326d6d (diff) | |
| parent | 61599b3eaadcc46ac8d24974176d7fd89778d06e (diff) | |
| download | uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.tar.gz uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.tar.bz2 uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.zip | |
Merge branch 'master' into ashish/vivado
Diffstat (limited to 'host/lib/transport/libusb1_base.cpp')
| -rw-r--r-- | host/lib/transport/libusb1_base.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/transport/libusb1_base.cpp b/host/lib/transport/libusb1_base.cpp index 18acb1fdc..b1045ffa5 100644 --- a/host/lib/transport/libusb1_base.cpp +++ b/host/lib/transport/libusb1_base.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2014 Ettus Research LLC +// Copyright 2010-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -326,7 +326,8 @@ public: } bool firmware_loaded() { - return (get_manufacturer() == "Ettus Research LLC"); + return (get_manufacturer() == "Ettus Research LLC") or + (get_manufacturer() == "Free Software Folks"); } private: |