usb: added timeout param and additional queries

5 files changed, 41 insertions, 15 deletions

diff --git a/host/include/uhd/transport/usb_control.hpp b/host/include/uhd/transport/usb_control.hpp
index 2af4b3bbe..92b10f339 100644
--- a/host/include/uhd/transport/usb_control.hpp
+++ b/host/include/uhd/transport/usb_control.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2013 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
@@ -51,6 +51,7 @@ public:
      * \param index        2-byte (wIndex)
      * \param buff         buffer to hold send or receive data
      * \param length       2-byte (wLength)
+     * \param timeout      4-byte (timeout, default is infinite wait)
      * \return             number of bytes submitted or error code
      */
     virtual ssize_t submit(boost::uint8_t request_type,
@@ -58,7 +59,8 @@ public:
                           boost::uint16_t value,
                           boost::uint16_t index, 
                           unsigned char *buff,
-                          boost::uint16_t length) = 0; 
+                          boost::uint16_t length,
+                          boost::int32_t timeout = 0) = 0;
 };
 
 }} //namespace
diff --git a/host/include/uhd/transport/usb_device_handle.hpp b/host/include/uhd/transport/usb_device_handle.hpp
index 6f8d868be..2951d7fbb 100644
--- a/host/include/uhd/transport/usb_device_handle.hpp
+++ b/host/include/uhd/transport/usb_device_handle.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2013 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
@@ -43,12 +43,24 @@ public:
     typedef boost::shared_ptr<usb_device_handle> sptr;
 
     /*!
-     * Return the device's serial number 
+     * Return the device's serial number
      * \return a string describing the device's serial number
      */
     virtual std::string get_serial() const = 0;
 
     /*!
+     * Return the device's manufacturer identification string
+     * \return a string describing the device's manufacturer string
+     */
+    virtual std::string get_manufacturer() const = 0;
+
+    /*!
+     * Return the device's product identification string
+     * \return a string describing the device's product string
+     */
+    virtual std::string get_product() const = 0;
+
+    /*!
      * Return the device's Vendor ID (usually assigned by the USB-IF)
      * \return a Vendor ID
      */
@@ -61,7 +73,7 @@ public:
     virtual boost::uint16_t get_product_id() const = 0;
 
     /*!
-     * Return a vector of USB devices on this host 
+     * Return a vector of USB devices on this host
      * \return a vector of USB device handles that match vid and pid
      */
     static std::vector<usb_device_handle::sptr> get_device_list(boost::uint16_t vid, boost::uint16_t pid);
diff --git a/host/lib/transport/libusb1_base.cpp b/host/lib/transport/libusb1_base.cpp
index d4ec874f1..fde96f385 100644
--- a/host/lib/transport/libusb1_base.cpp
+++ b/host/lib/transport/libusb1_base.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2011 Ettus Research LLC
+// Copyright 2010-2013 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
@@ -137,8 +137,13 @@ public:
         return _desc;
     }
 
-    std::string get_ascii_serial(void) const{
-        if (this->get().iSerialNumber == 0) return "";
+    std::string get_ascii_property(const std::string &what) const
+    {
+        boost::uint8_t off = 0;
+        if (what == "serial") off = this->get().iSerialNumber;
+        if (what == "product") off = this->get().iProduct;
+        if (what == "manufacturer") off = this->get().iManufacturer;
+        if (off == 0) return "";
 
         libusb::device_handle::sptr handle(
             libusb::device_handle::get_cached_handle(_dev)
@@ -146,7 +151,7 @@ public:
 
         unsigned char buff[512];
         ssize_t ret = libusb_get_string_descriptor_ascii(
-            handle->get(), this->get().iSerialNumber, buff, sizeof(buff)
+            handle->get(), off, buff, sizeof(buff)
         );
         if (ret < 0) return ""; //on error, just return empty string
 
@@ -240,7 +245,15 @@ public:
     }
 
     std::string get_serial(void) const{
-        return libusb::device_descriptor::make(this->get_device())->get_ascii_serial();
+        return libusb::device_descriptor::make(this->get_device())->get_ascii_property("serial");
+    }
+
+    std::string get_manufacturer() const{
+        return libusb::device_descriptor::make(this->get_device())->get_ascii_property("manufacturer");
+    }
+
+    std::string get_product() const{
+        return libusb::device_descriptor::make(this->get_device())->get_ascii_property("product");
     }
 
     boost::uint16_t get_vendor_id(void) const{
diff --git a/host/lib/transport/libusb1_base.hpp b/host/lib/transport/libusb1_base.hpp
index 04c1d6574..7dab07fda 100644
--- a/host/lib/transport/libusb1_base.hpp
+++ b/host/lib/transport/libusb1_base.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2013 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
@@ -102,7 +102,7 @@ namespace libusb {
         //! get the underlying device descriptor
         virtual const libusb_device_descriptor &get(void) const = 0;
 
-        virtual std::string get_ascii_serial(void) const = 0;
+        virtual std::string get_ascii_property(const std::string &what) const = 0;
     };
 
     /*!
diff --git a/host/lib/transport/libusb1_control.cpp b/host/lib/transport/libusb1_control.cpp
index 3d9b38785..c1b8fe6df 100644
--- a/host/lib/transport/libusb1_control.cpp
+++ b/host/lib/transport/libusb1_control.cpp
@@ -21,8 +21,6 @@
 
 using namespace uhd::transport;
 
-const int libusb_timeout = 0;
-
 /***********************************************************************
  * libusb-1.0 implementation of USB control transport
  **********************************************************************/
@@ -39,7 +37,8 @@ public:
                   boost::uint16_t value,
                   boost::uint16_t index,
                   unsigned char *buff,
-                  boost::uint16_t length
+                  boost::uint16_t length,
+                  boost::int32_t libusb_timeout = 0
     ){
         boost::mutex::scoped_lock lock(_mutex);
         return libusb_control_transfer(_handle->get(),