First Functional TX modulator

[debian/gnuradio] / usrp / host / lib / fusb.h

diff --git a/usrp/host/lib/fusb.h b/usrp/host/lib/fusb.h
index dbfda5a610a9889d8d19092dc95ba8f10530aada..538ae1ae0d64c0461529fd57ede6f64d124945a9 100644 (file)
--- a/usrp/host/lib/fusb.h
+++ b/usrp/host/lib/fusb.h
@@ -1,40 +1,29 @@
-/* -*- c++ -*- */
+/*  -*- c++ -*- */
 /*
- * Copyright 2003 Free Software Foundation, Inc.
- * 
+ * Copyright 2005,2009 Free Software Foundation, Inc.
+ *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio 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, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
 
-// Fast USB interface
-
 #ifndef _FUSB_H_
 #define _FUSB_H_
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_LIBUSB_1 
-struct  libusb_device_handle;
-#else
-struct usb_dev_handle;
-typedef struct usb_dev_handle libusb_device_handle;
-#endif
+#include <usrp/libusb_types.h>
 
 struct         libusb_context;
 class   fusb_ephandle;
@@ -65,7 +54,7 @@ public:
                                        int block_size = 0, int nblocks = 0) = 0;
   
   // ACCESSORS
-  libusb_device_handle *get_libusb_device_handle () const { return d_udh; }
+  libusb_device_handle *get_usb_dev_handle () const { return d_udh; }
 };
 
 
@@ -127,9 +116,7 @@ public:
    * \brief returns fusb_devhandle or throws if trouble
    */
   static fusb_devhandle *make_devhandle (libusb_device_handle *udh,
-                                         libusb_context *ctx);
-
-  static fusb_devhandle *make_devhandle (libusb_device_handle *udh);
+                                         libusb_context *ctx = 0);
 
   /*!
    * \brief Returns max block size in bytes (hard limit).