X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=09d3c9b8faf86512054482ef544f1a4ed23d3175;hb=9c6a2913fdf11857774418b18665f8f684762a31;hp=5148c8d7fc039cb37bc7b850b2674ed37e64c114;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 5148c8d7..09d3c9b8 100644
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -25,20 +25,22 @@
 
 #include "protocol.h"
 
-static const uint32_t dlm_hwcaps[] = {
+static const uint32_t dlm_devopts[] = {
 	SR_CONF_LOGIC_ANALYZER,
 	SR_CONF_OSCILLOSCOPE,
-	SR_CONF_TRIGGER_SLOPE,
-	SR_CONF_TRIGGER_SOURCE,
-	SR_CONF_TIMEBASE,
-	SR_CONF_NUM_TIMEBASE,
-	SR_CONF_HORIZ_TRIGGERPOS,
+	SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET,
+	SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_NUM_TIMEBASE | SR_CONF_GET,
+	SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
 };
 
-static const uint32_t dlm_analog_caps[] = {
-	SR_CONF_VDIV,
-	SR_CONF_COUPLING,
-	SR_CONF_NUM_VDIV,
+static const uint32_t dlm_analog_devopts[] = {
+	SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_NUM_VDIV | SR_CONF_GET,
 };
 
 static const char *dlm_coupling_options[] = {
@@ -177,11 +179,11 @@ static struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 		.digital_names = &scope_digital_channel_names,
 
-		.hw_caps = &dlm_hwcaps,
-		.num_hwcaps = ARRAY_SIZE(dlm_hwcaps),
+		.devopts = &dlm_devopts,
+		.num_devopts = ARRAY_SIZE(dlm_devopts),
 
-		.analog_hwcaps = &dlm_analog_caps,
-		.num_analog_hwcaps = ARRAY_SIZE(dlm_analog_caps),
+		.analog_devopts = &dlm_analog_devopts,
+		.num_analog_devopts = ARRAY_SIZE(dlm_analog_devopts),
 
 		.coupling_options = &dlm_coupling_options,
 		.trigger_sources = &dlm_2ch_trigger_sources,
@@ -206,11 +208,11 @@ static struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 		.digital_names = &scope_digital_channel_names,
 
-		.hw_caps = &dlm_hwcaps,
-		.num_hwcaps = ARRAY_SIZE(dlm_hwcaps),
+		.devopts = &dlm_devopts,
+		.num_devopts = ARRAY_SIZE(dlm_devopts),
 
-		.analog_hwcaps = &dlm_analog_caps,
-		.num_analog_hwcaps = ARRAY_SIZE(dlm_analog_caps),
+		.analog_devopts = &dlm_analog_devopts,
+		.num_analog_devopts = ARRAY_SIZE(dlm_analog_devopts),
 
 		.coupling_options = &dlm_coupling_options,
 		.trigger_sources = &dlm_4ch_trigger_sources,