]> sigrok.org Git - libsigrok.git/commitdiff
fx2lafw: Ensure default sample rate is set
authorJoel Holdsworth <redacted>
Sun, 4 Mar 2012 14:10:05 +0000 (14:10 +0000)
committerJoel Holdsworth <redacted>
Wed, 7 Mar 2012 07:52:05 +0000 (07:52 +0000)
hardware/fx2lafw/fx2lafw.c

index b0bd0e6067b6cb06db6924b3ef2eab9ac94a1ba9..e213df9c2cd18ef4b6df5b090acc468a9d3b93a5 100644 (file)
@@ -78,6 +78,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);
 
 /**
@@ -369,6 +370,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;
 }