From: Bert Vermeulen <redacted>
Date: Tue, 18 Nov 2014 15:30:47 +0000 (+0100)
Subject: asix-sigma: Fix driver options.
X-Git-Tag: libsigrok-0.4.0~751
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=2ff11e50a58480705e688b36dcbc17ad0b5beb09;p=libsigrok.git

asix-sigma: Fix driver options.
---

diff --git a/src/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c
index 24c786da..cad6b989 100644
--- a/src/hardware/asix-sigma/asix-sigma.c
+++ b/src/hardware/asix-sigma/asix-sigma.c
@@ -71,13 +71,13 @@ static const char *channel_names[] = {
 	"9", "10", "11", "12", "13", "14", "15", "16",
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
 	SR_CONF_LOGIC_ANALYZER,
-	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
-	SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
 };
 
-static const uint32_t devopts_global[] = {
+static const uint32_t devopts[] = {
+	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
 	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
 	SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
@@ -901,10 +901,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	case SR_CONF_DEVICE_OPTIONS:
 		if (!sdi)
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+					drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
 		else
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts_global, ARRAY_SIZE(devopts_global), sizeof(uint32_t));
+					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
 		break;
 	case SR_CONF_SAMPLERATE:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));