X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fapi.c;h=4665bca2419deae0f0347e6e2aa5039462ef04d0;hb=d810901a45e01b8e79f6b269dbb931b538071953;hp=5acb0016d0b8e6ab5ad204aea7e238f55e2f5fa8;hpb=bfc34b9ab0302fa0ba98eef3ce1b35c76d378589;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 5acb0016..4665bca2 100644
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -306,15 +306,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		num_analog_channels = prof->dev_caps & DEV_CAPS_AX_ANALOG ? 1 : 0;
 
 		/* Logic channels, all in one channel group. */
-		cg = g_malloc0(sizeof(struct sr_channel_group));
-		cg->name = g_strdup("Logic");
+		cg = sr_channel_group_new(sdi, "Logic", NULL);
 		for (j = 0; j < num_logic_channels; j++) {
 			sprintf(channel_name, "D%d", j);
 			ch = sr_channel_new(sdi, j, SR_CHANNEL_LOGIC,
 						TRUE, channel_name);
 			cg->channels = g_slist_append(cg->channels, ch);
 		}
-		sdi->channel_groups = g_slist_append(NULL, cg);
 
 		for (j = 0; j < num_analog_channels; j++) {
 			snprintf(channel_name, 16, "A%d", j);
@@ -322,10 +320,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 					SR_CHANNEL_ANALOG, TRUE, channel_name);
 
 			/* Every analog channel gets its own channel group. */
-			cg = g_malloc0(sizeof(struct sr_channel_group));
-			cg->name = g_strdup(channel_name);
+			cg = sr_channel_group_new(sdi, channel_name, NULL);
 			cg->channels = g_slist_append(NULL, ch);
-			sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
 		}
 
 		devc = fx2lafw_dev_new();