sr: rename all sr_device_* functions to sr_dev_*

diff --git a/devselect.c b/devselect.c
index 8ac05415c1369e0c0f8f0a00a2a4d55d0fb5862d..3a6771c41abdeb577217542bd994b556916efcc6 100644 (file)
--- a/devselect.c
+++ b/devselect.c
@@ -107,8 +107,8 @@ void dev_select_rescan(GtkAction *action, GtkWindow *parent)
 
        /* Scan for new devices and update our list */
        /* TODO: Fix this in libsigrok first. */
-       /*sr_device_scan();*/
-       devices = sr_device_list();
+       /*sr_dev_scan();*/
+       devices = sr_dev_list();
        for (l = devices; l; l = l->next) {
                device = l->data;
                sdi = GET_DEVICE_INSTANCE(device);

diff --git a/toolbar.c b/toolbar.c
index b3c6479bb70dd2fe1712aa439799bba2627e88d7..73fec3e0956280e60344f81b0b2ec9db888089d9 100644 (file)
--- a/toolbar.c
+++ b/toolbar.c
@@ -214,7 +214,7 @@ static void probe_toggled(GtkCellRenderer *cel, gchar *path,
        gtk_tree_model_get_iter_from_string(probes, &iter, path);
        gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, 
                                        PROBE_ENABLED, &en, -1);
-       probe = sr_device_probe_find(device, i);
+       probe = sr_dev_probe_find(device, i);
        probe->enabled = !en;
        gtk_list_store_set(GTK_LIST_STORE(probes), &iter, 
                                        PROBE_ENABLED, probe->enabled, -1);
@@ -231,7 +231,7 @@ static void probe_named(GtkCellRendererText *cel, gchar *path, gchar *text,
 
        gtk_tree_model_get_iter_from_string(probes, &iter, path);
        gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, -1);
-       sr_device_probe_name(device, i, text);
+       sr_dev_probe_name(device, i, text);
        gtk_list_store_set(GTK_LIST_STORE(probes), &iter, PROBE_NAME, text, -1);
 }
 
@@ -246,7 +246,7 @@ static void probe_trigger_set(GtkCellRendererText *cel, gchar *path,
 
        gtk_tree_model_get_iter_from_string(probes, &iter, path);
        gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, -1);
-       sr_device_trigger_set(device, i, text);
+       sr_dev_trigger_set(device, i, text);
        gtk_list_store_set(GTK_LIST_STORE(probes), &iter, 
                                        PROBE_TRIGGER, text, -1);
 }
@@ -368,7 +368,7 @@ static void capture_run(GtkAction *action, GObject *parent)
                         * convert to samples based on the samplerate.
                         */
                        limit_samples = 0;
-                       if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+                       if (sr_dev_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
                                guint64 tmp_u64;
                                tmp_u64 = *((uint64_t *) device->plugin->get_device_info(
                                                        device->plugin_index,