mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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.
merge-requests/1/head
Rene Rebe 2004-11-19 16:44:32 +00:00
rodzic 53fbb342f9
commit 2d579021a0
3 zmienionych plików z 17 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ChangeLog
Wyświetl plik

@ -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

6
configure.in
Wyświetl plik

@ -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)
if test "${ac_cv_lib_usb_usb_get_busses}" = "yes" ; then
AC_CHECK_LIB(usb, usb_interrupt_read)
if test "${ac_cv_lib_usb_usb_interrupt_read}" = "yes" ; then
HAVE_LIBUSB="yes"
fi
fi

10
sanei/sanei_usb.c
Wyświetl plik

@ -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,9 +1040,9 @@ 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,
devices[dn].int_in_ep, (char *) buffer,
(int) *size, libusb_timeout);
read_size = usb_interrupt_read (devices[dn].libusb_handle,
devices[dn].int_in_ep, (char *) buffer,
(int) *size, libusb_timeout);
else
{
DBG (1, "sanei_usb_read_int: can't read without an int "