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

hantek-4032l: Increase speed of data getting. 

- add support for multiple transfers.
 - set nummber of samples to 1 for FPGA FW version 0
- increase size of data transfer buffer to 2kB.

Signed-off-by: Andrej Valek <andy@skyrain.eu>
This commit is contained in:
Andrej Valek 2018-04-29 23:20:51 +02:00 committed by Uwe Hermann
parent 43d8603571
commit 2958315ded
3 changed files with 112 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,8 +219,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
devc->capture_ratio = 5;
devc->usb_transfer = libusb_alloc_transfer(0);
sdi->priv = devc;
devices = g_slist_append(devices, sdi);
@ -407,6 +405,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
/* Initialize variables. */
devc->acq_aborted = FALSE;
devc->submitted_transfers = 0;
/* Calculate packet ratio. */
cmd_pkt->pre_trigger_size = (cmd_pkt->sample_size * devc->capture_ratio) / 100;
@ -509,15 +508,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct dev_context *devc = sdi->priv;
devc->acq_aborted = TRUE;
if (devc->usb_transfer)
libusb_cancel_transfer(devc->usb_transfer);
devc->status = H4032L_STATUS_IDLE;
return SR_OK;
/* Stop capturing. */
return h4032l_stop(sdi);
}
SR_PRIV struct sr_dev_driver hantek_4032l_driver_info = {

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

@ -39,23 +39,54 @@ struct h4032l_status_packet {
uint32_t fpga_version;
};
static void abort_acquisition(struct dev_context *devc)
{
int i;
devc->acq_aborted = TRUE;
for (i = devc->num_transfers - 1; i >= 0; i--) {
if (devc->transfers[i])
libusb_cancel_transfer(devc->transfers[i]);
}
devc->status = H4032L_STATUS_IDLE;
}
static void finish_acquisition(struct sr_dev_inst *sdi)
{
struct dev_context *devc = sdi->priv;
struct drv_context *drvc = sdi->driver->context;
std_session_send_df_end(sdi);
usb_source_remove(sdi->session, drvc->sr_ctx);
devc->num_transfers = 0;
g_free(devc->transfers);
}
static void free_transfer(struct libusb_transfer *transfer)
{
struct sr_dev_inst *sdi = transfer->user_data;
struct dev_context *devc = sdi->priv;
unsigned int i;
if ((transfer->buffer != (unsigned char *)&devc->cmd_pkt) &&
(transfer->buffer != devc->buffer)) {
g_free(transfer->buffer);
}
transfer->buffer = NULL;
libusb_free_transfer(transfer);
devc->usb_transfer = NULL;
for (i = 0; i < devc->num_transfers; i++) {
if (devc->transfers[i] == transfer) {
devc->transfers[i] = NULL;
break;
}
}
if (--devc->submitted_transfers == 0)
finish_acquisition(sdi);
}
@ -90,7 +121,6 @@ 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 drv_context *drvc = sdi->driver->context;
uint32_t max_samples = transfer->actual_length / sizeof(uint32_t);
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
@ -131,13 +161,17 @@ void LIBUSB_CALL h4032l_data_transfer_callback(struct libusb_transfer *transfer)
/* Close data receiving. */
if (devc->remaining_samples == 0) {
std_session_send_df_end(sdi);
usb_source_remove(sdi->session, drvc->sr_ctx);
devc->status = H4032L_STATUS_IDLE;
if (buffer[number_samples] != H4032L_END_PACKET_MAGIC)
sr_err("Mismatch magic number of end poll.");
abort_acquisition(devc);
free_transfer(transfer);
} else {
if (((devc->submitted_transfers - 1) * H4032L_DATA_BUFFER_SIZE) <
(int32_t)(devc->remaining_samples * sizeof(uint32_t)))
resubmit_transfer(transfer);
else
free_transfer(transfer);
}
}
@ -303,13 +337,40 @@ 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;
unsigned int num_transfers;
unsigned int i;
int ret;
devc->submitted_transfers = 0;
/*
* Set number of data transfers regarding to size of buffer.
* FPGA version 0 can't transfer multiple transfers at once.
*/
if ((num_transfers = MIN(devc->remaining_samples * sizeof(uint32_t) /
H4032L_DATA_BUFFER_SIZE, devc->fpga_version ?
H4032L_DATA_TRANSFER_MAX_NUM : 1)) == 0)
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->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;
}
transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, usb->devhdl,
6 | LIBUSB_ENDPOINT_IN,
devc->buffer, ARRAY_SIZE(devc->buffer),
buffer, H4032L_DATA_BUFFER_SIZE,
h4032l_data_transfer_callback,
(void *)sdi, H4032L_USB_TIMEOUT);
@ -317,13 +378,16 @@ SR_PRIV int h4032l_start_data_transfers(const struct sr_dev_inst *sdi)
if ((ret = libusb_submit_transfer(transfer)) != 0) {
sr_err("Failed to submit transfer: %s.",
libusb_error_name(ret));
devc->status = H4032L_STATUS_IDLE;
libusb_free_transfer(transfer);
g_free(buffer);
abort_acquisition(devc);
return SR_ERR;
}
devc->transfers[i] = transfer;
devc->submitted_transfers++;
}
if (devc->status == H4032L_STATUS_IDLE)
free_transfer(transfer);
return (ret ? SR_ERR : SR_OK);
return SR_OK;
}
SR_PRIV int h4032l_start(const struct sr_dev_inst *sdi)
@ -365,6 +429,23 @@ SR_PRIV int h4032l_start(const struct sr_dev_inst *sdi)
return SR_ERR;
}
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;
return SR_OK;
}
SR_PRIV int h4032l_stop(struct sr_dev_inst *sdi)
{
abort_acquisition(sdi->priv);
return SR_OK;
}

8
src/hardware/hantek-4032l/protocol.h
View File

@ -33,6 +33,9 @@
#define H4032L_USB_VENDOR 0x04b5
#define H4032L_USB_PRODUCT 0x4032
#define H4032L_DATA_BUFFER_SIZE (2 * 1024)
#define H4032L_DATA_TRANSFER_MAX_NUM 32
#define H4032L_CMD_PKT_MAGIC 0x017f
#define H4032L_STATUS_PACKET_MAGIC 0x2B1A037F
#define H4032L_START_PACKET_MAGIC 0x2B1A027F
@ -120,10 +123,12 @@ struct h4032l_cmd_pkt {
struct dev_context {
enum h4032l_status status;
int submitted_transfers;
uint32_t remaining_samples;
gboolean acq_aborted;
struct h4032l_cmd_pkt cmd_pkt;
struct libusb_transfer *usb_transfer;
unsigned int num_transfers;
struct libusb_transfer **transfers;
uint8_t buffer[512];
uint64_t capture_ratio;
uint32_t fpga_version;
@ -135,6 +140,7 @@ SR_PRIV void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer);
SR_PRIV void LIBUSB_CALL h4032l_data_transfer_callback(struct libusb_transfer *transfer);
SR_PRIV int h4032l_start_data_transfers(const struct sr_dev_inst *sdi);
SR_PRIV int h4032l_start(const struct sr_dev_inst *sdi);
SR_PRIV int h4032l_stop(struct sr_dev_inst *sdi);
SR_PRIV int h4032l_dev_open(struct sr_dev_inst *sdi);
SR_PRIV int h4032l_get_fpga_version(const struct sr_dev_inst *sdi);