fx2lafw: Added slower sample rates

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

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 5ec1f492f2ecdd902739b8c7fa73d0a9b1f9c8cd..8a07928c10b21f4f6365ae9919924600da63f3e0 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -79,6 +79,9 @@ static const char *probe_names[] = {
 };
 
 static uint64_t supported_samplerates[] = {
+       SR_KHZ(200),
+       SR_KHZ(250),
+       SR_KHZ(500),
        SR_MHZ(1),
        SR_MHZ(2),
        SR_MHZ(3),
@@ -223,17 +226,18 @@ static int fx2lafw_dev_open(int dev_index)
                        break;
                }
 
-               if((ret = command_get_fw_version(ctx->usb->devhdl, &vi)) != SR_OK) {
+               ret = command_get_fw_version(ctx->usb->devhdl, &vi);
+               if (ret != SR_OK) {
                        sr_err("fx2lafw: Failed to retrieve "
-                               "firmware version information");
+                              "firmware version information.");
                        break;
                }
 
-               if(vi.major != FX2LAFW_VERSION_MAJOR ||
-                       vi.minor != FX2LAFW_VERSION_MINOR) {
+               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,
-                               FX2LAFW_VERSION_MINOR, vi.major, vi.minor);
+                              "got %d.%02d.", FX2LAFW_VERSION_MAJOR,
+                              FX2LAFW_VERSION_MINOR, vi.major, vi.minor);
                        break;
                }
 
@@ -421,8 +425,8 @@ static int hw_dev_open(int dev_index)
        ctx = sdi->priv;
 
        /*
-        * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
-        * for the FX2 to renumerate
+        * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
+        * for the FX2 to renumerate.
         */
        ret = 0;
        if (GTV_TO_MSEC(ctx->fw_updated) > 0) {