Changeset 9548

Show
Ignore:
Timestamp:
09/14/09 18:55:36 (4 years ago)
Author:
ttsou
Message:

Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims integration

Location:
ossiedev/branches/ttsou/gnuradio/trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • ossiedev/branches/ttsou/gnuradio/trunk/config/grc_usrp.m4

    r9544 r9548  
    4646 
    4747        dnl Make sure libusb version is installed; required for legacy USB 
    48         USRP_LIBUSB([$req_libusb1],[passed=no;AC_MSG_RESULT([Unable to find dependency libusb.])]) 
     48        USRP_LIBUSB([$req_libusb1],[],[passed=no;AC_MSG_RESULT([Unable to find dependency libusb.])]) 
    4949 
    5050        dnl Make sure SDCC >= 2.4.0 is available. 

  • ossiedev/branches/ttsou/gnuradio/trunk/config/usrp_libusb.m4

    r9546 r9548  
    119119          echo 'struct libusb_device;' >> $tmpfile 
    120120          echo 'struct libusb_device_handle;' >> $tmpfile 
     121          echo 'struct libusb_device_descriptor;' >> $tmpfile 
    121122          echo >> $tmpfile 
    122123        fi 
    … …  
    133134    ]) 
    134135 
    135       AC_SUBST(USB_LIBS) 
    136       ifelse([$1], , :, [$1]) 
     136    AC_SUBST(USB_LIBS) 
     137    ifelse([$2], , :, [$2]) 
    137138  else 
    138       ifelse([$2], , :, [$2]) 
     139    ifelse([$3], , :, [$3]) 
    139140  fi 
    140141]) 

  • ossiedev/branches/ttsou/gnuradio/trunk/usrp/host/include/usrp/usrp_prims.h.in

    r9547 r9548  
    278278                                unsigned char* data, int length); 
    279279 
    280 int _usb_control_transfer (struct usb_dev_handle *udh, int request_type, 
     280int _usb_control_transfer (libusb_device_handle *udh, int request_type, 
    281281                           int request, int value, int index, 
    282282                           unsigned char *data, int length, 

  • ossiedev/branches/ttsou/gnuradio/trunk/usrp/host/lib/fusb_libusb1.cc

    r9547 r9548  
    106106 
    107107  // We need the base class libusb_device_handle 
    108   libusb_device_handle *dev_handle = dh->get_libusb_device_handle(); 
     108  libusb_device_handle *dev_handle = dh->get_usb_dev_handle(); 
    109109 
    110110  // Load the libusb_transfer for bulk transfer 

  • ossiedev/branches/ttsou/gnuradio/trunk/usrp/host/lib/usrp_prims_libusb1.cc

    r9547 r9548  
    2727#include "usrp/usrp_prims.h" 
    2828#include "usrp_commands.h" 
    29 #include "usrp_ids.h" 
    30 #include "usrp_i2c_addr.h" 
    31 #include "fpga_regs_common.h" 
    32 #include "fpga_regs_standard.h" 
    3329#include <libusb-1.0/libusb.h> 
    3430#include <errno.h> 
    … …  
    3834#include <string.h> 
    3935#include <ctype.h> 
    40 #include <time.h>               // FIXME should check with autoconf (nanosleep) 
    41 #include <algorithm> 
    4236#include <ad9862.h> 
    4337#include <assert.h> 
    44 #include "std_paths.h" 
    4538 
    4639extern "C" { 
    … …  
    8073 
    8174int 
    82 _usb_control_transfer (struct libusb_dev_handle *udh, int request_type, 
    83                       int request, int value, int index, 
    84                       unsigned char *data, int length, unsigned int timeout) 
     75_usb_control_transfer (struct libusb_device_handle *udh, int request_type, 
     76                       int request, int value, int index, 
     77                       unsigned char *data, int length, unsigned int timeout) 
    8578{ 
    8679  return libusb_control_transfer (udh, request_type, request, value, index,