Use 'kHz' (not 'KHz') consistently.

[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 891476ec1d0784c56d901a8fe8a5ba9c467b2d54..07491fa085427889112e05bcb12b5e22a9773959 100644 (file)
--- 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
@@ -104,9 +104,11 @@ 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)
 {
@@ -162,74 +164,6 @@ int check_conf_profile(libusb_device *dev)
        return ret;
 }
 
-static int opendev2(int device_index, struct sigrok_device_instance **sdi,
-                   libusb_device *dev, struct libusb_device_descriptor *des,
-                   int *skip)
-{
-       int err;
-
-       if ((err = libusb_get_device_descriptor(dev, des))) {
-               g_warning("failed to get device descriptor: %d", err);
-               return -1;
-       }
-
-       if (des->idVendor != USB_VENDOR || des->idProduct != USB_PRODUCT)
-               return 0;
-
-       if (*skip != device_index) {
-               /* Skip devices of this type that aren't the one we want. */
-               *skip += 1;
-               return 0;
-       }
-
-       /*
-        * Should check the bus here, since we know that already. But what are
-        * we going to do if it doesn't match after the right number of skips?
-        */
-       if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
-               (*sdi)->usb->address = libusb_get_device_address(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);
-       } else {
-               g_warning("failed to open device: %d", err);
-               *sdi = NULL;
-       }
-
-       return 0;
-}
-
-static int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
-                   struct libusb_device_descriptor *des)
-{
-       int err;
-
-       if ((err = libusb_get_device_descriptor(dev, des))) {
-               g_warning("failed to get device descriptor: %d", err);
-               return -1;
-       }
-
-       if (des->idVendor != USB_VENDOR || des->idProduct != USB_PRODUCT)
-               return 0;
-
-       if (libusb_get_bus_number(dev) == (*sdi)->usb->bus
-           && libusb_get_device_address(dev) == (*sdi)->usb->address) {
-               /* Found it. */
-               if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
-                       (*sdi)->status = ST_ACTIVE;
-                       g_message("opened device %d on %d.%d interface %d",
-                                 (*sdi)->index, (*sdi)->usb->bus,
-                                 (*sdi)->usb->address, USB_INTERFACE);
-               } else {
-                       g_warning("failed to open device: %d", err);
-                       *sdi = NULL;
-               }
-       }
-
-       return 0;
-}
-
 struct sigrok_device_instance *sl_open_device(int device_index)
 {
        struct sigrok_device_instance *sdi;
@@ -252,7 +186,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) {
                /*
@@ -262,7 +197,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... */
@@ -323,16 +259,17 @@ static int configure_probes(GSList *probes)
                        continue;
                probe_bit = 1 << (probe->index - 1);
                probe_mask |= probe_bit;
-               if (probe->trigger) {
-                       stage = 0;
-                       for (tc = probe->trigger; *tc; tc++) {
-                               trigger_mask[stage] |= probe_bit;
-                               if (*tc == '1')
-                                       trigger_value[stage] |= probe_bit;
-                               stage++;
-                               if (stage > NUM_TRIGGER_STAGES)
-                                       return SIGROK_ERR;
-                       }
+               if (!(probe->trigger))
+                       continue;
+
+               stage = 0;
+               for (tc = probe->trigger; *tc; tc++) {
+                       trigger_mask[stage] |= probe_bit;
+                       if (*tc == '1')
+                               trigger_value[stage] |= probe_bit;
+                       stage++;
+                       if (stage > NUM_TRIGGER_STAGES)
+                               return SIGROK_ERR;
                }
        }
 
@@ -574,7 +511,8 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        } else if (capability == HWCAP_PROBECONFIG) {
                ret = configure_probes((GSList *) value);
        } else if (capability == HWCAP_LIMIT_SAMPLES) {
-               limit_samples = strtoull(value, NULL, 10);
+               tmp_u64 = value;
+               limit_samples = *tmp_u64;
                ret = SIGROK_OK;
        } else {
                ret = SIGROK_ERR;