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

Don't check if the firmware is loaded. The check seems to confuse the USB system on some UHCI chips.

merge-requests/1/head
Henning Geinitz 2003-06-05 09:58:45 +00:00
rodzic c84bdda420
commit 4526a711f4
4 zmienionych plików z 17 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ChangeLog
Wyświetl plik

@ -1,3 +1,10 @@
2003-06-05 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/gt68xx.c doc/descriptions/gt68xx.desc
doc/gt68xx/gt68xx.CHANGES: Don't check if the firmware is
loaded. The check seems to confuse the USB system on some UHCI
chips.
2003-06-04 Henning Meier-Geinitz <henning@meier-geinitz.de> 2003-06-04 Henning Meier-Geinitz <henning@meier-geinitz.de>
* sanei/sanei_scsi.c: Fixed C++-like code for MacOS X (patch from * sanei/sanei_scsi.c: Fixed C++-like code for MacOS X (patch from

7
backend/gt68xx.c
Wyświetl plik

@ -48,7 +48,7 @@
#include "../include/sane/config.h" #include "../include/sane/config.h"
#define BUILD 46 #define BUILD 47
#define MAX_DEBUG #define MAX_DEBUG
#define WARMUP_TIME 30 #define WARMUP_TIME 30
#define CALIBRATION_HEIGHT 2.5 #define CALIBRATION_HEIGHT 2.5
@ -1245,12 +1245,13 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
DBG (0, " details as possible, e.g. the exact name of your\n"); DBG (0, " details as possible, e.g. the exact name of your\n");
DBG (0, " scanner and what does (not) work.\n"); DBG (0, " scanner and what does (not) work.\n");
} }
RIE (gt68xx_device_check_firmware (dev, &firmware_loaded)); /* RIE (gt68xx_device_check_firmware (dev, &firmware_loaded));*/
firmware_loaded = SANE_FALSE;
if (firmware_loaded) if (firmware_loaded)
DBG (3, "sane_open: firmware already loaded, skipping load\n"); DBG (3, "sane_open: firmware already loaded, skipping load\n");
else else
RIE (download_firmware_file (dev)); RIE (download_firmware_file (dev));
RIE (gt68xx_device_check_firmware (dev, &firmware_loaded)); /* RIE (gt68xx_device_check_firmware (dev, &firmware_loaded));*/
if (!firmware_loaded) if (!firmware_loaded)
{ {
DBG (1, "sane_open: firmware still not loaded? Proceeding anyway\n"); DBG (1, "sane_open: firmware still not loaded? Proceeding anyway\n");

2
doc/descriptions/gt68xx.desc
Wyświetl plik

@ -1,6 +1,6 @@
:backend "gt68xx" :backend "gt68xx"
:status :beta :status :beta
:version "1.0-46" :version "1.0-47"
:manpage "sane-gt68xx" :manpage "sane-gt68xx"
:url "http://www.meier-geinitz.de/sane/gt68xx-backend/" :url "http://www.meier-geinitz.de/sane/gt68xx-backend/"
:comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend." :comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend."

5
doc/gt68xx/gt68xx.CHANGES
Wyświetl plik

@ -1,5 +1,10 @@
gt68xx.CHANGES -*-text-*- gt68xx.CHANGES -*-text-*-
V 1.0-47 (2003-06-05)
* Don't check if the firmware is loaded. The check seems to confuse the USB
system on some UHCI chips.
V 1.0-46 (2003-04-27) V 1.0-46 (2003-04-27)
- Added Genius 3x as working scanner, removed testing flag. - Added Genius 3x as working scanner, removed testing flag.