X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=1a788407a4be1db03287b51039922a661b3385e6;hb=db560903d196c39bceeaa543317fa602a02b51ac;hp=afa6efe375673b3ac9a9935d73d9c4ba1616b58a;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index afa6efe3..1a788407 100644
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -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,13 +608,11 @@ 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++) {
@@ -619,20 +621,25 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 			return SR_ERR_MALLOC;
 		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. */
@@ -642,8 +649,8 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 			return SR_ERR_MALLOC;
 		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];