Bumped build number. Changed scanner's name to Canon LiDE 35/40/50. Added Canon

LiDE LiDE 60. This scanner is still commented out in genesys.conf. Removed
comment sign for Canon LiDE 35/40/50 in genesys.conf.

ChangeLog

@@ -1,3 +1,11 @@
+2005-11-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* backend/genesys.c backend/genesys_devices.c
+	  backend/genesys.conf: Bumped build number. Changed scanner's
+	  name to Canon LiDE 35/40/50. Added Canon LiDE LiDE 60. This scanner
+	  is still commented out in genesys.conf. Removed comment sign for
+	  Canon LiDE 35/40/50 in genesys.conf.
+
 2005-11-19  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
 
         * backend/genesys_gl841.c backend/genesys_devices.c: 

backend/genesys.c

@@ -50,7 +50,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 5
+#define BUILD 7
 
 #include <errno.h>
 #include <string.h>

backend/genesys.conf

@@ -8,9 +8,6 @@
 # UMAX Astra 4500 and Avision iVina 1600
 #usb 0x0638 0x0a10
 
-# Canon LiDE 50
-#usb 0x04a9 0x2213
-
 # Hewlett Packard ScanJet 2400c
 #usb 0x03f0 0x0a01
 
@@ -20,6 +17,11 @@
 # Plustek OpticPro ST24
 #usb 0x07b3 0x0601
 
+# Canon LiDE 60
+# Be careful and read http://lists.alioth.debian.org/pipermail/sane-devel/2005-October/015059.html
+# Before uncommenting
+#usb 0x04a9 0x221c
+
 #
 # supported scanners
 #
@@ -29,3 +31,7 @@ usb 0x0461 0x0377
 
 # Hewlett Packard ScanJet 2300c
 usb 0x03f0 0x0901
+
+# Canon LiDE 35/40/50
+usb 0x04a9 0x2213
+

backend/genesys_devices.c

@@ -441,7 +441,7 @@ static Genesys_Model umax_astra_4500_model = {
 static Genesys_Model canon_lide_50_model = {
   "canon-lide-50",		/* Name */
   "Canon",			/* Device vendor string */
-  "LiDE 35/50",			/* Device model name */
+  "LiDE 35/40/50",			/* Device model name */
   GENESYS_GL841,
   NULL,
 
@@ -483,6 +483,51 @@ static Genesys_Model canon_lide_50_model = {
   400
 };
 
+static Genesys_Model canon_lide_60_model = {
+  "canon-lide-60",		/* Name */
+  "Canon",			/* Device vendor string */
+  "LiDE 60",			/* Device model name */
+  GENESYS_GL841,
+  NULL,
+
+  {1200, 600, 300, 150, 75, 0},	/* possible x-resolutions */
+  {2400, 1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
+  {16, 8, 0},			/* possible depths in gray mode */
+  {16, 8, 0},			/* possible depths in color mode */
+
+  SANE_FIX (0.42),		/* Start of scan area in mm  (x) */
+  SANE_FIX (7.9),		/* Start of scan area in mm (y) */
+  SANE_FIX (218.0),		/* Size of scan area in mm (x) */
+  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+
+  SANE_FIX (3.0),		/* Start of white strip in mm (y) */
+  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+
+  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+
+  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+
+  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+
+  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+
+  SANE_TRUE,			/* Is this a CIS scanner? */
+  CCD_CANONLIDE35,
+  DAC_CANONLIDE35,
+  GPO_CANONLIDE35,
+  MOTOR_CANONLIDE35,
+  GENESYS_FLAG_UNTESTED
+  | GENESYS_FLAG_LAZY_INIT
+  | GENESYS_FLAG_SKIP_WARMUP
+  | GENESYS_FLAG_OFFSET_CALIBRATION
+  | GENESYS_FLAG_DARK_WHITE_CALIBRATION,	/* Which flags are needed for this scanner? */
+  300,
+  400
+}; /* this is completely untested -- hmg */
+
 static Genesys_Model hp2300c_model = {
   "hewlett-packard-scanjet-2300c",	/* Name */
   "Hewlett Packard",		/* Device vendor string */
@@ -749,6 +794,7 @@ static Genesys_Model medion_md5345_model = {
 static Genesys_USB_Device_Entry genesys_usb_device_list[] = {
   {0x0638, 0x0a10, &umax_astra_4500_model},
   {0x04a9, 0x2213, &canon_lide_50_model},
+  {0x04a9, 0x221c, &canon_lide_60_model},
   {0x03f0, 0x0901, &hp2300c_model},
   {0x03f0, 0x0a01, &hp2400c_model},
   {0x03f0, 0x1405, &hp3670c_model},