X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=22aab6f5c296a73f5d9212620207905225ffcb52;hb=60679b18e6940d20ee36fa77ea7411b67cbb9c2a;hp=f6187a91ad3bf8da11665fe7208db906d2e05d5d;hpb=7d6588743503514c9de5c4fc8a511e9b0bdad7e6;p=libsigrok.git

diff --git a/sigrok-proto.h b/sigrok-proto.h
index f6187a91..22aab6f5 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -45,7 +45,7 @@ void device_destroy(struct sr_device *dev);
 
 void device_probe_clear(struct sr_device *device, int probenum);
 void device_probe_add(struct sr_device *device, char *name);
-struct probe *probe_find(struct sr_device *device, int probenum);
+struct sr_probe *probe_find(struct sr_device *device, int probenum);
 void device_probe_name(struct sr_device *device, int probenum, char *name);
 
 void device_trigger_clear(struct sr_device *device);
@@ -71,9 +71,11 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
 void sr_device_instance_free(struct sr_device_instance *sdi);
 
 /* USB-specific instances */
+#ifdef HAVE_LIBUSB_1_0
 struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
 		uint8_t address, struct libusb_device_handle *hdl);
 void sr_usb_device_instance_free(struct sr_usb_device_instance *usb);
+#endif
 
 /* Serial-specific instances */
 struct sr_serial_device_instance *sr_serial_device_instance_new(
@@ -95,31 +97,31 @@ typedef void (*datafeed_callback) (struct sr_device *device,
 				 struct sr_datafeed_packet *packet);
 
 /* Session setup */
-int session_load(const char *filename);
-struct session *session_new(void);
-void session_destroy(void);
-void session_device_clear(void);
-int session_device_add(struct sr_device *device);
+int sr_session_load(const char *filename);
+struct sr_session *sr_session_new(void);
+void sr_session_destroy(void);
+void sr_session_device_clear(void);
+int sr_session_device_add(struct sr_device *device);
 
 /* Protocol analyzers setup */
-void session_pa_clear(void);
-void session_pa_add(struct analyzer *pa);
+void sr_session_pa_clear(void);
+void sr_session_pa_add(struct analyzer *pa);
 
 /* Datafeed setup */
-void session_datafeed_callback_clear(void);
-void session_datafeed_callback_add(datafeed_callback callback);
+void sr_session_datafeed_callback_clear(void);
+void sr_session_datafeed_callback_add(datafeed_callback callback);
 
 /* Session control */
-int session_start(void);
-void session_run(void);
-void session_halt(void);
-void session_stop(void);
-void session_bus(struct sr_device *device, struct sr_datafeed_packet *packet);
+int sr_session_start(void);
+void sr_session_run(void);
+void sr_session_halt(void);
+void sr_session_stop(void);
+void sr_session_bus(struct sr_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,
+int sr_session_save(char *filename);
+void sr_session_source_add(int fd, int events, int timeout,
 	        receive_data_callback callback, void *user_data);
-void session_source_remove(int fd);
+void sr_session_source_remove(int fd);
 
 /*--- input/input.c ---------------------------------------------------------*/