From 37f0efe2a2a7fd1c2175289bf4075fac613503d1 Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Sun, 13 Sep 2009 10:24:46 +0200 Subject: [PATCH] pixma backend: Declared new Pixma models as untested, and modified some debug code: backend/pixma_mp150.c: Declared MP250, MP490, MP560, MP640, and MP990 backend/pixma_mp730.c: Modified some debug code. --- ChangeLog | 5 +++++ backend/pixma_mp150.c | 13 ++++++++++++- backend/pixma_mp730.c | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 359055013..2d507ee1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-09-13 Nicolas Martin + * backend/pixma_mp150.c, backend/pixma_mp730.c: + pixma backend: Declared new Pixma models MP250, MP490, MP560, MP640, + and MP990, all yet untested, and modified some debug code. + 2009-09-11 Mattias Ellert * tools/sane-find-scanner.c: Fix false warning about USB not supported when linking with libusb-1.0. diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index c607f6371..0e623803f 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -144,7 +144,11 @@ #define MX860_PID 0x1735 #define MX320_PID 0x1736 /* untested */ #define MX330_PID 0x1737 /* untested */ - +#define MP250_PID 0x173a /* untested */ +#define MP490_PID 0x173c /* untested */ +#define MP560_PID 0x173e /* untested */ +#define MP640_PID 0x173f /* untested */ +#define MP990_PID 0x1740 /* untested */ enum mp150_state_t { @@ -1460,5 +1464,12 @@ const pixma_config_t pixma_mp150_devices[] = { DEVICE ("Canon PIXMA MX330", "MX330", MX330_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA MX860", "MX860", MX860_PID, 2400, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP), + DEVICE ("Canon MP990 series", "MP990", MP990_PID, 4800, 638, 877, PIXMA_CAP_CCD | PIXMA_CAP_TPU), + + DEVICE ("Canon PIXMA MP640", "MP640", MP640_PID, 4800, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MP560", "MP560", MP560_PID, 2400, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MP490", "MP490", MP490_PID, 1200, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MP250", "MP250", MP250_PID, 600, 638, 877, PIXMA_CAP_CIS), + END_OF_DEVICE_LIST }; diff --git a/backend/pixma_mp730.c b/backend/pixma_mp730.c index b7b5c2a68..868da64c4 100644 --- a/backend/pixma_mp730.c +++ b/backend/pixma_mp730.c @@ -617,13 +617,13 @@ mp730_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib) s->cfg->pid != MF3110_PID) { /* color, and not an MF57x0 nor MF3110 */ -PDBG (pixma_dbg (1, "DEBUG: Packing colors\n")); +PDBG (pixma_dbg (10, "DEBUG: Packing colors\n")); pack_rgb (mp->imgbuf, n, mp->raw_width, mp->lbuf); } else { /* grayscale or MF57x0 or MF3110 */ -PDBG (pixma_dbg (1, "DEBUG: not processing colors\n")); +PDBG (pixma_dbg (10, "DEBUG: not processing colors\n")); memcpy (mp->lbuf, mp->imgbuf, n * s->param->line_size); } block_size = n * s->param->line_size;