From 35baca47f0eaf615301761c4402c18f0ff0ae79e Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Thu, 12 Mar 2009 11:13:37 +0000 Subject: [PATCH] pixma ImageClass doc and capabilities update, PIXMA_EOF return code added. --- ChangeLog | 8 ++++++++ backend/pixma.h | 1 + backend/pixma_common.c | 4 +++- backend/pixma_imageclass.c | 8 ++++---- backend/pixma_io_sanei.c | 1 + doc/descriptions/pixma.desc | 2 +- doc/sane-pixma.man | 4 ++-- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0e1327b5..395d44e9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-03-12 Nicolas Martin + * doc/sane-pixma.man, doc/descriptions/pixma.desc: + Added ImageClass MF4010 support in pixma backend docs. + * backend/pixma_imageclass.c: + Removed ADF capability to ImageClass models without ADF + * backend/pixma.h, backend/pixma_common.c, backend/pixma_io_sanei.c: + Added a PIXMA_EOF error return code + 2009-03-09 Stéphane Voltz * backend/genesys.c backend/genesys.h backend/genesys_devices.c backend/genesys_gl646.c doc/descriptions/lexmark.desc: cleanups diff --git a/backend/pixma.h b/backend/pixma.h index 8b52f9151..a0993d730 100644 --- a/backend/pixma.h +++ b/backend/pixma.h @@ -127,6 +127,7 @@ typedef uint32_t uint32_t; #define PIXMA_EPAPER_JAMMED -11 #define PIXMA_ECOVER_OPEN -12 #define PIXMA_ENO_PAPER -13 +#define PIXMA_EOF -14 /**@}*/ /** \name Capabilities for using with pixma_config_t::cap */ diff --git a/backend/pixma_common.c b/backend/pixma_common.c index 8e9a32182..2bcb3c1a1 100644 --- a/backend/pixma_common.c +++ b/backend/pixma_common.c @@ -228,11 +228,13 @@ pixma_strerror (int error) case PIXMA_EPROTO: return "EPROTO"; case PIXMA_EPAPER_JAMMED: - return "EPAPAR_JAMMED"; + return "EPAPER_JAMMED"; case PIXMA_ECOVER_OPEN: return "ECOVER_OPEN"; case PIXMA_ENO_PAPER: return "ENO_PAPER"; + case PIXMA_EOF: + return "EEOF"; } snprintf (buf, sizeof (buf), "EUNKNOWN:%d", error); return buf; diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c index 32e8838c0..6547f66ff 100644 --- a/backend/pixma_imageclass.c +++ b/backend/pixma_imageclass.c @@ -674,10 +674,10 @@ const pixma_config_t pixma_iclass_devices[] = { DEV ("Canon imageCLASS MF5730", "MF5730", MF5730_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF5750", "MF5750", MF5750_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF5770", "MF5770", MF5770_PID, 600, 640, 877, PIXMA_CAP_ADF), - DEV ("Canon imageCLASS MF3110", "MF3110", MF3110_PID, 600, 640, 877, PIXMA_CAP_ADF), - DEV ("Canon imageCLASS MF3240", "MF3240", MF3200_PID, 600, 640, 877, PIXMA_CAP_ADF), - DEV ("Canon MF6500 Series", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF), + DEV ("Canon imageCLASS MF3110", "MF3110", MF3110_PID, 600, 640, 877, 0), + 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 MF4690", "MF4690", MF4600_PID, 600, 640, 877, PIXMA_CAP_ADF), - DEV ("Canon imageCLASS MF4010", "MF4010", MF4010_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/backend/pixma_io_sanei.c b/backend/pixma_io_sanei.c index 30e72a6e2..f8686dd00 100644 --- a/backend/pixma_io_sanei.c +++ b/backend/pixma_io_sanei.c @@ -298,6 +298,7 @@ map_error (SANE_Status ss) case SANE_STATUS_NO_DOCS: return PIXMA_ENO_PAPER; case SANE_STATUS_EOF: + return PIXMA_EOF; case SANE_STATUS_HW_LOCKED: /* unused by pixma */ case SANE_STATUS_WARMING_UP: /* unused by pixma */ break; diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index 5a7114c67..58a13ebc6 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -379,7 +379,7 @@ :interface "USB" :usbid "0x04a9" "0x26b4" :status :untested -:comment "Same protocol as imageCLASS MF4270? Testers needed!" +:comment "All resolutions supported (up to 600DPI)" :model "imageCLASS MF6500 series" :interface "USB" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index 45e9efb3c..7185f431a 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -1,4 +1,4 @@ -.TH "sane\-pixma" "5" "3 Jan 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH "sane\-pixma" "5" "28 Feb 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane\-pixma .SH NAME sane\-pixma \- SANE backend for Canon PIXMA MP series @@ -24,7 +24,7 @@ PIXMA MX300, MX310, MX700, MX850, MX7600 .br MultiPASS MP700, PIXMA MP750 (no grayscale) .br -ImageCLASS MF4120, MF4122, MF4140, MF4150, MF4270 +ImageCLASS MF4010, MF4120, MF4122, MF4140, MF4150, MF4270 .RE .PP The following models are not well tested and/or the scanner sometimes hangs