X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=2ed6094bd42825165fa7d0cabb552dda428192b9;hb=8a7b47cdfae4a4a95e92958beab41a4985e8f8e3;hp=554dc5df2b05e549c089c35a848e70ac4c013116;hpb=6f1be0a2d40b3998abd8d10b5479e4538bc4ff1e;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index 554dc5df..2ed6094b 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -95,7 +95,7 @@ int load_hwplugins(void)
 	return SR_OK;
 }
 
-GSList *list_hwplugins(void)
+GSList *sr_list_hwplugins(void)
 {
 	return plugins;
 }
@@ -111,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;
@@ -236,7 +236,7 @@ void sr_source_remove(int fd)
 }
 
 void sr_source_add(int fd, int events, int timeout,
-		   receive_data_callback rcv_cb, void *user_data)
+		   sr_receive_data_callback rcv_cb, void *user_data)
 {
 	sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
 }