Consistently use 'devopts' variable across all drivers.

[libsigrok.git] / src / hardware / hameg-hmo / protocol.c

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index a1cee6aa9ef1df788043007e1f04ef22b2f5e973..8c80204fca024952bf9d7166a78da44d5a5f6dc3 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -45,7 +45,7 @@ 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,
@@ -56,7 +56,7 @@ static const uint32_t hmo_hwcaps[] = {
        SR_CONF_LIMIT_FRAMES,
 };
 
-static const uint32_t hmo_analog_caps[] = {
+static const uint32_t hmo_analog_devopts[] = {
        SR_CONF_NUM_VDIV,
        SR_CONF_COUPLING,
        SR_CONF_VDIV,
@@ -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,