Fix warnings: g_fopen() needs <glib/gstdio.h>.

[libsigrok.git] / sigrok-proto.h

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 4d700f3147d3ee0d3a552089e2e48a8787bb4831..57b899df16ac36c894cec77773ce6e8601a88af8 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -23,7 +23,7 @@
 /*--- backend.c -------------------------------------------------------------*/
 
 int sr_init(void);
-void sr_cleanup(void);
+void sr_exit(void);
 
 /*--- datastore.c -----------------------------------------------------------*/
 
@@ -50,6 +50,7 @@ void device_probe_name(struct sr_device *device, int probenum, char *name);
 
 void device_trigger_clear(struct sr_device *device);
 void device_trigger_set(struct sr_device *device, int probenum, char *trigger);
+gboolean device_has_hwcap(struct sr_device *device, int hwcap);
 
 /*--- filter.c --------------------------------------------------------------*/
 
@@ -70,14 +71,16 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
 void sr_device_instance_free(struct sr_device_instance *sdi);
 
 /* USB-specific instances */
-struct usb_device_instance *usb_device_instance_new(uint8_t bus,
+#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 usb_device_instance_free(struct usb_device_instance *usb);
+void sr_usb_device_instance_free(struct sr_usb_device_instance *usb);
+#endif
 
 /* Serial-specific instances */
-struct serial_device_instance *serial_device_instance_new(
+struct sr_serial_device_instance *sr_serial_device_instance_new(
                                        const char *port, int fd);
-void serial_device_instance_free(struct serial_device_instance *serial);
+void sr_serial_device_instance_free(struct sr_serial_device_instance *serial);
 
 int find_hwcap(int *capabilities, int hwcap);
 struct hwcap_option *find_hwcap_option(int hwcap);
@@ -94,7 +97,7 @@ typedef void (*datafeed_callback) (struct sr_device *device,
                                 struct sr_datafeed_packet *packet);
 
 /* Session setup */
-struct session *session_load(const char *filename);
+int session_load(const char *filename);
 struct session *session_new(void);
 void session_destroy(void);
 void session_device_clear(void);
@@ -132,5 +135,8 @@ struct sr_output_format **sr_output_list(void);
 
 char *sr_samplerate_string(uint64_t samplerate);
 char *sr_period_string(uint64_t frequency);
+char **sr_parse_triggerstring(struct sr_device *device, const char *triggerstring);
+uint64_t sr_parse_sizestring(const char *sizestring);
+uint64_t sr_parse_timestring(const char *timestring);
 
 #endif