From: Bert Vermeulen Date: Mon, 13 Feb 2012 14:23:16 +0000 (+0100) Subject: sr: rename hwplugin functions to sr_thing_action format X-Git-Tag: sigrok-cli-0.3.0~33 X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=548b7ddc8144ca0430f852c89ae4f2e61ab487d7 sr: rename hwplugin functions to sr_thing_action format --- diff --git a/parsers.c b/parsers.c index d6642b3..f3321ba 100644 --- a/parsers.c +++ b/parsers.c @@ -164,12 +164,12 @@ 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_hwplugin(plugin); + num_devices = sr_hwplugin_init(plugin); if (num_devices == 1) { devices = sr_dev_list(); device = devices->data; diff --git a/sigrok-cli.c b/sigrok-cli.c index 0cf0d01..06aa053 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -94,7 +94,7 @@ static void show_version(void) printf("sigrok-cli %s\n\n", VERSION); printf("Supported hardware drivers:\n"); - plugins = sr_list_hwplugins(); + plugins = sr_hwplugins_list(); for (p = plugins; p; p = p->next) { plugin = p->data; printf(" %-20s %s\n", plugin->name, plugin->longname);