From a18c3fd41ae2f576eda1a26b829c362e74b5a405 Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Wed, 21 Oct 2009 21:39:27 +0200 Subject: [PATCH] pixma: added I-SENSYS MF4320d and updated doc, for this model and MP390. --- ChangeLog | 4 ++++ backend/pixma_imageclass.c | 10 ++++++---- doc/descriptions/pixma.desc | 6 +++--- doc/sane-pixma.man | 6 ++++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index a84f46238..1fb2d7ee6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-10-21 Nicolas Martin + * backend/pixma_imageclass.c, doc/sane-pixma.man: + pixma: added I-SENSYS MF4320d and updated doc, for this model and MP390. + 2009-10-20 Louis Lagendijk * backend/pixma_io_sanei.c: Allow for ranges in model returned from device (allow -) diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c index aa828e64c..6429e1aad 100644 --- a/backend/pixma_imageclass.c +++ b/backend/pixma_imageclass.c @@ -72,8 +72,9 @@ #define MF4100_PID 0x26a3 #define MF4600_PID 0x26b0 #define MF4010_PID 0x26b4 -#define D480_PID 0x26ed #define MF4360_PID 0x26ec +#define D480_PID 0x26ed +#define MF4320_PID 0x26ee /* the following are all untested */ #define MF5630_PID 0x264e #define MF5650_PID 0x264f @@ -691,13 +692,14 @@ const pixma_config_t pixma_iclass_devices[] = { DEV ("Canon imageCLASS MF4150", "MF4100", MF4100_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF4690", "MF4690", MF4600_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS D480", "D480", D480_PID, 600, 640, 877, PIXMA_CAP_ADFDUP), - DEV ("Canon imageCLASS MF4360", "MF4360", MF4360_PID, 600, 640, 877, PIXMA_CAP_ADF), -/* FIXME: the following capabilities all need updating/verifying */ + DEV ("Canon imageCLASS MF4360", "MF4360", MF4360_PID, 600, 640, 877, PIXMA_CAP_ADFDUP), + DEV ("Canon imageCLASS MF4320", "MF4320", MF4320_PID, 600, 640, 877, 0), + DEV ("Canon imageCLASS MF4010", "MF4010", MF4010_PID, 600, 640, 877, 0), + /* FIXME: the following capabilities all need updating/verifying */ DEV ("Canon imageCLASS MF5630", "MF5630", MF5630_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon laserBase MF5650", "MF5650", MF5650_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF8170c", "MF8170c", MF8100_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF3240", "MF3240", MF3200_PID, 600, 640, 877, 0), DEV ("Canon imageClass MF6500", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF), - DEV ("Canon imageCLASS MF4010", "MF4010", MF4010_PID, 600, 640, 877, 0), DEV (NULL, NULL, 0, 0, 0, 0, 0) }; diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index 2e1ef3308..84507a2aa 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -169,7 +169,7 @@ :interface "USB Ethernet" :usbid "0x04a9" "0x1726" :status :good -:comment "All resolutions supported (up to 4800DPI). Full TPU support (negativa and slides) at 24 or 48 bits." +:comment "All resolutions supported (up to 4800DPI). Full TPU support (negative and slides) at 24 or 48 bits." :model "SmartBase MP360" :interface "USB" @@ -186,8 +186,8 @@ :model "SmartBase MP390" :interface "USB" :usbid "0x04a9" "0x263e" -:status :minimal -:comment "The scanner locks up sometimes." +:status :good +:comment "All resolutions supported (up to 1200DPI)." :model "MultiPASS MP700" :interface "USB" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index c68986e51..3053619f9 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -33,13 +33,15 @@ ImageCLASS MF3110, MF4010, MF4018, MF4120, MF4122, MF4140 ImageCLASS MF4150, MF4270, MF4380dn, MF4660, MF4690, MF5770 .br ImageCLASS D480 +.br +SmartBASE MP390 .RE .PP The following models are not well tested and/or the scanner sometimes hangs and must be switched off and on. .PP .RS -SmartBase MP360, MP370, MP390 +SmartBase MP360, MP370 .br MultiPASS PIXMA MP760, PIXMA MP780 .RE @@ -156,7 +158,7 @@ the verbosity. .TP .B PIXMA_EXPERIMENT Setting to a non-zero value will enable the support for experimental models. -You should also set SANE_DEBUG_PIXMA to 10. +You should also set SANE_DEBUG_PIXMA to 11. .SH "SEE ALSO" .BR sane (7), .BR sane\-dll (5),