sr/srd/cli: Fix compiling with Homebrew.

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

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 8a07928c10b21f4f6365ae9919924600da63f3e0..8132251f4410a296af06e03a3ae767bc52dd1f89 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -19,8 +19,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <inttypes.h>
-#include <glib.h>
 #include <libusb.h>
 #include "config.h"
 #include "sigrok.h"
@@ -46,10 +46,25 @@ static const struct fx2lafw_profile supported_fx2[] = {
         * Saleae Logic
         * EE Electronics ESLA100
         * Robomotic MiniLogic
+        * Robomotic BugLogic 3
         */
        { 0x0925, 0x3881, "Saleae", "Logic", NULL,
                FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", 8 },
 
+       /*
+        * Default Cypress FX2 without EEPROM, e.g.:
+        * Lcsoft Mini Board
+        * Braintechnology USB Interface V2.x
+        */
+       { 0x04B4, 0x8613, "Cypress", "FX2", NULL,
+               FIRMWARE_DIR "/fx2lafw-cypress-fx2.fw", 8 },
+
+       /*
+        * Braintechnology USB-LPS
+        */
+       { 0x16d0, 0x0498, "Braintechnology", "USB-LPS", NULL,
+               FIRMWARE_DIR "/fx2lafw-braintechnology-usb-lps.fw", 8 },
+
        { 0, 0, 0, 0, 0, 0, 0 }
 };
 
@@ -79,6 +94,10 @@ static const char *probe_names[] = {
 };
 
 static uint64_t supported_samplerates[] = {
+       SR_KHZ(20),
+       SR_KHZ(25),
+       SR_KHZ(50),
+       SR_KHZ(100),
        SR_KHZ(200),
        SR_KHZ(250),
        SR_KHZ(500),
@@ -91,6 +110,7 @@ static uint64_t supported_samplerates[] = {
        SR_MHZ(12),
        SR_MHZ(16),
        SR_MHZ(24),
+       0,
 };
 
 static struct sr_samplerates samplerates = {
@@ -115,48 +135,37 @@ static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
 static gboolean check_conf_profile(libusb_device *dev)
 {
        struct libusb_device_descriptor des;
-       struct libusb_config_descriptor *conf_dsc = NULL;
-       const struct libusb_interface_descriptor *intf_dsc;
-       gboolean ret = FALSE;
+       struct libusb_device_handle *hdl;
+       gboolean ret;
+       unsigned char strdesc[64];
 
+       hdl = NULL;
+       ret = FALSE;
        while (!ret) {
                /* Assume the FW has not been loaded, unless proven wrong. */
-               ret = FALSE;
-
                if (libusb_get_device_descriptor(dev, &des) != 0)
                        break;
 
-               /* Need exactly 1 configuration. */
-               if (des.bNumConfigurations != 1)
+               if (libusb_open(dev, &hdl) != 0)
                        break;
 
-               if (libusb_get_config_descriptor(dev, 0, &conf_dsc) != 0)
+               if (libusb_get_string_descriptor_ascii(hdl,
+                               des.iManufacturer, strdesc, sizeof(strdesc)) < 0)
                        break;
-
-               /* Need exactly 1 interface. */
-               if (conf_dsc->bNumInterfaces != 1)
+               if (strncmp((const char *)strdesc, "sigrok", 6))
                        break;
 
-               /* Need just one alternate setting. */
-               if (conf_dsc->interface[0].num_altsetting != 1)
+               if (libusb_get_string_descriptor_ascii(hdl,
+                               des.iProduct, strdesc, sizeof(strdesc)) < 0)
                        break;
-
-               /* Need exactly 2 endpoints. */
-               intf_dsc = &(conf_dsc->interface[0].altsetting[0]);
-               if (intf_dsc->bNumEndpoints != 2)
-                       break;
-
-               /* The first endpoint should be 2 (inbound). */
-               if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) !=
-                   (2 | LIBUSB_ENDPOINT_IN))
+               if (strncmp((const char *)strdesc, "fx2lafw", 7))
                        break;
 
                /* If we made it here, it must be an fx2lafw. */
                ret = TRUE;
        }
-
-       if (conf_dsc)
-               libusb_free_config_descriptor(conf_dsc);
+       if (hdl)
+               libusb_close(hdl);
 
        return ret;
 }
@@ -169,6 +178,7 @@ static int fx2lafw_dev_open(int dev_index)
        struct context *ctx;
        struct version_info vi;
        int ret, skip, i;
+       uint8_t revid;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
                return SR_ERR;
@@ -233,19 +243,25 @@ static int fx2lafw_dev_open(int dev_index)
                        break;
                }
 
+               ret = command_get_revid_version(ctx->usb->devhdl, &revid);
+               if (ret != SR_OK) {
+                       sr_err("fx2lafw: Failed to retrieve REVID.");
+                       break;
+               }
+
                if (vi.major != FX2LAFW_VERSION_MAJOR ||
                    vi.minor != FX2LAFW_VERSION_MINOR) {
-                       sr_err("fx2lafw: Expected firmware version %d.%02d "
-                              "got %d.%02d.", FX2LAFW_VERSION_MAJOR,
+                       sr_err("fx2lafw: Expected firmware version %d.%d "
+                              "got %d.%d.", FX2LAFW_VERSION_MAJOR,
                               FX2LAFW_VERSION_MINOR, vi.major, vi.minor);
                        break;
                }
 
                sdi->status = SR_ST_ACTIVE;
                sr_info("fx2lafw: Opened device %d on %d.%d "
-                       "interface %d, firmware version %d.%02d",
+                       "interface %d, firmware %d.%d, REVID %d.",
                        sdi->index, ctx->usb->bus, ctx->usb->address,
-                       USB_INTERFACE, vi.major, vi.minor);
+                       USB_INTERFACE, vi.major, vi.minor, revid);
 
                break;
        }