projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied libusb-1.0 patch set from Thomas Tsou <ttsou@vt.edu>:
[debian/gnuradio]
/
usrp
/
host
/
lib
/
fusb.h
diff --git
a/usrp/host/lib/fusb.h
b/usrp/host/lib/fusb.h
index 769e51ccad2ae10bea712b652af84a8dc6885c28..bfe34d5b881d572167dbf5ef783ebaa16d3d5292 100644
(file)
--- a/
usrp/host/lib/fusb.h
+++ b/
usrp/host/lib/fusb.h
@@
-26,7
+26,7
@@
#define _FUSB_H_
#define _FUSB_H_
-struct
usb_dev
_handle;
+struct
libusb_device
_handle;
class fusb_ephandle;
/*!
class fusb_ephandle;
/*!
@@
-39,11
+39,11
@@
private:
fusb_devhandle &operator= (const fusb_devhandle &rhs); // no assignment operator
protected:
fusb_devhandle &operator= (const fusb_devhandle &rhs); // no assignment operator
protected:
-
usb_dev_handle
*d_udh;
+
libusb_device_handle
*d_udh;
public:
// CREATORS
public:
// CREATORS
- fusb_devhandle (
usb_dev
_handle *udh);
+ fusb_devhandle (
libusb_device
_handle *udh);
virtual ~fusb_devhandle ();
// MANIPULATORS
virtual ~fusb_devhandle ();
// MANIPULATORS
@@
-55,7
+55,7
@@
public:
int block_size = 0, int nblocks = 0) = 0;
// ACCESSORS
int block_size = 0, int nblocks = 0) = 0;
// ACCESSORS
-
usb_dev_handle *get_usb_dev
_handle () const { return d_udh; }
+
libusb_device_handle *get_libusb_device
_handle () const { return d_udh; }
};
};
@@
-116,7
+116,7
@@
public:
/*!
* \brief returns fusb_devhandle or throws if trouble
*/
/*!
* \brief returns fusb_devhandle or throws if trouble
*/
- static fusb_devhandle *make_devhandle (
usb_dev
_handle *udh);
+ static fusb_devhandle *make_devhandle (
libusb_device
_handle *udh);
/*!
* \brief Returns max block size in bytes (hard limit).
/*!
* \brief Returns max block size in bytes (hard limit).