X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=5590a4bbb5b9a0d8e0b93d9f4583d7ca236f5cb2;hb=a00ba012288726678e1a270961c8d4f46f3dbd33;hp=a826cd9eb8ef768ea2a11ee6b56b5259781b9fef;hpb=f50f3f40d9238b0c50be67e52bc132aadfcf2050;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index a826cd9e..5590a4bb 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -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(
+struct sr_device_instance *get_sr_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: