* doc/u12/U12.changes: Update.

* backend/u12.c: Bumped build number.
* backend/u12-hw.c: SoftwareReset is now disabled in
  cancelSequence when the device is a Genius scanner.

ChangeLog

@@ -1,21 +1,30 @@
+2006-02-14  Gerhard Jaeger <gerhard@gjaeger.de>
+
+        * doc/u12/U12.changes: Update.
+        * backend/u12.c: Bumped build number.
+        * backend/u12-hw.c: SoftwareReset is now disabled in
+          cancelSequence when the device is a Genius scanner.
+
+Fixed CanoScan N1220U settings.
+
 2006-02-13  Stéphane Voltz <stefdev@modulonet.fr>
 
         * backend/genesys_gl646.c: disabled power saving for gl646.
 
 2006-02-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
-	* README.solaris: Added link to installation report.
+        * README.solaris: Added link to installation report.
-	* doc/descriptions/unsupported.desc: Removed HP ScanJet 8200
+        * doc/descriptions/unsupported.desc: Removed HP ScanJet 8200
-	  (supported by Avision backend). Minor updates.
+          (supported by Avision backend). Minor updates.
 
 2006-02-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
-	* doc/descriptions/unsupported.desc: Removed Trust Office Scan USB
+        * doc/descriptions/unsupported.desc: Removed Trust Office Scan USB
-	  19200 (now in niash.desc), added Xerox 4800 One Touch.
+          19200 (now in niash.desc), added Xerox 4800 One Touch.
-	* include/sane/sanei_usb.h sanei/sanei_usb.c: Workaround for
+        * include/sane/sanei_usb.h sanei/sanei_usb.c: Workaround for
-	  compilation problem on Windows/cygwin.
+          compilation problem on Windows/cygwin.
-	* backend/dll.c: With cygwin, use ":" as DIR_SEP (patch from
+        * backend/dll.c: With cygwin, use ":" as DIR_SEP (patch from
-	  Philip Aston <paston@bea.com>). 
+          Philip Aston <paston@bea.com>).
 
 2006-02-04  Ullrich Sigwanz <usigwanz@freesurf.ch>
 

backend/u12-hw.c

@@ -7,6 +7,8 @@
  * - 0.01 - initial version
  * - 0.02 - cleanup
  *        - added lampTimer stuff
+ *        - fixed issue for Genius device - reported by
+ *          Jose Alberto Reguero <jareguero@telefonica.net>
  * .
  * <hr>
  * This file is part of the SANE package.
@@ -804,7 +806,9 @@ static void u12hw_CancelSequence( U12_Device *dev )
 	u12io_DataToRegister( dev, REG_MODELCONTROL, 0x1a );
 
 	u12hw_PutToIdleMode( dev );
-	u12io_SoftwareReset( dev );
+
+	if( strcmp( dev->usbId, "0x0458-0x2004" ))
+		u12io_SoftwareReset( dev );
 
 	u12motor_PositionModuleToHome( dev );
 

backend/u12.c

@@ -80,7 +80,7 @@
 #include "../include/sane/sanei.h"
 #include "../include/sane/saneopts.h"
 
-#define BACKEND_VERSION "0.02-9"
+#define BACKEND_VERSION "0.02-10"
 #define BACKEND_NAME    u12
 #include "../include/sane/sanei_backend.h"
 #include "../include/sane/sanei_config.h"

doc/u12/U12.changes

@@ -25,4 +25,9 @@ V 0.02-6 (2004-21-01)
 V 0.02-9 (2004-06-10)
 ---------------------
 - using now SANE definitions for scanmodes
-                                  
+
+V 0.02-10 (2006-14-02)
+----------------------
+- SoftwareReset is now disabled in cancelSequence when the device
+  is a Genius (reported by Jose Alberto Reguero <jareguero@telefonica.net>)
+