X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=e76b6b9236c14fd9dbb02ef8294786982df5852e;hb=a0e0bb4149081eda06714f1158639f2dadcfa9d8;hp=f11d233dece73a2fee376dbaa9c98b7794245b9a;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index f11d233d..e76b6b92 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -29,12 +29,12 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-static const uint32_t hwopts[] = {
+static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 	SR_CONF_SERIALCOMM
 };
 
-static const uint32_t hwcaps[] = {
+static const uint32_t devopts[] = {
 	SR_CONF_OSCILLOSCOPE,
 	SR_CONF_TIMEBASE,
 	SR_CONF_TRIGGER_SOURCE,
@@ -45,7 +45,7 @@ static const uint32_t hwcaps[] = {
 	SR_CONF_SAMPLERATE,
 };
 
-static const uint32_t analog_hwcaps[] = {
+static const uint32_t analog_devopts[] = {
 	SR_CONF_NUM_VDIV,
 	SR_CONF_VDIV,
 	SR_CONF_COUPLING,
@@ -772,11 +772,11 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 
 	if (key == SR_CONF_SCAN_OPTIONS) {
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
+				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
 		return SR_OK;
 	} else if (key == SR_CONF_DEVICE_OPTIONS && cg == NULL) {
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t));
+				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
 		return SR_OK;
 	}
 
@@ -809,7 +809,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 			for (i = 0; i < devc->model->analog_channels; i++) {
 				if (cg == devc->analog_groups[i]) {
 					*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-						analog_hwcaps, ARRAY_SIZE(analog_hwcaps), sizeof(uint32_t));
+						analog_devopts, ARRAY_SIZE(analog_devopts), sizeof(uint32_t));
 					return SR_OK;
 				}
 			}