X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-4032l%2Fprotocol.c;h=a166c0a1aa01812abe7b82531c633cd37c36af39;hb=bc294eaca829f7681c6d3a371a816e871aa9c4b8;hp=908cacaa73e789e772f51d064a842602953a0f71;hpb=43d8603571d1f9a8d7dbd4f90d906ba75dd99a05;p=libsigrok.git

diff --git a/src/hardware/hantek-4032l/protocol.c b/src/hardware/hantek-4032l/protocol.c
index 908cacaa..a166c0a1 100644
--- a/src/hardware/hantek-4032l/protocol.c
+++ b/src/hardware/hantek-4032l/protocol.c
@@ -39,24 +39,55 @@ 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;
 
-	finish_acquisition(sdi);
+	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);
 }
 
 static void resubmit_transfer(struct libusb_transfer *transfer)
@@ -70,6 +101,48 @@ 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
+	};
+	const struct sr_datafeed_packet trig = {
+		.type = SR_DF_TRIGGER,
+		.payload = NULL
+	};
+	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. */
+		sr_session_send(sdi, &trig);
+
+		/* 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;
@@ -88,12 +161,9 @@ 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 drv_context *drvc = sdi->driver->context;
+	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;
 
@@ -120,38 +190,35 @@ void LIBUSB_CALL h4032l_data_transfer_callback(struct libusb_transfer *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);
+	send_data(sdi, buffer, number_samples);
 	sr_dbg("Remaining: %d %08X %08X.", devc->remaining_samples,
 		buffer[0], buffer[1]);
 
 	/* 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 {
-		resubmit_transfer(transfer);
+		if (((devc->submitted_transfers - 1) * H4032L_DATA_BUFFER_SIZE) <
+		    (int32_t)(devc->remaining_samples * sizeof(uint32_t)))
+			resubmit_transfer(transfer);
+		else
+			free_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;
 	struct h4032l_status_packet *status;
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_logic logic;
 	uint32_t number_samples;
 	int ret;
 
@@ -225,12 +292,7 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *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);
+		send_data(sdi, buffer, number_samples);
 		sr_dbg("Remaining: %d %08X %08X.", devc->remaining_samples,
 		       buffer[0], buffer[1]);
 		break;
@@ -303,27 +365,57 @@ 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;
 
-	transfer = libusb_alloc_transfer(0);
-
-	libusb_fill_bulk_transfer(transfer, usb->devhdl,
-		6 | LIBUSB_ENDPOINT_IN,
-		devc->buffer, ARRAY_SIZE(devc->buffer),
-		h4032l_data_transfer_callback,
-		(void *)sdi, H4032L_USB_TIMEOUT);
+	devc->submitted_transfers = 0;
 
-	/* Send prepared usb packet. */
-	if ((ret = libusb_submit_transfer(transfer)) != 0) {
-		sr_err("Failed to submit transfer: %s.",
-		       libusb_error_name(ret));
-		devc->status = H4032L_STATUS_IDLE;
+	/*
+	 * 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;
 	}
 
-	if (devc->status == H4032L_STATUS_IDLE)
-		free_transfer(transfer);
+	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,
+			buffer, H4032L_DATA_BUFFER_SIZE,
+			h4032l_data_transfer_callback,
+			(void *)sdi, H4032L_USB_TIMEOUT);
+
+		/* Send prepared usb packet. */
+		if ((ret = libusb_submit_transfer(transfer)) != 0) {
+			sr_err("Failed to submit transfer: %s.",
+			       libusb_error_name(ret));
+			libusb_free_transfer(transfer);
+			g_free(buffer);
+			abort_acquisition(devc);
+			return SR_ERR;
+		}
+		devc->transfers[i] = transfer;
+		devc->submitted_transfers++;
+	}
 
-	return (ret ? SR_ERR : SR_OK);
+	return SR_OK;
 }
 
 SR_PRIV int h4032l_start(const struct sr_dev_inst *sdi)
@@ -365,6 +457,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;
 }