Some more g_try_*alloc() fixes.

[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 6f5c0500f00413f5e7d4163db224ac8e7ea4d573..77027f1d300ecedc25db9cf9381c487db86805bc 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -50,7 +50,7 @@ static const uint32_t hmo_devopts[] = {
        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_TIMEBASE | SR_CONF_GET,
+       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,
@@ -194,7 +194,7 @@ static const char *scope_digital_channel_names[] = {
        "D15",
 };
 
-static struct scope_config scope_models[] = {
+static const struct scope_config scope_models[] = {
        {
                .name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", NULL},
                .analog_channels = 2,
@@ -257,7 +257,7 @@ static struct scope_config scope_models[] = {
        },
 };
 
-static void scope_state_dump(struct scope_config *config,
+static void scope_state_dump(const struct scope_config *config,
                             struct scope_state *state)
 {
        unsigned int i;
@@ -326,7 +326,7 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
 }
 
 static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
-                                   struct scope_config *config,
+                                   const struct scope_config *config,
                                    struct scope_state *state)
 {
        unsigned int i, j;
@@ -381,7 +381,7 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
 }
 
 static int digital_channel_state_get(struct sr_scpi_dev_inst *scpi,
-                                    struct scope_config *config,
+                                    const struct scope_config *config,
                                     struct scope_state *state)
 {
        unsigned int i;
@@ -414,7 +414,7 @@ SR_PRIV int hmo_update_sample_rate(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct scope_state *state;
-       struct scope_config *config;
+       const struct scope_config *config;
 
        int tmp;
        unsigned int i;
@@ -476,7 +476,7 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct scope_state *state;
-       struct scope_config *config;
+       const struct scope_config *config;
        float tmp_float;
        unsigned int i;
 
@@ -539,37 +539,19 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static struct scope_state *scope_state_new(struct scope_config *config)
+static struct scope_state *scope_state_new(const struct scope_config *config)
 {
        struct scope_state *state;
 
-       if (!(state = g_try_malloc0(sizeof(struct scope_state))))
-               return NULL;
-
-       if (!(state->analog_channels = g_try_malloc0_n(config->analog_channels,
-                                   sizeof(struct analog_channel_state))))
-           goto fail;
-
-       if (!(state->digital_channels = g_try_malloc0_n(
-                       config->digital_channels, sizeof(gboolean))))
-           goto fail;
-
-       if (!(state->digital_pods = g_try_malloc0_n(config->digital_pods,
-                                                    sizeof(gboolean))))
-           goto fail;
+       state = g_malloc0(sizeof(struct scope_state));
+       state->analog_channels = g_malloc0_n(config->analog_channels,
+                       sizeof(struct analog_channel_state));
+       state->digital_channels = g_malloc0_n(
+                       config->digital_channels, sizeof(gboolean));
+       state->digital_pods = g_malloc0_n(config->digital_pods,
+                       sizeof(gboolean));
 
        return state;
-
-fail:
-       if (state->analog_channels)
-               g_free(state->analog_channels);
-       if (state->digital_channels)
-               g_free(state->digital_channels);
-       if (state->digital_pods)
-               g_free(state->digital_pods);
-       g_free(state);
-
-       return NULL;
 }
 
 SR_PRIV void hmo_scope_state_free(struct scope_state *state)
@@ -616,9 +598,8 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 
        /* Add analog channels. */
        for (i = 0; i < scope_models[model_index].analog_channels; i++) {
-               ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE,
+               ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE,
                           (*scope_models[model_index].analog_names)[i]);
-               sdi->channels = g_slist_append(sdi->channels, ch);
 
                devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
 
@@ -643,9 +624,8 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 
        /* Add digital channels. */
        for (i = 0; i < scope_models[model_index].digital_channels; i++) {
-               ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+               ch = sr_channel_new(sdi, 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);
@@ -672,6 +652,8 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 
        (void)fd;
 
+       data = NULL;
+
        if (!(sdi = cb_data))
                return TRUE;
 
@@ -704,6 +686,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) {
@@ -722,6 +705,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.");