diff options
Diffstat (limited to 'src/main/canon-printers.h')
-rw-r--r-- | src/main/canon-printers.h | 2418 |
1 files changed, 1872 insertions, 546 deletions
diff --git a/src/main/canon-printers.h b/src/main/canon-printers.h index 4e8f6be..08b86f1 100644 --- a/src/main/canon-printers.h +++ b/src/main/canon-printers.h @@ -24,9 +24,15 @@ /* This file contains the capabilities of the various canon printers */ +/* TODO-LIST + * + * * adjust the paper sizes based on available Canon PPDs and + * Windows driver information + * + */ #ifndef GUTENPRINT_INTERNAL_CANON_PRINTERS_H #define GUTENPRINT_INTERNAL_CANON_PRINTERS_H - +#define INCH(x) (72 * x) typedef struct canon_caps { const char* name; /* model name */ @@ -37,13 +43,17 @@ typedef struct canon_caps { int border_right; /* right margin, points */ int border_top; /* absolute top margin, points */ int border_bottom; /* absolute bottom margin, points */ - int raster_lines_per_block; /* number of raster lines in every F) command */ + /* int raster_lines_per_block; */ + /* number of raster lines in every F) command */ const canon_slotlist_t* slotlist; /*available paperslots */ unsigned long features; /* special bjl settings */ unsigned char ESC_r_arg; /* argument used for the ESC (r command during init */ + int ESC_l_len; /* length of ESC (l command, in bytes */ + int ESC_P_len; /* length of ESC (P command, in bytes */ const char** control_cmdlist; const canon_modelist_t* modelist; const canon_paperlist_t* paperlist; + const canon_modeuselist_t* modeuselist; const char *lum_adjustment; const char *hue_adjustment; const char *sat_adjustment; @@ -140,6 +150,51 @@ static const char iP4200_hue_adjustment[] = "</curve>\n" "</gutenprint>\n"; +static const char MP450_sat_adjustment[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +"<gutenprint>\n" +"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n" +"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n" +/* C */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* B */ +/* B */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* M */ +/* M */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* R */ +/* R */ "1.00 1.00 1.05 1.10 1.20 1.26 1.34 1.41 " /* Y */ +/* Y */ "1.38 1.32 1.24 1.15 1.08 1.00 1.00 1.00 " /* G */ +/* G */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* C */ +"</sequence>\n" +"</curve>\n" +"</gutenprint>\n"; + +static const char MP450_lum_adjustment[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +"<gutenprint>\n" +"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n" +"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n" +/* C */ "0.52 0.56 0.61 0.67 0.79 0.86 0.91 0.98 " /* B */ +/* B */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* M */ +/* M */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.04 " /* R */ +/* R */ "1.04 1.04 1.04 1.04 1.03 1.03 1.03 1.02 " /* Y */ +/* Y */ "1.02 0.97 0.92 0.88 0.83 0.78 0.74 0.71 " /* G */ +/* G */ "0.70 0.62 0.59 0.53 0.48 0.52 0.53 0.51 " /* C */ +"</sequence>\n" +"</curve>\n" +"</gutenprint>\n"; + +static const char MP450_hue_adjustment[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +"<gutenprint>\n" +"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n" +"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n" +/* C */ "-.30 -.33 -.35 -.37 -.40 -.30 -.20 0.00 " /* B */ +/* B */ "0.00 -.04 -.01 0.08 0.14 0.16 0.09 0.00 " /* M */ +/* M */ "0.00 0.00 -.05 -.07 -.10 -.08 -.06 0.00 " /* R */ +/* R */ "0.00 0.04 0.08 0.10 0.13 0.10 0.07 0.00 " /* Y */ +/* Y */ "0.00 -.11 -.18 -.23 -.30 -.37 -.46 -.54 " /* G */ +/* G */ "0.00 0.00 -.02 -.05 -.07 -.11 -.17 -.25 " /* C */ +"</sequence>\n" +"</curve>\n" +"</gutenprint>\n"; + static const char* control_cmd_ackshort[] = { "AckTime=Short", NULL @@ -153,6 +208,19 @@ static const char* control_cmd_PIXMA_iP4000[] = { NULL }; +static const char* control_cmd_BJC_i550[] = { +/*"SetTime=20060722092503", */ /*what is this for?*/ + "SetSilent=OFF", + "SelectParallel=ECP", + NULL +}; + +static const char* control_cmd_BJC_i6100[] = { +/*"SetTime=20060722092503", */ /*what is this for?*/ + "SelectParallel=ECP", + NULL +}; + static const char* control_cmd_PIXMA_iP4200[] = { /*"SetTime=20060722092503", */ /*original driver sends current time, is it needed?*/ "SetSilent=OFF", @@ -160,15 +228,14 @@ static const char* control_cmd_PIXMA_iP4200[] = { NULL }; -static const char* control_cmd_MULTIPASS_MP150[] = { - "AckTime=Short", - "MediaDetection=ON", +static const char* control_cmd_PIXMA_iP2700[] = { +/*"SetTime=20060722092503", */ /*what is this for?*/ + "SetSilent=OFF", NULL }; -static const char* control_cmd_PIXMA_iP2700[] = { +static const char* control_cmd_PIXMA_MG5300[] = { /*"SetTime=20060722092503", */ /*what is this for?*/ - "SetSilent=OFF", NULL }; @@ -179,71 +246,79 @@ static const canon_cap_t canon_model_capabilities[] = /* the first printer is used as default in case something has gone wrong in printers.xml */ { /* Canon MULTIPASS MP830 */ "PIXMA MP830", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - /* CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px,0,control_cmd_MULTIPASS_MP150, */ /*features */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_MULTIPASS_MP830_modelist, - /* &canon_PIXMA_iP4000_paperlist, */ &canon_MULTIPASS_MP600_paperlist, + &canon_MULTIPASS_MP830_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon MULTIPASS MP800 */ "PIXMA MP800", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_MULTIPASS_MP800_modelist, &canon_MULTIPASS_MP600_paperlist, + &canon_MULTIPASS_MP800_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon MULTIPASS MP810 */ "PIXMA MP810", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_MULTIPASS_MP810_modelist, &canon_MULTIPASS_MP600_paperlist, + &canon_MULTIPASS_MP810_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA MP950 */ "PIXMA MP950", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200, /* features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP3100_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /* features */ &canon_MULTIPASS_MP950_modelist, - &canon_PIXMA_iP4000_paperlist, + &canon_MULTIPASS_MP950_paperlist, + &canon_MULTIPASS_MP950_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA MP960 */ "PIXMA MP960", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_iP4600_slotlist, /* changed from iP4000 */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200, /* features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4600_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /* features */ &canon_MULTIPASS_MP960_modelist, - &canon_PIXMA_iP4600_paperlist, /* changed from iP4000 */ + &canon_MULTIPASS_MP960_paperlist, + &canon_MULTIPASS_MP960_modeuselist, NULL, NULL, NULL, @@ -251,45 +326,51 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA MP970 */ "PIXMA MP970", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_P|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_MULTIPASS_MP970_modelist, - &canon_PIXMA_iP4000_paperlist, + &canon_MULTIPASS_MP970_paperlist, + &canon_MULTIPASS_MP970_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA MP980 */ "PIXMA MP980", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4600_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_P|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_MULTIPASS_MP980_modelist, &canon_MULTIPASS_MP980_paperlist, + &canon_MULTIPASS_MP980_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA MP990 --- uses XML */ "PIXMA MP990", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4600_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_MULTIPASS_MP990_modelist, &canon_MULTIPASS_MP990_paperlist, + &canon_MULTIPASS_MP990_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, /* ******************************** */ @@ -309,43 +390,191 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon S200x *//* heads: BC-24 */ "S200", 3, - 618, 936, /* 8.58" x 13 " */ - 10, 10, 9, 20, - 8, - &canon_default_slotlist, - CANON_CAP_STD1 | CANON_CAP_rr,0x61,NULL, + INCH(19/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 20, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD1 | CANON_CAP_rr,0x61, + 2,0, + NULL, &canon_S200_modelist, - &canon_default_paperlist, + &canon_BJC_S200_paperlist, + &canon_BJC_S200_modeuselist, NULL, NULL, NULL, NULL }, - { /* Canon BJC S300 */ "S300", 3, - 842, 17*72, - 11, 9, 10, 18, - 8, - &canon_default_slotlist, - CANON_CAP_STD1 | CANON_CAP_r,0x61,control_cmd_ackshort, - &canon_BJC_8500_modelist, - &canon_default_paperlist, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px,0, + 2,0, + control_cmd_ackshort, + &canon_BJC_S300_modelist, + &canon_BJC_S300_paperlist, + &canon_BJC_S300_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC S330 */ + "S330", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px,0, + 2,0, + control_cmd_PIXMA_iP2700, + &canon_BJC_S330_modelist, + &canon_BJC_S330_paperlist, + &canon_BJC_S330_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon S500 */ + "S500", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_p,0, + 2,0, + control_cmd_BJC_i6100, + &canon_BJC_S500_modelist, + &canon_BJC_S300_paperlist, + &canon_BJC_S500_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon S520 */ + "S520", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px,0, + 2,0, + control_cmd_BJC_i6100, + &canon_BJC_S520_modelist, + &canon_BJC_S520_paperlist, + &canon_BJC_S520_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC S600 *//* heads: BC-50 */ + "S600", 3, + 842, INCH(17), + 10, 10, 9, 15, + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_p,0, + 2,0, + control_cmd_BJC_i6100, + &canon_BJC_S600_modelist, + &canon_BJC_S300_paperlist, + &canon_BJC_S600_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC S750 */ + "S750", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px,0, + 2,0, + control_cmd_BJC_i550, + &canon_BJC_S750_modelist, + &canon_BJC_S750_paperlist, + &canon_BJC_S750_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC S800 */ + "S800", 3, + 842, INCH(17), + 10, 10, 9, 15, + &canon_BJC_S800_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_p,0, + 2,0, + control_cmd_BJC_i6100, + &canon_BJC_S800_modelist, + &canon_BJC_S800_paperlist, + &canon_BJC_S800_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC S820 */ + "S820", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px|CANON_CAP_rr,0, + 2,0, + control_cmd_BJC_i550, + &canon_BJC_S820_modelist, + &canon_BJC_S800_paperlist, + &canon_BJC_S820_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC S830D */ + "S830", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px|CANON_CAP_rr,0, + 2,0, + control_cmd_PIXMA_iP2700, + &canon_BJC_S820_modelist, + &canon_BJC_S800_paperlist, + &canon_BJC_S820_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC S900 */ + "S900", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px|CANON_CAP_rr,0, + 2,0, + control_cmd_PIXMA_iP2700, + &canon_BJC_S900_modelist, + &canon_BJC_S800_paperlist, + &canon_BJC_S900_modeuselist, NULL, NULL, NULL, NULL }, - { /* Canon BJ 30 *//* heads: BC-10 */ "30", 1, - 9.5*72, 14*72, - 11, 9, 10, 18, - 8, + INCH(19/2), INCH(14), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0 | CANON_CAP_a,0,NULL, + CANON_CAP_STD0 | CANON_CAP_a,0, + 2,0, + NULL, &canon_BJC_30_modelist, &canon_default_paperlist, + &canon_BJC_30_modeuselist, NULL, NULL, NULL, @@ -353,13 +582,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 85 *//* heads: BC-20 BC-21 BC-22 */ "85", 1, - 9.5*72, 14*72, - 11, 9, 10, 18, - 8, + INCH(19/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 20, /* confirmed */ &canon_default_slotlist, - CANON_CAP_STD0 | CANON_CAP_a,0,NULL, + CANON_CAP_STD0 | CANON_CAP_a,0, + 2,0, + NULL, &canon_BJC_85_modelist, &canon_default_paperlist, + &canon_BJC_85_modeuselist, NULL, NULL, NULL, @@ -369,12 +600,14 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon BJC 4300 *//* heads: BC-20 BC-21 BC-22 BC-29 */ "4300", 1, 618, 936, /* 8.58" x 13 " */ - 11, 9, 10, 18, - 8, + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0,0,NULL, + CANON_CAP_STD0 | CANON_CAP_cart,0, + 2,0, + NULL, &canon_BJC_4300_modelist, &canon_default_paperlist, + &canon_BJC_4300_modeuselist, NULL, NULL, NULL, @@ -383,13 +616,31 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon BJC 4400 *//* heads: BC-20 BC-21 BC-22 BC-29 */ "4400", 1, - 9.5*72, 14*72, - 11, 9, 10, 18, - 8, + INCH(19/2), INCH(14), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0 | CANON_CAP_a,0,NULL, + CANON_CAP_STD0 | CANON_CAP_a,0, + 2,0, + NULL, &canon_BJC_4400_modelist, &canon_default_paperlist, + &canon_BJC_4400_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC 4550 *//* heads: BC-21 BCI-21 BC-22 */ + "4550", 3, + INCH(17), INCH(22), + 11, 9, 10, 18, /* unconfirmed */ + &canon_default_slotlist, + CANON_CAP_STD0 | CANON_CAP_a | CANON_CAP_cart,0, + 2,0, + NULL, + &canon_BJC_4550_modelist, + &canon_default_paperlist, + &canon_BJC_4550_modeuselist, NULL, NULL, NULL, @@ -399,12 +650,14 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon BJC 6000 *//* heads: BC-30/BC-31 BC-32/BC-31 */ "6000", 3, 618, 936, /* 8.58" x 13 " */ - 11, 9, 10, 18, - 8, + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD1,0,control_cmd_ackshort, + CANON_CAP_STD1,0, + 2,0, + control_cmd_ackshort, &canon_BJC_6000_modelist, &canon_default_paperlist, + &canon_BJC_6000_modeuselist, NULL, NULL, NULL, @@ -414,12 +667,14 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon BJC 6200 *//* heads: BC-30/BC-31 BC-32/BC-31 */ "6200", 3, 618, 936, /* 8.58" x 13 " */ - 11, 9, 10, 18, - 8, + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD1,0,control_cmd_ackshort, + CANON_CAP_STD1,0, + 2,0, + control_cmd_ackshort, &canon_BJC_6000_modelist, &canon_default_paperlist, + &canon_BJC_6000_modeuselist, NULL, NULL, NULL, @@ -428,13 +683,15 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */ "6500", 3, - 842, 17*72, - 11, 9, 10, 18, - 8, + 842, INCH(17), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD1,0,NULL, + CANON_CAP_STD1,0, + 2,0, + NULL, &canon_BJC_6000_modelist, &canon_default_paperlist, + &canon_BJC_6000_modeuselist, NULL, NULL, NULL, @@ -442,27 +699,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 8200 *//* heads: BC-50 */ "8200", 3, - 842, 17*72, - 11, 9, 10, 18, - 8, + 842, INCH(17), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD1 | CANON_CAP_r,0x61,control_cmd_ackshort, + CANON_CAP_STD1 | CANON_CAP_r,0x61, + 2,0, + control_cmd_ackshort, &canon_BJC_8200_modelist, &canon_default_paperlist, - NULL, - NULL, - NULL, - NULL - }, - { /* Canon S500 */ - "S500", 3, - 842, 17*72, - 10, 10, 15, 15, - 8, - &canon_default_slotlist, - CANON_CAP_STD0 | CANON_CAP_r | CANON_CAP_p,0x61,control_cmd_ackshort, - &canon_S500_modelist, - &canon_default_paperlist, + &canon_BJC_8200_modeuselist, NULL, NULL, NULL, @@ -479,12 +724,14 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon BJC 210 *//* heads: BC-02 BC-05 BC-06 */ "210", 1, 618, 936, /* 8.58" x 13 " */ - 11, 9, 10, 18, - 8, + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0,0,NULL, + CANON_CAP_STD0,0, + 2,0, + NULL, &canon_BJC_210_modelist, &canon_default_paperlist, + &canon_BJC_210_modeuselist, NULL, NULL, NULL, @@ -493,12 +740,14 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon BJC 240 *//* heads: BC-02 BC-05 BC-06 */ "240", 1, 618, 936, /* 8.58" x 13 " */ - 11, 9, 10, 18, - 8, + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0,0,NULL, + CANON_CAP_STD0,0, + 2,0, + NULL, &canon_BJC_240_modelist, &canon_default_paperlist, + &canon_BJC_240_modeuselist, NULL, NULL, NULL, @@ -507,12 +756,14 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon BJC 250 *//* heads: BC-02 BC-05 BC-06 */ "250", 1, 618, 936, /* 8.58" x 13 " */ - 11, 9, 10, 18, - 8, + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0,0,NULL, + CANON_CAP_STD0,0, + 2,0, + NULL, &canon_BJC_240_modelist, &canon_default_paperlist, + &canon_BJC_240_modeuselist, NULL, NULL, NULL, @@ -520,13 +771,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 1000 *//* heads: BC-02 BC-05 BC-06 */ "1000", 1, - 842, 17*72, - 11, 9, 10, 18, - 8, + 842, INCH(17), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0 | CANON_CAP_a,0,NULL, + CANON_CAP_STD0 | CANON_CAP_a,0, + 2,0, + NULL, &canon_BJC_240_modelist, &canon_default_paperlist, + &canon_BJC_240_modeuselist, NULL, NULL, NULL, @@ -534,13 +787,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 2000 *//* heads: BC-20 BC-21 BC-22 BC-29 */ "2000", 1, - 842, 17*72, - 11, 9, 10, 18, - 8, + 842, INCH(17), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0 | CANON_CAP_a,0,NULL, + CANON_CAP_STD0 | CANON_CAP_a,0, + 2,0, + NULL, &canon_BJC_2000_modelist, &canon_default_paperlist, + &canon_BJC_2000_modeuselist, NULL, NULL, NULL, @@ -548,13 +803,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 3000 *//* heads: BC-30 BC-33 BC-34 */ "3000", 3, - 842, 17*72, - 10, 10, 9, 15, - 8, - &canon_default_slotlist, - CANON_CAP_STD0 | CANON_CAP_a | CANON_CAP_p,0,NULL, /*FIX? should have _r? */ + 842, INCH(17), + 10, 10, 9, 15, /* unconfirmed but looks right */ + &canon_MULTIPASS_MP150_slotlist, /* cartridge selection option */ + CANON_CAP_STD0 | CANON_CAP_p | CANON_CAP_cart,0, + 2,0, + control_cmd_BJC_i6100, &canon_BJC_3000_modelist, &canon_default_paperlist, + &canon_BJC_3000_modeuselist, NULL, NULL, NULL, @@ -562,13 +819,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 6100 *//* heads: BC-30/BC-31 BC-32/BC-31 */ "6100", 3, - 842, 17*72, - 11, 9, 10, 18, - 8, + 842, INCH(17), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD1 | CANON_CAP_a | CANON_CAP_r,0x61,NULL, + CANON_CAP_STD1 | CANON_CAP_a | CANON_CAP_r,0x61, + 2,0, + NULL, &canon_BJC_3000_modelist, &canon_default_paperlist, + &canon_BJC_3000_modeuselist, NULL, NULL, NULL, @@ -576,41 +835,48 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 7000 *//* heads: BC-60/BC-61 BC-60/BC-62 ??????? */ "7000", 3, - 842, 17*72, - 11, 9, 10, 18, - 8, + 842, INCH(17), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD1,0,NULL, + CANON_CAP_STD1,0, + 2,0, + NULL, &canon_BJC_7000_modelist, &canon_default_paperlist, + &canon_BJC_7000_modeuselist, NULL, NULL, NULL, NULL }, - { /* Canon BJC i560 */ - "i560", 3, - 842, 17*72, - 11, 9, 10, 18, - 8, + { /* Canon BJC 7100 *//* heads: BC-60/BC-61 BC-60/BC-62 ??????? */ + "7100", 3, + 842, INCH(17), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD1,0,NULL, - &canon_BJC_i560_modelist, + CANON_CAP_STD0,0, + 2,0, + NULL, + &canon_BJC_7100_modelist, &canon_default_paperlist, + &canon_BJC_7100_modeuselist, NULL, NULL, NULL, NULL }, - { /* Canon BJC 7100 *//* heads: BC-60/BC-61 BC-60/BC-62 ??????? */ - "7100", 3, - 842, 17*72, - 11, 9, 10, 18, - 8, - &canon_default_slotlist, - CANON_CAP_STD0,0,NULL, - &canon_BJC_7100_modelist, - &canon_default_paperlist, + { /* Canon BJC i50 *//* heads: BC-60/BC-61 BC-60/BC-62 ??????? */ + /* 50i sold outside of Japan as the i70, but we need i in front for the name */ + "i50", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15,/* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_PIXMA_iP2700, + &canon_BJC_i50_modelist, + &canon_BJC_i50_paperlist, + &canon_BJC_i50_modeuselist, NULL, NULL, NULL, @@ -618,13 +884,332 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC i80 *//* heads: BC-60/BC-61 BC-60/BC-62 ??????? */ "i80", 3, - 842, 17*72, - 11, 9, 10, 18, - 8, - &canon_default_slotlist, - CANON_CAP_STD0,0,NULL, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 2,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, &canon_BJC_i80_modelist, - &canon_default_paperlist, + &canon_BJC_i80_paperlist, + &canon_BJC_i80_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, +#if 0 + { /* Canon BJC i250 */ /* does not conform to any current model, commands not known yet */ + "i250", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_PIXMA_iP2700, + &canon_BJC_i250_modelist, + &canon_BJC_i250_paperlist, + &canon_BJC_i250_modeuselist,/*not yet created*/ + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC i320 */ /* does not conform to any current model, commands not known yet */ + "i320", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_PIXMA_iP2700, + &canon_BJC_i320_modelist, + &canon_BJC_i320_paperlist, + &canon_BJC_i320_modeuselist,/*not yet created*/ + NULL, + NULL, + NULL, + NULL + }, +#endif + { /* Canon BJC i450 */ + "i450", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_PIXMA_iP2700, + &canon_BJC_i450_modelist, + &canon_BJC_i450_paperlist, + &canon_BJC_i450_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC i455*/ + "i455", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, + &canon_BJC_i455_modelist, + &canon_BJC_i455_paperlist, + &canon_BJC_i455_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon BJC i550 */ + "i550", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_BJC_i550, + &canon_BJC_i550_modelist, + &canon_BJC_i550_paperlist, + &canon_BJC_i550_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC i560 */ + "i560", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP900_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_BJC_i550, + &canon_BJC_i560_modelist, + &canon_BJC_i560_paperlist, + &canon_BJC_i560_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon BJC i850 */ + "i850", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP900_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_BJC_i550, + &canon_BJC_i850_modelist, + &canon_BJC_i850_paperlist, + &canon_BJC_i850_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC i860 */ + "i860", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_BJC_i860_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */ + 3,2, /* ESC (l and (P command lengths */ + control_cmd_BJC_i550, + &canon_BJC_i860_modelist, + &canon_BJC_i560_paperlist, + &canon_BJC_i860_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon BJC i900D */ + "i900", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP900_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */ + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, + &canon_BJC_i900_modelist, + &canon_BJC_i560_paperlist, + &canon_BJC_i900_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon BJC i950 */ + "i950", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP900_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_PIXMA_iP2700, + &canon_BJC_i950_modelist, + &canon_BJC_i950_paperlist, + &canon_BJC_i950_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC i960 */ + "i960", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_BJC_i860_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */ + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, + &canon_BJC_i960_modelist, + &canon_BJC_i560_paperlist, + &canon_BJC_i960_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon BJC i990 */ + "i990", 3, + INCH(17/2), INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_BJC_i860_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */ + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, + &canon_BJC_i990_modelist, + &canon_BJC_i560_paperlist, + &canon_BJC_i990_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon BJC i6100 */ + "i6100", 3, + 933, INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_BJC_i6100, /* 32 times 0x0 before form feed not implemented */ + &canon_BJC_i6100_modelist, + &canon_BJC_i6100_paperlist, + &canon_BJC_i6100_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC i9100 */ + "i9100", 3, + 933, INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_PIXMA_iP2700, + &canon_BJC_i9100_modelist, + &canon_BJC_i9100_paperlist, + &canon_BJC_i9100_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon BJC i9900 */ + "i9900", 3, + 933, INCH(23), /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP900_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */ + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, + &canon_BJC_i9900_modelist, + &canon_BJC_i9900_paperlist, + &canon_BJC_i9900_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + + /***************/ + /* mini models */ + /***************/ + + { /* mini220 */ + "PIXMA mini220", 3, + INCH(4), INCH(8), /* US 4" x 8" */ /* from MacOSX driver */ + 10, 10, 9, 15, /* for hagaki: 3.4mm L/R, 3mm top, 5mm bottom */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, + &canon_PIXMA_mini220_modelist, + &canon_SELPHY_DS810_paperlist, + &canon_PIXMA_mini220_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* mini320 */ + "PIXMA mini320", 3, + INCH(5), INCH(8), /* from MacOSX driver */ + 10, 10, 9, 15, /* for hagaki: 3.4mm L/R, 3mm top, 5mm bottom */ + &canon_MULTIPASS_MP250_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, + &canon_PIXMA_mini320_modelist, + &canon_PIXMA_mini320_paperlist, + &canon_PIXMA_mini320_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + + + /*************/ + /* DS models */ + /*************/ + + { /* Canon DS700 */ + "SELPHY DS700", 3, + INCH(4), INCH(6), /* US 4" x 6" */ /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 2,2, /* ESC (l and (P command lengths */ + NULL, + &canon_SELPHY_DS700_modelist, + &canon_SELPHY_DS700_paperlist, + &canon_SELPHY_DS700_modeuselist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon DS810 */ + "SELPHY DS810", 3, + INCH(4), INCH(8), /* US 4" x 8" */ /* from MacOSX driver */ + 10, 10, 9, 15, /* confirmed */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + NULL, + &canon_SELPHY_DS810_modelist, + &canon_SELPHY_DS810_paperlist, + &canon_SELPHY_DS810_modeuselist, NULL, NULL, NULL, @@ -640,13 +1225,15 @@ static const canon_cap_t canon_model_capabilities[] = { /* Canon BJC 5100 *//* heads: BC-20 BC-21 BC-22 BC-23 BC-29 */ "5100", 1, - 17*72, 22*72, - 11, 9, 10, 18, - 8, + INCH(17), INCH(22), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0,0,NULL, + CANON_CAP_STD0,0, + 2,0, + NULL, &canon_BJC_3000_modelist, &canon_default_paperlist, + &canon_BJC_3000_modeuselist, NULL, NULL, NULL, @@ -654,13 +1241,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 5500 *//* heads: BC-20 BC-21 BC-29 */ "5500", 1, - 22*72, 34*72, - 11, 9, 10, 18, - 8, + INCH(22), INCH(34), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0 | CANON_CAP_a,0,NULL, + CANON_CAP_STD0 | CANON_CAP_a,0, + 2,0, + NULL, &canon_BJC_5500_modelist, &canon_default_paperlist, + &canon_BJC_5500_modeuselist, NULL, NULL, NULL, @@ -668,13 +1257,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */ "6500", 3, - 17*72, 22*72, - 11, 9, 10, 18, - 8, + INCH(17), INCH(22), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD1 | CANON_CAP_a,0,NULL, + CANON_CAP_STD1 | CANON_CAP_a,0, + 2,0, + NULL, &canon_BJC_3000_modelist, &canon_default_paperlist, + &canon_BJC_3000_modeuselist, NULL, NULL, NULL, @@ -682,27 +1273,64 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon BJC 8500 *//* heads: BC-80/BC-81 BC-82/BC-81 */ "8500", 3, - 17*72, 22*72, - 11, 9, 10, 18, - 8, + INCH(17), INCH(22), + 11, 9, 10, 18, /* unconfirmed */ &canon_default_slotlist, - CANON_CAP_STD0,0,NULL, + CANON_CAP_STD0,0, + 2,0, + NULL, &canon_BJC_8500_modelist, &canon_default_paperlist, + &canon_BJC_8500_modeuselist, NULL, NULL, NULL, NULL }, + { /* Canon PIXMA iP90, iP90v */ + "PIXMA iP90", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_T|CANON_CAP_NOBLACK|CANON_CAP_S|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_PIXMA_iP90_modelist, + &canon_PIXMA_iP90_paperlist, + &canon_PIXMA_iP90_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP100 */ + "PIXMA iP100", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_T|CANON_CAP_NOBLACK|CANON_CAP_S|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_PIXMA_iP100_modelist, + &canon_PIXMA_iP100_paperlist, + &canon_PIXMA_iP100_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, +#if 0 { /* Canon PIXMA iP1000 */ "PIXMA iP1000", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */ - CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */ + CANON_CAP_STD0,0, + 2,0, + control_cmd_PIXMA_iP4000, /*features */ &canon_PIXMA_iP1000_modelist, &canon_PIXMA_iP1000_paperlist, + &canon_PIXMA_iP1000_modeuselist,/*not created yet*/ NULL, NULL, NULL, @@ -710,13 +1338,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA iP1200 --- iP1300 same */ "PIXMA iP1200", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */ - CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */ + CANON_CAP_STD0,0, + 2,0, + control_cmd_PIXMA_iP4000, /*features */ &canon_PIXMA_iP1200_modelist, &canon_PIXMA_iP1200_paperlist, + &canon_PIXMA_iP1200_modeuselist,/*not created yet*/ NULL, NULL, NULL, @@ -724,13 +1354,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA iP1500 */ "PIXMA iP1500", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */ - CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */ + CANON_CAP_STD0,0, + 2,0, + control_cmd_PIXMA_iP4000, /*features */ &canon_PIXMA_iP1500_modelist, &canon_PIXMA_iP1500_paperlist, + &canon_PIXMA_iP1500_modeuselist,/*not created yet*/ NULL, NULL, NULL, @@ -738,13 +1370,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA iP1600 */ "PIXMA iP1600", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */ - CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000, /*features */ - &canon_MULTIPASS_MP170_modelist, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */ + CANON_CAP_STD0,0, + 2,0, + control_cmd_PIXMA_iP4000, /*features */ + &canon_MULTIPASS_MP150_modelist, &canon_PIXMA_iP1500_paperlist, + &canon_PIXMA_iP1600_modeuselist,/*not created yet*/ NULL, NULL, NULL, @@ -752,39 +1386,46 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA iP1900 */ "PIXMA iP1900", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, /* rear only */ - CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_P,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4000, /*features */ &canon_PIXMA_iP1900_modelist, &canon_PIXMA_iP1900_paperlist, + &canon_PIXMA_iP1900_modeuselist,/*not created yet*/ NULL, NULL, NULL, NULL }, +#endif { /* Canon PIXMA iP2000 */ "PIXMA iP2000", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x61,control_cmd_PIXMA_iP4000, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP2000_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_PIXMA_iP2000_modelist, - &canon_PIXMA_iP4000_paperlist, + &canon_PIXMA_iP2000_paperlist, + &canon_PIXMA_iP2000_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, +#if 0 { /* Canon PIXMA iP2200 */ "PIXMA iP2200", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */ - CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */ + CANON_CAP_STD0,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4000, /*features */ &canon_PIXMA_iP1900_modelist, &canon_PIXMA_iP2200_paperlist, NULL, @@ -794,13 +1435,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA iP2500 */ "PIXMA iP2500", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */ - CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */ + CANON_CAP_STD0,0, + 2,0, + control_cmd_PIXMA_iP4000, /*features */ &canon_PIXMA_iP1900_modelist, &canon_PIXMA_iP2200_paperlist,/* OHP experimental */ + &canon_PIXMA_iP2500_modeuselist,/*not created yet*/ NULL, NULL, NULL, @@ -808,27 +1451,32 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA iP2600 */ "PIXMA iP2600", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */ - CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */ + CANON_CAP_STD0,0, + 2,0, + control_cmd_PIXMA_iP4000, /*features */ &canon_PIXMA_iP1900_modelist, &canon_PIXMA_iP2600_paperlist, + &canon_PIXMA_iP2600_modeuselist,/*not created yet*/ NULL, NULL, NULL, NULL }, +#endif { /* Canon PIXMA iP2700 */ "PIXMA iP2700", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.30 (from MacOSX driver only INCH(23) ) */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, /* rear only */ - CANON_CAP_STD0|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_T|CANON_CAP_XML,0,control_cmd_PIXMA_iP2700, /*features */ + CANON_CAP_STD0|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_PIXMA_iP2700_modelist, &canon_PIXMA_iP2700_paperlist, + &canon_PIXMA_iP2700_modeuselist, NULL, NULL, NULL, @@ -836,98 +1484,175 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA iP3000 */ "PIXMA iP3000", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP3100_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_PIXMA_iP3000_modelist, - &canon_PIXMA_iP4000_paperlist, + &canon_PIXMA_iP3000_paperlist, + &canon_PIXMA_iP3000_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA iP3100 */ "PIXMA iP3100", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP3100_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_PIXMA_iP3100_modelist, &canon_PIXMA_iP3100_paperlist, + &canon_PIXMA_iP3100_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, - { /* Canon PIXMA iP4000 */ - "PIXMA iP4000", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px /*|CANON_CAP_I*/,0x64,control_cmd_PIXMA_iP4000, /*features */ - &canon_PIXMA_iP4000_modelist, - &canon_PIXMA_iP4000_paperlist, + { /* Canon PIXMA iP3300 */ + "PIXMA iP3300", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP3500_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP520_modelist, + &canon_PIXMA_iP3300_paperlist, + &canon_PIXMA_iP3300_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, - { /* PIXMA MP740 (== iP4000 without duplex) */ - "PIXMA MP740", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px /*,|CANON_CAP_I*/,0x64,control_cmd_PIXMA_iP4000, /*features */ - &canon_PIXMA_iP4000_modelist, - &canon_PIXMA_iP4000_paperlist, + { /* Canon PIXMA iP3500 - like MP520 */ + "PIXMA iP3500", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP3500_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP520_modelist, + &canon_MULTIPASS_MP520_paperlist, + &canon_MULTIPASS_MP520_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, - { /* Canon PIXMA iP5300, MP610 */ - "PIXMA iP5300", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + { /* Canon PIXMA iP3600 */ + "PIXMA iP3600", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP3600_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_r|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP540_modelist, + &canon_PIXMA_iP3600_paperlist, + &canon_PIXMA_iP3600_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP4000 */ + "PIXMA iP4000", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /*features */ - &canon_PIXMA_iP5300_modelist, - /*&canon_PIXMA_iP4000_paperlist,*/ - &canon_MULTIPASS_MP600_paperlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4000, /*features */ + &canon_PIXMA_iP4000_modelist, + &canon_PIXMA_iP4000_paperlist, + &canon_PIXMA_iP4000_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, - { /* Canon PIXMA iP4600 */ - "PIXMA iP4600", 3, /*model, model_id*/ - 8.5*72, 26.625*72, /* max paper width and height */ + { /* Canon PIXMA iP4100 */ + "PIXMA iP4100", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ - 16, - &canon_PIXMA_iP4600_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x61,control_cmd_MULTIPASS_MP150, /*features */ - &canon_PIXMA_iP5300_modelist, - &canon_PIXMA_iP4600_paperlist, + &canon_PIXMA_iP4000_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP4100_modelist, + &canon_PIXMA_iP4100_paperlist, + &canon_PIXMA_iP4100_modeuselist, NULL, NULL, NULL, iP4500_channel_order }, + { /* Canon PIXMA iP4200 */ + "PIXMA iP4200", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP3100_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP4200_modelist, + &canon_PIXMA_iP4200_paperlist, + &canon_PIXMA_iP4200_modeuselist, + iP4200_lum_adjustment, + iP4200_hue_adjustment, + iP4200_sat_adjustment, + iP4500_channel_order + }, + { /* Canon PIXMA iP4300 */ + "PIXMA iP4300", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4000_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP4300_modelist, /* slight differences to iP4200 */ + &canon_PIXMA_iP4200_paperlist, + &canon_PIXMA_iP4300_modeuselist, + iP4200_lum_adjustment, + iP4200_hue_adjustment, + iP4200_sat_adjustment, + iP4500_channel_order + }, { /* Canon PIXMA iP4500 CD-R tray F */ "PIXMA iP4500", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4500_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150, /* features */ - &canon_PIXMA_iP4500_modelist, /* changed from iP5300 */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /* features */ + &canon_PIXMA_iP4500_modelist, &canon_PIXMA_iP4500_paperlist, + &canon_PIXMA_iP4500_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP4600 */ + "PIXMA iP4600", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4600_slotlist, /* iP4600 uses ESC (r 0x64 at reset followed by 0x65 later for CD media */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP4600_modelist, + &canon_PIXMA_iP4600_paperlist, + &canon_PIXMA_iP4600_modeuselist, NULL, NULL, NULL, @@ -935,97 +1660,175 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA iP4700 CD-R tray G */ "PIXMA iP4700", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_iP4600_slotlist, /* there is some ESC (r 0x65 command for CD tray also, not sure why */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150, /* features */ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.20 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4600_slotlist, /* iP4700 uses ESC (r 0x64 at reset followed by 0x65 later for CD media */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /* features */ &canon_PIXMA_iP4700_modelist, &canon_PIXMA_iP4700_paperlist, + &canon_PIXMA_iP4700_modeuselist, NULL, NULL, NULL, iP4500_channel_order }, - { /* Canon PIXMA iP4200 */ - "PIXMA iP4200", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4200, /*features */ - &canon_PIXMA_iP4200_modelist, - &canon_PIXMA_iP4000_paperlist, - iP4200_lum_adjustment, - iP4200_hue_adjustment, - iP4200_sat_adjustment, - NULL - }, { /* Canon PIXMA iP4800 CD-R tray G */ "PIXMA iP4800", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_iP4600_slotlist, /* there is some ESC (r 0x68 command for CD tray also, not sure why */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150, /* features */ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.40 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4600_slotlist, /* iP4800 uses ESC (r 0x64 at reset followed by 0x68 later for CD media only */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /* features */ &canon_PIXMA_iP4700_modelist,/* same for iP4800 */ &canon_PIXMA_iP4700_paperlist,/* same for iP4800 */ + &canon_PIXMA_iP4700_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP4900 CD-R tray G */ + "PIXMA iP4900", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.60 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4600_slotlist, /* iP4900 uses ESC (r 0x68 command for CD tray only */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, /* features Uses ESC (r only for CD media */ + &canon_PIXMA_iP4900_modelist, + &canon_PIXMA_MG5200_paperlist, + &canon_PIXMA_iP4900_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP5000 */ + "PIXMA iP5000", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4000_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP5000_modelist, + &canon_PIXMA_iP5000_paperlist, + &canon_PIXMA_iP5000_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP5300 */ + "PIXMA iP5300", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP3100_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP5300_modelist, + &canon_MULTIPASS_MP600_paperlist, + &canon_PIXMA_iP5300_modeuselist, NULL, NULL, NULL, iP4500_channel_order }, - { /* Canon PIXMA iP6000 */ + { /* Canon PIXMA iP6000D */ "PIXMA iP6000", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_PIXMA_iP6000_modelist, &canon_PIXMA_iP4000_paperlist, + &canon_PIXMA_iP6000_modeuselist, NULL, NULL, NULL, iP4500_channel_order }, - { /* Canon PIXMA iP6100 */ + { /* Canon PIXMA iP6100D */ "PIXMA iP6100", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_PIXMA_iP6000_modelist, &canon_PIXMA_iP6100_paperlist, + &canon_PIXMA_iP6100_modeuselist, NULL, NULL, NULL, iP4500_channel_order }, - { /* Canon PIXMA iP6600 */ + { /* Canon PIXMA iP6210D */ + "PIXMA iP6210", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* has ESC (T */ + CANON_CAP_STD0|CANON_CAP_T|CANON_CAP_NOBLACK|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_PIXMA_iP6210_modelist, + &canon_PIXMA_iP90_paperlist, + &canon_PIXMA_iP6210_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP6600D */ "PIXMA iP6600", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000, /*features */ - &canon_PIXMA_iP6700_modelist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_I|CANON_CAP_r|CANON_CAP_px|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP6600_modelist, &canon_PIXMA_iP6600_paperlist, + &canon_PIXMA_iP6600_modeuselist, NULL, NULL, NULL, iP4500_channel_order }, - { /* Canon PIXMA iP6700 */ + { /* Canon PIXMA iP6700D */ "PIXMA iP6700", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_I|CANON_CAP_r|CANON_CAP_px|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_PIXMA_iP6700_modelist, &canon_PIXMA_iP6700_paperlist, + &canon_PIXMA_iP6700_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iX4000 --- like iX5000 but includes Transparency and ud1 mode is different */ + "PIXMA iX4000", 3, /*model, model_id*/ + 933, INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_PIXMA_iX4000_modelist, + &canon_PIXMA_iP1500_paperlist, + &canon_PIXMA_iX4000_modeuselist, NULL, NULL, NULL, @@ -1033,182 +1836,337 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA iX5000 */ "PIXMA iX5000", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, - /* CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x61,control_cmd_PIXMA_iP4000, */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I,0,control_cmd_PIXMA_iP4000, /*features */ + 933, INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_PIXMA_iX5000_modelist, &canon_PIXMA_iP1500_paperlist, + &canon_PIXMA_iX5000_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA iX6500 --- with XML */ "PIXMA iX6500", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + 933, 1917, /* max paper width and height */ /* from linux v3.50 driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP540_modelist, &canon_MULTIPASS_MX880_paperlist, + &canon_PIXMA_iX6500_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA iX7000 --- with XML */ "PIXMA iX7000", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + 933, INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iX7000_slotlist, - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_PIXMA_iP4200, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_PIXMA_iX7000_modelist, &canon_PIXMA_iX7000_paperlist, + &canon_PIXMA_iX7000_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA MP510 --- like MP520 but without PPGgold paper support */ "PIXMA MP510", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP520_slotlist, - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I,0,control_cmd_PIXMA_iP2700, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP520_modelist, &canon_MULTIPASS_MP520_paperlist, /* Windows driver lacks PPGgold, but let us try anyway */ + &canon_MULTIPASS_MP520_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA MP520 */ "PIXMA MP520", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP520_slotlist, - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I,0,control_cmd_PIXMA_iP2700, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP520_modelist, &canon_MULTIPASS_MP520_paperlist, + &canon_MULTIPASS_MP520_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon PIXMA MP530 */ + "PIXMA MP530", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP530_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_r|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_MULTIPASS_MP530_modelist, + &canon_MULTIPASS_MP600_paperlist, + &canon_MULTIPASS_MP530_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, { /* Canon PIXMA MP540 */ "PIXMA MP540", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_MG5100_slotlist, - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r,0x64,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_r|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP540_modelist, &canon_MULTIPASS_MX330_paperlist, + &canon_MULTIPASS_MP540_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, - { /* Canon PIXMA MP550 ---wth XML */ + { /* Canon PIXMA MP550 ---with XML */ "PIXMA MP550", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.20 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_MG5100_slotlist, - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150, /*features */ - &canon_MULTIPASS_MP540_modelist, /* seems to have same modes */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP550_modelist, /* similar to MP540 but fewer modes */ &canon_MULTIPASS_MP250_paperlist, + &canon_MULTIPASS_MP550_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon PIXMA MP560 ---with XML */ + "PIXMA MP560", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.20 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG5100_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP560_modelist, /* like MP550 but has duplex */ + &canon_MULTIPASS_MP250_paperlist, + &canon_MULTIPASS_MP560_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, { /* Canon PIXMA MP600 */ "PIXMA MP600", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MX850_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /*features */ - &canon_MULTIPASS_MP520_modelist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_P|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_MULTIPASS_MP600_modelist, &canon_MULTIPASS_MP600_paperlist, + &canon_MULTIPASS_MP600_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon PIXMA MP610 */ + "PIXMA MP610", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4500_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_MULTIPASS_MP610_modelist, + &canon_MULTIPASS_MP610_paperlist, + &canon_MULTIPASS_MP610_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA MP620 */ + "PIXMA MP620", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG5100_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_r|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP540_modelist, + &canon_MULTIPASS_MX330_paperlist, + &canon_MULTIPASS_MP620_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, { /* Canon PIXMA MP630 */ "PIXMA MP630", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_MG5200_slotlist, - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r,0x64,control_cmd_PIXMA_iP4200, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_MULTIPASS_MP640_modelist, &canon_MULTIPASS_MP630_paperlist, + &canon_MULTIPASS_MP630_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA MP640 */ "PIXMA MP640", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.20 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_MG5200_slotlist, - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_r,0x64,control_cmd_PIXMA_iP4200, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_r|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_MULTIPASS_MP640_modelist, &canon_MULTIPASS_MP640_paperlist, + &canon_MULTIPASS_MP640_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA MP700/MP730 --- split from iP3000 driver, with modifications */ + /* US model: control_cmd_iP2700 */ + /* Japanese model: control_BJC_i550, so chose this as base (more commands) */ + "PIXMA MP700", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from user manual */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP900_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,0, + control_cmd_BJC_i550, /*features */ + &canon_MULTIPASS_MP700_modelist, + &canon_MULTIPASS_MP700_paperlist, + &canon_MULTIPASS_MP700_modeuselist, NULL, NULL, NULL, NULL }, + { /* PIXMA MP710/MP740 --- heavily modified from MP700/MP730 */ + "PIXMA MP710", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from user manual */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP710_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP710_modelist, + &canon_MULTIPASS_MP710_paperlist, + &canon_MULTIPASS_MP710_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* PIXMA MP750/MP760/MP770/MP780/MP790 */ + "PIXMA MP750", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP3100_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_PIXMA_iP4100_modelist, + &canon_MULTIPASS_MP750_paperlist, + &canon_MULTIPASS_MP750_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA MP900 */ + "PIXMA MP900", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP900_slotlist, /* auto sheetfeeder amd CD tray only */ + CANON_CAP_STD0|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP900_modelist, + &canon_PIXMA_iP3100_paperlist, + &canon_MULTIPASS_MP900_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, { /* Canon PIXMA Pro9000 */ "PIXMA Pro9000", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(14), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_Pro9000_slotlist, - CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_PIXMA_Pro9000_modelist, &canon_PIXMA_Pro9000_paperlist, + &canon_PIXMA_Pro9000_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA Pro9000 Mk.II */ "PIXMA Pro9002", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(14), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_Pro9000_slotlist, - CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_PIXMA_Pro9000mk2_modelist, &canon_PIXMA_Pro9000mk2_paperlist, + &canon_PIXMA_Pro9000mk2_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon PIXMA Pro9500 */ "PIXMA Pro9500", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(14), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_Pro9000_slotlist, - CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_PIXMA_Pro9500_modelist, &canon_PIXMA_Pro9500_paperlist, + &canon_PIXMA_Pro9500_modeuselist, NULL, NULL, NULL, @@ -1216,171 +2174,383 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA Pro9500 Mk.II */ "PIXMA Pro9502", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(14), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_Pro9000_slotlist, - CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_PIXMA_Pro9500mk2_modelist, &canon_PIXMA_Pro9500mk2_paperlist, + &canon_PIXMA_Pro9500mk2_modeuselist, NULL, NULL, NULL, NULL }, + { /* Canon PIXMA iP7100 */ + "PIXMA iP7100", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4000_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP7100_modelist, + &canon_PIXMA_iP7100_paperlist, + &canon_PIXMA_iP7100_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP7500 */ + "PIXMA iP7500", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4000_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP7500_modelist, + &canon_PIXMA_iP7500_paperlist, + &canon_PIXMA_iP7500_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP8100 */ + "PIXMA iP8100", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4000_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP8100_modelist, + &canon_PIXMA_iP7100_paperlist, + &canon_PIXMA_iP8100_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, { /* Canon PIXMA iP8500 */ "PIXMA iP8500", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - /*CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x61,control_cmd_PIXMA_iP4000,*/ /*features */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ &canon_PIXMA_iP8500_modelist, - &canon_PIXMA_iP4000_paperlist, + &canon_PIXMA_iP8500_paperlist, + &canon_PIXMA_iP8500_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon PIXMA iP8600 */ + "PIXMA iP8600", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4000_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features */ + &canon_PIXMA_iP8600_modelist, + &canon_PIXMA_iP7100_paperlist, + &canon_PIXMA_iP8600_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA iP9910 */ + "PIXMA iP9910", 3, /*model, model_id*/ + 933, INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP900_slotlist, + CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_PIXMA_iP9910_modelist, + &canon_PIXMA_iP9910_paperlist, + &canon_PIXMA_iP9910_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, { /* Canon MULTIPASS MP150 */ "PIXMA MP150", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - /* &canon_PIXMA_iP4000_slotlist, */ - &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ - /* CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_T|CANON_CAP_I,0x61,control_cmd_MULTIPASS_MP150, */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP150_modelist, - /* &canon_PIXMA_iP4000_paperlist, */ &canon_MULTIPASS_MP150_paperlist, + &canon_MULTIPASS_MP150_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, - { /* Canon MULTIPASS MP170 */ - "PIXMA MP170", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150, /*features */ - &canon_MULTIPASS_MP170_modelist, - &canon_MULTIPASS_MP170_paperlist, + { /* Canon MULTIPASS MP190 */ + "PIXMA MP190", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP190_modelist, + &canon_MULTIPASS_MP190_paperlist, + &canon_MULTIPASS_MP190_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon MULTIPASS MP210 */ + "PIXMA MP210", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP250_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP210_modelist, + &canon_MULTIPASS_MP150_paperlist, + &canon_MULTIPASS_MP210_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon MULTIPASS MP360/370/375R/390 */ + "PIXMA MP360", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from user manual */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,2, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP360_modelist, + &canon_MULTIPASS_MP360_paperlist, + &canon_MULTIPASS_MP360_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, { /* Canon MULTIPASS MP450 */ "PIXMA MP450", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150, /*features */ - &canon_MULTIPASS_MP170_modelist, - &canon_MULTIPASS_MP170_paperlist, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP150_modelist, + &canon_MULTIPASS_MP150_paperlist, + &canon_MULTIPASS_MP150_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon MULTIPASS MP470 --- no XML */ + "PIXMA MP470", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP470_modelist, + &canon_MULTIPASS_MP470_paperlist, + &canon_MULTIPASS_MP470_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, { /* Canon MULTIPASS MP480 --- no XML */ "PIXMA MP480", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP480_modelist, &canon_MULTIPASS_MP480_paperlist, + &canon_MULTIPASS_MP480_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon MULTIPASS MP490 --- with XML */ + "PIXMA MP490", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.20 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP490_modelist, + &canon_MULTIPASS_MP493_paperlist, + &canon_MULTIPASS_MP490_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, - { /* Canon MULTIPASS MP493: new model after MP480(?) --- with XML */ + { /* Canon MULTIPASS MP493 --- with XML */ "PIXMA MP493", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP480_modelist, &canon_MULTIPASS_MP493_paperlist, + &canon_MULTIPASS_MP493_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, { /* Canon MULTIPASS MP495 identical to MP280 it seems --- with XML */ "PIXMA MP495", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.40 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP280_modelist, &canon_MULTIPASS_MP280_paperlist, + &canon_MULTIPASS_MP280_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon MULTIPASS MP240 */ + "PIXMA MP240", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray. Also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_BORDERLESS,0, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MP240_modelist, + &canon_MULTIPASS_MP240_paperlist, + &canon_MULTIPASS_MP240_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, - { /* Canon MULTIPASS MP250 */ + { /* Canon MULTIPASS MP250 --- with XML */ "PIXMA MP250", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.20 & v3.40 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray. Also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML,0x61,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP250_modelist, &canon_MULTIPASS_MP250_paperlist, + &canon_MULTIPASS_MP250_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, - { /* Canon MULTIPASS MP270 */ + { /* Canon MULTIPASS MP270 --- with XML */ "PIXMA MP270", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.20 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray. Also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP250_modelist, &canon_MULTIPASS_MP250_paperlist, + &canon_MULTIPASS_MP250_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order }, - { /* Canon MULTIPASS MP280 */ + { /* Canon MULTIPASS MP280 --- with XML */ "PIXMA MP280", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray. */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150, /*features Also uses CAP_T. MP280 no duplex, no 0x61 */ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.40 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray. Also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MP280_modelist, &canon_MULTIPASS_MP280_paperlist, + &canon_MULTIPASS_MP280_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon PIXMA MG2100 */ + "PIXMA MG2100", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.60 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG2100_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, /* features Also uses CAP_T */ + &canon_PIXMA_MG2100_modelist, + &canon_PIXMA_MG5100_paperlist, + &canon_PIXMA_MG2100_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA MG3100 */ + "PIXMA MG3100", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.60 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG2100_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, /* features Also uses CAP_T */ + &canon_PIXMA_MG3100_modelist, + &canon_PIXMA_MG5100_paperlist, + &canon_PIXMA_MG3100_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, { /* Canon PIXMA MG5100 */ "PIXMA MG5100", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.40 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_MG5100_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150, /* features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /* features */ &canon_PIXMA_MG5100_modelist, &canon_PIXMA_MG5100_paperlist, + &canon_PIXMA_MG5100_modeuselist, NULL, NULL, NULL, @@ -1388,13 +2558,31 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA MG5200 --- like MG5100, plus CD tray */ "PIXMA MG5200", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_MG5200_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150, /* features */ - &canon_PIXMA_MG5200_modelist,/* there is some ESC (r 0x68 command for CD tray also, not sure why */ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.40 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG5200_slotlist, /* ESC (r only for CD media */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /* features */ + &canon_PIXMA_MG5200_modelist, + &canon_PIXMA_MG5200_paperlist, + &canon_PIXMA_MG5200_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA MG5300 --- like MG5200 */ + "PIXMA MG5300", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.60 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG5200_slotlist, /* ESC (r only for CD media */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, /* features */ + &canon_PIXMA_MG5300_modelist, &canon_PIXMA_MG5200_paperlist, + &canon_PIXMA_MG5300_modeuselist, NULL, NULL, NULL, @@ -1402,13 +2590,31 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA MG6100 */ "PIXMA MG6100", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_MG5200_slotlist, /* same as MG5200 */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150, /* features */ - &canon_PIXMA_MG6100_modelist,/* there is some ESC (r 0x68 command for CD tray also, not sure why */ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.40 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG5200_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /* features */ + &canon_PIXMA_MG6100_modelist, &canon_PIXMA_MG6100_paperlist, + &canon_PIXMA_MG6100_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA MG6200 */ + "PIXMA MG6200", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.60 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG5200_slotlist, /* ESC (r only for CD media */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, /* features */ + &canon_PIXMA_MG6200_modelist, + &canon_PIXMA_MG6100_paperlist, + &canon_PIXMA_MG6200_modeuselist, NULL, NULL, NULL, @@ -1416,13 +2622,31 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon PIXMA MG8100 */ "PIXMA MG8100", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_PIXMA_MG5200_slotlist, /* same as MG5200 */ - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150, /* features */ - &canon_PIXMA_MG8100_modelist,/* there is some ESC (r 0x68 command for CD tray also, not sure why */ - &canon_PIXMA_MG6100_paperlist, /* same as MG6100 */ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.40 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG5200_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /* features */ + &canon_PIXMA_MG8100_modelist, + &canon_PIXMA_MG6100_paperlist, + &canon_PIXMA_MG8100_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon PIXMA MG8200 */ + "PIXMA MG8200", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.60 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG5200_slotlist, /* ESC (r only for CD media */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, /* features */ + &canon_PIXMA_MG8200_modelist, + &canon_PIXMA_MG6100_paperlist, + &canon_PIXMA_MG8200_modeuselist, NULL, NULL, NULL, @@ -1431,13 +2655,15 @@ static const canon_cap_t canon_model_capabilities[] = /* MX series */ { /* Canon MULTIPASS MX300 --- MX310 is the same */ "PIXMA MX300", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150, /*features */ + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 2,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MX300_modelist, &canon_MULTIPASS_MX300_paperlist, + &canon_MULTIPASS_MX300_modeuselist, NULL, NULL, NULL, @@ -1445,27 +2671,31 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon MULTIPASS MX330 */ "PIXMA MX330", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150, /*features */ + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MX330_modelist, &canon_MULTIPASS_MX330_paperlist, + &canon_MULTIPASS_MX330_modeuselist, NULL, NULL, NULL, iP4500_channel_order }, - { /* Canon MULTIPASS MX340 */ + { /* Canon MULTIPASS MX340 --- with XML*/ "PIXMA MX340", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, - &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150, /*features */ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.30 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MX340_modelist, &canon_MULTIPASS_MX340_paperlist, + &canon_MULTIPASS_MX340_modeuselist, NULL, NULL, NULL, @@ -1473,13 +2703,31 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon MULTIPASS MX360 -- with XML */ "PIXMA MX360", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.50 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150, /*features */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ &canon_MULTIPASS_MX360_modelist, &canon_MULTIPASS_MX360_paperlist, + &canon_MULTIPASS_MX360_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon MULTIPASS MX370 --- with XML */ + "PIXMA MX370", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.70 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG2100_slotlist, /* only front tray also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,8, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, + &canon_MULTIPASS_MX370_modelist, + &canon_MULTIPASS_MX420_paperlist, + &canon_MULTIPASS_MX370_modeuselist, NULL, NULL, NULL, @@ -1487,27 +2735,63 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon MULTIPASS MX420 --- with XML */ "PIXMA MX420", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.50 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150, /*features */ - &canon_MULTIPASS_MP480_modelist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features */ + &canon_MULTIPASS_MX420_modelist, &canon_MULTIPASS_MX420_paperlist, + &canon_MULTIPASS_MX420_modeuselist, NULL, NULL, NULL, - NULL + iP4500_channel_order + }, + { /* Canon MULTIPASS MX510 --- with XML */ + "PIXMA MX510", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.70 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG2100_slotlist, /* only front tray also uses CAP_T */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,8, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, + &canon_MULTIPASS_MX510_modelist, + &canon_MULTIPASS_MX420_paperlist, + &canon_MULTIPASS_MX510_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order }, { /* Canon MULTIPASS MX700 */ "PIXMA MX700", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MP520_slotlist, /* front, rear, button, and front/plain-only */ - CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0,control_cmd_PIXMA_iP4000, /*features*/ + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features*/ &canon_MULTIPASS_MP520_modelist, &canon_MULTIPASS_MX300_paperlist, + &canon_MULTIPASS_MX700_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon MULTIPASS MX710 --- with XML */ + "PIXMA MX710", 3, /*model, model_id*/ + INCH(17/2), INCH(23), /* max paper width and height */ /* from linux driver v3.70 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG5100_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,8, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, /*features*/ + &canon_MULTIPASS_MX710_modelist, + &canon_MULTIPASS_MX420_paperlist, + &canon_MULTIPASS_MX710_modeuselist, NULL, NULL, NULL, @@ -1515,13 +2799,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon MULTIPASS MX850 */ "PIXMA MX850", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MX850_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /*features*/ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features*/ &canon_PIXMA_iP4500_modelist, /* same inksets as iP4500 */ &canon_MULTIPASS_MX850_paperlist, + &canon_MULTIPASS_MX850_modeuselist, NULL, NULL, NULL, @@ -1529,13 +2815,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon MULTIPASS MX860 */ "PIXMA MX860", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_MG5100_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /*features*/ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features*/ &canon_MULTIPASS_MX860_modelist, &canon_MULTIPASS_MX330_paperlist, + &canon_MULTIPASS_MX860_modeuselist, NULL, NULL, NULL, @@ -1543,13 +2831,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon MULTIPASS MX870 --- with XML */ "PIXMA MX870", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.30 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_MG5100_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150, /*features*/ - &canon_MULTIPASS_MX870_modelist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features*/ + &canon_MULTIPASS_MX860_modelist, &canon_MULTIPASS_MX340_paperlist, + &canon_MULTIPASS_MX870_modeuselist, NULL, NULL, NULL, @@ -1557,13 +2847,15 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon MULTIPASS MX880 --- with XML */ "PIXMA MX880", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.50 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_MG5100_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150, /*features*/ - &canon_MULTIPASS_MP540_modelist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP2700, /*features*/ + &canon_MULTIPASS_MX880_modelist, &canon_MULTIPASS_MX880_paperlist, + &canon_MULTIPASS_MX880_modeuselist, NULL, NULL, NULL, @@ -1571,13 +2863,47 @@ static const canon_cap_t canon_model_capabilities[] = }, { /* Canon MULTIPASS MX7600 */ "PIXMA MX7600", 3, /*model, model_id*/ - 842, 17*72, /* max paper width and height */ - 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ - 8, + INCH(17/2), INCH(23), /* max paper width and height */ /* from MacOSX driver */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ &canon_MULTIPASS_MX7600_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /*features*/ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64, + 3,4, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_iP4200, /*features*/ &canon_MULTIPASS_MX7600_modelist, &canon_MULTIPASS_MX7600_paperlist, + &canon_MULTIPASS_MX7600_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon MULTIPASS E500 --- with XML */ + "PIXMA E500", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.60 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG2100_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,6, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, /*features*/ + &canon_MULTIPASS_E500_modelist, + &canon_MULTIPASS_MX880_paperlist, + &canon_MULTIPASS_E500_modeuselist, + NULL, + NULL, + NULL, + iP4500_channel_order + }, + { /* Canon MULTIPASS E600 --- with XML */ + "PIXMA E600", 3, /*model, model_id*/ + INCH(17/2), 1917, /* max paper width and height */ /* from linux driver v3.70 */ + 10, 10, 9, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_MG2100_slotlist, + CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0, + 3,8, /* ESC (l and (P command lengths */ + control_cmd_PIXMA_MG5300, /*features*/ + &canon_MULTIPASS_E500_modelist, + &canon_MULTIPASS_MX880_paperlist, + &canon_MULTIPASS_E500_modeuselist, NULL, NULL, NULL, |