opendev2/opendev3: Don't depend on global vars.

[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 95598192ab50a597ad8f949239a478273b70a5a1..423e1d3441cf114ee21e8f5d04b235ef447a1de8 100644 (file)
--- 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,17 @@ 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
+/**
+ * Check the USB configuration to determine if this is a Saleae Logic.
+ *
+ * @return 1 if the device's configuration profile match the Logic firmware's
+ *         configuration, 0 otherwise.
  */
 int check_conf_profile(libusb_device *dev)
 {
@@ -161,7 +166,7 @@ int check_conf_profile(libusb_device *dev)
 
 static int opendev2(int device_index, struct sigrok_device_instance **sdi,
                    libusb_device *dev, struct libusb_device_descriptor *des,
-                   int *skip)
+                   int *skip, uint16_t vid, uint16_t pid, int interface)
 {
        int err;
 
@@ -170,7 +175,7 @@ static int opendev2(int device_index, struct sigrok_device_instance **sdi,
                return -1;
        }
 
-       if (des->idVendor != USB_VENDOR || des->idProduct != USB_PRODUCT)
+       if (des->idVendor != vid || des->idProduct != pid)
                return 0;
 
        if (*skip != device_index) {
@@ -188,7 +193,7 @@ static int opendev2(int device_index, struct sigrok_device_instance **sdi,
                (*sdi)->status = ST_ACTIVE;
                g_message("opened device %d on %d.%d interface %d",
                          (*sdi)->index, (*sdi)->usb->bus,
-                         (*sdi)->usb->address, USB_INTERFACE);
+                         (*sdi)->usb->address, interface);
        } else {
                g_warning("failed to open device: %d", err);
                *sdi = NULL;
@@ -198,7 +203,8 @@ static int opendev2(int device_index, struct sigrok_device_instance **sdi,
 }
 
 static int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
-                   struct libusb_device_descriptor *des)
+                   struct libusb_device_descriptor *des,
+                   uint16_t vid, uint16_t pid, int interface)
 {
        int err;
 
@@ -207,7 +213,7 @@ static int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
                return -1;
        }
 
-       if (des->idVendor != USB_VENDOR || des->idProduct != USB_PRODUCT)
+       if (des->idVendor != vid || des->idProduct != pid)
                return 0;
 
        if (libusb_get_bus_number(dev) == (*sdi)->usb->bus
@@ -217,7 +223,7 @@ static int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
                        (*sdi)->status = ST_ACTIVE;
                        g_message("opened device %d on %d.%d interface %d",
                                  (*sdi)->index, (*sdi)->usb->bus,
-                                 (*sdi)->usb->address, USB_INTERFACE);
+                                 (*sdi)->usb->address, interface);
                } else {
                        g_warning("failed to open device: %d", err);
                        *sdi = NULL;
@@ -249,7 +255,8 @@ struct sigrok_device_instance *sl_open_device(int device_index)
                for (i = 0; devlist[i]; i++) {
                        /* TODO: Error handling. */
                        err = opendev2(device_index, &sdi, devlist[i], &des,
-                                      &skip);
+                                      &skip, USB_VENDOR, USB_PRODUCT,
+                                      USB_INTERFACE);
                }
        } else if (sdi->status == ST_INACTIVE) {
                /*
@@ -259,7 +266,8 @@ struct sigrok_device_instance *sl_open_device(int device_index)
                libusb_get_device_list(usb_context, &devlist);
                for (i = 0; devlist[i]; i++) {
                        /* TODO: Error handling. */
-                       err = opendev3(&sdi, devlist[i], &des);
+                       err = opendev3(&sdi, devlist[i], &des, USB_VENDOR,
+                                      USB_PRODUCT, USB_INTERFACE);
                }
        } else {
                /* Status must be ST_ACTIVE, i.e. already in use... */
@@ -300,7 +308,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 +399,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 +454,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 +547,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 +674,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 +703,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 +728,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 +775,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);