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

Only disable object position command for Ricoh IS-420.

merge-requests/1/head
Henning Geinitz 2003-05-04 13:13:15 +00:00
rodzic b80e324c87
commit 0ccece33cd
3 zmienionych plików z 21 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
ChangeLog
Wyświetl plik

@ -5,6 +5,8 @@
<jb@jblache.org>).
* TODO: Removed obsololete entries.
* NEWS: Updated for 1.0.12.
* backend/ibm.c backend/ibm-scsi.c: Only disable object position
command for Ricoh IS-420.
2003-05-04 Oliver Rauch <Oliver.Rauch@XSane.org>

2
backend/ibm-scsi.c
Wyświetl plik

@ -309,7 +309,7 @@ object_position (int fd, int load)
SANE_Status status;
DBG (11, ">> object_position\n");
#if 1
#if 0
/* At least the Ricoh 420 doesn't like that command */
DBG (11, "object_position: ignored\n");
return SANE_STATUS_GOOD;

26
backend/ibm.c
Wyświetl plik

@ -43,9 +43,11 @@
This file implements a SANE backend for the Ibm 2456 flatbed scanner,
written by mf <massifr@tiscalinet.it>. It derives from the backend for
Ricoh flatbed scanners written by Feico W. Dillema.
Currently maintained by Henning Meier-Geinitz <henning@meier-geinitz.de>.
*/
#define BUILD 4
#define BUILD 5
#include "../include/sane/config.h"
@ -178,14 +180,22 @@ attach (const char *devnam, Ibm_Device ** devp)
sanei_scsi_close (fd);
return (status);
}
DBG (3, "attach: sending OBJECT POSITION\n");
status = object_position (fd, OBJECT_POSITION_UNLOAD);
if (status != SANE_STATUS_GOOD)
/*
* Causes a problem with RICOH IS420
* Ignore this function ... seems to work ok
* Suggested to George Murphy george@topfloor.ie by henning
*/
if (strncmp(ibuf.vendor, "RICOH", 5) != 0
&& strncmp(ibuf.product, "IS420", 5) != 0)
{
DBG (1, "attach: OBJECT POSTITION failed\n");
sanei_scsi_close (fd);
return (SANE_STATUS_INVAL);
DBG (3, "attach: sending OBJECT POSITION\n");
status = object_position (fd, OBJECT_POSITION_UNLOAD);
if (status != SANE_STATUS_GOOD)
{
DBG (1, "attach: OBJECT POSTITION failed\n");
sanei_scsi_close (fd);
return (SANE_STATUS_INVAL);
}
}
memset (&mup, 0, sizeof (mup));