kopia lustrzana https://gitlab.com/sane-project/backends
moved desc for one scanner, added packet counting code to backend
rodzic
acd9a6d0e5
commit
52085051fc
|
@ -1,3 +1,10 @@
|
|||
2003-12-09 Allan Noah <anoah at pfeiffer dot edu>
|
||||
* doc/desc/{fujitsu|ma1509}.desc: move fujitsu fi-4110eox2 section
|
||||
|
||||
2003-12-09 Allan Noah <anoah at pfeiffer dot edu>
|
||||
* backend/fujitsu.c: count USB packets to prevent timeouts, perhaps
|
||||
due to DATA0/1 toggle problems in certain scanners
|
||||
|
||||
2003-12-07 Peter Fales <peter@fales-lorenz.net>
|
||||
* acinclude.m4, aclocal.m4, configure: remove "enabling GPHOTO2"
|
||||
messages printed by configure
|
||||
|
|
|
@ -360,6 +360,9 @@ static int forceModel = -1;
|
|||
/* Also set via config file. */
|
||||
static int scsiBuffer = 64 * 1024;
|
||||
|
||||
/* flaming hack to get USB scanners
|
||||
working without timeouts under linux */
|
||||
static unsigned int cmd_count = 0;
|
||||
|
||||
/*
|
||||
* required for compressed data transfer. sense_handler has to tell
|
||||
|
@ -3024,6 +3027,8 @@ do_usb_cmd (int fd, unsigned char *cmd,
|
|||
retry:
|
||||
hexdump (IO_CMD, "<cmd<", cmd, cmd_len);
|
||||
|
||||
cmd_count++;
|
||||
|
||||
if (cmd_len > 0) op_code = ((int)cmd[0]) & 0xff;
|
||||
|
||||
if ((cmd_len+USB_CMD_HEADER_BYTES) > (int)sizeof(buf)) {
|
||||
|
@ -3252,6 +3257,15 @@ free_scanner (struct fujitsu *s)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* flaming hack cause some usb scanners (fi-4x20) fail
|
||||
to work properly on next connection if an odd number
|
||||
of commands are sent to the scanner. */
|
||||
if(s->connection == SANE_FUJITSU_USB && cmd_count % 2){
|
||||
ret = get_hardware_status(s);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
DBG (10, "free_scanner: ok\n");
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -49,10 +49,6 @@
|
|||
:interface "SCSI"
|
||||
:status :good
|
||||
|
||||
:model "fi-4110EOX2"
|
||||
:interface "USB"
|
||||
:status :unsupported
|
||||
|
||||
:model "fi-4120C"
|
||||
:interface "SCSI USB"
|
||||
:status :good
|
||||
|
|
|
@ -30,6 +30,12 @@
|
|||
:status :good
|
||||
:comment "Works upto 600 dpi. No support for TA and ADF yet."
|
||||
|
||||
:mfg "Fujitsu" ; name a manufacturer
|
||||
:model "fi-4110EOX2"
|
||||
:interface "USB"
|
||||
:status :unsupported
|
||||
:comment "Uses ma1509 chip, but very different from other scanners supported by backend"
|
||||
:url "http://www2.pfeiffer.edu/~anoah/fujitsu/"
|
||||
|
||||
; :comment and :url specifiers are optional after :mfg, :model, :desc,
|
||||
; and at the top-level.
|
||||
|
|
Ładowanie…
Reference in New Issue