BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hantek-4032l: Fix mismatch in magic number. 

- fix LIBUSB_TIMEOUT errors
- fix same data receiving
- send reset vendor request before new data getting
- decrease USB polling timeout

This fixes bug #1190.

Signed-off-by: Andrej Valek <andy@skyrain.eu>
This commit is contained in:
Andrej Valek 2018-04-02 20:08:01 +02:00 committed by Uwe Hermann
parent e80e1858ef
commit 74c4c1747f
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/hantek-4032l/api.c
View File

@ -492,7 +492,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
} }
} }
usb_source_add(sdi->session, drvc->sr_ctx, 10000, usb_source_add(sdi->session, drvc->sr_ctx, 1000,
h4032l_receive_data, sdi->driver->context); h4032l_receive_data, sdi->driver->context);
/* Start capturing. */ /* Start capturing. */

31
src/hardware/hantek-4032l/protocol.c
View File

@ -25,7 +25,8 @@
#define H4032L_USB_TIMEOUT 500 #define H4032L_USB_TIMEOUT 500
enum h4032l_cmd { enum h4032l_cmd {
CMD_CONFIGURE = 0x2b1a, /* Also arms the logic analyzer. */ CMD_RESET = 0x00b3, /* Also arms the logic analyzer. */
CMD_CONFIGURE = 0x2b1a,
CMD_STATUS = 0x4b3a, CMD_STATUS = 0x4b3a,
CMD_GET = 0x6b5a CMD_GET = 0x6b5a
}; };
@ -67,10 +68,8 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer)
uint32_t number_samples; uint32_t number_samples;
int ret; int ret;
if (transfer->status != LIBUSB_TRANSFER_COMPLETED) { if (transfer->status != LIBUSB_TRANSFER_COMPLETED)
sr_err("%s error: %d.", __func__, transfer->status); sr_dbg("%s error: %d.", __func__, transfer->status);
return;
}
buffer = (uint32_t *)transfer->buffer; buffer = (uint32_t *)transfer->buffer;
@ -95,9 +94,7 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer)
*/ */
status = (struct h4032l_status_packet *)transfer->buffer; status = (struct h4032l_status_packet *)transfer->buffer;
if (status->magic != H4032L_STATUS_PACKET_MAGIC) { if (status->magic != H4032L_STATUS_PACKET_MAGIC) {
devc->status = H4032L_STATUS_CMD_STATUS; devc->status = H4032L_STATUS_RESPONSE_STATUS;
devc->cmd_pkt.cmd = CMD_STATUS;
cmd = TRUE;
} else if (status->status == 2) { } else if (status->status == 2) {
devc->status = H4032L_STATUS_RESPONSE_STATUS_CONTINUE; devc->status = H4032L_STATUS_RESPONSE_STATUS_CONTINUE;
} else { } else {
@ -118,9 +115,9 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer)
devc->status = H4032L_STATUS_FIRST_TRANSFER; devc->status = H4032L_STATUS_FIRST_TRANSFER;
break; break;
case H4032L_STATUS_FIRST_TRANSFER: case H4032L_STATUS_FIRST_TRANSFER:
/* Drop packets until H4032L_START_PACKET_MAGIC. */
if (buffer[0] != H4032L_START_PACKET_MAGIC) { if (buffer[0] != H4032L_START_PACKET_MAGIC) {
sr_err("Mismatch magic number of start poll."); sr_dbg("Mismatch magic number of start poll.");
devc->status = H4032L_STATUS_IDLE;
break; break;
} }
devc->status = H4032L_STATUS_TRANSFER; devc->status = H4032L_STATUS_TRANSFER;
@ -209,9 +206,21 @@ SR_PRIV int h4032l_start(const struct sr_dev_inst *sdi)
struct dev_context *devc = sdi->priv; struct dev_context *devc = sdi->priv;
struct sr_usb_dev_inst *usb = sdi->conn; struct sr_usb_dev_inst *usb = sdi->conn;
struct libusb_transfer *transfer; struct libusb_transfer *transfer;
unsigned char buffer[] = {0x0f, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
int ret; int ret;
/* Send configure command to arm the logic analyzer. */ /* Send reset command to arm the logic analyzer. */
if ((ret = libusb_control_transfer(usb->devhdl,
LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT, CMD_RESET,
0x00, 0x00, buffer, ARRAY_SIZE(buffer), H4032L_USB_TIMEOUT)) < 0) {
sr_err("Failed to send vendor request %s.", libusb_error_name(ret));
return SR_ERR;
}
/* Wait for reset vendor request. */
g_usleep(20 * 1000);
/* Send configure command. */
devc->cmd_pkt.cmd = CMD_CONFIGURE; devc->cmd_pkt.cmd = CMD_CONFIGURE;
devc->status = H4032L_STATUS_CMD_CONFIGURE; devc->status = H4032L_STATUS_CMD_CONFIGURE;
devc->remaining_samples = devc->cmd_pkt.sample_size; devc->remaining_samples = devc->cmd_pkt.sample_size;