sr: rename all sr_hwplugin(s)_* functions to sr_hw_*

[sigrok-cli.git] / sigrok-cli.c

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 780c3eb1f9ea36562458b3254e9cab6c4339d9f7..8c92d9fff3b70826eb3a7cafd435ce252522703a 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -93,8 +93,9 @@ static void show_version(void)
        int i;
 
        printf("sigrok-cli %s\n\n", VERSION);
+
        printf("Supported hardware drivers:\n");
-       plugins = sr_hwplugins_list();
+       plugins = sr_hw_list();
        for (p = plugins; p; p = p->next) {
                plugin = p->data;
                printf("  %-20s %s\n", plugin->name, plugin->longname);
@@ -113,17 +114,17 @@ static void show_version(void)
                printf("  %-20s %s\n", outputs[i]->id, outputs[i]->description);
        printf("\n");
 
-       /* TODO: Error handling. */
-       srd_init(NULL);
-
-       printf("Supported protocol decoders:\n");
-       for (l = srd_list_decoders(); l; l = l->next) {
-               dec = l->data;
-               printf("  %-20s %s\n", dec->id, dec->longname);
+       if (srd_init(NULL) == SRD_OK) {
+               printf("Supported protocol decoders:\n");
+               srd_decoders_load_all();
+               for (l = srd_decoders_list(); l; l = l->next) {
+                       dec = l->data;
+                       printf("  %-20s %s\n", dec->id, dec->longname);
+               }
+               srd_exit();
        }
        printf("\n");
 
-       srd_exit();
 }
 
 static void print_device_line(const struct sr_device *device)
@@ -202,7 +203,7 @@ static void show_device_detail(void)
        title = "Supported options:\n";
        capabilities = device->plugin->get_capabilities();
        for (cap = 0; capabilities[cap]; cap++) {
-               if (!(hwo = sr_hwplugins_hwcap_get(capabilities[cap])))
+               if (!(hwo = sr_hw_hwcap_get(capabilities[cap])))
                        continue;
 
                if (title) {
@@ -265,7 +266,7 @@ static void show_pd_detail(void)
 
        pdtokens = g_strsplit(opt_pds, ",", -1);
        for (pdtok = pdtokens; *pdtok; pdtok++) {
-               if (!(dec = srd_get_decoder_by_id(*pdtok))) {
+               if (!(dec = srd_decoder_get_by_id(*pdtok))) {
                        printf("Protocol decoder %s not found.", *pdtok);
                        return;
                }
@@ -484,8 +485,12 @@ static int register_pds(struct sr_device *device, const char *pdstring)
 
                pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key"));
                g_hash_table_remove(pd_opthash, "sigrok_key");
+               if (srd_decoder_load(pd_name) != SRD_OK) {
+                       fprintf(stderr, "Failed to load protocol decoder %s\n", pd_name);
+                       goto err_out;
+               }
                if (!(di = srd_inst_new(pd_name, pd_opthash))) {
-                       fprintf(stderr, "Failed to instantiate PD %s\n", pd_name);
+                       fprintf(stderr, "Failed to instantiate protocol decoder %s\n", pd_name);
                        goto err_out;
                }
                g_datalist_set_data(&pd_ann_visible, di->inst_id, pd_name);
@@ -494,7 +499,7 @@ static int register_pds(struct sr_device *device, const char *pdstring)
                 * is the probe name as specified in the decoder class, and the
                 * value is the probe number i.e. the order in which the PD's
                 * incoming samples are arranged. */
-               if (srd_inst_set_probes(di, pd_opthash) != SRD_OK)
+               if (srd_inst_probes_set(di, pd_opthash) != SRD_OK)
                        goto err_out;
                g_hash_table_destroy(pd_opthash);
                pd_opthash = NULL;
@@ -832,7 +837,7 @@ static void run_session(void)
             return;
 
        if (opt_continuous) {
-               if (!sr_hwplugin_has_hwcap(device->plugin, SR_HWCAP_CONTINUOUS)) {
+               if (!sr_hw_has_hwcap(device->plugin, SR_HWCAP_CONTINUOUS)) {
                        printf("This device does not support continuous sampling.");
                        sr_session_destroy();
                        return;
@@ -864,7 +869,7 @@ static void run_session(void)
                        return;
                }
 
-               if (sr_hwplugin_has_hwcap(device->plugin, SR_HWCAP_LIMIT_MSEC)) {
+               if (sr_hw_has_hwcap(device->plugin, SR_HWCAP_LIMIT_MSEC)) {
                        if (device->plugin->set_configuration(device->plugin_index,
                                                          SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
                                printf("Failed to configure time limit.\n");