slp
/
selphy_print
1
0
Fork 0
Code Issues Pull Requests Activity

mitsu9550: Split out the 9800/9810/9800S into unique types. 

The 9810 is different from the 9800 (matte support), and the 9800S is
probably different from the 9800, if the 9550/9550S is any indication.
master
Solomon Peachy 2016-10-13 12:50:30 -04:00
parent ed4a98c031
commit 5105d71b6c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend_common.h
View File

@ -112,8 +112,9 @@ enum {
P_MITSU_K60,
P_MITSU_9xxx,
P_MITSU_9550S,
P_MITSU_98x0,
P_MITSU_98x0S,
P_MITSU_9800,
P_MITSU_9800S,
P_MITSU_9810,
P_DNP_DS40,
P_DNP_DS80,
P_DNP_DS80D,

15
backend_mitsu9550.c
View File

@ -1,5 +1,5 @@
/*
* Mitsubishi CP-9550DW[-S] Photo Printer CUPS backend
* Mitsubishi CP-9xxx Photo Printer Family CUPS backend
*
* (c) 2014-2016 Solomon Peachy <pizza@shaftnet.org>
*
@ -348,7 +348,7 @@ hdr_done:
ctx->cols = be16_to_cpu(ctx->hdr1.cols);
ctx->plane_len = ctx->rows * ctx->cols;
if (ctx->type == P_MITSU_98x0)
if (ctx->type == P_MITSU_9800 || ctx->type == P_MITSU_9810)
ctx->plane_len *= 2;
/* We have three planes and the final command to read */
@ -388,7 +388,6 @@ hdr_done:
ctx->hdr4_present = 0;
}
#if 0
/* XXX force matte off */
if (ctx->type != P_MITSU_9810) {
if (ctx->hdr1.matte) {
@ -396,7 +395,7 @@ hdr_done:
ctx->hdr1.matte = 0;
}
}
#endif
return CUPS_BACKEND_OK;
}
@ -901,10 +900,10 @@ struct dyesub_backend mitsu9550_backend = {
{ USB_VID_MITSU, USB_PID_MITSU_9550DS, P_MITSU_9550S, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9xxx, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9600S, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9800D, P_MITSU_98x0, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9800DS, P_MITSU_98x0S, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9810D, P_MITSU_98x0, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9810DS, P_MITSU_98x0S, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9800D, P_MITSU_9800, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9800DS, P_MITSU_9800S, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9810D, P_MITSU_9810, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9810DS, P_MITSU_9810S, ""},
{ 0, 0, 0, ""}
}
};