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

Detect USB controller type.

merge-requests/1/head
Jan Hauffa 2011-05-15 15:09:21 +02:00 zatwierdzone przez m. allan noah
rodzic d8a203a693
commit 2fa054456e
1 zmienionych plików z 10 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
backend/mustek_usb2_asic.c
Wyświetl plik

@ -1978,6 +1978,7 @@ SANE_Status
Asic_Open (ASIC * chip) Asic_Open (ASIC * chip)
{ {
SANE_Status status; SANE_Status status;
struct sanei_usb_dev_descriptor desc;
DBG_ASIC_ENTER (); DBG_ASIC_ENTER ();
if (chip->firmwarestate > FS_OPENED) if (chip->firmwarestate > FS_OPENED)
@ -1996,6 +1997,15 @@ Asic_Open (ASIC * chip)
return status; return status;
} }
status = sanei_usb_get_descriptor (chip->fd, &desc);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_ERR, "sanei_usb_get_descriptor failed: %s\n",
sane_strstatus (status));
return status;
}
chip->isUsb20 = (desc.bcd_usb >= 0x0200) ? SANE_TRUE : SANE_FALSE;
status = OpenScanChip (chip); status = OpenScanChip (chip);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
{ {
@ -2074,7 +2084,6 @@ Asic_Initialize (ASIC * chip, const ASIC_ModelParams * params)
chip->params = params; chip->params = params;
chip->isFirstOpenChip = SANE_TRUE; chip->isFirstOpenChip = SANE_TRUE;
chip->isUsb20 = SANE_FALSE;
chip->dwBytesCountPerRow = 0; chip->dwBytesCountPerRow = 0;
chip->isMotorMoveToFirstLine = MOTOR_MOVE_TO_FIRST_LINE_ENABLE; chip->isMotorMoveToFirstLine = MOTOR_MOVE_TO_FIRST_LINE_ENABLE;
chip->pShadingTable = NULL; chip->pShadingTable = NULL;