X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Flogicport.c;h=ea4cb39b252bb406aaf31bcb4a343128ed2dab9b;hb=1e7468a8858768806a066f52d47d167a3721a8e4;hp=354330ab453e9f800d5926cc2df081a59906e3c2;hpb=a38f0f5e28c497be051b62402be1ee90e68bc2d2;p=libsigrok.git

diff --git a/src/input/logicport.c b/src/input/logicport.c
index 354330ab..ea4cb39b 100644
--- a/src/input/logicport.c
+++ b/src/input/logicport.c
@@ -60,10 +60,6 @@
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
-/* TODO: Move these helpers to some library API routine group. */
-struct sr_channel_group *sr_channel_group_new(const char *name, void *priv);
-void sr_channel_group_free(struct sr_channel_group *cg);
-
 #define LOG_PREFIX	"input/logicport"
 
 #define MAX_CHANNELS	34
@@ -155,26 +151,6 @@ static void free_signal_group(struct signal_group_desc *desc)
 	g_free(desc);
 }
 
-struct sr_channel_group *sr_channel_group_new(const char *name, void *priv)
-{
-	struct sr_channel_group *cg;
-
-	cg = g_malloc0(sizeof(*cg));
-	if (name && *name)
-		cg->name = g_strdup(name);
-	cg->priv = priv;
-
-	return cg;
-}
-
-void sr_channel_group_free(struct sr_channel_group *cg)
-{
-	if (!cg)
-		return;
-	g_free(cg->name);
-	g_slist_free(cg->channels);
-}
-
 /* Wrapper for GDestroyNotify compatibility. */
 static void sg_free(void *p)
 {
@@ -802,10 +778,9 @@ static int create_channels_groups(struct sr_input *in)
 	sdi = in->sdi;
 	for (l = inc->signal_groups; l; l = l->next) {
 		desc = l->data;
-		cg = sr_channel_group_new(desc->name, NULL);
+		cg = sr_channel_group_new(sdi, desc->name, NULL);
 		if (!cg)
 			return SR_ERR_MALLOC;
-		sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
 		mask = UINT64_C(1);
 		for (idx = 0; idx < inc->channel_count; idx++, mask <<= 1) {
 			if (!(desc->mask & mask))