Rename SR_CONF_NUM_TIMEBASE to SR_CONF_NUM_HDIV.

[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 afa6efe375673b3ac9a9935d73d9c4ba1616b58a..28c9fd611950b270efbb441d8102f7be31b4640e 100644 (file)
--- 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 int32_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_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
+       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_HDIV | 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 int32_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,
@@ -355,8 +355,10 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
                                break;
                        }
                }
-               if (i == config->num_vdivs)
+               if (j == config->num_vdivs) {
+                       sr_err("Could not determine array index for vertical div scale.");
                        return SR_ERR;
+               }
 
                g_snprintf(command, sizeof(command),
                           (*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_OFFSET],
@@ -502,8 +504,10 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
                        break;
                }
        }
-       if (i == config->num_timebases)
+       if (i == config->num_timebases) {
+               sr_err("Could not determine array index for time base.");
                return SR_ERR;
+       }
 
        if (sr_scpi_get_float(sdi->conn,
                        (*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS],
@@ -604,46 +608,47 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
                return SR_ERR_NA;
        }
 
-       if (!(devc->analog_groups = g_try_malloc0(sizeof(struct sr_channel_group) *
-                                                 scope_models[model_index].analog_channels)))
-                       return SR_ERR_MALLOC;
+       devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) *
+                                       scope_models[model_index].analog_channels);
 
-       if (!(devc->digital_groups = g_try_malloc0(sizeof(struct sr_channel_group) *
-                                                  scope_models[model_index].digital_pods)))
-                       return SR_ERR_MALLOC;
+       devc->digital_groups = g_malloc0(sizeof(struct sr_channel_group*) *
+                                        scope_models[model_index].digital_pods);
 
        /* Add analog channels. */
        for (i = 0; i < scope_models[model_index].analog_channels; i++) {
-               if (!(ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE,
-                          (*scope_models[model_index].analog_names)[i])))
-                       return SR_ERR_MALLOC;
+               ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE,
+                          (*scope_models[model_index].analog_names)[i]);
                sdi->channels = g_slist_append(sdi->channels, ch);
 
-               devc->analog_groups[i].name =
-                       (char *)(*scope_models[model_index].analog_names)[i];
-               devc->analog_groups[i].channels = g_slist_append(NULL, ch);
+               devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
+
+               devc->analog_groups[i]->name = g_strdup(
+                       (char *)(*scope_models[model_index].analog_names)[i]);
+               devc->analog_groups[i]->channels = g_slist_append(NULL, ch);
 
                sdi->channel_groups = g_slist_append(sdi->channel_groups,
-                                                  &devc->analog_groups[i]);
+                                                  devc->analog_groups[i]);
        }
 
        /* Add digital channel groups. */
        for (i = 0; i < scope_models[model_index].digital_pods; ++i) {
                g_snprintf(tmp, 25, "POD%d", i);
-               devc->digital_groups[i].name = g_strdup(tmp);
+
+               devc->digital_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
+
+               devc->digital_groups[i]->name = g_strdup(tmp);
                sdi->channel_groups = g_slist_append(sdi->channel_groups,
-                                  &devc->digital_groups[i < 8 ? 0 : 1]);
+                                  devc->digital_groups[i < 8 ? 0 : 1]);
        }
 
        /* Add digital channels. */
        for (i = 0; i < scope_models[model_index].digital_channels; i++) {
-               if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
-                          (*scope_models[model_index].digital_names)[i])))
-                       return SR_ERR_MALLOC;
+               ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+                          (*scope_models[model_index].digital_names)[i]);
                sdi->channels = g_slist_append(sdi->channels, ch);
 
-               devc->digital_groups[i < 8 ? 0 : 1].channels = g_slist_append(
-                       devc->digital_groups[i < 8 ? 0 : 1].channels, ch);
+               devc->digital_groups[i < 8 ? 0 : 1]->channels = g_slist_append(
+                       devc->digital_groups[i < 8 ? 0 : 1]->channels, ch);
        }
 
        devc->model_config = &scope_models[model_index];
@@ -667,6 +672,8 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 
        (void)fd;
 
+       data = NULL;
+
        if (!(sdi = cb_data))
                return TRUE;
 
@@ -699,6 +706,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
                        sr_session_send(cb_data, &packet);
                        g_slist_free(analog.channels);
                        g_array_free(data, TRUE);
+                       data = NULL;
                        break;
                case SR_CHANNEL_LOGIC:
                        if (sr_scpi_get_uint8v(sdi->conn, NULL, &data) != SR_OK) {
@@ -717,6 +725,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
                        packet.payload = &logic;
                        sr_session_send(cb_data, &packet);
                        g_array_free(data, TRUE);
+                       data = NULL;
                        break;
                default:
                        sr_err("Invalid channel type.");