X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=c97658ea441990a5563ff582861349d3a180e7c6;hb=6508992d04bf972ae98b8c7e97201c5164501687;hp=a1cee6aa9ef1df788043007e1f04ef22b2f5e973;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index a1cee6aa..c97658ea 100644
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -45,21 +45,21 @@ static const char *hameg_scpi_dialect[] = {
 	[SCPI_CMD_SET_ANALOG_CHAN_STATE]    = ":CHAN%d:STAT %d",
 };
 
-static const uint32_t hmo_hwcaps[] = {
+static const uint32_t hmo_devopts[] = {
 	SR_CONF_OSCILLOSCOPE,
-	SR_CONF_TRIGGER_SOURCE,
-	SR_CONF_TIMEBASE,
-	SR_CONF_NUM_TIMEBASE,
-	SR_CONF_TRIGGER_SLOPE,
-	SR_CONF_HORIZ_TRIGGERPOS,
-	SR_CONF_SAMPLERATE,
 	SR_CONF_LIMIT_FRAMES,
+	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_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET,
 };
 
-static const uint32_t hmo_analog_caps[] = {
-	SR_CONF_NUM_VDIV,
-	SR_CONF_COUPLING,
-	SR_CONF_VDIV,
+static const uint32_t hmo_analog_devopts[] = {
+	SR_CONF_NUM_VDIV | SR_CONF_GET,
+	SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 static const char *hmo_coupling_options[] = {
@@ -204,11 +204,11 @@ static struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 		.digital_names = &scope_digital_channel_names,
 
-		.hw_caps = &hmo_hwcaps,
-		.num_hwcaps = ARRAY_SIZE(hmo_hwcaps),
+		.devopts = &hmo_devopts,
+		.num_devopts = ARRAY_SIZE(hmo_devopts),
 
-		.analog_hwcaps = &hmo_analog_caps,
-		.num_analog_hwcaps = ARRAY_SIZE(hmo_analog_caps),
+		.analog_devopts = &hmo_analog_devopts,
+		.num_analog_devopts = ARRAY_SIZE(hmo_analog_devopts),
 
 		.coupling_options = &hmo_coupling_options,
 		.trigger_sources = &hmo_compact2_trigger_sources,
@@ -234,11 +234,11 @@ static struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 		.digital_names = &scope_digital_channel_names,
 
-		.hw_caps = &hmo_hwcaps,
-		.num_hwcaps = ARRAY_SIZE(hmo_hwcaps),
+		.devopts = &hmo_devopts,
+		.num_devopts = ARRAY_SIZE(hmo_devopts),
 
-		.analog_hwcaps = &hmo_analog_caps,
-		.num_analog_hwcaps = ARRAY_SIZE(hmo_analog_caps),
+		.analog_devopts = &hmo_analog_devopts,
+		.num_analog_devopts = ARRAY_SIZE(hmo_analog_devopts),
 
 		.coupling_options = &hmo_coupling_options,
 		.trigger_sources = &hmo_compact4_trigger_sources,