From e54c2ae2ee48eb11773af5e8f098be102da5a45a Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Sat, 29 Aug 2009 14:43:01 +0200 Subject: [PATCH] pixma backend: moved MF3110 declaration to mp730 part of the backend, as using a Pixma protocol closer to this device. --- ChangeLog | 4 ++++ backend/pixma_imageclass.c | 2 -- backend/pixma_mp730.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3ca5b785..8d8a429ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-08-29 Nicolas Martin + * backend/pixma_imageclass.c, backend/pixma_mp730.c: + pixma backend: moved MF3110 declaration to mp730 part of backend. + 2009-08-27 Nicolas Martin * doc/descriptions/pixma.desc, backend/pixma_mp150.c: - pixma backend: Updated description for MP830 reported to be fully supported. diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c index da59d5e58..2bbc2846d 100644 --- a/backend/pixma_imageclass.c +++ b/backend/pixma_imageclass.c @@ -76,7 +76,6 @@ #define MF5630_PID 0x264e #define MF5650_PID 0x264f #define MF8100_PID 0x2659 -#define MF3110_PID 0x2660 #define MF3200_PID 0x2684 #define MF6500_PID 0x2686 @@ -679,7 +678,6 @@ const pixma_config_t pixma_iclass_devices[] = { 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 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 MF4010", "MF4010", MF4010_PID, 600, 640, 877, 0), diff --git a/backend/pixma_mp730.c b/backend/pixma_mp730.c index fb499a4db..8ecc3cb76 100644 --- a/backend/pixma_mp730.c +++ b/backend/pixma_mp730.c @@ -75,6 +75,7 @@ #define MF5730_PID 0x265d /* Untested */ #define MF5750_PID 0x265e /* Untested */ #define MF5770_PID 0x265f +#define MF3110_PID 0x2660 enum mp730_state_t { @@ -722,6 +723,7 @@ const pixma_config_t pixma_mp730_devices[] = { DEVICE ("Canon imageCLASS MF5730", "MF5730", MF5730_PID, 1200, 636, 868, PIXMA_CAP_ADF), DEVICE ("Canon imageCLASS MF5750", "MF5750", MF5750_PID, 1200, 636, 868, PIXMA_CAP_ADF), DEVICE ("Canon imageCLASS MF5770", "MF5770", MF5770_PID, 1200, 636, 868, PIXMA_CAP_ADF), + DEVICE ("Canon imageCLASS MF3110", "MF3110", MF3110_PID, 600, 640, 877, 0), DEVICE (NULL, NULL, 0, 0, 0, 0, 0) };