Remove USB 2.0 mode, as it causes horrible backtracking for resolutions > 300 dpi.

merge-requests/1/head
Jan Hauffa 2012-07-14 16:44:28 +02:00 zatwierdzone przez m. allan noah
rodzic 98248f6088
commit a64477bf1a
2 zmienionych plików z 35 dodań i 61 usunięć

Wyświetl plik

@ -2010,7 +2010,6 @@ SANE_Status
Asic_Open (ASIC * chip)
{
SANE_Status status;
struct sanei_usb_dev_descriptor desc;
DBG_ASIC_ENTER ();
if (chip->firmwarestate > FS_OPENED)
@ -2029,15 +2028,6 @@ Asic_Open (ASIC * chip)
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);
if (status != SANE_STATUS_GOOD)
{
@ -2188,8 +2178,6 @@ GetDummyCycleNumber (ASIC * chip, unsigned short wYResolution,
{
SANE_Byte bDummyCycleNum = 0;
if (lsLightSource == SS_REFLECTIVE)
{
if (!chip->isUsb20)
{
switch (wYResolution)
{
@ -2229,19 +2217,6 @@ GetDummyCycleNumber (ASIC * chip, unsigned short wYResolution,
break;
}
}
else
{
switch (wYResolution)
{
case 2400:
case 1200:
case 75:
case 50:
bDummyCycleNum = 1;
break;
}
}
}
return bDummyCycleNum;
}

Wyświetl plik

@ -230,7 +230,6 @@ typedef struct ASIC
FIRMWARESTATE firmwarestate;
SANE_Bool isFirstOpenChip; /* == SANE_FALSE after first Asic_Open */
SANE_Bool isUsb20;
unsigned int dwBytesCountPerRow;