From 88acee2eeecf65119e0730c81970971109559d50 Mon Sep 17 00:00:00 2001 From: Oliver Schwartz Date: Wed, 28 Sep 2005 22:09:26 +0000 Subject: [PATCH] Reenabled enhanced inquiry command for Epson scanners (duh\!) --- ChangeLog | 3 ++- backend/snapscan-options.c | 4 +++- backend/snapscan-scsi.c | 9 ++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c09989913..22dff7160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,8 @@ * backend/snapscan-options.c backend/snapscan-scsi.c 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 * tools/udev/convert-usermap.sh: Don't print 0x when matching VID diff --git a/backend/snapscan-options.c b/backend/snapscan-options.c index 8139a3d5a..5dee4bab6 100644 --- a/backend/snapscan-options.c +++ b/backend/snapscan-options.c @@ -905,7 +905,6 @@ static void control_options(SnapScan_Scanner *pss) { case PERFECTION2480: case PERFECTION3490: - case PRISA620: pss->options[OPT_BIT_DEPTH].cap &= ~SANE_CAP_INACTIVE; break; default: @@ -1586,6 +1585,9 @@ SANE_Status sane_control_option (SANE_Handle h, /* * $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 * Added 16 bit option for Epson scanners (untested) * diff --git a/backend/snapscan-scsi.c b/backend/snapscan-scsi.c index ebe545af7..27e252229 100644 --- a/backend/snapscan-scsi.c +++ b/backend/snapscan-scsi.c @@ -438,12 +438,10 @@ static SANE_Status inquiry (SnapScan_Scanner *pss) SANE_Status status; switch (pss->pdev->model) { -/* Doesn't work yet case PERFECTION2480: case PERFECTION3490: pss->read_bytes = (pss->firmware_loaded) ? 139 : INQUIRY_RET_LEN; break; -*/ default: pss->read_bytes = INQUIRY_RET_LEN; break; @@ -451,7 +449,7 @@ static SANE_Status inquiry (SnapScan_Scanner *pss) zero_buf (pss->cmd, MAX_SCSI_CMD_LEN); pss->cmd[0] = INQUIRY; - pss->cmd[4] = INQUIRY_RET_LEN; + pss->cmd[4] = pss->read_bytes; DBG (DL_CALL_TRACE, "%s\n", me); 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 = 0; break; -/* Doesn't work yet case PERFECTION2480: case PERFECTION3490: if (pss->firmware_loaded) @@ -489,7 +486,6 @@ static SANE_Status inquiry (SnapScan_Scanner *pss) 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; @@ -1434,6 +1430,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss) /* * $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 * Added 16 bit option for Epson scanners (untested) *