hiti: RDS_RIS and RDS_RSUS take 0 arguments, not 1.

...Hopefully fixes the P51x probing.
This commit is contained in:
Solomon Peachy 2022-06-12 11:13:31 -04:00
parent 8150fdeb83
commit 12ca1f99de
1 changed files with 6 additions and 12 deletions

View File

@ -69,7 +69,7 @@ struct hiti_cmd {
#define CMD_RDS_DSRA 0x0408 /* Request Device Serviced Alerts */
#define CMD_RDS_SA 0x040A /* Request Service Alerts */
#define CMD_RDS_RPS 0x040B /* Request Printer Statistics */
#define CMD_RDS_RSUS 0x040C /* Request Supplies Status (not P51x) */
#define CMD_RDS_RSUS 0x040C /* Request Supplies Status */
/* Job Control */
#define CMD_JC_SJ 0x0500 /* Start Job (3 arg) */
@ -1717,8 +1717,6 @@ static int hiti_read_parse(void *vctx, const void **vjob, int data_fd, int copie
}
/* Sanity check against ribbon type */
if (ctx->conn->type != P_HITI_51X) {
switch (ctx->supplies[2]) {
case RIBBON_TYPE_4x6:
if (job->hdr.code != PRINT_TYPE_6x4 &&
@ -1769,7 +1767,6 @@ static int hiti_read_parse(void *vctx, const void **vjob, int data_fd, int copie
hiti_cleanup_job(job);
return CUPS_BACKEND_CANCEL;
}
}
/* Convert input packed BGR data into YMC planar, if needed */
if (!(job->hdr.payload_flag & PAYLOAD_FLAG_YMCPLANAR)) {
@ -2310,16 +2307,13 @@ static int hiti_query_supplies(struct hiti_ctx *ctx)
{
int ret;
uint16_t len = 5;
uint8_t arg = 0;
if (ctx->conn->type != P_HITI_51X) {
ret = hiti_docmd_resp(ctx, CMD_RDS_RSUS, &arg, sizeof(arg), ctx->supplies, &len);
if (ret)
return ret;
}
ret = hiti_docmd_resp(ctx, CMD_RDS_RSUS, NULL, 0, ctx->supplies, &len);
if (ret)
return ret;
len = 4;
ret = hiti_docmd_resp(ctx, CMD_RDS_RIS, &arg, sizeof(arg), ctx->supplies2, &len);
ret = hiti_docmd_resp(ctx, CMD_RDS_RIS, NULL, 0, ctx->supplies2, &len);
if (ret)
return ret;
@ -2485,7 +2479,7 @@ static const char *hiti_prefixes[] = {
const struct dyesub_backend hiti_backend = {
.name = "HiTi Photo Printers",
.version = "0.35",
.version = "0.36",
.uri_prefixes = hiti_prefixes,
.cmdline_usage = hiti_cmdline,
.cmdline_arg = hiti_cmdline_arg,