Added Packard Bell Diamond 1200 Plus to .desc and manpage. New flag to avoid

running stop_scan before doing a scan. The Windows firmware of the BearPaw
1200 CU Plus doesn't seem to like that.

ChangeLog

@@ -1,3 +1,12 @@
+2003-03-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_low.h
+	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
+	  doc/gt68xx/gt68xx.CHANGES: Added Packard Bell Diamond 1200 Plus to
+	  .desc and manpage. New flag to avoid running stop_scan before doing
+	  a scan. The Windows firmware of the BearPaw 1200 CU Plus doesn't
+	  seem to like that.
+
 2003-03-10  Oliver Schirrmeister <oschirr@abm.de>
 
 	* backend/fujitsu.c backund/fujitsu-scsi.h

backend/gt68xx.c

@@ -48,7 +48,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 43
+#define BUILD 44
 #define MAX_DEBUG
 #define WARMUP_TIME 30
 #define CALIBRATION_HEIGHT 2.5
@@ -1259,7 +1259,8 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
 
   RIE (gt68xx_device_get_id (dev));
 
-  RIE (gt68xx_device_stop_scan (dev));
+  if (!(dev->model->flags | GT68XX_FLAG_NO_STOP))
+    RIE (gt68xx_device_stop_scan (dev));
 
   RIE (gt68xx_device_get_power_status (dev, &power_ok));
   if (power_ok)
@@ -1612,7 +1613,8 @@ sane_start (SANE_Handle handle)
     }
 
   s->calib = s->val[OPT_QUALITY_CAL].w;
-  RIE (gt68xx_device_stop_scan (s->dev));
+  if (!(s->dev->model->flags | GT68XX_FLAG_NO_STOP))
+    RIE (gt68xx_device_stop_scan (s->dev));
 
   RIE (gt68xx_device_carriage_home (s->dev));
 

backend/gt68xx_devices.c

@@ -356,7 +356,7 @@ static GT68xx_Model mustek_1200cuplus_model = {
   SANE_FIX (2.0),		/* Default gamma value */
 
   SANE_TRUE,			/* Is this a CIS scanner? */
-  0				/* Which flags are needed for this scanner? */
+  GT68XX_FLAG_NO_STOP		/* Which flags are needed for this scanner? */
     /* Everything untested */
 };
 

backend/gt68xx_low.h

@@ -1,7 +1,7 @@
 /* sane - Scanner Access Now Easy.
 
    Copyright (C) 2002 Sergey Vlasov <vsu@altlinux.ru>
-   Copyright (C) 2002 Henning Meier-Geinitz <henning@meier-geinitz.de>
+   Copyright (C) 2002, 2003 Henning Meier-Geinitz <henning@meier-geinitz.de>
    
    This file is part of the SANE package.
    
@@ -135,6 +135,7 @@
 #define GT68XX_FLAG_OFFSET_INV   (1 << 2)	/* Offset control is inverted */
 #define GT68XX_FLAG_UNTESTED     (1 << 3)	/* Print a warning for these scanners */
 #define GT68XX_FLAG_SE_2400      (1 << 4)	/* Special quirks for SE 2400USB */
+#define GT68XX_FLAG_NO_STOP      (1 << 5)	/* Don't call stop_scan before the scan */
 
 /* Forward typedefs */
 typedef struct GT68xx_USB_Device_Entry GT68xx_USB_Device_Entry;

doc/descriptions/gt68xx.desc

@@ -1,6 +1,6 @@
 :backend "gt68xx"
 :status :beta
-:version "1.0-43"
+:version "1.0-44"
 :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."
@@ -113,6 +113,11 @@
 :model "Diamond 1200"
 :status :beta
 :interface "USB"
+:comment "similar to Mustek BearPaw 1200 (Plus)"
+
+:model "Diamond 1200 Plus"
+:status :beta
+:interface "USB"
 :comment "similar to Mustek BearPaw 1200 Plus"
 
 :mfg "Medion/Lifetec/Tevion/Cytron"

doc/gt68xx/gt68xx.CHANGES

@@ -1,5 +1,11 @@
 gt68xx.CHANGES -*-text-*-
 
+V 1.0-44 (2003-03-13)
+
+- Added Packard Bell Diamond 1200 Plus to .desc and manpage.
+- New flag to avoid running stop_scan before doing a scan. The Windows firmware
+  of the BearPaw 1200 CU Plus doesn't seem to like that.
+
 V 1.0-43 (2003-03-06)
 
 - Small requests are done with a response buffer of 8 bytes (instead of 64)

doc/sane-gt68xx.man

@@ -1,4 +1,4 @@
-.TH sane-gt68xx 5 "6 Mar 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane-gt68xx 5 "9 Mar 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane-gt68xx
 .SH NAME
 sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners
@@ -49,7 +49,7 @@ Mustek ScanExpress 1200 UB Plus
 .br
 Mustek ScanExpress 2400 USB
 .br
-Packard Bell Diamond 1200
+Packard Bell Diamond 1200 (Plus)
 .br
 Plustek OpticPro 1248U
 .br