2004-11-19 Rene Rebe <rene@exactcode.de>

* sanei/sanei_usb.c configure.in: use usb_interrupt_read instead of
          usb_bulk_read for sanei_usb_read_int. Fixes bug #300878. Added a                missing DBG output in sanei_usb_read_int. Check for
          usb_interrupt_read to make sure, we have at least version 0.1.8.

ChangeLog

@@ -1,4 +1,11 @@
 
+2004-11-19  Rene Rebe <rene@exactcode.de>
+
+	* sanei/sanei_usb.c configure.in: use usb_interrupt_read instead of
+	  usb_bulk_read for sanei_usb_read_int. Fixes bug #300878. Added a
+	  missing DBG output in sanei_usb_read_int. Check for
+	  usb_interrupt_read to make sure, we have at least version 0.1.8.
+
 2004-11-19  Rene Rebe <rene@exactcode.de>
 
 	* backend/avison.c doc/descriptions/avision.desc

configure.in

@@ -234,10 +234,10 @@ AC_ARG_ENABLE(libusb,
     fi
   ])
 
-dnl we need both libusb header and a libusb providing usb_get_busses
+dnl we need both libusb header and a libusb providing usb_interrupt_read
 if test "${ac_cv_header_usb_h}" = "yes" && test "$USE_LIBUSB" = "yes" ; then
-  AC_CHECK_LIB(usb, usb_get_busses)
+  AC_CHECK_LIB(usb, usb_interrupt_read)
-  if test "${ac_cv_lib_usb_usb_get_busses}" = "yes" ; then
+  if test "${ac_cv_lib_usb_usb_interrupt_read}" = "yes" ; then
     HAVE_LIBUSB="yes"
   fi
 fi

sanei/sanei_usb.c

@@ -1027,6 +1027,10 @@ sanei_usb_read_int (SANE_Int dn, SANE_Byte * buffer, size_t * size)
       DBG (1, "sanei_usb_read_int: dn >= MAX_DEVICES || dn < 0\n");
       return SANE_STATUS_INVAL;
     }
+  
+  DBG (5, "sanei_usb_read_int: trying to read %lu bytes\n",
+       (unsigned long) *size);
+
   if (devices[dn].method == sanei_usb_method_scanner_driver) {
      DBG (1, "sanei_usb_read_int: access method %d not implemented\n",
 	   devices[dn].method);
@@ -1036,7 +1040,7 @@ sanei_usb_read_int (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 #ifdef HAVE_LIBUSB
     {
       if (devices[dn].int_in_ep)
-	read_size = usb_bulk_read (devices[dn].libusb_handle,
+	read_size = usb_interrupt_read (devices[dn].libusb_handle,
 				        devices[dn].int_in_ep, (char *) buffer,
 				        (int) *size, libusb_timeout);
       else