X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-4032l%2Fprotocol.c;h=a5b90ac56227f8128ec7cffdc6108a6dafc82817;hb=b28e391a755e28568b6e0a8161d55d87e0c5f3cc;hp=5aa35de496a2fb2ef4c09c94450cd23bb3d6bd96;hpb=2958315ded7c27982875e56d1dc72cc537db6224;p=libsigrok.git diff --git a/src/hardware/hantek-4032l/protocol.c b/src/hardware/hantek-4032l/protocol.c index 5aa35de4..a5b90ac5 100644 --- a/src/hardware/hantek-4032l/protocol.c +++ b/src/hardware/hantek-4032l/protocol.c @@ -72,7 +72,7 @@ static void free_transfer(struct libusb_transfer *transfer) unsigned int i; if ((transfer->buffer != (unsigned char *)&devc->cmd_pkt) && - (transfer->buffer != devc->buffer)) { + (transfer->buffer != devc->buf)) { g_free(transfer->buffer); } @@ -101,6 +101,44 @@ static void resubmit_transfer(struct libusb_transfer *transfer) free_transfer(transfer); } +static void send_data(struct sr_dev_inst *sdi, + uint32_t *data, size_t sample_count) +{ + struct dev_context *devc = sdi->priv; + struct sr_datafeed_logic logic = { + .length = sample_count * sizeof(uint32_t), + .unitsize = sizeof(uint32_t), + .data = data + }; + const struct sr_datafeed_packet packet = { + .type = SR_DF_LOGIC, + .payload = &logic + }; + size_t trigger_offset; + + if (devc->trigger_pos >= devc->sent_samples && + devc->trigger_pos < (devc->sent_samples + sample_count)) { + /* Get trigger position. */ + trigger_offset = devc->trigger_pos - devc->sent_samples; + logic.length = trigger_offset * sizeof(uint32_t); + if (logic.length) + sr_session_send(sdi, &packet); + + /* Send trigger position. */ + std_session_send_df_trigger(sdi); + + /* Send rest of data. */ + logic.length = (sample_count - trigger_offset) * sizeof(uint32_t); + logic.data = data + trigger_offset; + if (logic.length) + sr_session_send(sdi, &packet); + } else { + sr_session_send(sdi, &packet); + } + + devc->sent_samples += sample_count; +} + SR_PRIV int h4032l_receive_data(int fd, int revents, void *cb_data) { struct timeval tv; @@ -119,13 +157,11 @@ SR_PRIV int h4032l_receive_data(int fd, int revents, void *cb_data) void LIBUSB_CALL h4032l_data_transfer_callback(struct libusb_transfer *transfer) { - const struct sr_dev_inst *sdi = transfer->user_data; - struct dev_context *devc = sdi->priv; + struct sr_dev_inst *const sdi = transfer->user_data; + struct dev_context *const devc = sdi->priv; uint32_t max_samples = transfer->actual_length / sizeof(uint32_t); - struct sr_datafeed_packet packet; - struct sr_datafeed_logic logic; - uint32_t *buffer; - uint32_t number_samples; + uint32_t *buf; + uint32_t num_samples; /* * If acquisition has already ended, just free any queued up @@ -145,23 +181,17 @@ void LIBUSB_CALL h4032l_data_transfer_callback(struct libusb_transfer *transfer) return; } - buffer = (uint32_t *)transfer->buffer; - - number_samples = (devc->remaining_samples < max_samples) ? - devc->remaining_samples : max_samples; - devc->remaining_samples -= number_samples; - packet.type = SR_DF_LOGIC; - packet.payload = &logic; - logic.length = number_samples * sizeof(uint32_t); - logic.unitsize = sizeof(uint32_t); - logic.data = buffer; - sr_session_send(sdi, &packet); + buf = (uint32_t *)transfer->buffer; + + num_samples = MIN(devc->remaining_samples, max_samples); + devc->remaining_samples -= num_samples; + send_data(sdi, buf, num_samples); sr_dbg("Remaining: %d %08X %08X.", devc->remaining_samples, - buffer[0], buffer[1]); + buf[0], buf[1]); /* Close data receiving. */ if (devc->remaining_samples == 0) { - if (buffer[number_samples] != H4032L_END_PACKET_MAGIC) + if (buf[num_samples] != H4032L_END_PACKET_MAGIC) sr_err("Mismatch magic number of end poll."); abort_acquisition(devc); @@ -177,16 +207,14 @@ void LIBUSB_CALL h4032l_data_transfer_callback(struct libusb_transfer *transfer) void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer) { - const struct sr_dev_inst *sdi = transfer->user_data; - struct dev_context *devc = sdi->priv; + struct sr_dev_inst *const sdi = transfer->user_data; + struct dev_context *const devc = sdi->priv; struct sr_usb_dev_inst *usb = sdi->conn; gboolean cmd = FALSE; uint32_t max_samples = transfer->actual_length / sizeof(uint32_t); - uint32_t *buffer; + uint32_t *buf; struct h4032l_status_packet *status; - struct sr_datafeed_packet packet; - struct sr_datafeed_logic logic; - uint32_t number_samples; + uint32_t num_samples; int ret; /* @@ -201,7 +229,7 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer) if (transfer->status != LIBUSB_TRANSFER_COMPLETED) sr_dbg("%s error: %d.", __func__, transfer->status); - buffer = (uint32_t *)transfer->buffer; + buf = (uint32_t *)transfer->buffer; switch (devc->status) { case H4032L_STATUS_IDLE: @@ -247,26 +275,20 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer) break; case H4032L_STATUS_FIRST_TRANSFER: /* Drop packets until H4032L_START_PACKET_MAGIC. */ - if (buffer[0] != H4032L_START_PACKET_MAGIC) { + if (buf[0] != H4032L_START_PACKET_MAGIC) { sr_dbg("Mismatch magic number of start poll."); break; } devc->status = H4032L_STATUS_TRANSFER; max_samples--; - buffer++; + buf++; /* Fallthrough. */ case H4032L_STATUS_TRANSFER: - number_samples = (devc->remaining_samples < max_samples) ? - devc->remaining_samples : max_samples; - devc->remaining_samples -= number_samples; - packet.type = SR_DF_LOGIC; - packet.payload = &logic; - logic.length = number_samples * sizeof(uint32_t); - logic.unitsize = sizeof(uint32_t); - logic.data = buffer; - sr_session_send(sdi, &packet); + num_samples = MIN(devc->remaining_samples, max_samples); + devc->remaining_samples -= num_samples; + send_data(sdi, buf, num_samples); sr_dbg("Remaining: %d %08X %08X.", devc->remaining_samples, - buffer[0], buffer[1]); + buf[0], buf[1]); break; } @@ -291,7 +313,7 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer) sr_dbg("Poll: %d.", devc->status); libusb_fill_bulk_transfer(transfer, usb->devhdl, 6 | LIBUSB_ENDPOINT_IN, - devc->buffer, ARRAY_SIZE(devc->buffer), + devc->buf, ARRAY_SIZE(devc->buf), h4032l_usb_callback, (void *)sdi, H4032L_USB_TIMEOUT); } @@ -337,7 +359,7 @@ SR_PRIV int h4032l_start_data_transfers(const struct sr_dev_inst *sdi) struct dev_context *devc = sdi->priv; struct sr_usb_dev_inst *usb = sdi->conn; struct libusb_transfer *transfer; - uint8_t *buffer; + uint8_t *buf; unsigned int num_transfers; unsigned int i; int ret; @@ -354,23 +376,16 @@ SR_PRIV int h4032l_start_data_transfers(const struct sr_dev_inst *sdi) num_transfers = 1; g_free(devc->transfers); - devc->transfers = g_try_malloc(sizeof(*devc->transfers) * num_transfers); - if (!devc->transfers) { - sr_err("USB transfers malloc failed."); - return SR_ERR_MALLOC; - } - + devc->transfers = g_malloc(sizeof(*devc->transfers) * num_transfers); devc->num_transfers = num_transfers; + for (i = 0; i < num_transfers; i++) { - if (!(buffer = g_malloc(H4032L_DATA_BUFFER_SIZE))) { - sr_err("USB transfer buffer malloc failed."); - return SR_ERR_MALLOC; - } + buf = g_malloc(H4032L_DATA_BUFFER_SIZE); transfer = libusb_alloc_transfer(0); libusb_fill_bulk_transfer(transfer, usb->devhdl, 6 | LIBUSB_ENDPOINT_IN, - buffer, H4032L_DATA_BUFFER_SIZE, + buf, H4032L_DATA_BUFFER_SIZE, h4032l_data_transfer_callback, (void *)sdi, H4032L_USB_TIMEOUT); @@ -379,7 +394,7 @@ SR_PRIV int h4032l_start_data_transfers(const struct sr_dev_inst *sdi) sr_err("Failed to submit transfer: %s.", libusb_error_name(ret)); libusb_free_transfer(transfer); - g_free(buffer); + g_free(buf); abort_acquisition(devc); return SR_ERR; } @@ -395,13 +410,13 @@ SR_PRIV int h4032l_start(const struct sr_dev_inst *sdi) struct dev_context *devc = sdi->priv; struct sr_usb_dev_inst *usb = sdi->conn; struct libusb_transfer *transfer; - unsigned char buffer[] = {0x0f, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + unsigned char buf[] = {0x0f, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; int ret; /* 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) { + 0x00, 0x00, buf, ARRAY_SIZE(buf), H4032L_USB_TIMEOUT)) < 0) { sr_err("Failed to send vendor request %s.", libusb_error_name(ret)); return SR_ERR; @@ -430,11 +445,6 @@ SR_PRIV int h4032l_start(const struct sr_dev_inst *sdi) } devc->transfers = g_malloc0(sizeof(*devc->transfers)); - if (!devc->transfers) { - sr_err("USB start transfer malloc failed."); - return SR_ERR_MALLOC; - } - devc->submitted_transfers++; devc->num_transfers = 1; devc->transfers[0] = transfer; @@ -530,13 +540,13 @@ SR_PRIV int h4032l_get_fpga_version(const struct sr_dev_inst *sdi) /* Attempt to get FGPA version. */ for (i = 0; i < 10; i++) { if ((ret = libusb_bulk_transfer(usb->devhdl, - 6 | LIBUSB_ENDPOINT_IN, devc->buffer, - ARRAY_SIZE(devc->buffer), &transferred, H4032L_USB_TIMEOUT)) < 0) { + 6 | LIBUSB_ENDPOINT_IN, devc->buf, + ARRAY_SIZE(devc->buf), &transferred, H4032L_USB_TIMEOUT)) < 0) { sr_err("Unable to receive FPGA version: %s.", libusb_error_name(ret)); return SR_ERR; } - status = (struct h4032l_status_packet *)devc->buffer; + status = (struct h4032l_status_packet *)devc->buf; if (status->magic == H4032L_STATUS_PACKET_MAGIC) { sr_dbg("FPGA version: 0x%x.", status->fpga_version); devc->fpga_version = status->fpga_version;