X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=8a96a88f96a484390754d7b6c0a6086f05fecb10;hb=a00ba012288726678e1a270961c8d4f46f3dbd33;hp=199599e118537558359e539d1856bdf6cac1b890;hpb=62eeeb171bd9a05d167990373e33bc1f956cbfee;p=libsigrok.git

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 199599e1..8a96a88f 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -22,8 +22,8 @@
 
 /*--- backend.c -------------------------------------------------------------*/
 
-int sigrok_init(void);
-void sigrok_cleanup(void);
+int sr_init(void);
+void sr_cleanup(void);
 
 /*--- datastore.c -----------------------------------------------------------*/
 
@@ -35,10 +35,11 @@ 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);
 void device_close_all(void);
 GSList *device_list(void);
 struct device *device_new(struct device_plugin *plugin, int plugin_index,
-			  int num_probes, int probe_type);
+			  int num_probes);
 void device_clear(struct device *device);
 void device_destroy(struct device *dev);
 
@@ -62,11 +63,11 @@ int load_hwplugins(void);
 GSList *list_hwplugins(void);
 
 /* Generic device instances */
-struct sigrok_device_instance *sigrok_device_instance_new(int index,
+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 *get_sigrok_device_instance(
+struct sr_device_instance *get_sr_device_instance(
 			GSList *device_instances, int device_index);
-void sigrok_device_instance_free(struct sigrok_device_instance *sdi);
+void sr_device_instance_free(struct sr_device_instance *sdi);
 
 /* USB-specific instances */
 struct usb_device_instance *usb_device_instance_new(uint8_t bus,
@@ -109,22 +110,27 @@ void 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 device *device, struct datafeed_packet *packet);
 void make_metadata(char *filename);
 int session_save(char *filename);
+void session_source_add(int fd, int events, int timeout,
+	        receive_data_callback callback, void *user_data);
+void session_source_remove(int fd);
 
 /*--- input/input.c ---------------------------------------------------------*/
 
-struct input_format **input_list(void);
+struct sr_input_format **sr_input_list(void);
 
 /*--- output/output.c -------------------------------------------------------*/
 
-struct output_format **output_list(void);
+struct sr_output_format **sr_output_list(void);
 
 /*--- output/common.c -------------------------------------------------------*/
 
-char *sigrok_samplerate_string(uint64_t samplerate);
-char *sigrok_period_string(uint64_t frequency);
+char *sr_samplerate_string(uint64_t samplerate);
+char *sr_period_string(uint64_t frequency);
 
 #endif