Prefix device structs with sr_.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index a826cd9eb8ef768ea2a11ee6b56b5259781b9fef..efd8f5e1b77dac587ae042f48f6339476303218a 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -41,25 +41,25 @@ struct hwcap_option hwcap_options[] = {
 };
 
 #ifdef HAVE_LA_DEMO
-extern struct device_plugin demo_plugin_info;
+extern struct sr_device_plugin demo_plugin_info;
 #endif
 #ifdef HAVE_LA_SALEAE_LOGIC
-extern struct device_plugin saleae_logic_plugin_info;
+extern struct sr_device_plugin saleae_logic_plugin_info;
 #endif
 #ifdef HAVE_LA_OLS
-extern struct device_plugin ols_plugin_info;
+extern struct sr_device_plugin ols_plugin_info;
 #endif
 #ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
-extern struct device_plugin zeroplus_logic_cube_plugin_info;
+extern struct sr_device_plugin zeroplus_logic_cube_plugin_info;
 #endif
 #ifdef HAVE_LA_ASIX_SIGMA
-extern struct device_plugin asix_sigma_plugin_info;
+extern struct sr_device_plugin asix_sigma_plugin_info;
 #endif
 #ifdef HAVE_LA_LINK_MSO19
-extern struct device_plugin link_mso19_plugin_info;
+extern struct sr_device_plugin link_mso19_plugin_info;
 #endif
 #ifdef HAVE_LA_ALSA
-extern struct device_plugin alsa_plugin_info;
+extern struct sr_device_plugin alsa_plugin_info;
 #endif
 
 
@@ -99,12 +99,12 @@ GSList *list_hwplugins(void)
        return plugins;
 }
 
-struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
+struct sr_device_instance *sr_device_instance_new(int index, int status,
                const char *vendor, const char *model, const char *version)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
 
-       if (!(sdi = malloc(sizeof(struct sigrok_device_instance))))
+       if (!(sdi = malloc(sizeof(struct sr_device_instance))))
                return NULL;
 
        sdi->index = index;
@@ -119,14 +119,14 @@ struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
        return sdi;
 }
 
-struct sigrok_device_instance *get_sigrok_device_instance(
-                               GSList *device_instances, int device_index)
+struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
+                                                 int device_index)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        GSList *l;
 
        for (l = device_instances; l; l = l->next) {
-               sdi = (struct sigrok_device_instance *)(l->data);
+               sdi = (struct sr_device_instance *)(l->data);
                if (sdi->index == device_index)
                        return sdi;
        }
@@ -135,7 +135,7 @@ struct sigrok_device_instance *get_sigrok_device_instance(
        return NULL;
 }
 
-void sigrok_device_instance_free(struct sigrok_device_instance *sdi)
+void sr_device_instance_free(struct sr_device_instance *sdi)
 {
        switch (sdi->instance_type) {
        case USB_INSTANCE: