From ad03d73cd4ecf4743bd63dda0651e5d949631141 Mon Sep 17 00:00:00 2001
From: Henning Geinitz <sane@geinitz.org>
Date: Sun, 26 Aug 2001 10:56:38 +0000
Subject: [PATCH] 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>

---
 backend/mustek.c          | 18 ++++++------------
 doc/mustek/mustek.CHANGES | 11 +++++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/backend/mustek.c b/backend/mustek.c
index 8fd2599f6..5d9d99f5b 100644
--- a/backend/mustek.c
+++ b/backend/mustek.c
@@ -46,7 +46,7 @@
 
 /**************************************************************************/
 /* Mustek backend version                                                 */
-#define BUILD 111
+#define BUILD 112
 /**************************************************************************/
 
 #include "../include/sane/config.h"
@@ -2782,23 +2782,15 @@ do_stop (Mustek_Scanner *s)
       if (s->hw->flags & MUSTEK_FLAG_PRO)
 	dev_wait_ready (s);
       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 && 
 	      (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 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
 	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... */
       _exit (status);
     }
+#ifndef HAVE_OS2_H
   close (fds[1]);
+#endif
   s->pipe = fds[0];
 
   return SANE_STATUS_GOOD;
diff --git a/doc/mustek/mustek.CHANGES b/doc/mustek/mustek.CHANGES
index 684eb82c0..d26e3267b 100644
--- a/doc/mustek/mustek.CHANGES
+++ b/doc/mustek/mustek.CHANGES
@@ -1,5 +1,16 @@
 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
   * Released Mustek backend 1.0-111.