Minor modifications to sheet-fed scanner support.

ChangeLog

@@ -10,6 +10,9 @@
 	  1200 SE is supported. Backend is unmaintained.
 	* doc/descriptions/unsupported.desc: Added HP ScanJet
 	  4850C. Removed UMAX AstraSlim 1200 SE.
+	* backend/gt68xx.c backend/gt68xx_generic.c
+	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Minor
+	  modifications to sheet-fed scanner support.
 
 2005-10-15  Jochen Eisinger <jochen@penguin-breeder.org>
 

backend/gt68xx.c

@@ -48,7 +48,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 77
+#define BUILD 78
 #define MAX_DEBUG
 #define WARMUP_TIME 60
 #define CALIBRATION_HEIGHT 2.5
@@ -652,19 +652,13 @@ init_options (GT68xx_Scanner * s)
   s->opt[OPT_BACKTRACK_LINES].unit = SANE_UNIT_NONE;
   s->opt[OPT_BACKTRACK_LINES].constraint_type = SANE_CONSTRAINT_RANGE;
   s->opt[OPT_BACKTRACK_LINES].constraint.range = &u8_range;
-  if (s->dev->model->is_cis)
+  if (s->dev->model->is_cis && !(s->dev->model->flags & GT68XX_FLAG_SHEET_FED))
     s->val[OPT_BACKTRACK_LINES].w = 0x10;
   else
     s->val[OPT_BACKTRACK_LINES].w = 0x3f;
   if (!debug_options)
     DISABLE (OPT_BACKTRACK_LINES);
 
-  if (s->dev->model->flags & GT68XX_FLAG_SHEET_FED)
-    {
-      s->val[OPT_BACKTRACK_LINES].w = 0x3f;
-      DISABLE (OPT_BACKTRACK_LINES);
-    }
-
   /* "Enhancement" group: */
   s->opt[OPT_ENHANCEMENT_GROUP].title = SANE_I18N ("Enhancement");
   s->opt[OPT_ENHANCEMENT_GROUP].desc = "";

backend/gt68xx_generic.c

@@ -97,16 +97,8 @@ gt68xx_generic_read_scanned_data (GT68xx_Device * dev, SANE_Bool * ready)
   RIE (gt68xx_device_req (dev, req, req));
 
   *ready = SANE_FALSE;
-  if (dev->model->flags & GT68XX_FLAG_SHEET_FED)
-    {
-      if (req[0] == 0 && req[1] == 0x35)
-	*ready = SANE_TRUE;
-    }
-  else
-    {
-      if (req[0] == 0)
-	*ready = SANE_TRUE;
-    }
+  if (req[0] == 0)
+    *ready = SANE_TRUE;
 
   return SANE_STATUS_GOOD;
 }

doc/descriptions/gt68xx.desc

@@ -1,5 +1,5 @@
 :backend "gt68xx"
-:version "1.0-77"
+:version "1.0-78"
 :manpage "sane-gt68xx"
 :url "http://www.meier-geinitz.de/sane/gt68xx-backend/"
 :comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend."

doc/gt68xx/gt68xx.CHANGES

@@ -1,5 +1,9 @@
 gt68xx.CHANGES -*-text-*-
 
+V 1.0.78 (2005-10-16)
+
+* Minor modifications to sheet-fed scanner support.
+
 V 1.0.77 (2005-09-29)
 
 * Added support for Plustek OpticSlim M12 (untested). Based on patch from