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

various: We used CUPS_BACKEND_HOLD instead of _STOP for some errors

This commit is contained in:
Solomon Peachy 2021-09-29 22:54:07 -04:00
parent 1a1e1c7dfb
commit 87f3f39005
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend_canonselphy.c
View File

@ -860,7 +860,7 @@ top:
/* Try to clear error state */ /* Try to clear error state */
if ((ret = send_data(ctx->conn, ctx->printer->clear_error, ctx->printer->clear_error_len))) if ((ret = send_data(ctx->conn, ctx->printer->clear_error, ctx->printer->clear_error_len)))
return CUPS_BACKEND_FAILED; return CUPS_BACKEND_FAILED;
return CUPS_BACKEND_HOLD; return CUPS_BACKEND_STOP;
} }
if (memcmp(rdbuf, rdbuf2, READBACK_LEN)) { if (memcmp(rdbuf, rdbuf2, READBACK_LEN)) {
@ -1097,7 +1097,7 @@ static const char *canonselphy_prefixes[] = {
const struct dyesub_backend canonselphy_backend = { const struct dyesub_backend canonselphy_backend = {
.name = "Canon SELPHY CP/ES (legacy)", .name = "Canon SELPHY CP/ES (legacy)",
.version = "0.110", .version = "0.111",
.uri_prefixes = canonselphy_prefixes, .uri_prefixes = canonselphy_prefixes,
.cmdline_usage = canonselphy_cmdline, .cmdline_usage = canonselphy_cmdline,
.cmdline_arg = canonselphy_cmdline_arg, .cmdline_arg = canonselphy_cmdline_arg,

4
backend_dnpds40.c
View File

@ -2234,7 +2234,7 @@ top:
return CUPS_BACKEND_CANCEL; return CUPS_BACKEND_CANCEL;
default: default:
ERROR("Fatal Printer Error: %d => %s, halting queue!\n", status, dnpds40_statuses(status)); ERROR("Fatal Printer Error: %d => %s, halting queue!\n", status, dnpds40_statuses(status));
return CUPS_BACKEND_HOLD; return CUPS_BACKEND_STOP;
} }
{ {
@ -3484,7 +3484,7 @@ static const char *dnpds40_prefixes[] = {
const struct dyesub_backend dnpds40_backend = { const struct dyesub_backend dnpds40_backend = {
.name = "DNP DS-series / Citizen C-series", .name = "DNP DS-series / Citizen C-series",
.version = "0.142", .version = "0.143",
.uri_prefixes = dnpds40_prefixes, .uri_prefixes = dnpds40_prefixes,
.cmdline_usage = dnpds40_cmdline, .cmdline_usage = dnpds40_cmdline,
.cmdline_arg = dnpds40_cmdline_arg, .cmdline_arg = dnpds40_cmdline_arg,

4
backend_mitsu9550.c
View File

@ -249,7 +249,7 @@ static const char *cp30_media_types(uint16_t remain)
/* Sanity-check media response */ \ /* Sanity-check media response */ \
if ((media->remain == 0 && media->remain2 == 0) || media->max == 0) { \ if ((media->remain == 0 && media->remain2 == 0) || media->max == 0) { \
ERROR("Printer out of media!\n"); \ ERROR("Printer out of media!\n"); \
return CUPS_BACKEND_HOLD; \ return CUPS_BACKEND_STOP; \
} \ } \
#define QUERY_STATUS_II \ #define QUERY_STATUS_II \
@ -1612,7 +1612,7 @@ static const char *mitsu9550_prefixes[] = {
/* Exported */ /* Exported */
const struct dyesub_backend mitsu9550_backend = { const struct dyesub_backend mitsu9550_backend = {
.name = "Mitsubishi CP9xxx family", .name = "Mitsubishi CP9xxx family",
.version = "0.61" " (lib " LIBMITSU_VER ")", .version = "0.62" " (lib " LIBMITSU_VER ")",
.uri_prefixes = mitsu9550_prefixes, .uri_prefixes = mitsu9550_prefixes,
.cmdline_usage = mitsu9550_cmdline, .cmdline_usage = mitsu9550_cmdline,
.cmdline_arg = mitsu9550_cmdline_arg, .cmdline_arg = mitsu9550_cmdline_arg,