From db1a049706785e499b546f944a8248432fc5f1ca Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Wed, 28 Oct 2009 23:49:13 +0100 Subject: [PATCH] pixma: declared Pixma MP550 (yet untested), updated docs. modified: ChangeLog modified: backend/pixma_mp150.c modified: doc/descriptions/pixma.desc modified: doc/sane-pixma.man --- ChangeLog | 8 ++++---- backend/pixma_mp150.c | 2 ++ doc/descriptions/pixma.desc | 6 ++++++ doc/sane-pixma.man | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ccf3eb213..1b5b7bc6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ -2009-10-22 Nicolas Martin - * backend/pixma_mp150.c, doc/descriptions/pixma.desc: - pixma: fix MP830 ADF shifted lines, add support for I-SENSYS MF4320d to descriptions. +2009-10-28 Nicolas Martin + * backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man: + pixma: declared Pixma MP550 (yet untested), updated docs. 2009-10-22 Louis Lagendijk - * doc/sane-pixma.man + * doc/sane-pixma.man: Added networking details to doc/sane-pixma.man 2009-10-21 Nicolas Martin diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index 23d7a739a..b57c0e6ab 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -149,6 +149,7 @@ #define MP250_PID 0x173a /* untested */ #define MP270_PID 0x173b #define MP490_PID 0x173c /* untested */ +#define MP550_PID 0x173d /* untested */ #define MP560_PID 0x173e /* untested */ #define MP640_PID 0x173f #define MP990_PID 0x1740 /* untested */ @@ -1547,6 +1548,7 @@ const pixma_config_t pixma_mp150_devices[] = { /* Generation 4: CIS */ 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 MP550", "MP550", MP550_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), DEVICE ("Canon PIXMA MP270", "MP270", MP270_PID, 1200, 638, 877, PIXMA_CAP_CIS), diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index ce9d39524..cab19d792 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -297,6 +297,12 @@ :status :untested :comment "Same protocol as Pixma Generation 3? Testers needed!" +:model "PIXMA MP550" +:interface "USB" +:usbid "0x04a9" "0x173d" +:status :untested +:comment "Same protocol as Pixma Generation 3? Testers needed!" + :model "PIXMA MP540" :interface "USB" :usbid "0x04a9" "0x1730" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index d2af2668d..70ae98053 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -54,7 +54,7 @@ Feedback in the Sane-dev mailing list welcome. .RS PIXMA MP740 .br -PIXMA MX320, MX330, MP250, MP490, MP560, MP990 +PIXMA MX320, MX330, MP250, MP490, MP550, MP560, MP990 .br ImageCLASS MF3240, MF5630, MF5650, MF5730, MF5750, MF8170c .RE