sr: Fix handling of virtual devices.

[libsigrok.git] / hardware / fx2lafw / fx2lafw.c

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index b0bd0e6067b6cb06db6924b3ef2eab9ac94a1ba9..22b9772ff4aa04808e73e9e37a34842c62a91091 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -28,10 +28,26 @@
 #include "fx2lafw.h"
 #include "command.h"
 
-static struct fx2lafw_profile supported_fx2[] = {
-       /* USBee AX */
-       { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, 8 },
-       { 0, 0, 0, 0, 0, 0 }
+static const struct fx2lafw_profile supported_fx2[] = {
+       /* CWAV USBee AX
+        * EE Electronics ESLA201A
+        */
+       { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
+               FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", 8 },
+
+       /* CWAV USBee SX
+        */
+       { 0x08a9, 0x0009, "CWAV", "USBee SX", NULL,
+               FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw", 8 },
+
+       /* Saleae Logic
+        * EE Electronics ESLA100
+        * Robomotic MiniLogic
+        */
+       { 0x0925, 0x3881, "Saleae", "Logic", NULL,
+               FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", 8 },
+
+       { 0, 0, 0, 0, 0, 0, 0 }
 };
 
 static int fx2lafw_capabilities[] = {
@@ -78,6 +94,7 @@ static struct sr_samplerates fx2lafw_samplerates = {
 static GSList *dev_insts = NULL;
 static libusb_context *usb_context = NULL;
 
+static int hw_dev_config_set(int dev_index, int hwcap, void *value);
 static int hw_dev_acquisition_stop(int dev_index, void *session_dev_id);
 
 /**
@@ -94,7 +111,7 @@ static gboolean check_conf_profile(libusb_device *dev)
        gboolean ret = FALSE;
 
        while (!ret) {
-               /* Assume it's not a Saleae Logic unless proven wrong. */
+               /* Assume the firmware has not been loaded, unless proven wrong. */
                ret = 0;
 
                if (libusb_get_device_descriptor(dev, &des) != 0)
@@ -116,18 +133,13 @@ static gboolean check_conf_profile(libusb_device *dev)
                        break;
 
                intf_dsc = &(conf_dsc->interface[0].altsetting[0]);
-               if (intf_dsc->bNumEndpoints != 3)
-                       /* Need exactly 3 end points. */
+               if (intf_dsc->bNumEndpoints != 2)
+                       /* Need exactly 2 end points. */
                        break;
 
                if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) !=
-                   (1 | LIBUSB_ENDPOINT_OUT))
-                       /* The first endpoint should be 1 (outbound). */
-                       break;
-
-               if ((intf_dsc->endpoint[1].bEndpointAddress & 0x8f) !=
-                   (2 | LIBUSB_ENDPOINT_IN))
-                       /* The second endpoint should be 2 (inbound). */
+                   (2 | LIBUSB_ENDPOINT_IN)) // 0x82
+                       /* The first endpoint should be 2 (inbound). */
                        break;
 
                /* TODO: Check the debug channel... */
@@ -251,7 +263,7 @@ static int hw_init(const char *deviceinfo)
 {
        struct sr_dev_inst *sdi;
        struct libusb_device_descriptor des;
-       struct fx2lafw_profile *fx2lafw_prof;
+       const struct fx2lafw_profile *fx2lafw_prof;
        struct context *ctx;
        libusb_device **devlist;
        int err;
@@ -307,7 +319,8 @@ static int hw_init(const char *deviceinfo)
                            (libusb_get_bus_number(devlist[i]),
                             libusb_get_device_address(devlist[i]), NULL);
                } else {
-                       if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, FIRMWARE) == SR_OK)
+                       if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
+                               fx2lafw_prof->firmware) == SR_OK)
                                /* Remember when the firmware on this device was updated */
                                g_get_current_time(&ctx->fw_updated);
                        else
@@ -369,6 +382,13 @@ static int hw_dev_open(int dev_index)
                return SR_ERR;
        }
 
+       if (ctx->cur_samplerate == 0) {
+               /* Samplerate hasn't been set; default to the slowest one. */
+               if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE,
+                   &fx2lafw_supported_samplerates[0]) == SR_ERR)
+                       return SR_ERR;
+       }
+
        return SR_OK;
 }
 
@@ -617,10 +637,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
                return SR_ERR_MALLOC;
        }
 
-       if ((err = command_start_acquisition (ctx->usb->devhdl)) != SR_OK) {
-               return err;
-       }
-
        /* Start with 2K transfer, subsequently increased to 4K. */
        size = 2048;
        for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) {
@@ -657,6 +673,11 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        g_free(header);
        g_free(packet);
 
+       if ((err = command_start_acquisition (ctx->usb->devhdl,
+               ctx->cur_samplerate)) != SR_OK) {
+               return err;
+       }
+
        return SR_OK;
 }