Add a field for the full name of a device.

[libsigrok.git] / sigrok-proto.h

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 8a96a88f96a484390754d7b6c0a6086f05fecb10..6cf3ff1de51a6a6473b5ddea2df093e4dcaf1d89 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -65,8 +65,8 @@ GSList *list_hwplugins(void);
 /* Generic device instances */
 struct sr_device_instance *sr_device_instance_new(int index,
        int status, const char *vendor, const char *model, const char *version);
-struct sr_device_instance *get_sr_device_instance(
-                       GSList *device_instances, int device_index);
+struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
+                                                 int device_index);
 void sr_device_instance_free(struct sr_device_instance *sdi);
 
 /* USB-specific instances */
@@ -91,7 +91,7 @@ typedef void (*source_callback_remove) (int fd);
 typedef void (*source_callback_add) (int fd, int events, int timeout,
                receive_data_callback callback, void *user_data);
 typedef void (*datafeed_callback) (struct device *device,
-                                struct datafeed_packet *packet);
+                                struct sr_datafeed_packet *packet);
 
 /* Session setup */
 struct session *session_load(const char *filename);
@@ -113,7 +113,7 @@ int session_start(void);
 void session_run(void);
 void session_halt(void);
 void session_stop(void);
-void session_bus(struct device *device, struct datafeed_packet *packet);
+void session_bus(struct device *device, struct sr_datafeed_packet *packet);
 void make_metadata(char *filename);
 int session_save(char *filename);
 void session_source_add(int fd, int events, int timeout,