Attachment #157641 for bug #200788

View | Details | Raw Unified | Return to bug 200788
Collapse All | Expand All




--- backend/genesys.c.orig	2013-08-26 00:23:27.000000000 +0300
+++ backend/genesys.c	2015-05-30 21:42:14.505092157 +0300
@@ -3026,10 +3026,12 @@ genesys_send_shading_coefficient (Genesy
     case CIS_CANONLIDE200:
     case CIS_CANONLIDE110:
     case CIS_CANONLIDE210:
+    case CIS_CANONLIDE220:
         /* TODO store this in a data struct so we avoid
          * growing this switch */
         if(dev->model->ccd_type!=CIS_CANONLIDE110
-        && dev->model->ccd_type!=CIS_CANONLIDE210)
+        && dev->model->ccd_type!=CIS_CANONLIDE210
+        && dev->model->ccd_type!=CIS_CANONLIDE220)
           target_code=0xdc00;
         else
           target_code=0xf000;

Added Link Here

(-)graphics/sane-backends/files/patch-backend_genesys.conf.in (+12 lines)
1	--- backend/genesys.conf.in.orig 2013-08-26 00:22:58.000000000 +0300
2	+++ backend/genesys.conf.in 2015-05-30 21:42:14.506093037 +0300
3	@@ -57,6 +57,9 @@ usb 0x04a9 0x1907
4	# Canon LiDE 210
5	usb 0x04a9 0x190a
6
7	+# Canon LiDE 220
8	+usb 0x04a9 0x190f
9	+
10	# Canon 5600f
11	usb 0x04a9 0x1906
12




--- backend/genesys_devices.c.orig	2013-08-26 00:22:58.000000000 +0300
+++ backend/genesys_devices.c	2015-05-30 21:42:35.971090137 +0300
@@ -671,6 +671,29 @@ static Genesys_Sensor Sensor[] = {
    {2.1, 2.1, 2.1},
    {NULL, NULL, NULL}}
   ,
+  /* CANON LIDE 220 sensor */
+  {CIS_CANONLIDE220,
+   2400,	/* optical resolution */
+   87,		/* black pixels */
+   16,		/* dummy pixels 16 */
+   303,		/* 303 */
+   5168*4,	/* total pixels */
+   210,
+   200,
+   {0x00, 0x00, 0x00, 0x00},
+   /* reg 0x10 - 0x15 : EXPR, EXPG and EXPB */
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   /* reg 0x16 - 0x1d */
+    0x10, 0x04, 0x00, 0x01, 0x30, 0x00, 0x02, 0x01 },
+   /* reg 0x52 - 0x5e */
+   {
+    0x00, 0x02, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04,
+    0x1a, 0x00, 0xc0, 0x00, 0x00
+    }
+   ,
+   {2.1, 2.1, 2.1},
+   {NULL, NULL, NULL}}
+  ,
   {CCD_PLUSTEK_3600,
    1200,
    87,				/*(black) */
@@ -1868,6 +1891,59 @@ static Genesys_Model canon_lide_210_mode
   400
 };
 
+static Genesys_Model canon_lide_220_model = {
+  "canon-lide-220",		/* Name */
+  "Canon",			/* Device vendor string */
+  "LiDE 220",			/* Device model name */
+  GENESYS_GL124, /* or a compatible one */
+  NULL,
+
+  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},	/* possible x-resolutions */
+  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},	/* possible y-resolutions */
+  {16, 8, 0},			/* possible depths in gray mode */
+  {16, 8, 0},			/* possible depths in color mode */
+
+  SANE_FIX (2.2),		/* Start of scan area in mm (x) */
+  SANE_FIX (8.7),		/* Start of scan area in mm (y) */
+  SANE_FIX (216.70),		/* Size of scan area in mm (x) */
+  SANE_FIX (297.5),		/* Size of scan area in mm (y) */
+
+  SANE_FIX (0.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) */
+
+  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+				   sensing document in mm */
+  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+				   after finishing scanning in mm */
+
+  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? */
+  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  CIS_CANONLIDE220,
+  DAC_CANONLIDE110,
+  GPO_CANONLIDE210,
+  MOTOR_CANONLIDE210,
+      GENESYS_FLAG_SKIP_WARMUP
+    | GENESYS_FLAG_OFFSET_CALIBRATION
+    | GENESYS_FLAG_DARK_CALIBRATION
+    | GENESYS_FLAG_HALF_CCD_MODE
+    | GENESYS_FLAG_SHADING_REPARK
+    | GENESYS_FLAG_CUSTOM_GAMMA,
+  GENESYS_HAS_SCAN_SW | GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_FILE_SW | GENESYS_HAS_EXTRA_SW,
+  60,
+  400
+};
+
 static Genesys_Model canon_5600f_model = {
   "canon-5600f",		/* Name */
   "Canon",			/* Device vendor string */
@@ -3411,5 +3487,6 @@ static Genesys_USB_Device_Entry genesys_
   /* GL124 devices */
   {0x04a9, 0x1909, &canon_lide_110_model},
   {0x04a9, 0x190a, &canon_lide_210_model},
+  {0x04a9, 0x190f, &canon_lide_220_model},
   {0, 0, NULL}
 };




--- backend/genesys_gl124.c.orig	2013-08-26 00:22:58.000000000 +0300
+++ backend/genesys_gl124.c	2015-05-30 21:42:35.972090085 +0300
@@ -987,7 +987,7 @@ gl124_init_motor_regs_scan (Genesys_Devi
     }
   else
     {
-      min_speed = 600;
+      min_speed = 900;
       if(dev->model->ccd_type==MOTOR_CANONLIDE110)
         {
           min_speed = 300;
@@ -3604,7 +3604,7 @@ gl124_init_gpio (Genesys_Device * dev)
       idx = 0;
     }
   else
-    {				/* canon LiDE 210 case */
+    {				/* canon LiDE 210 and 220 case */
       idx = 1;
     }
 
@@ -3637,7 +3637,7 @@ gl124_init_memory_layout (Genesys_Device
       idx = 0;
     }
   else
-    {				/* canon LiDE 210 case */
+    {				/* canon LiDE 210 and 220 case */
       idx = 1;
     }
 

Added Link Here

(-)graphics/sane-backends/files/patch-backend_genesys_gl124.h (+15 lines)
1	--- backend/genesys_gl124.h.orig 2013-08-26 00:22:58.000000000 +0300
2	+++ backend/genesys_gl124.h 2015-05-30 21:42:14.521092536 +0300
3	@@ -622,6 +622,12 @@ static Sensor_Profile sensors[]={
4	{CIS_CANONLIDE210, 600, 0, 5360, 0x1e, 0x9f, 0x55, 5168, 163, 101, 388, 574, 393, NULL , 0x00, 0x0a, 0x20, 0x21},
5	{CIS_CANONLIDE210, 1200, 0, 10528, 0x1e, 0x9f, 0x55, 5168, 163, 101, 388, 574, 393, order_01 , 0x00, 0x08, 0x20, 0x22},
6	{CIS_CANONLIDE210, 2400, 0, 20864, 0x1e, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24},
7	+
8	+ /* LiDE 210 */
9	+ {CIS_CANONLIDE220, 600, 1, 2768, 0x0f, 0x9f, 0x55, 2584, 154, 101, 388, 574, 393, NULL , 0x00, 0x0c, 0x20, 0x21},
10	+ {CIS_CANONLIDE220, 600, 0, 5360, 0x0f, 0x9f, 0x55, 5168, 163, 101, 388, 574, 393, NULL , 0x00, 0x0a, 0x20, 0x21},
11	+ {CIS_CANONLIDE220, 1200, 0, 10528, 0x0f, 0x9f, 0x55, 5168, 163, 101, 388, 574, 393, order_01 , 0x00, 0x08, 0x20, 0x22},
12	+ {CIS_CANONLIDE220, 2400, 0, 20864, 0x0f, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24},
13	};
14
15

Added Link Here

(-)graphics/sane-backends/files/patch-backend_genesys_low.h (+11 lines)
1	--- backend/genesys_low.h.orig 2013-08-26 00:23:27.000000000 +0300
2	+++ backend/genesys_low.h 2015-05-30 21:42:14.522093811 +0300
3	@@ -375,6 +375,8 @@ Genesys_Color_Order;
4	#define CCD_IMG101 25
5	#define CCD_PLUSTEK3800 26
6	#define CIS_CANONLIDE210 27
7	+#define CIS_CANONLIDE80 28
8	+#define CIS_CANONLIDE220 29
9
10	#define GPO_UMAX 0
11	#define GPO_ST12 1




--- doc/descriptions/genesys.desc.orig	2013-08-26 00:22:58.000000000 +0300
+++ doc/descriptions/genesys.desc	2015-05-30 21:42:14.523095452 +0300
@@ -149,7 +149,13 @@
 :interface "USB"
 :usbid "0x04a9" "0x190a"
 :status :complete
-:comment "GL124 based, resolution from 75 to 2400 dpi"
+:comment "GL124 based, resolution from 75 to 4800 dpi"
+
+:model "CanoScan LiDE 220"
+:interface "USB"
+:usbid "0x04a9" "0x190f"
+:status :complete
+:comment "GL124+ based, resolution from 75 to 4800 dpi"
 
 :model "CanoScan 4400f"
 :interface "USB"




--- doc/sane-genesys.man.orig	2013-08-26 00:23:27.000000000 +0300
+++ doc/sane-genesys.man	2015-05-30 21:42:14.523095452 +0300
@@ -10,7 +10,7 @@ access to USB flatbed scanners based on 
 At present, the following scanners are known to work with this backend:
 .PP 
 .RS
-Canon LiDE 35/40/50/60/100/110/200/210/700
+Canon LiDE 35/40/50/60/100/110/200/210/220/700
 .br
 Hewlett-Packard HP2300C/HP2400/HP3670/HP3690/G4010/G4050
 .br
@@ -268,6 +268,9 @@ cncsolutions (http://www.cncsolutions.co
 .TP
 Brian Paavo from Benthic Science Limited for donating a Canoscan LiDE 700F.
 .br
+.TP
+Dany Qumsiyeh for donating a Canoscan LiDE 210 and a LiDE 220.
+.br
 
 .SH "SEE ALSO"
 .BR sane (7),

Return to bug 200788

Added Link Here

(-)graphics/sane-backends/files/patch-backend_genesys.c (+16 lines)
1	--- backend/genesys.c.orig 2013-08-26 00:23:27.000000000 +0300
2	+++ backend/genesys.c 2015-05-30 21:42:14.505092157 +0300
3	@@ -3026,10 +3026,12 @@ genesys_send_shading_coefficient (Genesy
4	case CIS_CANONLIDE200:
5	case CIS_CANONLIDE110:
6	case CIS_CANONLIDE210:
7	+ case CIS_CANONLIDE220:
8	/* TODO store this in a data struct so we avoid
9	* growing this switch */
10	if(dev->model->ccd_type!=CIS_CANONLIDE110
11	- && dev->model->ccd_type!=CIS_CANONLIDE210)
12	+ && dev->model->ccd_type!=CIS_CANONLIDE210
13	+ && dev->model->ccd_type!=CIS_CANONLIDE220)
14	target_code=0xdc00;
15	else
16	target_code=0xf000;

Added Link Here

(-)graphics/sane-backends/files/patch-backend_genesys_devices.c (+99 lines)
1	--- backend/genesys_devices.c.orig 2013-08-26 00:22:58.000000000 +0300
2	+++ backend/genesys_devices.c 2015-05-30 21:42:35.971090137 +0300
3	@@ -671,6 +671,29 @@ static Genesys_Sensor Sensor[] = {
4	{2.1, 2.1, 2.1},
5	{NULL, NULL, NULL}}
6	,
7	+ /* CANON LIDE 220 sensor */
8	+ {CIS_CANONLIDE220,
9	+ 2400, /* optical resolution */
10	+ 87, /* black pixels */
11	+ 16, /* dummy pixels 16 */
12	+ 303, /* 303 */
13	+ 51684, / total pixels */
14	+ 210,
15	+ 200,
16	+ {0x00, 0x00, 0x00, 0x00},
17	+ /* reg 0x10 - 0x15 : EXPR, EXPG and EXPB */
18	+ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
19	+ /* reg 0x16 - 0x1d */
20	+ 0x10, 0x04, 0x00, 0x01, 0x30, 0x00, 0x02, 0x01 },
21	+ /* reg 0x52 - 0x5e */
22	+ {
23	+ 0x00, 0x02, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04,
24	+ 0x1a, 0x00, 0xc0, 0x00, 0x00
25	+ }
26	+ ,
27	+ {2.1, 2.1, 2.1},
28	+ {NULL, NULL, NULL}}
29	+ ,
30	{CCD_PLUSTEK_3600,
31	1200,
32	87, /(black) /
33	@@ -1868,6 +1891,59 @@ static Genesys_Model canon_lide_210_mode
34	400
35	};
36
37	+static Genesys_Model canon_lide_220_model = {
38	+ "canon-lide-220", /* Name */
39	+ "Canon", /* Device vendor string */
40	+ "LiDE 220", /* Device model name */
41	+ GENESYS_GL124, /* or a compatible one */
42	+ NULL,
43	+
44	+ {4800, 2400, 1200, 600, 300, 150, 100, 75, 0}, /* possible x-resolutions */
45	+ {4800, 2400, 1200, 600, 300, 150, 100, 75, 0}, /* possible y-resolutions */
46	+ {16, 8, 0}, /* possible depths in gray mode */
47	+ {16, 8, 0}, /* possible depths in color mode */
48	+
49	+ SANE_FIX (2.2), /* Start of scan area in mm (x) */
50	+ SANE_FIX (8.7), /* Start of scan area in mm (y) */
51	+ SANE_FIX (216.70), /* Size of scan area in mm (x) */
52	+ SANE_FIX (297.5), /* Size of scan area in mm (y) */
53	+
54	+ SANE_FIX (0.0), /* Start of white strip in mm (y) */
55	+ SANE_FIX (0.0), /* Start of black mark in mm (x) */
56	+
57	+ SANE_FIX (0.0), /* Start of scan area in TA mode in mm (x) */
58	+ SANE_FIX (0.0), /* Start of scan area in TA mode in mm (y) */
59	+ SANE_FIX (100.0), /* Size of scan area in TA mode in mm (x) */
60	+ SANE_FIX (100.0), /* Size of scan area in TA mode in mm (y) */
61	+
62	+ SANE_FIX (0.0), /* Start of white strip in TA mode in mm (y) */
63	+
64	+ SANE_FIX (0.0), /* Size of scan area after paper sensor stops
65	+ sensing document in mm */
66	+ SANE_FIX (0.0), /* Amount of feeding needed to eject document
67	+ after finishing scanning in mm */
68	+
69	+ 0, 0, 0, /* RGB CCD Line-distance correction in pixel */
70	+
71	+ COLOR_ORDER_RGB, /* Order of the CCD/CIS colors */
72	+
73	+ SANE_TRUE, /* Is this a CIS scanner? */
74	+ SANE_FALSE, /* Is this a sheetfed scanner? */
75	+ CIS_CANONLIDE220,
76	+ DAC_CANONLIDE110,
77	+ GPO_CANONLIDE210,
78	+ MOTOR_CANONLIDE210,
79	+ GENESYS_FLAG_SKIP_WARMUP
80	+ \| GENESYS_FLAG_OFFSET_CALIBRATION
81	+ \| GENESYS_FLAG_DARK_CALIBRATION
82	+ \| GENESYS_FLAG_HALF_CCD_MODE
83	+ \| GENESYS_FLAG_SHADING_REPARK
84	+ \| GENESYS_FLAG_CUSTOM_GAMMA,
85	+ GENESYS_HAS_SCAN_SW \| GENESYS_HAS_COPY_SW \| GENESYS_HAS_EMAIL_SW \| GENESYS_HAS_FILE_SW \| GENESYS_HAS_EXTRA_SW,
86	+ 60,
87	+ 400
88	+};
89	+
90	static Genesys_Model canon_5600f_model = {
91	"canon-5600f", /* Name */
92	"Canon", /* Device vendor string */
93	@@ -3411,5 +3487,6 @@ static Genesys_USB_Device_Entry genesys_
94	/* GL124 devices */
95	{0x04a9, 0x1909, &canon_lide_110_model},
96	{0x04a9, 0x190a, &canon_lide_210_model},
97	+ {0x04a9, 0x190f, &canon_lide_220_model},
98	{0, 0, NULL}
99	};

Added Link Here

(-)graphics/sane-backends/files/patch-backend_genesys_gl124.c (+29 lines)
1	--- backend/genesys_gl124.c.orig 2013-08-26 00:22:58.000000000 +0300
2	+++ backend/genesys_gl124.c 2015-05-30 21:42:35.972090085 +0300
3	@@ -987,7 +987,7 @@ gl124_init_motor_regs_scan (Genesys_Devi
4	}
5	else
6	{
7	- min_speed = 600;
8	+ min_speed = 900;
9	if(dev->model->ccd_type==MOTOR_CANONLIDE110)
10	{
11	min_speed = 300;
12	@@ -3604,7 +3604,7 @@ gl124_init_gpio (Genesys_Device * dev)
13	idx = 0;
14	}
15	else
16	- { /* canon LiDE 210 case */
17	+ { /* canon LiDE 210 and 220 case */
18	idx = 1;
19	}
20
21	@@ -3637,7 +3637,7 @@ gl124_init_memory_layout (Genesys_Device
22	idx = 0;
23	}
24	else
25	- { /* canon LiDE 210 case */
26	+ { /* canon LiDE 210 and 220 case */
27	idx = 1;
28	}
29

Added Link Here

(-)graphics/sane-backends/files/patch-doc_descriptions_genesys.desc (+17 lines)
1	--- doc/descriptions/genesys.desc.orig 2013-08-26 00:22:58.000000000 +0300
2	+++ doc/descriptions/genesys.desc 2015-05-30 21:42:14.523095452 +0300
3	@@ -149,7 +149,13 @@
4	:interface "USB"
5	:usbid "0x04a9" "0x190a"
6	:status :complete
7	-:comment "GL124 based, resolution from 75 to 2400 dpi"
8	+:comment "GL124 based, resolution from 75 to 4800 dpi"
9	+
10	+:model "CanoScan LiDE 220"
11	+:interface "USB"
12	+:usbid "0x04a9" "0x190f"
13	+:status :complete
14	+:comment "GL124+ based, resolution from 75 to 4800 dpi"
15
16	:model "CanoScan 4400f"
17	:interface "USB"

Added Link Here

(-)graphics/sane-backends/files/patch-doc_sane-genesys.man (+21 lines)
1	--- doc/sane-genesys.man.orig 2013-08-26 00:23:27.000000000 +0300
2	+++ doc/sane-genesys.man 2015-05-30 21:42:14.523095452 +0300
3	@@ -10,7 +10,7 @@ access to USB flatbed scanners based on
4	At present, the following scanners are known to work with this backend:
5	.PP
6	.RS
7	-Canon LiDE 35/40/50/60/100/110/200/210/700
8	+Canon LiDE 35/40/50/60/100/110/200/210/220/700
9	.br
10	Hewlett-Packard HP2300C/HP2400/HP3670/HP3690/G4010/G4050
11	.br
12	@@ -268,6 +268,9 @@ cncsolutions (http://www.cncsolutions.co
13	.TP
14	Brian Paavo from Benthic Science Limited for donating a Canoscan LiDE 700F.
15	.br
16	+.TP
17	+Dany Qumsiyeh for donating a Canoscan LiDE 210 and a LiDE 220.
18	+.br
19
20	.SH "SEE ALSO"
21	.BR sane (7),