hameg-hmo: Use g_byte_array_free() instead of g_free().

[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 0a60127faa662d6523ee25339d0af4cc164e227e..f534cb4705c07042dfbeb5da562870a950c5f990 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -379,13 +379,29 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
        return SR_ERR;
 }
 
-static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
+static struct sr_channel *get_channel_by_index_and_type(GSList *channel_lhead,
+                                                       int index, int type)
+{
+       while (channel_lhead) {
+               struct sr_channel *ch = channel_lhead->data;
+               if (ch->index == index && ch->type == type)
+                       return ch;
+
+               channel_lhead = channel_lhead->next;
+       }
+
+       return 0;
+}
+
+static int analog_channel_state_get(struct sr_dev_inst *sdi,
                                    const struct scope_config *config,
                                    struct scope_state *state)
 {
        unsigned int i, j;
        char command[MAX_COMMAND_SIZE];
        char *tmp_str;
+       struct sr_channel *ch;
+       struct sr_scpi_dev_inst *scpi = sdi->conn;
 
        for (i = 0; i < config->analog_channels; i++) {
                g_snprintf(command, sizeof(command),
@@ -396,6 +412,10 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
                                     &state->analog_channels[i].state) != SR_OK)
                        return SR_ERR;
 
+               ch = get_channel_by_index_and_type(sdi->channels, i, SR_CHANNEL_ANALOG);
+               if (ch)
+                       ch->enabled = state->analog_channels[i].state;
+
                g_snprintf(command, sizeof(command),
                           (*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_DIV],
                           i + 1);
@@ -446,12 +466,14 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
        return SR_OK;
 }
 
-static int digital_channel_state_get(struct sr_scpi_dev_inst *scpi,
+static int digital_channel_state_get(struct sr_dev_inst *sdi,
                                     const struct scope_config *config,
                                     struct scope_state *state)
 {
        unsigned int i;
        char command[MAX_COMMAND_SIZE];
+       struct sr_channel *ch;
+       struct sr_scpi_dev_inst *scpi = sdi->conn;
 
        for (i = 0; i < config->digital_channels; i++) {
                g_snprintf(command, sizeof(command),
@@ -461,6 +483,10 @@ static int digital_channel_state_get(struct sr_scpi_dev_inst *scpi,
                if (sr_scpi_get_bool(scpi, command,
                                     &state->digital_channels[i]) != SR_OK)
                        return SR_ERR;
+
+               ch = get_channel_by_index_and_type(sdi->channels, i, SR_CHANNEL_LOGIC);
+               if (ch)
+                       ch->enabled = state->digital_channels[i];
        }
 
        for (i = 0; i < config->digital_pods; i++) {
@@ -552,10 +578,10 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
 
        sr_info("Fetching scope state");
 
-       if (analog_channel_state_get(sdi->conn, config, state) != SR_OK)
+       if (analog_channel_state_get(sdi, config, state) != SR_OK)
                return SR_ERR;
 
-       if (digital_channel_state_get(sdi->conn, config, state) != SR_OK)
+       if (digital_channel_state_get(sdi, config, state) != SR_OK)
                return SR_ERR;
 
        if (sr_scpi_get_float(sdi->conn,
@@ -638,6 +664,7 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
        unsigned int i, j, group;
        struct sr_channel *ch;
        struct dev_context *devc;
+       int ret;
 
        devc = sdi->priv;
        model_index = -1;
@@ -661,9 +688,13 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 
        devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) *
                                        scope_models[model_index].analog_channels);
-
        devc->digital_groups = g_malloc0(sizeof(struct sr_channel_group*) *
                                         scope_models[model_index].digital_pods);
+       if (!devc->analog_groups || !devc->digital_groups) {
+               g_free(devc->analog_groups);
+               g_free(devc->digital_groups);
+               return SR_ERR_MALLOC;
+       }
 
        /* Add analog channels. */
        for (i = 0; i < scope_models[model_index].analog_channels; i++) {
@@ -681,12 +712,19 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
        }
 
        /* Add digital channel groups. */
+       ret = SR_OK;
        for (i = 0; i < scope_models[model_index].digital_pods; i++) {
                devc->digital_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
+               if (!devc->digital_groups[i]) {
+                       ret = SR_ERR_MALLOC;
+                       break;
+               }
                devc->digital_groups[i]->name = g_strdup_printf("POD%d", i);
                sdi->channel_groups = g_slist_append(sdi->channel_groups,
                                   devc->digital_groups[i]);
        }
+       if (ret != SR_OK)
+               return ret;
 
        /* Add digital channels. */
        for (i = 0; i < scope_models[model_index].digital_channels; i++) {
@@ -843,7 +881,6 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
                if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) {
                        if (data)
                                g_byte_array_free(data, TRUE);
-
                        return TRUE;
                }
 
@@ -889,7 +926,8 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
                break;
        case SR_CHANNEL_LOGIC:
                if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) {
-                       g_free(data);
+                       if (data)
+                               g_byte_array_free(data, TRUE);
                        return TRUE;
                }