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

Update to backend version 1.0-112. Some minor fixes for returning 

the scan slider and OS/2.
Henning Meier-Geinitz <henning@meier-geinitz.de>
DEVEL_2_0_BRANCH-1
Henning Geinitz 2001-08-26 10:56:38 +00:00
rodzic d23c7b2a9e
commit ad03d73cd4
2 zmienionych plików z 17 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
backend/mustek.c
Wyświetl plik

@ -46,7 +46,7 @@
/**************************************************************************/ /**************************************************************************/
/* Mustek backend version */ /* Mustek backend version */
#define BUILD 111 #define BUILD 112
/**************************************************************************/ /**************************************************************************/
#include "../include/sane/config.h" #include "../include/sane/config.h"
@ -2782,23 +2782,15 @@ do_stop (Mustek_Scanner *s)
if (s->hw->flags & MUSTEK_FLAG_PRO) if (s->hw->flags & MUSTEK_FLAG_PRO)
dev_wait_ready (s); dev_wait_ready (s);
if ((s->hw->flags & MUSTEK_FLAG_PARAGON_1) if ((s->hw->flags & MUSTEK_FLAG_PARAGON_1)
|| (s->hw->flags & MUSTEK_FLAG_PARAGON_2)) || (s->hw->flags & MUSTEK_FLAG_PARAGON_2)
|| (s->hw->flags & MUSTEK_FLAG_PRO)
|| (s->hw->flags & MUSTEK_FLAG_THREE_PASS))
{ {
/* scsi_inquiry_wait_ready (s);
return sanei_scsi_cmd (s->fd, scsi_test_unit_ready,
sizeof (scsi_test_unit_ready), 0, 0); */
if (s->cancelled && if (s->cancelled &&
(s->total_bytes < s->params.lines * s->params.bytes_per_line)) (s->total_bytes < s->params.lines * s->params.bytes_per_line))
status = dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop), status = dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop),
0, 0); 0, 0);
} }
else if (s->hw->flags & MUSTEK_FLAG_THREE_PASS)
{
if (s->cancelled &&
(s->total_bytes < s->params.lines * s->params.bytes_per_line))
status = dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop),
0, 0);
}
else else
status = dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop), 0, 0); status = dev_cmd (s, scsi_start_stop, sizeof (scsi_start_stop), 0, 0);
@ -6128,7 +6120,9 @@ sane_start (SANE_Handle handle)
/* don't use exit() since that would run the atexit() handlers... */ /* don't use exit() since that would run the atexit() handlers... */
_exit (status); _exit (status);
} }
#ifndef HAVE_OS2_H
close (fds[1]); close (fds[1]);
#endif
s->pipe = fds[0]; s->pipe = fds[0];
return SANE_STATUS_GOOD; return SANE_STATUS_GOOD;

11
doc/mustek/mustek.CHANGES
Wyświetl plik

@ -1,5 +1,16 @@
CHANGES for the SANE Mustek backend CHANGES for the SANE Mustek backend
2001-08-26
* Released Mustek backend 1.0-112.
2001-08-10
* Don't close fds[1] in case of OS/2.
2001-08-01
* Send stop_scan only for ScanExpress scanners when the scan
wasn't cancelled.
2001-07-18 2001-07-18
* Released Mustek backend 1.0-111. * Released Mustek backend 1.0-111.