From dc8bcfde805228ed5d00334ce44c6c0684dcfe2c Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Sat, 25 Sep 2010 21:07:15 -0700
Subject: usb: work on libusb code to use a single context across all calls

libusb allocation stuff had been moved inside of smart pointer classes to handle automatic cleanup

the public device handle implementation now holds an actual libusb device inside of it

needs testing - all platforms
---
 host/lib/transport/libusb1_device_handle.cpp | 118 ---------------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 host/lib/transport/libusb1_device_handle.cpp

(limited to 'host/lib/transport/libusb1_device_handle.cpp')

diff --git a/host/lib/transport/libusb1_device_handle.cpp b/host/lib/transport/libusb1_device_handle.cpp
deleted file mode 100644
index 6bef37ed2..000000000
--- a/host/lib/transport/libusb1_device_handle.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright 2010 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include "libusb1_base.hpp"
-#include <uhd/utils/assert.hpp>
-#include <iostream>
-
-using namespace uhd::transport;
-
-const int libusb_debug_level = 0;
-
-/****************************************************************
- * libusb USB device handle implementation class
- ***************************************************************/
-class libusb1_device_handle_impl : public usb_device_handle {
-public:
-    libusb1_device_handle_impl(std::string serial,
-                               boost::uint16_t product_id,
-                               boost::uint16_t vendor_id,
-                               boost::uint16_t device_addr)
-      : _serial(serial), _product_id(product_id), 
-        _vendor_id(vendor_id), _device_addr(device_addr)
-    {
-        /* NOP */
-    }
-
-    ~libusb1_device_handle_impl()
-    {
-        /* NOP */
-    }
-
-    std::string get_serial() const
-    {
-        return _serial;
-    }
-
-    boost::uint16_t get_vendor_id() const
-    {
-        return _vendor_id;
-    }
-
-
-    boost::uint16_t get_product_id() const
-    {
-        return _product_id;
-    }
-
-    boost::uint16_t get_device_addr() const
-    {
-        return _device_addr;
-    }
-
-private:
-    std::string     _serial;
-    boost::uint16_t _product_id;
-    boost::uint16_t _vendor_id;
-    boost::uint16_t _device_addr;
-};
-
-
-usb_device_handle::sptr make_usb_device_handle(libusb_device *dev)
-{
-    libusb_device_descriptor desc;
-
-    if (libusb_get_device_descriptor(dev, &desc) < 0) {
-        throw std::runtime_error("USB: failed to get device descriptor");
-    }
-
-    std::string     serial      = libusb::get_serial(dev);
-    boost::uint16_t product_id  = desc.idProduct;
-    boost::uint16_t vendor_id   = desc.idVendor;
-    boost::uint16_t device_addr = libusb_get_device_address(dev);
-
-    return usb_device_handle::sptr(new libusb1_device_handle_impl(
-        serial,
-        product_id,
-        vendor_id,
-        device_addr));
-}
-
-std::vector<usb_device_handle::sptr> usb_device_handle::get_device_list(boost::uint16_t vid, boost::uint16_t pid)
-{
-    libusb_context *ctx = NULL;
-    libusb_device** libusb_device_list;
-    std::vector<usb_device_handle::sptr> device_handle_list;
-    libusb_device_descriptor desc;
-
-    libusb::init(&ctx, libusb_debug_level);
-
-    size_t dev_size = libusb_get_device_list(ctx, &libusb_device_list);
-    for (size_t i = 0; i < dev_size; i++) {
-        libusb_device *dev = libusb_device_list[i];
-        if(libusb_get_device_descriptor(dev, &desc) != 0) {
-            continue; //just try the next device, do not throw
-        }
-        if(desc.idVendor == vid && desc.idProduct == pid) {
-            device_handle_list.push_back(make_usb_device_handle(dev));
-        }
-    }
-
-    libusb_free_device_list(libusb_device_list, true);
-    libusb_exit(ctx);
-    return device_handle_list; 
-}
-- 
cgit v1.2.3