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

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index c135cb3c..b3b78d2a 100644
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -37,7 +37,7 @@
 #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
@@ -102,6 +102,7 @@ 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
@@ -541,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);
@@ -668,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;
 	}
 
@@ -696,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 {
@@ -723,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 {
 		/*
@@ -773,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);