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

Fixed debugging code for epson scanners

merge-requests/1/head
Oliver Schwartz 2005-09-03 10:52:11 +00:00
rodzic e790e335e8
commit 304b667a6a
3 zmienionych plików z 24 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
ChangeLog
Wyświetl plik

@ -1,3 +1,9 @@
2005-09-03 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.h backend/snapscan-scsi.c: (Hopefully) fixed
some debugging code for Epson scanners that only works after
firmware upload.
2005-09-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Epson Perfection 4490
@ -46,7 +52,7 @@
* doc/descriptions-external/brother2.desc: Brother MFC-5440CN is
reported to work (bug #302105).
2005-08-24 Stéphane Voltz <stefdev@modulonet.fr>
2005-08-24 St<EFBFBD>hane Voltz <stefdev@modulonet.fr>
* backend/umax_pp.c backend/umax_pp_low.c tools/umax_pp.c: Added EPP
support for 610P, revision number changes
@ -56,7 +62,7 @@
* doc/descriptions/unsupported.desc: Added Canon LiDE 60. Reflecta
Digitdia 3600 is not GL841-based.
2005-08-22 Stéphane Voltz <stefdev@modulonet.fr>
2005-08-22 St<EFBFBD>hane Voltz <stefdev@modulonet.fr>
* tools/check-usb-chip.c: Added rts8858c detection (Lexmark
X1100 series, Dell A920).

13
backend/snapscan-scsi.c
Wyświetl plik

@ -440,7 +440,7 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
{
case PERFECTION2480:
case PERFECTION3490:
pss->read_bytes = 138;
pss->read_bytes = (pss->firmware_loaded) ? 139 : INQUIRY_RET_LEN;
break;
default:
pss->read_bytes = INQUIRY_RET_LEN;
@ -482,8 +482,11 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
case PERFECTION2480:
case PERFECTION3490:
/* TODO: remove */
snapscani_debug_data(tmpstr, pss->buf+120, 18);
DBG (DL_DATA_TRACE, "%s: Epson additional inquiry data:\n%s\n", me, tmpstr);
if (pss->firmware_loaded)
{
snapscani_debug_data(tmpstr, pss->buf+120, 19);
DBG (DL_DATA_TRACE, "%s: Epson additional inquiry data:\n%s\n", me, tmpstr);
}
default:
{
signed char min_diff;
@ -1410,6 +1413,7 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
status = snapscan_cmd (
pss->pdev->bus, pss->fd, pCDB, bufLength+cdbLength, NULL, NULL);
pss->firmware_loaded = SANE_TRUE;
free(pCDB);
fclose(fd);
@ -1420,6 +1424,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
/*
* $Log$
* Revision 1.36 2005/09/03 10:52:11 oliver-guest
* Fixed debugging code for epson scanners
*
* Revision 1.35 2005/08/16 17:19:20 oliver-guest
* Make compileable again
*

8
backend/snapscan.h
Wyświetl plik

@ -405,12 +405,16 @@ struct snapscan_scanner
SANE_Int threshold; /* threshold for line art */
SANE_Int rgb_lpr; /* lines per scsi read (RGB) */
SANE_Int gs_lpr; /* lines per scsi read (greyscale) */
SANE_Bool firmware_loaded; /* true if firmware was downloaded */
};
#endif
/*
* $Log$
* Revision 1.35 2005/09/03 10:52:11 oliver-guest
* Fixed debugging code for epson scanners
*
* Revision 1.34 2005/08/15 18:06:37 oliver-guest
* Added support for Epson 3490/3590 (thanks to Matt Judge)
*
@ -491,7 +495,7 @@ struct snapscan_scanner
* Improve recognition of Acer 320U
*
* Revision 1.27 2002/01/06 18:34:02 oliverschwartz
* Added support for Snapscan e42 thanks to Yari Adán Petralanda
* Added support for Snapscan e42 thanks to Yari Ad<EFBFBD> Petralanda
*
* Revision 1.26 2001/12/20 23:18:01 oliverschwartz
* Remove tmpfname
@ -549,7 +553,7 @@ struct snapscan_scanner
* add changes from Acer (new models; automatic firmware upload for USB scanners); fix distorted colour scans after greyscale scans (call set_window only in sane_start); code cleanup
*
* Revision 1.11 2001/04/10 12:38:21 sable
* Adding e20 support thanks to Steffen Hübner
* Adding e20 support thanks to Steffen Hbner
*
* Revision 1.10 2001/04/10 11:04:31 sable
* Adding support for snapscan e40 an e50 thanks to Giuseppe Tanzilli