slp/selphy_print
1
0
Fork 0
Code Issues 50 Pull requests Activity

cw01: We don't need to send the plane length *twice*

Browse source
This commit is contained in:
Solomon Peachy 2014-10-08 14:29:58 -04:00
parent 7a88991b69
commit 721b621266
1 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
backend_cw01.c
View file

@ -192,7 +192,7 @@ static int cw01_do_cmd(struct cw01_ctx *ctx,
(uint8_t*)cmd, sizeof(*cmd))))
return ret;
if (data && len)
if (data && len)
if ((ret = send_data(ctx->dev, ctx->endp_down,
data, len)))
return ret;
@ -200,9 +200,9 @@ static int cw01_do_cmd(struct cw01_ctx *ctx,
return CUPS_BACKEND_OK;
}
static uint8_t * cw01_resp_cmd(struct cw01_ctx *ctx,
struct cw01_cmd *cmd,
int *len)
static uint8_t *cw01_resp_cmd(struct cw01_ctx *ctx,
struct cw01_cmd *cmd,
int *len)
{
char tmp[9];
uint8_t *respbuf;
@ -445,16 +445,10 @@ top:
/******** Plane 1 */
cw01_build_cmd(&cmd, "IMAGE", "YPLANE", ctx->hdr.plane_len - SPOOL_PLANE_HDR_LEN + PRINTER_PLANE_HDR_LEN);
snprintf(buf, sizeof(buf), "%08d", ctx->hdr.plane_len - SPOOL_PLANE_HDR_LEN + PRINTER_PLANE_HDR_LEN);
ret = cw01_do_cmd(ctx, &cmd, (uint8_t*) buf, 8);
ret = cw01_do_cmd(ctx, &cmd, plane_hdr, PRINTER_PLANE_HDR_LEN);
if (ret)
return CUPS_BACKEND_FAILED;
/* Send plane header */
if ((ret = send_data(ctx->dev, ctx->endp_down,
plane_hdr, PRINTER_PLANE_HDR_LEN)))
return CUPS_BACKEND_FAILED;
/* Send plane data */
if ((ret = send_data(ctx->dev, ctx->endp_down,
ptr + SPOOL_PLANE_HDR_LEN, ctx->hdr.plane_len - SPOOL_PLANE_HDR_LEN)))
@ -464,16 +458,10 @@ top:
/******** Plane 2 */
cw01_build_cmd(&cmd, "IMAGE", "MPLANE", ctx->hdr.plane_len - SPOOL_PLANE_HDR_LEN + PRINTER_PLANE_HDR_LEN);
snprintf(buf, sizeof(buf), "%08d", ctx->hdr.plane_len - SPOOL_PLANE_HDR_LEN + PRINTER_PLANE_HDR_LEN);
ret = cw01_do_cmd(ctx, &cmd, (uint8_t*) buf, 8);
ret = cw01_do_cmd(ctx, &cmd, plane_hdr, PRINTER_PLANE_HDR_LEN);
if (ret)
return CUPS_BACKEND_FAILED;
/* Send plane header */
if ((ret = send_data(ctx->dev, ctx->endp_down,
plane_hdr, PRINTER_PLANE_HDR_LEN)))
return CUPS_BACKEND_FAILED;
/* Send plane data */
if ((ret = send_data(ctx->dev, ctx->endp_down,
ptr + SPOOL_PLANE_HDR_LEN, ctx->hdr.plane_len - SPOOL_PLANE_HDR_LEN)))
@ -483,16 +471,10 @@ top:
/******** Plane 3 */
cw01_build_cmd(&cmd, "IMAGE", "CPLANE", ctx->hdr.plane_len - SPOOL_PLANE_HDR_LEN + PRINTER_PLANE_HDR_LEN);
snprintf(buf, sizeof(buf), "%08d", ctx->hdr.plane_len - SPOOL_PLANE_HDR_LEN + PRINTER_PLANE_HDR_LEN);
ret = cw01_do_cmd(ctx, &cmd, (uint8_t*) buf, 8);
ret = cw01_do_cmd(ctx, &cmd, plane_hdr, PRINTER_PLANE_HDR_LEN);
if (ret)
return CUPS_BACKEND_FAILED;
/* Send plane header */
if ((ret = send_data(ctx->dev, ctx->endp_down,
plane_hdr, PRINTER_PLANE_HDR_LEN)))
return CUPS_BACKEND_FAILED;
/* Send plane data */
if ((ret = send_data(ctx->dev, ctx->endp_down,
ptr + SPOOL_PLANE_HDR_LEN, ctx->hdr.plane_len - SPOOL_PLANE_HDR_LEN)))