slp
/
selphy_print
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s2145: Use a fixed-size buffer to receive responses from the printer.

Browse Source 
Doesn't seem to fix the hanging on subsequent requests.  Hmm.  Maybe
there's something wrong with the initial requests instead?
master
Solomon Peachy 10 years ago
parent fbbd488c36
commit 28c70a6fbc
2 changed files with 150 additions and 136 deletions
Show Stats Download Patch File Download Diff File

2
README
Unescape View File

@ -160,7 +160,7 @@
In order to use this backend, you will need to ensure the printer is
configured to use the 'DRV' (as opposed to 'DLL') operating mode. See
the printer documention for details on how to set this.
the printer documentation for details on how to set this.
This backend supports additional commands:

284
shinko_s2145_print.c
Unescape View File

@ -39,7 +39,7 @@
#include <fcntl.h>
#include <signal.h>
#define VERSION "0.09"
#define VERSION "0.10"
#define URI_PREFIX "shinko_s2145://"
#include "backend_common.c"
@ -421,7 +421,7 @@ struct s2145_getunique_resp {
uint8_t data[24]; /* Not necessarily all used. */
} __attribute__((packed));
#define READBACK_LEN sizeof(struct s2145_status_resp)
#define READBACK_LEN 128 /* Needs to be larger than largest response hdr */
#define CMDBUF_LEN sizeof(struct s2145_print_cmd)
static int find_and_enumerate(struct libusb_context *ctx,
@ -464,8 +464,9 @@ static int find_and_enumerate(struct libusb_context *ctx,
static int get_status(libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_cmd_hdr cmd;
struct s2145_status_resp resp;
struct s2145_status_resp *resp = (struct s2145_status_resp *) rdbuf;
int ret, num = 0;
cmd.cmd = cpu_to_le16(S2145_CMD_STATUS);
@ -476,8 +477,8 @@ static int get_status(libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -486,37 +487,39 @@ static int get_status(libusb_device_handle *dev,
return ret;
}
INFO("Printer Status: %02x\n", resp.hdr.status);
INFO("Printer Status: 0x%02x\n", resp->hdr.status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.hdr.result, resp.hdr.error, resp.hdr.printer_major,
resp.hdr.printer_minor);
if (resp->hdr.result != RESULT_SUCCESS) {
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp->hdr.result, resp->hdr.error, resp->hdr.printer_major,
resp->hdr.printer_minor);
}
if (le16_to_cpu(resp.hdr.payload_len) != (sizeof(struct s2145_status_resp) - sizeof(struct s2145_status_hdr)))
if (le16_to_cpu(resp->hdr.payload_len) != (sizeof(struct s2145_status_resp) - sizeof(struct s2145_status_hdr)))
return 0;
INFO(" Prints:\n");
INFO("\tLifetime:\t\t\t%08d\n", le32_to_cpu(resp.count_lifetime));
INFO("\tMaintainence:\t\t%08d\n", le32_to_cpu(resp.count_maint));
INFO("\tSince Paper Changed:\t%08d\n", le32_to_cpu(resp.count_paper));
INFO("\tCutter:\t\t\t%08d\n", le32_to_cpu(resp.count_cutter));
INFO("\tPrint Head:\t\t%08d\n", le32_to_cpu(resp.count_head));
INFO("\tRibbon Remaining:\t%08d\n", le32_to_cpu(resp.count_ribbon_left));
INFO("\tLifetime:\t\t%08d\n", le32_to_cpu(resp->count_lifetime));
INFO("\tMaintainence:\t\t%08d\n", le32_to_cpu(resp->count_maint));
INFO("\tSince Paper Changed:\t%08d\n", le32_to_cpu(resp->count_paper));
INFO("\tCutter:\t\t\t%08d\n", le32_to_cpu(resp->count_cutter));
INFO("\tPrint Head:\t\t%08d\n", le32_to_cpu(resp->count_head));
INFO("\tRibbon Remaining:\t%08d\n", le32_to_cpu(resp->count_ribbon_left));
INFO("Bank 1: 0x%02x (%s) Job %03d @ %03d/%03d (%03d remaining)\n",
resp.bank1_status, bank_statuses[resp.bank1_status],
resp.bank1_printid,
le16_to_cpu(resp.bank1_remaining),
le16_to_cpu(resp.bank1_finished),
le16_to_cpu(resp.bank1_specified));
resp->bank1_status, bank_statuses[resp->bank1_status],
resp->bank1_printid,
le16_to_cpu(resp->bank1_remaining),
le16_to_cpu(resp->bank1_finished),
le16_to_cpu(resp->bank1_specified));
INFO("Bank 2: 0x%02x (%s) Job %03d @ %03d/%03d (%03d remaining)\n",
resp.bank2_status, bank_statuses[resp.bank1_status],
resp.bank2_printid,
le16_to_cpu(resp.bank2_remaining),
le16_to_cpu(resp.bank2_finished),
le16_to_cpu(resp.bank2_specified));
resp->bank2_status, bank_statuses[resp->bank1_status],
resp->bank2_printid,
le16_to_cpu(resp->bank2_remaining),
le16_to_cpu(resp->bank2_finished),
le16_to_cpu(resp->bank2_specified));
INFO("Tonecurve Status: 0x%02x (%s)\n", resp.tonecurve_status, tonecurve_statuses[resp.tonecurve_status]);
INFO("Tonecurve Status: 0x%02x (%s)\n", resp->tonecurve_status, tonecurve_statuses[resp->tonecurve_status]);
return 0;
}
@ -524,8 +527,9 @@ static int get_status(libusb_device_handle *dev,
static int get_fwinfo(libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_fwinfo_cmd cmd;
struct s2145_fwinfo_resp resp;
struct s2145_fwinfo_resp *resp = (struct s2145_fwinfo_resp *)rdbuf;
int ret, num = 0;
int i;
@ -541,8 +545,8 @@ static int get_fwinfo(libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -551,26 +555,26 @@ static int get_fwinfo(libusb_device_handle *dev,
return ret;
}
if (resp.hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.hdr.status);
if (resp->hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->hdr.status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.hdr.result, resp.hdr.error, resp.hdr.printer_major,
resp.hdr.printer_minor);
resp->hdr.result, resp->hdr.error, resp->hdr.printer_major,
resp->hdr.printer_minor);
continue;
}
if (le16_to_cpu(resp.hdr.payload_len) != (sizeof(struct s2145_fwinfo_resp) - sizeof(struct s2145_status_hdr)))
if (le16_to_cpu(resp->hdr.payload_len) != (sizeof(struct s2145_fwinfo_resp) - sizeof(struct s2145_status_hdr)))
continue;
INFO(" '%s'\t ver %02x.%02x\n", fwinfo_targets[i],
resp.major, resp.minor);
resp->major, resp->minor);
#if 0
INFO(" name: '%s'\n", resp.name);
INFO(" type: '%s'\n", resp.type);
INFO(" date: '%s'\n", resp.date);
INFO(" version: %02x.%02x (CRC %04x)\n", resp.major, resp.minor,
le16_to_cpu(resp.checksum));
INFO(" name: '%s'\n", resp->name);
INFO(" type: '%s'\n", resp->type);
INFO(" date: '%s'\n", resp->date);
INFO(" version: %02x.%02x (CRC %04x)\n", resp->major, resp->minor,
le16_to_cpu(resp->checksum));
#endif
}
return 0;
@ -579,8 +583,9 @@ static int get_fwinfo(libusb_device_handle *dev,
static int get_errorlog(libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_cmd_hdr cmd;
struct s2145_errorlog_resp resp;
struct s2145_errorlog_resp *resp = (struct s2145_errorlog_resp *) rdbuf;
int ret, num = 0;
int i;
@ -592,8 +597,8 @@ static int get_errorlog(libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -602,23 +607,23 @@ static int get_errorlog(libusb_device_handle *dev,
return ret;
}
if (resp.hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.hdr.status);
if (resp->hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->hdr.status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.hdr.result, resp.hdr.error, resp.hdr.printer_major,
resp.hdr.printer_minor);
resp->hdr.result, resp->hdr.error, resp->hdr.printer_major,
resp->hdr.printer_minor);
return -1;
}
if (le16_to_cpu(resp.hdr.payload_len) != (sizeof(struct s2145_errorlog_resp) - sizeof(struct s2145_status_hdr)))
if (le16_to_cpu(resp->hdr.payload_len) != (sizeof(struct s2145_errorlog_resp) - sizeof(struct s2145_status_hdr)))
return -2;
INFO("Stored Error Events: %d entries:\n", resp.count);
for (i = 0 ; i < resp.count ; i++) {
INFO("Stored Error Events: %d entries:\n", resp->count);
for (i = 0 ; i < resp->count ; i++) {
INFO(" %02d: 0x%02x/0x%02x @ %08d prints\n", i,
resp.items[i].major, resp.items[i].minor,
le32_to_cpu(resp.items[i].print_counter));
resp->items[i].major, resp->items[i].minor,
le32_to_cpu(resp->items[i].print_counter));
}
return 0;
}
@ -626,8 +631,9 @@ static int get_errorlog(libusb_device_handle *dev,
static int get_mediainfo(libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_cmd_hdr cmd;
struct s2145_mediainfo_resp resp;
struct s2145_mediainfo_resp *resp = (struct s2145_mediainfo_resp *) rdbuf;
int ret, num = 0;
int i;
@ -639,8 +645,8 @@ static int get_mediainfo(libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -649,26 +655,26 @@ static int get_mediainfo(libusb_device_handle *dev,
return ret;
}
if (resp.hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.hdr.status);
if (resp->hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->hdr.status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.hdr.result, resp.hdr.error, resp.hdr.printer_major,
resp.hdr.printer_minor);
resp->hdr.result, resp->hdr.error, resp->hdr.printer_major,
resp->hdr.printer_minor);
return -1;
}
if (le16_to_cpu(resp.hdr.payload_len) != (sizeof(struct s2145_mediainfo_resp) - sizeof(struct s2145_status_hdr)))
if (le16_to_cpu(resp->hdr.payload_len) != (sizeof(struct s2145_mediainfo_resp) - sizeof(struct s2145_status_hdr)))
return -2;
INFO("Supported Media Information: %d entries:\n", resp.count);
for (i = 0 ; i < resp.count ; i++) {
INFO("Supported Media Information: %d entries:\n", resp->count);
for (i = 0 ; i < resp->count ; i++) {
INFO(" %02d: C 0x%02x (%s), %04dx%04d, M 0x%02x (%s), P 0x%02x (%s)\n", i,
resp.items[i].code, print_medias[resp.items[i].code],
le16_to_cpu(resp.items[i].columns),
le16_to_cpu(resp.items[i].rows),
resp.items[i].media_type, media_types[resp.items[i].media_type],
resp.items[i].print_type, print_methods[resp.items[i].print_type]);
resp->items[i].code, print_medias[resp->items[i].code],
le16_to_cpu(resp->items[i].columns),
le16_to_cpu(resp->items[i].rows),
resp->items[i].media_type, media_types[resp->items[i].media_type],
resp->items[i].print_type, print_methods[resp->items[i].print_type]);
}
return 0;
}
@ -676,8 +682,9 @@ static int get_mediainfo(libusb_device_handle *dev,
static int get_user_string(libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_cmd_hdr cmd;
struct s2145_getunique_resp resp;
struct s2145_getunique_resp *resp = (struct s2145_getunique_resp*) rdbuf;
int ret, num = 0;
cmd.cmd = cpu_to_le16(S2145_CMD_GETUNIQUE);
@ -688,8 +695,8 @@ static int get_user_string(libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -698,29 +705,30 @@ static int get_user_string(libusb_device_handle *dev,
return ret;
}
if (resp.hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.hdr.status);
if (resp->hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->hdr.status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.hdr.result, resp.hdr.error, resp.hdr.printer_major,
resp.hdr.printer_minor);
resp->hdr.result, resp->hdr.error, resp->hdr.printer_major,
resp->hdr.printer_minor);
return -1;
}
/* Null-terminate */
resp.hdr.payload_len = le16_to_cpu(resp.hdr.payload_len);
if (resp.hdr.payload_len > 23)
resp.hdr.payload_len = 23;
resp.data[resp.hdr.payload_len] = 0;
INFO("Unique String: '%s'\n", resp.data);
resp->hdr.payload_len = le16_to_cpu(resp->hdr.payload_len);
if (resp->hdr.payload_len > 23)
resp->hdr.payload_len = 23;
resp->data[resp->hdr.payload_len] = 0;
INFO("Unique String: '%s'\n", resp->data);
return 0;
}
static int set_user_string(char *str, libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_setunique_cmd cmd;
struct s2145_status_hdr resp;
struct s2145_status_hdr *resp = (struct s2145_status_hdr *) rdbuf;
int ret, num = 0;
if (str) {
@ -741,8 +749,8 @@ static int set_user_string(char *str, libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -751,12 +759,12 @@ static int set_user_string(char *str, libusb_device_handle *dev,
return ret;
}
if (resp.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.status);
if (resp->result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.result, resp.error, resp.printer_major,
resp.printer_minor);
resp->result, resp->error, resp->printer_major,
resp->printer_minor);
return -1;
}
@ -766,8 +774,9 @@ static int set_user_string(char *str, libusb_device_handle *dev,
static int cancel_job(char *str, libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_cancel_cmd cmd;
struct s2145_status_hdr resp;
struct s2145_status_hdr *resp = (struct s2145_status_hdr *) rdbuf;
int ret, num = 0;
if (!str)
@ -783,8 +792,8 @@ static int cancel_job(char *str, libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -793,12 +802,12 @@ static int cancel_job(char *str, libusb_device_handle *dev,
return ret;
}
if (resp.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.status);
if (resp->result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.result, resp.error, resp.printer_major,
resp.printer_minor);
resp->result, resp->error, resp->printer_major,
resp->printer_minor);
return -1;
}
@ -808,8 +817,9 @@ static int cancel_job(char *str, libusb_device_handle *dev,
static int flash_led(libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_cmd_hdr cmd;
struct s2145_status_hdr resp;
struct s2145_status_hdr *resp = (struct s2145_status_hdr *) rdbuf;
int ret, num = 0;
cmd.cmd = cpu_to_le16(S2145_CMD_FLASHLED);
@ -820,8 +830,8 @@ static int flash_led(libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -830,12 +840,12 @@ static int flash_led(libusb_device_handle *dev,
return ret;
}
if (resp.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.status);
if (resp->result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.result, resp.error, resp.printer_major,
resp.printer_minor);
resp->result, resp->error, resp->printer_major,
resp->printer_minor);
return -1;
}
@ -845,8 +855,9 @@ static int flash_led(libusb_device_handle *dev,
static int reset_curve(int target, libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_reset_cmd cmd;
struct s2145_status_hdr resp;
struct s2145_status_hdr *resp = (struct s2145_status_hdr *) rdbuf;
int ret, num = 0;
cmd.target = target;
@ -859,8 +870,8 @@ static int reset_curve(int target, libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -869,12 +880,12 @@ static int reset_curve(int target, libusb_device_handle *dev,
return ret;
}
if (resp.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.status);
if (resp->result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.result, resp.error, resp.printer_major,
resp.printer_minor);
resp->result, resp->error, resp->printer_major,
resp->printer_minor);
return -1;
}
@ -884,8 +895,9 @@ static int reset_curve(int target, libusb_device_handle *dev,
static int button_set(int enable, libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_button_cmd cmd;
struct s2145_status_hdr resp;
struct s2145_status_hdr *resp = (struct s2145_status_hdr *) rdbuf;
int ret, num = 0;
cmd.enabled = enable;
@ -898,8 +910,8 @@ static int button_set(int enable, libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -908,12 +920,12 @@ static int button_set(int enable, libusb_device_handle *dev,
return ret;
}
if (resp.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.status);
if (resp->result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.result, resp.error, resp.printer_major,
resp.printer_minor);
resp->result, resp->error, resp->printer_major,
resp->printer_minor);
return -1;
}
@ -923,8 +935,9 @@ static int button_set(int enable, libusb_device_handle *dev,
static int get_tonecurve(int type, char *fname, libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_readtone_cmd cmd;
struct s2145_readtone_resp resp;
struct s2145_readtone_resp *resp = (struct s2145_readtone_resp *) rdbuf;
int ret, num = 0;
uint8_t *data;
@ -944,8 +957,8 @@ static int get_tonecurve(int type, char *fname, libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -954,36 +967,36 @@ static int get_tonecurve(int type, char *fname, libusb_device_handle *dev,
return ret;
}
if (resp.hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.hdr.status);
if (resp->hdr.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->hdr.status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.hdr.result, resp.hdr.error, resp.hdr.printer_major,
resp.hdr.printer_minor);
resp->hdr.result, resp->hdr.error, resp->hdr.printer_major,
resp->hdr.printer_minor);
return -2;
}
resp.total_size = le16_to_cpu(resp.total_size);
resp->total_size = le16_to_cpu(resp->total_size);
data = malloc(resp.total_size * 2);
data = malloc(resp->total_size * 2);
i = 0;
while (i < resp.total_size) {
while (i < resp->total_size) {
ret = libusb_bulk_transfer(dev, endp_up,
data + i,
resp.total_size * 2 - i,
resp->total_size * 2 - i,
&num,
5000);
if (ret < 0) {
ERROR("Failure to receive data from printer (libusb error %d: (%d/%d from 0x%02x))\n", ret, num + i, (int)resp.total_size, endp_up);
ERROR("Failure to receive data from printer (libusb error %d: (%d/%d from 0x%02x))\n", ret, num + i, (int)resp->total_size, endp_up);
return ret;
}
i += num;
}
i = j = 0;
while (i < resp.total_size) {
while (i < resp->total_size) {
memcpy(curves + j, data + i+2, data[i+1]);
j += data[i+1] / 2;
i += data[i+1] + 2;
@ -1010,8 +1023,9 @@ static int get_tonecurve(int type, char *fname, libusb_device_handle *dev,
static int set_tonecurve(int target, char *fname, libusb_device_handle *dev,
uint8_t endp_down, uint8_t endp_up)
{
uint8_t rdbuf[READBACK_LEN];
struct s2145_update_cmd cmd;
struct s2145_status_hdr resp;
struct s2145_status_hdr *resp = (struct s2145_status_hdr *) rdbuf;
int ret, num = 0;
INFO("Set %s Tone Curve from '%s'\n", update_targets[target], fname);
@ -1048,8 +1062,8 @@ static int set_tonecurve(int target, char *fname, libusb_device_handle *dev,
return -1;
ret = libusb_bulk_transfer(dev, endp_up,
(uint8_t *)&resp,
sizeof(resp),
rdbuf,
READBACK_LEN,
&num,
5000);
@ -1058,12 +1072,12 @@ static int set_tonecurve(int target, char *fname, libusb_device_handle *dev,
return ret;
}
if (resp.result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp.status);
if (resp->result != RESULT_SUCCESS) {
INFO("Printer Status: %02x\n", resp->status);
INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x)\n",
resp.result, resp.error, resp.printer_major,
resp.printer_minor);
resp->result, resp->error, resp->printer_major,
resp->printer_minor);
return -1;
}

Write Preview
Loading…
Cancel
Save