X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=b3b78d2a03ce8c429604f5958cc284cb0b2feedd;hb=6b5e3ceefcdee5e942b9cbff5c697016dacee774;hp=95598192ab50a597ad8f949239a478273b70a5a1;hpb=afc8e4deb68271ba7696e38cc02053b97cfc1a19;p=libsigrok.git

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 95598192..b3b78d2a 100644
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -23,8 +23,8 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
+#include <sigrok.h>
 #include "config.h"
-#include "sigrok.h"
 
 #define USB_VENDOR			0x0925
 #define USB_PRODUCT			0x3881
@@ -37,14 +37,14 @@
 #define NUM_PROBES			8
 #define NUM_TRIGGER_STAGES		4
 #define TRIGGER_TYPES			"01"
-#define FIRMWARE			FIRMWARE_DIR "/saleae-logic.firmware"
+#define FIRMWARE			FIRMWARE_DIR "/saleae-logic.fw"
 
 /* delay in ms */
 #define FIRMWARE_RENUM_DELAY		2000
 #define NUM_SIMUL_TRANSFERS		10
 #define MAX_EMPTY_TRANSFERS		(NUM_SIMUL_TRANSFERS * 2)
 
-/* software trigger implementation: positive values indicate trigger stage */
+/* Software trigger implementation: positive values indicate trigger stage. */
 #define TRIGGER_FIRED			-1
 
 /* There is only one model Saleae Logic, and this is what it supports: */
@@ -98,12 +98,15 @@ static uint8_t probe_mask = 0;
 static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 };
 static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 0 };
 static uint8_t trigger_buffer[NUM_TRIGGER_STAGES] = { 0 };
+
 int trigger_stage = TRIGGER_FIRED;
 
 static int hw_set_configuration(int device_index, int capability, void *value);
+static void hw_stop_acquisition(int device_index, gpointer session_device_id);
 
-/* returns 1 if the device's configuration profile match the Logic firmware's
- * configuration, 0 otherwise
+/*
+ * Returns 1 if the device's configuration profile match the Logic firmware's
+ * configuration, 0 otherwise.
  */
 int check_conf_profile(libusb_device *dev)
 {
@@ -300,7 +303,7 @@ static void close_device(struct sigrok_device_instance *sdi)
 	sdi->status = ST_INACTIVE;
 }
 
-static int configure_probes(GSList * probes)
+static int configure_probes(GSList *probes)
 {
 	struct probe *probe;
 	GSList *l;
@@ -391,16 +394,16 @@ static int hw_init(char *deviceinfo)
 			 * or uploading the firmware again.
 			 */
 			if (upload_firmware(devlist[i]) > 0)
-				g_warning("firmware upload failed for device %d", devcnt);
+				g_warning("firmware upload failed for "
+					  "device %d", devcnt);
 
 			sdi->usb = usb_device_instance_new
-			  (libusb_get_bus_number(devlist[i]), 0, NULL);
+				(libusb_get_bus_number(devlist[i]), 0, NULL);
 		} else {
 			/* Already has the firmware, so fix the new address. */
 			sdi->usb = usb_device_instance_new
 			    (libusb_get_bus_number(devlist[i]),
-			     libusb_get_device_address(devlist[i]),
-			     NULL);
+			     libusb_get_device_address(devlist[i]), NULL);
 		}
 		devcnt++;
 	}
@@ -446,7 +449,7 @@ static int hw_opendev(int device_index)
 	if (cur_samplerate == 0) {
 		/* Samplerate hasn't been set; default to the slowest one. */
 		if (hw_set_configuration(device_index, HWCAP_SAMPLERATE,
-		     &supported_samplerates[0]) == SIGROK_ERR)
+		    &supported_samplerates[0]) == SIGROK_ERR)
 			return SIGROK_ERR;
 	}
 
@@ -539,7 +542,7 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
 	if (supported_samplerates[i] == 0)
 		return SIGROK_ERR_SAMPLERATE;
 
-	divider = (uint8_t) (48 / (float)(samplerate / 1000000)) - 1;
+	divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1;
 
 	g_message("setting samplerate to %" PRIu64 " Hz (divider %d)",
 		  samplerate, divider);
@@ -666,7 +669,8 @@ void receive_transfer(struct libusb_transfer *transfer)
 	 * transfer that come in.
 	 */
 	if (num_samples == -1) {
-		libusb_free_transfer(transfer);
+		if (transfer)
+			libusb_free_transfer(transfer);
 		return;
 	}
 
@@ -694,9 +698,7 @@ void receive_transfer(struct libusb_transfer *transfer)
 			 * The FX2 gave up. End the acquisition, the frontend
 			 * will work out that the samplecount is short.
 			 */
-			packet.type = DF_END;
-			session_bus(user_data, &packet);
-			num_samples = -1;
+			hw_stop_acquisition(-1, user_data);
 		}
 		return;
 	} else {
@@ -721,10 +723,7 @@ void receive_transfer(struct libusb_transfer *transfer)
 
 		num_samples += cur_buflen;
 		if ((unsigned int)num_samples > limit_samples) {
-			/* End the acquisition. */
-			packet.type = DF_END;
-			session_bus(user_data, &packet);
-			num_samples = -1;
+			hw_stop_acquisition(-1, user_data);
 		}
 	} else {
 		/*
@@ -771,7 +770,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 
 	lupfd = libusb_get_pollfds(usb_context);
 	for (i = 0; lupfd[i]; i++)
-		source_add(lupfd[i]->fd, lupfd[i]->events, -1, receive_data,
+		source_add(lupfd[i]->fd, lupfd[i]->events, 40, receive_data,
 			   NULL);
 	free(lupfd);