make output modules a bit more crashproof

[libsigrok.git] / hardware / saleae-logic / saleae-logic.c

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index beedf4baf23a2537c8732638fb8e659299e4b8cd..92a43f93acff00c2cbda9f5e303242326d702bb0 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -26,26 +26,26 @@
 #include <sigrok.h>
 #include "config.h"
 
-#define USB_VENDOR                     0x0925
+#define USB_VENDOR                 0x0925
 #define USB_PRODUCT                    0x3881
-#define USB_VENDOR_NAME                        "Saleae"
-#define USB_MODEL_NAME                 "Logic"
-#define USB_MODEL_VERSION              ""
+#define USB_VENDOR_NAME        "Saleae"
+#define USB_MODEL_NAME         "Logic"
+#define USB_MODEL_VERSION      ""
 
-#define USB_INTERFACE                  0
-#define USB_CONFIGURATION              1
-#define NUM_PROBES                     8
-#define NUM_TRIGGER_STAGES             4
-#define TRIGGER_TYPES                  "01"
-#define FIRMWARE                       FIRMWARE_DIR "/saleae-logic.fw"
+#define USB_INTERFACE          0
+#define USB_CONFIGURATION      1
+#define NUM_PROBES             8
+#define NUM_TRIGGER_STAGES     4
+#define TRIGGER_TYPES          "01"
+#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)
+#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. */
-#define TRIGGER_FIRED                  -1
+#define TRIGGER_FIRED          -1
 
 /* There is only one model Saleae Logic, and this is what it supports: */
 static int capabilities[] = {
@@ -54,6 +54,7 @@ static int capabilities[] = {
 
        /* These are really implemented in the driver, not the hardware. */
        HWCAP_LIMIT_SAMPLES,
+       HWCAP_CONTINUOUS,
        0,
 };
 
@@ -231,7 +232,7 @@ static void close_device(struct sigrok_device_instance *sdi)
        if (sdi->usb->devhdl == NULL)
                return;
 
-       g_message("closing device %d on %d.%d interface %d", sdi->index,
+       g_message("saleae: closing device %d on %d.%d interface %d", sdi->index,
                  sdi->usb->bus, sdi->usb->address, USB_INTERFACE);
        libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE);
        libusb_close(sdi->usb->devhdl);
@@ -364,7 +365,7 @@ static int hw_opendev(int device_index)
                timediff = cur - upd;
                if (timediff < FIRMWARE_RENUM_DELAY) {
                        timediff = FIRMWARE_RENUM_DELAY - timediff;
-                       g_message("waiting %d ms for device to reset",
+                       g_message("saleae: waiting %d ms for device to reset",
                                  timediff);
                        g_usleep(timediff * 1000);
                        firmware_updated.tv_sec = 0;
@@ -480,7 +481,7 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
 
        divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1;
 
-       g_message("setting samplerate to %" PRIu64 " Hz (divider %d)",
+       g_message("saleae: setting samplerate to %" PRIu64 " Hz (divider %d)",
                  samplerate, divider);
        buf[0] = 0x01;
        buf[1] = divider;
@@ -558,7 +559,7 @@ void receive_transfer(struct libusb_transfer *transfer)
                return;
        }
 
-       g_message("receive_transfer(): status %d received %d bytes",
+       g_message("saleae: receive_transfer(): status %d received %d bytes",
                  transfer->status, transfer->actual_length);
 
        /* Save incoming transfer before reusing the transfer struct. */
@@ -613,8 +614,9 @@ void receive_transfer(struct libusb_transfer *transfer)
                                         * Send the samples that triggered it, since we're
                                         * skipping past them.
                                         */
-                                       packet.type = DF_LOGIC8;
+                                       packet.type = DF_LOGIC;
                                        packet.length = trigger_stage;
+                                       packet.unitsize = 1;
                                        packet.payload = trigger_buffer;
                                        session_bus(user_data, &packet);
 
@@ -645,14 +647,15 @@ void receive_transfer(struct libusb_transfer *transfer)
 
        if (trigger_stage == TRIGGER_FIRED) {
                /* Send the incoming transfer to the session bus. */
-               packet.type = DF_LOGIC8;
+               packet.type = DF_LOGIC;
                packet.length = cur_buflen - trigger_offset;
+               packet.unitsize = 1;
                packet.payload = cur_buf + trigger_offset;
                session_bus(user_data, &packet);
                g_free(cur_buf);
 
                num_samples += cur_buflen;
-               if ((unsigned int)num_samples > limit_samples) {
+               if (limit_samples && (unsigned int) num_samples > limit_samples) {
                        hw_stop_acquisition(-1, user_data);
                }
        } else {
@@ -711,7 +714,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        gettimeofday(&header->starttime, NULL);
        header->samplerate = cur_samplerate;
        header->protocol_id = PROTO_RAW;
-       header->num_probes = NUM_PROBES;
+       header->num_logic_probes = NUM_PROBES;
+       header->num_analog_probes = 0;
        session_bus(session_device_id, packet);
        g_free(header);
        g_free(packet);