all: Ensure all jobid-aware printers log the ID properly.

This commit is contained in:
Solomon Peachy 2016-01-20 13:40:11 -05:00
parent f97b139549
commit 1c3cfc996a
6 changed files with 8 additions and 8 deletions

View file

@ -1126,7 +1126,7 @@ static int kodak6800_main_loop(void *vctx, int copies) {
}
#endif
INFO("Initiating Print Job\n");
INFO("Sending Print Job (internal id %d)\n", ctx->jobid);
if ((ret = kodak6800_do_cmd(ctx, (uint8_t*) &ctx->hdr, sizeof(ctx->hdr),
&status, sizeof(status),
&num)))

View file

@ -995,8 +995,8 @@ top:
}
/* Make sure we don't have any jobid collisions */
while (hdr->jobid == be16_to_cpu(jobs.jobid_0) ||
hdr->jobid == be16_to_cpu(jobs.jobid_1)) {
while (ctx->jobid == be16_to_cpu(jobs.jobid_0) ||
ctx->jobid == be16_to_cpu(jobs.jobid_1)) {
ctx->jobid++;
if (!ctx->jobid)
ctx->jobid++;
@ -1032,7 +1032,7 @@ top:
#endif
/* We're clear to send data over! */
INFO("Sending Print Job\n");
INFO("Sending Print Job (internal id %d)\n", ctx->jobid);
if ((ret = send_data(ctx->dev, ctx->endp_down,
ctx->databuf + sizeof(struct mitsu70x_hdr),

View file

@ -1478,7 +1478,7 @@ top:
}
}
INFO("Initiating print job (internal id %d)\n", ctx->jobid);
INFO("Sending print job (internal id %d)\n", ctx->jobid);
shinkos1245_fill_hdr(&cmd.hdr);
cmd.cmd[0] = 0x0a;

View file

@ -1589,7 +1589,7 @@ top:
break;
case S_PRINTER_READY_CMD:
INFO("Initiating print job (internal id %d)\n", ctx->jobid);
INFO("Sending print job (internal id %d)\n", ctx->jobid);
memset(cmdbuf, 0, CMDBUF_LEN);
print->hdr.cmd = cpu_to_le16(S2145_CMD_PRINTJOB);

View file

@ -2314,7 +2314,7 @@ top:
ctx->databuf = (uint8_t*) databuf2;
ctx->datalen = newlen;
INFO("Initiating print job (internal id %d)\n", ctx->jobid);
INFO("Sending print job (internal id %d)\n", ctx->jobid);
memset(cmdbuf, 0, CMDBUF_LEN);
print->hdr.cmd = cpu_to_le16(S6145_CMD_PRINTJOB);

View file

@ -1727,7 +1727,7 @@ top:
case S_PRINTER_READY_CMD:
// XXX send "get eeprom backup command"
INFO("Initiating print job (internal id %d)\n", ctx->jobid);
INFO("Sending print job (internal id %d)\n", ctx->jobid);
memset(cmdbuf, 0, CMDBUF_LEN);
print->hdr.cmd = cpu_to_le16(S6245_CMD_PRINTJOB);