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

- restored warming-up broken by a previous commit

merge-requests/1/head
Stéphane Voltz 2008-12-31 07:11:20 +00:00
rodzic 751d878c56
commit 2fda04000a
2 zmienionych plików z 5 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
ChangeLog
Wyświetl plik

@ -1,3 +1,6 @@
2008-12-31 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c: restored warming up broken by a previuos commit
2008-12-28 Nicolas Martin <nicols-guest at users.alioth.debian.org> 2008-12-28 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_imageclass.c: * backend/pixma_imageclass.c:
Change to include different checksumming for MF41xx and MF42xx series Change to include different checksumming for MF41xx and MF42xx series

4
backend/genesys.c
Wyświetl plik

@ -3535,13 +3535,13 @@ genesys_warmup_lamp (Genesys_Device * dev)
fixes the communication with scanner . Put usb timeout to a friendly fixes the communication with scanner . Put usb timeout to a friendly
value first, so that 'recovery' doesn't take too long */ value first, so that 'recovery' doesn't take too long */
sanei_usb_set_timeout (2 * 1000); sanei_usb_set_timeout (2 * 1000);
/* status = status =
sanei_genesys_read_data_from_scanner (dev, first_line, total_size); sanei_genesys_read_data_from_scanner (dev, first_line, total_size);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
{ {
RIE (sanei_genesys_read_data_from_scanner RIE (sanei_genesys_read_data_from_scanner
(dev, first_line, total_size)); (dev, first_line, total_size));
} */ }
/* back to normal time out */ /* back to normal time out */
sanei_usb_set_timeout (30 * 1000); sanei_usb_set_timeout (30 * 1000);
RIE (dev->model->cmd_set->end_scan (dev, local_reg, SANE_FALSE)); RIE (dev->model->cmd_set->end_scan (dev, local_reg, SANE_FALSE));