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

kodak8800: Fix some crash errors. Printer now properly queries stats.

This commit is contained in:
Solomon Peachy 2021-08-04 17:45:01 -04:00
parent ccec9973eb
commit b2f7e231a3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend_kodak8800.c
View File

@ -319,6 +319,7 @@ static int kodak8800_attach(void *vctx, struct dyesub_connection *conn, uint8_t
ctx->marker.levelnow = media.ribbon_remain; ctx->marker.levelnow = media.ribbon_remain;
else else
ctx->marker.levelnow = media.paper_remain; ctx->marker.levelnow = media.paper_remain;
ctx->marker.levelnow /= 12;
ctx->marker.color = "#00FFFF#FF00FF#FFFF00"; ctx->marker.color = "#00FFFF#FF00FF#FFFF00";
ctx->marker.numtype = media.media_type; ctx->marker.numtype = media.media_type;
@ -551,6 +552,7 @@ static int kodak8800_query_markers(void *vctx, struct marker **markers, int *cou
ctx->marker.levelnow = media.ribbon_remain; ctx->marker.levelnow = media.ribbon_remain;
else else
ctx->marker.levelnow = media.paper_remain; ctx->marker.levelnow = media.paper_remain;
ctx->marker.levelnow /= 12;
*markers = &ctx->marker; *markers = &ctx->marker;
*count = 1; *count = 1;
@ -567,8 +569,9 @@ static int kodak8800_query_stats(void *vctx, struct printerstats *stats)
stats->mfg = "Kodak"; stats->mfg = "Kodak";
stats->model = "8800/9810"; stats->model = "8800/9810";
if (kodak8800_query_mfgmodel(ctx)) ret = kodak8800_query_mfgmodel(ctx);
return CUPS_BACKEND_FAILED; if (ret)
return ret;
stats->serial = ctx->serial; stats->serial = ctx->serial;
stats->fwver = ctx->fwver; stats->fwver = ctx->fwver;
@ -576,13 +579,14 @@ static int kodak8800_query_stats(void *vctx, struct printerstats *stats)
stats->decks = 1; stats->decks = 1;
stats->mediatype[0] = ctx->marker.name; stats->mediatype[0] = ctx->marker.name;
stats->levelmax[0] = ctx->marker.levelmax; stats->levelmax[0] = ctx->marker.levelmax;
stats->levelmax[0] = ctx->marker.levelnow; stats->levelnow[0] = ctx->marker.levelnow;
stats->name[0] = "Roll"; stats->name[0] = "Roll";
stats->status[0] = "Unknown"; // XXX stats->status[0] = strdup("Unknown"); // XXX
ret = rtp1_docmd(ctx, rtp_getcounters, NULL, 0, sizeof(counters), (uint8_t*) &counters); ret = rtp1_docmd(ctx, rtp_getcounters, NULL, 0, sizeof(counters), (uint8_t*) &counters);
if (!ret) if (ret)
return ret; return ret;
stats->cnt_life[0] = be32_to_cpu(counters.prints_finished); stats->cnt_life[0] = be32_to_cpu(counters.prints_finished);
return CUPS_BACKEND_OK; return CUPS_BACKEND_OK;
@ -597,7 +601,7 @@ static const char *kodak8800_prefixes[] = {
/* Exported */ /* Exported */
const struct dyesub_backend kodak8800_backend = { const struct dyesub_backend kodak8800_backend = {
.name = "Kodak 8800/9810", .name = "Kodak 8800/9810",
.version = "0.01WIP", .version = "0.02WIP",
.uri_prefixes = kodak8800_prefixes, .uri_prefixes = kodak8800_prefixes,
.cmdline_usage = kodak8800_cmdline, .cmdline_usage = kodak8800_cmdline,
.cmdline_arg = kodak8800_cmdline_arg, .cmdline_arg = kodak8800_cmdline_arg,