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

dnp_ds40: Fix termination when printing multiple copies, and some minor 

things.
This commit is contained in:
Solomon Peachy 2013-12-08 07:14:27 -05:00
parent ce731aa034
commit 8de9099adf
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backend_dnpds40.c
View File

@ -59,12 +59,12 @@ struct dnpds40_cmd {
uint8_t arg1[6]; uint8_t arg1[6];
uint8_t arg2[16]; uint8_t arg2[16];
uint8_t arg3[8]; /* Decimal value of arg4's length, or empty */ uint8_t arg3[8]; /* Decimal value of arg4's length, or empty */
uint8_t arg4[0]; /* Extra payload if arg3 is non-empty
Doesn't have to be sent in the same URB */
/* All unused elements are set to ' ' (ie ascii space) */ /* All unused elements are set to 0x20 (ie ascii space) */
}; };
#define DS40_CMD_LEN 32
#define min(__x, __y) ((__x) < (__y)) ? __x : __y #define min(__x, __y) ((__x) < (__y)) ? __x : __y
static void dnpds40_build_cmd(struct dnpds40_cmd *cmd, char *arg1, char *arg2, uint32_t arg3_len) static void dnpds40_build_cmd(struct dnpds40_cmd *cmd, char *arg1, char *arg2, uint32_t arg3_len)
@ -79,7 +79,7 @@ static void dnpds40_build_cmd(struct dnpds40_cmd *cmd, char *arg1, char *arg2, u
if (arg3_len) if (arg3_len)
snprintf((char*)cmd->arg3, 8, "%08d", arg3_len); snprintf((char*)cmd->arg3, 8, "%08d", arg3_len);
DEBUG("command: '%s' ", (char*)cmd); DEBUG("command: ");
for (i = 0 ; i < sizeof(*cmd); i++) { for (i = 0 ; i < sizeof(*cmd); i++) {
DEBUG2("%02x ", *(((uint8_t*)cmd)+i)); DEBUG2("%02x ", *(((uint8_t*)cmd)+i));
} }
@ -169,13 +169,14 @@ static uint8_t * dnpds40_resp_cmd(struct dnpds40_ctx *ctx,
uint8_t *respbuf; uint8_t *respbuf;
int ret, i, num = 0; int ret, i, num = 0;
memset(tmp, 0, sizeof(tmp));
if ((ret = send_data(ctx->dev, ctx->endp_down, if ((ret = send_data(ctx->dev, ctx->endp_down,
(uint8_t*)cmd, sizeof(*cmd)))) (uint8_t*)cmd, sizeof(*cmd))))
return NULL; return NULL;
/* Read in the response header */ /* Read in the response header */
memset(tmp, 0, sizeof(tmp));
ret = libusb_bulk_transfer(ctx->dev, ctx->endp_up, ret = libusb_bulk_transfer(ctx->dev, ctx->endp_up,
(uint8_t*)tmp, (uint8_t*)tmp,
8, 8,
@ -293,17 +294,20 @@ static int dnpds40_main_loop(void *vctx, int copies) {
if (!ctx) if (!ctx)
return 1; return 1;
// XXX printer probably supports making copies.
while (copies--) { while (copies--) {
/* Just dump the whole damn thing over */
DEBUG("Sending %d bytes to printer\n", ctx->datalen); DEBUG("Sending %d bytes to printer\n", ctx->datalen);
if ((ret = send_data(ctx->dev, ctx->endp_down, if ((ret = send_data(ctx->dev, ctx->endp_down,
ctx->databuf, ctx->datalen))) ctx->databuf, ctx->datalen)))
return ret; return ret;
/* Clean up */
if (terminate)
copies = 1;
INFO("Print complete (%d remaining)\n", copies); INFO("Print complete (%d remaining)\n", copies);
} }
/* Just dump the whole damn thing over */
return 0; return 0;
} }
@ -441,7 +445,7 @@ static int dnpds40_cmdline_arg(void *vctx, int run, char *arg1, char *arg2)
/* Exported */ /* Exported */
struct dyesub_backend dnpds40_backend = { struct dyesub_backend dnpds40_backend = {
.name = "DNP DS40/DS80", .name = "DNP DS40/DS80",
.version = "0.04", .version = "0.05",
.uri_prefix = "dnpds40", .uri_prefix = "dnpds40",
.cmdline_usage = dnpds40_cmdline, .cmdline_usage = dnpds40_cmdline,
.cmdline_arg = dnpds40_cmdline_arg, .cmdline_arg = dnpds40_cmdline_arg,