X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=f3321ba099a3f7b481a2020dce99bbecce7b1db2;hp=fdf8562f365f73a04a4099f361eadceade29e191;hb=548b7ddc8144ca0430f852c89ae4f2e61ab487d7;hpb=c2c4a0def11bd2a589aa62f8f501ff20ef5f99e4 diff --git a/parsers.c b/parsers.c index fdf8562..f3321ba 100644 --- a/parsers.c +++ b/parsers.c @@ -146,10 +146,10 @@ struct sr_device *parse_devicestring(const char *devicestring) return NULL; device_cnt = 0; - devices = sr_device_list(); + devices = sr_dev_list(); for (l = devices; l; l = l->next) { d = l->data; - if (sr_device_has_hwcap(d, SR_HWCAP_DEMO_DEVICE)) + if (sr_dev_has_hwcap(d, SR_HWCAP_DEMO_DEVICE)) continue; if (device_cnt == device_num) { if (device_num == device_cnt) { @@ -164,14 +164,14 @@ struct sr_device *parse_devicestring(const char *devicestring) * no need to let them all scan */ device = NULL; - plugins = sr_list_hwplugins(); + plugins = sr_hwplugins_list(); for (p = plugins; p; p = p->next) { plugin = p->data; if (strcmp(plugin->name, devicestring)) continue; - num_devices = sr_init_hwplugins(plugin); + num_devices = sr_hwplugin_init(plugin); if (num_devices == 1) { - devices = sr_device_list(); + devices = sr_dev_list(); device = devices->data; } else if (num_devices > 1) { printf("driver '%s' found %d devices, select by ID instead.\n",