Attachment 157641 Details for Bug 200788 – Canon LiDE 220 support patches

[patch] Canon LiDE 220 support patches

sane-backends-genesys-canon-lide-220.diff (text/plain), 9.87 KB, created by Andriy Gapon on 2015-06-11 13:05:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Gapon

Created: 2015-06-11 13:05:35 UTC

Size: 9.87 KB

patch

obsolete

>diff --git graphics/sane-backends/files/patch-backend_genesys.c graphics/sane-backends/files/patch-backend_genesys.c
>new file mode 100644
>index 0000000..050dab6
>--- /dev/null
>+++ graphics/sane-backends/files/patch-backend_genesys.c
>@@ -0,0 +1,16 @@
>+--- 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;
>diff --git graphics/sane-backends/files/patch-backend_genesys.conf.in graphics/sane-backends/files/patch-backend_genesys.conf.in
>new file mode 100644
>index 0000000..e9b1033
>--- /dev/null
>+++ graphics/sane-backends/files/patch-backend_genesys.conf.in
>@@ -0,0 +1,12 @@
>+--- backend/genesys.conf.in.orig	2013-08-26 00:22:58.000000000 +0300
>++++ backend/genesys.conf.in	2015-05-30 21:42:14.506093037 +0300
>+@@ -57,6 +57,9 @@ usb 0x04a9 0x1907
>+ # Canon LiDE 210
>+ usb 0x04a9 0x190a
>+ 
>++# Canon LiDE 220
>++usb 0x04a9 0x190f
>++
>+ # Canon 5600f
>+ usb 0x04a9 0x1906
>+ 
>diff --git graphics/sane-backends/files/patch-backend_genesys_devices.c graphics/sane-backends/files/patch-backend_genesys_devices.c
>new file mode 100644
>index 0000000..5a07ec4
>--- /dev/null
>+++ graphics/sane-backends/files/patch-backend_genesys_devices.c
>@@ -0,0 +1,99 @@
>+--- 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}
>+ };
>diff --git graphics/sane-backends/files/patch-backend_genesys_gl124.c graphics/sane-backends/files/patch-backend_genesys_gl124.c
>new file mode 100644
>index 0000000..a9d2da7
>--- /dev/null
>+++ graphics/sane-backends/files/patch-backend_genesys_gl124.c
>@@ -0,0 +1,29 @@
>+--- 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;
>+     }
>+ 
>diff --git graphics/sane-backends/files/patch-backend_genesys_gl124.h graphics/sane-backends/files/patch-backend_genesys_gl124.h
>new file mode 100644
>index 0000000..9f927c3
>--- /dev/null
>+++ graphics/sane-backends/files/patch-backend_genesys_gl124.h
>@@ -0,0 +1,15 @@
>+--- backend/genesys_gl124.h.orig	2013-08-26 00:22:58.000000000 +0300
>++++ backend/genesys_gl124.h	2015-05-30 21:42:14.521092536 +0300
>+@@ -622,6 +622,12 @@ static Sensor_Profile sensors[]={
>+ 	{CIS_CANONLIDE210,  600, 0,  5360, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, NULL      , 0x00, 0x0a, 0x20, 0x21},
>+ 	{CIS_CANONLIDE210, 1200, 0, 10528, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, order_01  , 0x00, 0x08, 0x20, 0x22},
>+ 	{CIS_CANONLIDE210, 2400, 0, 20864, 0x1e, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24},
>++
>++        /* LiDE 210 */
>++	{CIS_CANONLIDE220,  600, 1,  2768, 0x0f, 0x9f, 0x55, 2584, 154,  101,  388,  574,  393, NULL      , 0x00, 0x0c, 0x20, 0x21},
>++	{CIS_CANONLIDE220,  600, 0,  5360, 0x0f, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, NULL      , 0x00, 0x0a, 0x20, 0x21},
>++	{CIS_CANONLIDE220, 1200, 0, 10528, 0x0f, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, order_01  , 0x00, 0x08, 0x20, 0x22},
>++	{CIS_CANONLIDE220, 2400, 0, 20864, 0x0f, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24},
>+ };
>+ 
>+ 
>diff --git graphics/sane-backends/files/patch-backend_genesys_low.h graphics/sane-backends/files/patch-backend_genesys_low.h
>new file mode 100644
>index 0000000..4aa12e0
>--- /dev/null
>+++ graphics/sane-backends/files/patch-backend_genesys_low.h
>@@ -0,0 +1,11 @@
>+--- backend/genesys_low.h.orig	2013-08-26 00:23:27.000000000 +0300
>++++ backend/genesys_low.h	2015-05-30 21:42:14.522093811 +0300
>+@@ -375,6 +375,8 @@ Genesys_Color_Order;
>+ #define CCD_IMG101       25
>+ #define CCD_PLUSTEK3800  26
>+ #define CIS_CANONLIDE210 27
>++#define CIS_CANONLIDE80  28
>++#define CIS_CANONLIDE220 29
>+ 
>+ #define GPO_UMAX         0
>+ #define GPO_ST12         1
>diff --git graphics/sane-backends/files/patch-doc_descriptions_genesys.desc graphics/sane-backends/files/patch-doc_descriptions_genesys.desc
>new file mode 100644
>index 0000000..4a1a7ad
>--- /dev/null
>+++ graphics/sane-backends/files/patch-doc_descriptions_genesys.desc
>@@ -0,0 +1,17 @@
>+--- 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"
>diff --git graphics/sane-backends/files/patch-doc_sane-genesys.man graphics/sane-backends/files/patch-doc_sane-genesys.man
>new file mode 100644
>index 0000000..1ba7add
>--- /dev/null
>+++ graphics/sane-backends/files/patch-doc_sane-genesys.man
>@@ -0,0 +1,21 @@
>+--- 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),

Actions: View | Diff

Attachments on bug 200788: 157641