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 4fc5744da84f5e6090841aa2c3bf7f2c8e2f2705..8132251f4410a296af06e03a3ae767bc52dd1f89 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
-#include <glib.h>
 #include <libusb.h>
 #include "config.h"
 #include "sigrok.h"
@@ -95,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),
@@ -175,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;
@@ -239,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;
        }