X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=06dae50f7cd9a3979692371138df4ad8b91b3f0b;hp=d22b223ef18b69f5ffd8036a32bd560ac63379ce;hb=HEAD;hpb=692716f5d1aae4ef06c67b57aaf253f46f538c33

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index d22b223e..06dae50f 100644
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -769,7 +769,6 @@ SR_PRIV int dlm_model_get(char *model_id, char **model_name, int *model_index)
  */
 SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index)
 {
-	char tmp[25];
 	int i;
 	struct sr_channel *ch;
 	struct dev_context *devc;
@@ -778,36 +777,30 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index)
 
 	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].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, each in its own group. */
 	for (i = 0; i < scope_models[model_index].analog_channels; i++) {
 		ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE,
 				(*scope_models[model_index].analog_names)[i]);
 
-		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] = sr_channel_group_new(sdi,
+			(*scope_models[model_index].analog_names)[i], NULL);
 		devc->analog_groups[i]->channels = g_slist_append(NULL, ch);
-
-		sdi->channel_groups = g_slist_append(sdi->channel_groups,
-				devc->analog_groups[i]);
 	}
 
 	/* Add digital channel groups. */
 	for (i = 0; i < scope_models[model_index].pods; i++) {
-		g_snprintf(tmp, sizeof(tmp), "POD%d", i);
-
-		devc->digital_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
+		devc->digital_groups[i] = sr_channel_group_new(sdi, NULL, NULL);
 		if (!devc->digital_groups[i])
 			return SR_ERR_MALLOC;
-
-		devc->digital_groups[i]->name = g_strdup(tmp);
-		sdi->channel_groups = g_slist_append(sdi->channel_groups,
-				devc->digital_groups[i]);
+		devc->digital_groups[i]->name = g_strdup_printf("POD%d", i);
 	}
 
 	/* Add digital channels. */
@@ -1018,7 +1011,6 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
 	struct scope_state *model_state;
 	struct dev_context *devc;
 	struct sr_channel *ch;
-	struct sr_datafeed_packet packet;
 	int chunk_len, num_bytes;
 	static GArray *data = NULL;
 
@@ -1065,10 +1057,8 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
 	devc->data_pending = FALSE;
 
 	/* Signal the beginning of a new frame if this is the first channel. */
-	if (devc->current_channel == devc->enabled_channels) {
-		packet.type = SR_DF_FRAME_BEGIN;
-		sr_session_send(sdi, &packet);
-	}
+	if (devc->current_channel == devc->enabled_channels)
+		std_session_send_df_frame_begin(sdi);
 
 	if (dlm_block_data_header_process(data, &num_bytes) != SR_OK) {
 		sr_err("Encountered malformed block data header.");
@@ -1111,8 +1101,7 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
 	 * and set the next enabled channel. Then, request its data.
 	 */
 	if (!devc->current_channel->next) {
-		packet.type = SR_DF_FRAME_END;
-		sr_session_send(sdi, &packet);
+		std_session_send_df_frame_end(sdi);
 		devc->current_channel = devc->enabled_channels;
 
 		/*