diff options
| author | Johnathan Corgan | 2009-08-17 23:46:30 -0400 |
|---|---|---|
| committer | ttsou | 2009-09-15 18:06:27 -0400 |
| commit | b5aa407ec2b1bdebc1c950a9428789fe50327776 (patch) | |
| tree | ecbc04220951ee75640cdcc17048d81525f54d0c /config/usrp_fusb_tech.m4 | |
| parent | 895f2e04a9d962cfe56d416691600b5c619ea180 (diff) | |
| download | gnuradio-b5aa407ec2b1bdebc1c950a9428789fe50327776.tar.gz gnuradio-b5aa407ec2b1bdebc1c950a9428789fe50327776.tar.bz2 gnuradio-b5aa407ec2b1bdebc1c950a9428789fe50327776.zip | |
Applied libusb-1.0 patch set from Thomas Tsou <ttsou@vt.edu>:
This patch set updates the usrp to support libusb-1.0. Asynchronous I/O
through libusb is added with fusb_libusb1.*, which is heavily based on
fusb_linux.*. In short, URB's and ioctl calls are replaced with
libusb_transfer structs and native calls. Transfer reaping is handled by
libusb and associated callbacks. I get 32Mb/s on all of my machines using
test_usrp_standard_rx or tx. Due to the API rewrite in 1.0 from 0.12, there
are alot of changes, many are simply name changes.
Known Issues:
Transmit and receive both work, but not at same time
(e.g. usrp_benchmark_usb.py). libusb does not create any internal threads,
so for a single session fusb_libusb1 works in the same manner as
fusb_linux with the callback called at controlled times. With multiple
libusb sessions the callback may occur at any time and threading issues
come into play causing behavior to become undefined. The use of separate
libusb_contexts _might_ solve this issue; I have not had the time to look
into it.
Diffstat (limited to 'config/usrp_fusb_tech.m4')
| -rw-r--r-- | config/usrp_fusb_tech.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/usrp_fusb_tech.m4 b/config/usrp_fusb_tech.m4 index db857249b..bda6f5af9 100644 --- a/config/usrp_fusb_tech.m4 +++ b/config/usrp_fusb_tech.m4 @@ -37,9 +37,9 @@ AC_DEFUN([USRP_SET_FUSB_TECHNIQUE],[ [x_have_usbdevice_fs_h=yes], [x_have_usbdevice_fs_h=no]) if test x${x_have_usbdevice_fs_h} = xyes; then - FUSB_TECH=linux + FUSB_TECH=libusb1 else - FUSB_TECH=generic + FUSB_TECH=libusb1 fi ;; darwin*) @@ -69,6 +69,7 @@ AC_DEFUN([USRP_SET_FUSB_TECHNIQUE],[ AM_CONDITIONAL(FUSB_TECH_darwin, test x$FUSB_TECH = xdarwin) AM_CONDITIONAL(FUSB_TECH_win32, test x$FUSB_TECH = xwin32) AM_CONDITIONAL(FUSB_TECH_generic, test x$FUSB_TECH = xgeneric) + AM_CONDITIONAL(FUSB_TECH_libusb1, test x$FUSB_TECH = xlibusb1) AM_CONDITIONAL(FUSB_TECH_linux, test x$FUSB_TECH = xlinux) AM_CONDITIONAL(FUSB_TECH_ra_wb, test x$FUSB_TECH = xra_wb) ]) |