X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhp-59306a%2Fapi.c;h=d2b840041d36dc227979f5b6dfde0a8f353372a4;hb=b9890a3292ac709a330208aabcc9472a019edcaf;hp=c7a0afca5b2ad34d11309313754c0aa0a5fbb45e;hpb=3029e904e8729d48938b81233ab550b2353089cb;p=libsigrok.git diff --git a/src/hardware/hp-59306a/api.c b/src/hardware/hp-59306a/api.c index c7a0afca..d2b84004 100644 --- a/src/hardware/hp-59306a/api.c +++ b/src/hardware/hp-59306a/api.c @@ -47,6 +47,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) struct channel_group_context *cgc; size_t idx, nr; struct sr_channel_group *cg; + char cg_name[24]; /* * The device cannot get identified by means of SCPI queries. @@ -73,15 +74,11 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) devc->channel_count = 6; for (idx = 0; idx < devc->channel_count; idx++) { nr = idx + 1; - - cg = g_malloc0(sizeof(*cg)); - cg->name = g_strdup_printf("R%zu", nr); - + snprintf(cg_name, sizeof(cg_name), "R%zu", nr); cgc = g_malloc0(sizeof(*cgc)); cgc->number = nr; - cg->priv = cgc; - - sdi->channel_groups = g_slist_append(sdi->channel_groups, cg); + cg = sr_channel_group_new(sdi, cg_name, cgc); + (void)cg; } return sdi;