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

Reenabled enhanced inquiry command for Epson scanners (duh\!)

merge-requests/1/head
Oliver Schwartz 2005-09-28 22:09:26 +00:00
rodzic cb8f353952
commit 88acee2eee
3 zmienionych plików z 9 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
ChangeLog
Wyświetl plik

@ -2,7 +2,8 @@
* backend/snapscan-options.c backend/snapscan-scsi.c * backend/snapscan-options.c backend/snapscan-scsi.c
backend/snapscan.c backend/snapscan.h: backend/snapscan.c backend/snapscan.h:
Added 16 bit option for Epson scanners, untested Added 16 bit option for Epson scanners, untested.
Reenabled enhanced inquiry command for epson scanners.
2005-09-28 Julien Blache <jb@jblache.org> 2005-09-28 Julien Blache <jb@jblache.org>
* tools/udev/convert-usermap.sh: Don't print 0x when matching VID * tools/udev/convert-usermap.sh: Don't print 0x when matching VID

4
backend/snapscan-options.c
Wyświetl plik

@ -905,7 +905,6 @@ static void control_options(SnapScan_Scanner *pss)
{ {
case PERFECTION2480: case PERFECTION2480:
case PERFECTION3490: case PERFECTION3490:
case PRISA620:
pss->options[OPT_BIT_DEPTH].cap &= ~SANE_CAP_INACTIVE; pss->options[OPT_BIT_DEPTH].cap &= ~SANE_CAP_INACTIVE;
break; break;
default: default:
@ -1586,6 +1585,9 @@ SANE_Status sane_control_option (SANE_Handle h,
/* /*
* $Log$ * $Log$
* Revision 1.25 2005/09/28 22:09:26 oliver-guest
* Reenabled enhanced inquiry command for Epson scanners (duh\!)
*
* Revision 1.24 2005/09/28 21:33:10 oliver-guest * Revision 1.24 2005/09/28 21:33:10 oliver-guest
* Added 16 bit option for Epson scanners (untested) * Added 16 bit option for Epson scanners (untested)
* *

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

@ -438,12 +438,10 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
SANE_Status status; SANE_Status status;
switch (pss->pdev->model) switch (pss->pdev->model)
{ {
/* Doesn't work yet
case PERFECTION2480: case PERFECTION2480:
case PERFECTION3490: case PERFECTION3490:
pss->read_bytes = (pss->firmware_loaded) ? 139 : INQUIRY_RET_LEN; pss->read_bytes = (pss->firmware_loaded) ? 139 : INQUIRY_RET_LEN;
break; break;
*/
default: default:
pss->read_bytes = INQUIRY_RET_LEN; pss->read_bytes = INQUIRY_RET_LEN;
break; break;
@ -451,7 +449,7 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
zero_buf (pss->cmd, MAX_SCSI_CMD_LEN); zero_buf (pss->cmd, MAX_SCSI_CMD_LEN);
pss->cmd[0] = INQUIRY; pss->cmd[0] = INQUIRY;
pss->cmd[4] = INQUIRY_RET_LEN; pss->cmd[4] = pss->read_bytes;
DBG (DL_CALL_TRACE, "%s\n", me); DBG (DL_CALL_TRACE, "%s\n", me);
status = snapscan_cmd (pss->pdev->bus, status = snapscan_cmd (pss->pdev->bus,
@ -481,7 +479,6 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
pss->chroma_offset[B_CHAN] = 0; pss->chroma_offset[B_CHAN] = 0;
pss->chroma = 0; pss->chroma = 0;
break; break;
/* Doesn't work yet
case PERFECTION2480: case PERFECTION2480:
case PERFECTION3490: case PERFECTION3490:
if (pss->firmware_loaded) if (pss->firmware_loaded)
@ -489,7 +486,6 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
snapscani_debug_data(tmpstr, pss->buf+120, 19); snapscani_debug_data(tmpstr, pss->buf+120, 19);
DBG (DL_DATA_TRACE, "%s: Epson additional inquiry data:\n%s\n", me, tmpstr); DBG (DL_DATA_TRACE, "%s: Epson additional inquiry data:\n%s\n", me, tmpstr);
} }
*/
default: default:
{ {
signed char min_diff; signed char min_diff;
@ -1434,6 +1430,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
/* /*
* $Log$ * $Log$
* Revision 1.40 2005/09/28 22:09:26 oliver-guest
* Reenabled enhanced inquiry command for Epson scanners (duh\!)
*
* Revision 1.39 2005/09/28 21:33:10 oliver-guest * Revision 1.39 2005/09/28 21:33:10 oliver-guest
* Added 16 bit option for Epson scanners (untested) * Added 16 bit option for Epson scanners (untested)
* *