kopia lustrzana https://gitlab.com/sane-project/backends
epson2: improved debug messages and comments
rodzic
2668cf8062
commit
8013bd7acb
|
@ -583,16 +583,14 @@ detect_usb(struct Epson_Scanner *s)
|
||||||
|
|
||||||
status = sanei_usb_get_vendor_product(s->fd, &vendor, &product);
|
status = sanei_usb_get_vendor_product(s->fd, &vendor, &product);
|
||||||
if (status != SANE_STATUS_GOOD) {
|
if (status != SANE_STATUS_GOOD) {
|
||||||
DBG(1,
|
DBG(1, "the device cannot be verified - will continue\n");
|
||||||
"cannot use IOCTL interface to verify that device is a scanner - will continue\n");
|
|
||||||
return SANE_STATUS_GOOD;
|
return SANE_STATUS_GOOD;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check the vendor ID to see if we are dealing with an EPSON device */
|
/* check the vendor ID to see if we are dealing with an EPSON device */
|
||||||
if (vendor != SANE_EPSON_VENDOR_ID) {
|
if (vendor != SANE_EPSON_VENDOR_ID) {
|
||||||
/* this is not a supported vendor ID */
|
/* this is not a supported vendor ID */
|
||||||
DBG(1,
|
DBG(1, "not an Epson device at %s (vendor id=0x%x)\n",
|
||||||
"the device at %s is not manufactured by EPSON (vendor id=0x%x)\n",
|
|
||||||
s->hw->sane.name, vendor);
|
s->hw->sane.name, vendor);
|
||||||
return SANE_STATUS_INVAL;
|
return SANE_STATUS_INVAL;
|
||||||
}
|
}
|
||||||
|
@ -610,14 +608,12 @@ detect_usb(struct Epson_Scanner *s)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_valid == SANE_FALSE) {
|
if (is_valid == SANE_FALSE) {
|
||||||
DBG(1,
|
DBG(1, "the device at %s is not a supported (product id=0x%x)\n",
|
||||||
"the device at %s is not a supported EPSON scanner (product id=0x%x)\n",
|
|
||||||
s->hw->sane.name, product);
|
s->hw->sane.name, product);
|
||||||
return SANE_STATUS_INVAL;
|
return SANE_STATUS_INVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
DBG(1,
|
DBG(1, "found valid Epson scanner: 0x%x/0x%x (vendorID/productID)\n",
|
||||||
"found valid EPSON scanner: 0x%x/0x%x (vendorID/productID)\n",
|
|
||||||
vendor, product);
|
vendor, product);
|
||||||
|
|
||||||
return SANE_STATUS_GOOD;
|
return SANE_STATUS_GOOD;
|
||||||
|
|
Ładowanie…
Reference in New Issue