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

Fixed vendor/device detection for Linux versions >= 2.4.13. 

Henning Meier-Geinitz <henning@meier-geinitz.de>
DEVEL_2_0_BRANCH-1
Henning Geinitz 2001-10-26 21:24:49 +00:00
rodzic b9969f8279
commit de16f98b44
1 zmienionych plików z 19 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
sanei/sanei_usb.c
Wyświetl plik

@ -114,22 +114,31 @@ sanei_usb_get_vendor_product (SANE_Int fd, SANE_Word * vendor,
SANE_Word vendorID, productID;
#if defined (__linux__)
#define IOCTL_SCANNER_VENDOR _IOR('u', 0xa0, int)
#define IOCTL_SCANNER_PRODUCT _IOR('u', 0xa1, int)
#define IOCTL_SCANNER_VENDOR _IOR('U', 0x20, int)
#define IOCTL_SCANNER_PRODUCT _IOR('U', 0x21, int)
/* Older (unofficial) IOCTL numbers for Linux < v2.4.13 */
#define IOCTL_SCANNER_VENDOR_OLD _IOR('u', 0xa0, int)
#define IOCTL_SCANNER_PRODUCT_OLD _IOR('u', 0xa1, int)
/* read the vendor and product IDs via the IOCTLs */
if (ioctl (fd, IOCTL_SCANNER_VENDOR , &vendorID) == -1)
{
DBG (3, "sanei_usb_get_vendor_product: ioctl (vendor) of fd %d failed: "
"%s\n", fd, strerror (errno));
/* just set the vendor ID to 0 */
vendorID = 0;
if (ioctl (fd, IOCTL_SCANNER_VENDOR_OLD , &vendorID) == -1)
{
DBG (3, "sanei_usb_get_vendor_product: ioctl (vendor) of fd %d "
"failed: %s\n", fd, strerror (errno));
/* just set the vendor ID to 0 */
vendorID = 0;
}
}
if (ioctl (fd, IOCTL_SCANNER_PRODUCT , &productID) == -1)
{
DBG (3, "sanei_usb_get_vendor_product: ioctl (product) of ds %d failed: "
"%s\n", fd, strerror (errno));
/* just set the product ID to 0 */
productID = 0;
if (ioctl (fd, IOCTL_SCANNER_PRODUCT_OLD , &productID) == -1)
{
DBG (3, "sanei_usb_get_vendor_product: ioctl (product) of ds %d "
"failed: %s\n", fd, strerror (errno));
/* just set the product ID to 0 */
productID = 0;
}
}
if (vendor)
*vendor = vendorID;