X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fbrymen-dmm%2Fapi.c;h=41a318124992632fd1f696efd97a6cea40e4e7c8;hb=580ed4005bf0a95e8d7e11b527b0b1ad259aecca;hp=9af92f1da15e2f4eb334d1c7995d5813e11b713e;hpb=53b4680fceab9351fc87b8c5b34854733f5fdac0;p=libsigrok.git diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c index 9af92f1d..41a31812 100644 --- a/hardware/brymen-dmm/api.c +++ b/hardware/brymen-dmm/api.c @@ -44,7 +44,7 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm) struct sr_dev_inst *sdi; struct dev_context *devc; struct drv_context *drvc; - struct sr_probe *probe; + struct sr_channel *ch; struct sr_serial_dev_inst *serial; GSList *devices; int ret; @@ -75,7 +75,7 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm) sr_info("Found device on port %s.", conn); - if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Brymen", "BM85x", ""))) + if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Brymen", "BM85x", NULL))) goto scan_cleanup; if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { @@ -89,10 +89,10 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm) sdi->priv = devc; sdi->driver = di; - if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1"))) + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1"))) goto scan_cleanup; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi);