Fixed the problem concerning scanning on *BSD. Scanning only worked once (bug

#300597). Fixed compilation warnings.

ChangeLog

@@ -1,3 +1,11 @@
+2005-08-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* backend/gt68xx.c backend/gt68xx_low.c backend/gt68xx_low.h
+	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
+	  doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO:
+	  Fixed the problem concerning scanning on *BSD. Scanning only
+	  worked once (bug #300597). Fixed compilation warnings.
+
 2005-08-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* README: Min. libusb version is 0.1.8.

backend/gt68xx.c

@@ -48,7 +48,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 71
+#define BUILD 72
 #define MAX_DEBUG
 #define WARMUP_TIME 60
 #define CALIBRATION_HEIGHT 2.5
@@ -1187,7 +1187,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
 	}
       else if (strcmp (word, "afe") == 0)
 	{
-	  GT68xx_AFE_Parameters afe;
+	  GT68xx_AFE_Parameters afe = {0, 0, 0, 0, 0, 0};
 	  SANE_Status status;
 
 	  free (word);
@@ -1462,6 +1462,9 @@ sane_close (SANE_Handle handle)
 
   dev = s->dev;
   gt68xx_scanner_free (s);
+  
+  gt68xx_device_fix_descriptor (dev);
+
   gt68xx_device_deactivate (dev);
   gt68xx_device_close (dev);
 

backend/gt68xx_low.c

@@ -1013,4 +1013,12 @@ gt68xx_device_get_id (GT68xx_Device * dev)
     return SANE_STATUS_UNSUPPORTED;
 }
 
+static void 
+gt68xx_device_fix_descriptor (GT68xx_Device * dev)
+{
+  SANE_Byte data[8];
+  sanei_usb_control_msg (dev->fd, 0x80, 0x06, 0x01 << 8, 0, 8, data);
+}
+
+
 /* vim: set sw=2 cino=>2se-1sn-1s{s^-1st0(0u0 smarttab expandtab: */

backend/gt68xx_low.h

@@ -1038,7 +1038,20 @@ static SANE_Status
 gt68xx_device_check_result (GT68xx_Packet res, SANE_Byte command);
 
 
-static SANE_Status gt68xx_device_get_id (GT68xx_Device * dev);
+static SANE_Status 
+gt68xx_device_get_id (GT68xx_Device * dev);
+
+/** Read the device descriptor of the scanner.
+ *
+ * This function should be called before closing the device to make sure
+ * that the device descriptor is propperly stored in the scanner's memory.
+ * If that's not done, the next try to get the config descriptor will
+ * result in a corrupted descriptor.
+ *
+ * @param dev device
+*/
+static void 
+gt68xx_device_fix_descriptor (GT68xx_Device * dev);
 
 #endif /* not GT68XX_LOW_H */
 

doc/descriptions/gt68xx.desc

@@ -1,5 +1,5 @@
 :backend "gt68xx"
-:version "1.0-71"
+:version "1.0-72"
 :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,6 +1,17 @@
 gt68xx.CHANGES -*-text-*-
 
-V 1.0.71 (2005-07-10)
+V 1.0.72 (2005-08-18)
+
+* Finally fixed the problem concerning scanning on *BSD. Scanning only worked
+  once. After that, the scanner wasn't even detected anymore beacuse the config
+  descriptor returned by the device was corrupted. This is a hardware bug. When
+  filling the internal memory of the scanner completely, the config descriptor
+  is overwritten. The work-around is to ask the scanner for the device
+  descriptor before closing the device. This rewrites also the config descriptor
+  to the memory of the scanner.
+* Fixed compilation warnings.
+
+V 1.0.71 (2005-07-10) Included in sane-backends 1.0.16
 
 * Changed resolution from 75 to 100 dpi and changed 16 bit/color to 12 based on
   a user report for the Visioneer OneTouch 7300. Updated .desc.

doc/gt68xx/gt68xx.TODO

@@ -6,8 +6,6 @@ General:
 - some sort of fixed lookup-table may be necessary to compensate for the
   non-linear CCD/CIS behaviour. A gamma value is not good enough. Or maybe line
   calibration  can be used for that?
-- Scanning on *BSD works only once for all scanners but 2448. Firmware 
-  upload sometimes works more than once
 - Check autobandwidth
 - check several get scanner info functions
 - check exposure (start + stop)?

doc/sane-gt68xx.man

@@ -1,4 +1,4 @@
-.TH sane-gt68xx 5 "29 May 2005" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane-gt68xx 5 "18 August 2005" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane-gt68xx
 .SH NAME
 sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners
@@ -203,10 +203,6 @@ David Stevenson. Thanks for sending patches and answering questions to them
 and all the other contributors.
 
 .SH BUGS
-Currently scanning seems to only work reliably under Linux. With FreeBSD,
-NetBSD and OpenBSD scanning works only once. Then the scanner isn't detected
-anymore and has to be replugged.
-.PP
 The first few lines of the image are garbage for the 2400 TA
 Plus.
 .PP