Changeset 9513

Timestamp:

08/16/09 14:41:48 (4 years ago)

Author:

ttsou

Message:

reverting unused files

Location:

ossiedev/branches/ttsou/gnuradio/usrp/host/lib

Files:

• fusb_linux.cc (modified) (5 diffs)
• fusb_linux.h (modified) (2 diffs)
• fusb_ra_wb.cc (modified) (3 diffs)
• fusb_sysconfig_linux.cc (modified) (1 diff)

ossiedev/branches/ttsou/gnuradio/usrp/host/lib/fusb_linux.cc

@@ -26 +26 @@
 
 #include <fusb_linux.h>
-#include <libusb-1.0/libusb.h>          // libusb header
+#include <usb.h>                // libusb header
 #include <stdexcept>
 #ifdef HAVE_LINUX_COMPILER_H
@@ -39 +39 @@
 #include <string.h>
 #include <cstdio>
-#include <pthread.h>
 
 #define MINIMIZE_TX_BUFFERING 1         // must be defined to 0 or 1
@@ -54 +53 @@
 //
 // FIXME if everything breaks someday in the future, look here...
-//
-// With libusb-1.0 the libusb_device_handle is still opaque and the file
-// descriptor is buried even further. Lock the doors and hide the women and
-// children; this may code may kill you. Obviously it's rigged for 64-bit
-// machines.
 
 static int
-fd_from_usb_dev_handle (libusb_device_handle *udh)
-{
-  return *(int*)((u_int64_t)udh + sizeof(pthread_mutex_t)
-                                + sizeof(long)
-                                + 3*sizeof(void*));
-
-#if 0
-
-  return *(int*)((u_int32_t)udh + sizeof(pthread_mutex_t)
-                                + sizeof(long)
-                                + 3*sizeof(void*));
-#endif
-
+fd_from_usb_dev_handle (usb_dev_handle *udh)
+{
+  return *((int *) udh);
 }
 
@@ -143 +127 @@
 // ------------------------------------------------------------------------
 
-fusb_devhandle_linux::fusb_devhandle_linux (libusb_device_handle *udh)
+fusb_devhandle_linux::fusb_devhandle_linux (usb_dev_handle *udh)
   : fusb_devhandle (udh)
 {
@@ -311 +295 @@
       break;
 }
-// ------------------------------------------------------------------------
+// ------------------------------------------------------------------------
 //                           end point handle
 // ------------------------------------------------------------------------

ossiedev/branches/ttsou/gnuradio/usrp/host/lib/fusb_linux.h

@@ -46 +46 @@
 public:
   // CREATORS
-  fusb_devhandle_linux (libusb_device_handle *udh);
+  fusb_devhandle_linux (usb_dev_handle *udh);
   virtual ~fusb_devhandle_linux ();
 
@@ -61 +61 @@
 };
 
-/*!
+/*!
  * \brief linux specific implementation of fusb_ephandle using usbdevice_fs
  */

ossiedev/branches/ttsou/gnuradio/usrp/host/lib/fusb_ra_wb.cc

@@ -26 +26 @@
 
 #include <fusb_ra_wb.h>
-#include <libusb-1.0/libusb.h>
+#include <usb.h>
 
 #include <stdio.h>
@@ -55 +55 @@
 // new "fragile extraction"
 static int
-ep_fd_from_usb_dev_handle (libusb_dev_handle *udh, int endpoint)
-{
-  struct libusb_device_handle_kludge2 { // see also usrp_prims.cc
+ep_fd_from_usb_dev_handle (usb_dev_handle *udh, int endpoint)
+{
+  struct usb_dev_handle_kludge2 { // see also usrp_prims.cc
     int                  fd;
     struct usb_bus      *bus;
@@ -71 +71 @@
   struct bsd_usb_dev_handle_info_kludge *info
       = (struct bsd_usb_dev_handle_info_kludge *)
-           ((struct libusb_device_handle_kludge2 *)udh)->impl_info;
+           ((struct usb_dev_handle_kludge2 *)udh)->impl_info;
   return info->ep_fd[UE_GET_ADDR(endpoint)];
 }

ossiedev/branches/ttsou/gnuradio/usrp/host/lib/fusb_sysconfig_linux.cc

@@ -29 +29 @@
 
 fusb_devhandle *
-fusb_sysconfig::make_devhandle (libusb_device_handle *udh)
+fusb_sysconfig::make_devhandle (usb_dev_handle *udh)
 {
   return new fusb_devhandle_linux (udh);