Revert temporary changes for 0.2 release.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index 046670d5ffe13731a98f233bbdaea6064c42e0e0..2ed6094bd42825165fa7d0cabb552dda428192b9 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -33,7 +33,8 @@ GSList *plugins;
  * This enumerates which plugin capabilities correspond to user-settable
  * options.
  */
-struct hwcap_option hwcap_options[] = {
+/* TODO: This shouldn't be a global. */
+struct sr_hwcap_option sr_hwcap_options[] = {
        {SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"},
        {SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"},
        {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"},
@@ -94,7 +95,7 @@ int load_hwplugins(void)
        return SR_OK;
 }
 
-GSList *list_hwplugins(void)
+GSList *sr_list_hwplugins(void)
 {
        return plugins;
 }
@@ -110,8 +111,8 @@ struct sr_device_instance *sr_device_instance_new(int index, int status,
        sdi->index = index;
        sdi->status = status;
        sdi->instance_type = -1;
-       sdi->vendor = vendor ? strdup(vendor) : strdup("(unknown)");
-       sdi->model = model ? strdup(model) : NULL;
+       sdi->vendor = vendor ? strdup(vendor) : NULL;
+       sdi->model = model ? strdup(model) : strdup("(unknown)");
        sdi->version = version ? strdup(version) : NULL;
        sdi->priv = NULL;
        sdi->usb = NULL;
@@ -203,7 +204,7 @@ void sr_serial_device_instance_free(struct sr_serial_device_instance *serial)
        free(serial->port);
 }
 
-int find_hwcap(int *capabilities, int hwcap)
+int sr_find_hwcap(int *capabilities, int hwcap)
 {
        int i;
 
@@ -215,13 +216,13 @@ int find_hwcap(int *capabilities, int hwcap)
        return FALSE;
 }
 
-struct hwcap_option *find_hwcap_option(int hwcap)
+struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
 {
        int i;
 
-       for (i = 0; hwcap_options[i].capability; i++) {
-               if (hwcap_options[i].capability == hwcap)
-                       return &hwcap_options[i];
+       for (i = 0; sr_hwcap_options[i].capability; i++) {
+               if (sr_hwcap_options[i].capability == hwcap)
+                       return &sr_hwcap_options[i];
        }
 
        return NULL;
@@ -229,13 +230,13 @@ struct hwcap_option *find_hwcap_option(int hwcap)
 
 /* unnecessary level of indirection follows. */
 
-void source_remove(int fd)
+void sr_source_remove(int fd)
 {
        sr_session_source_remove(fd);
 }
 
-void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb,
-               void *user_data)
+void sr_source_add(int fd, int events, int timeout,
+                  sr_receive_data_callback rcv_cb, void *user_data)
 {
        sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
 }