X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=8dfe2db149daea8ce46163fd0e0e3c6585239f20;hb=2872d21ebc4e9554f685551e4915f193357f13d9;hp=8a96a88f96a484390754d7b6c0a6086f05fecb10;hpb=a00ba012288726678e1a270961c8d4f46f3dbd33;p=libsigrok.git

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 8a96a88f..8dfe2db1 100644
--- 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 -----------------------------------------------------------*/
 
@@ -35,21 +35,22 @@ void datastore_put(struct datastore *ds, void *data, unsigned int length,
 /*--- device.c --------------------------------------------------------------*/
 
 void device_scan(void);
-int device_plugin_init(struct device_plugin *plugin);
+int device_plugin_init(struct sr_device_plugin *plugin);
 void device_close_all(void);
 GSList *device_list(void);
-struct device *device_new(struct device_plugin *plugin, int plugin_index,
-			  int num_probes);
-void device_clear(struct device *device);
-void device_destroy(struct device *dev);
+struct sr_device *device_new(struct sr_device_plugin *plugin, int plugin_index,
+			     int num_probes);
+void device_clear(struct sr_device *device);
+void device_destroy(struct sr_device *dev);
 
-void device_probe_clear(struct device *device, int probenum);
-void device_probe_add(struct device *device, char *name);
-struct probe *probe_find(struct device *device, int probenum);
-void device_probe_name(struct device *device, int probenum, char *name);
+void device_probe_clear(struct sr_device *device, int probenum);
+void device_probe_add(struct sr_device *device, char *name);
+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 device *device);
-void device_trigger_set(struct device *device, int probenum, char *trigger);
+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 --------------------------------------------------------------*/
 
@@ -65,19 +66,21 @@ 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 */
-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);
@@ -90,15 +93,15 @@ void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb,
 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);
+typedef void (*datafeed_callback) (struct sr_device *device,
+				 struct sr_datafeed_packet *packet);
 
 /* Session setup */
-struct session *session_load(const char *filename);
-struct session *session_new(void);
+int session_load(const char *filename);
+struct sr_session *session_new(void);
 void session_destroy(void);
 void session_device_clear(void);
-int session_device_add(struct device *device);
+int session_device_add(struct sr_device *device);
 
 /* Protocol analyzers setup */
 void session_pa_clear(void);
@@ -113,7 +116,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 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,
@@ -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