Drop obsolete source_callback_*().

[libsigrok.git] / sigrok-proto.h

diff --git a/sigrok-proto.h b/sigrok-proto.h
index d6904eb89f39eb10c1d3afe4390f6aded64381db..f63156fa0b501af6d0549112f3d451a1531714c6 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -44,25 +44,25 @@ void sr_device_clear(struct sr_device *device);
 void sr_device_destroy(struct sr_device *dev);
 
 void sr_device_probe_clear(struct sr_device *device, int probenum);
-void sr_device_probe_add(struct sr_device *device, char *name);
+void sr_device_probe_add(struct sr_device *device, const char *name);
 struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum);
-void sr_device_probe_name(struct sr_device *device, int probenum, char *name);
+void sr_device_probe_name(struct sr_device *device, int probenum,
+                         const char *name);
 
 void sr_device_trigger_clear(struct sr_device *device);
 void sr_device_trigger_set(struct sr_device *device, int probenum,
-                          char *trigger);
+                          const char *trigger);
 gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap);
 
 /*--- filter.c --------------------------------------------------------------*/
 
-int filter_probes(int in_unitsize, int out_unitsize, int *probelist,
-                 char *data_in, uint64_t length_in, char **data_out,
-                 uint64_t *length_out);
+int sr_filter_probes(int in_unitsize, int out_unitsize, int *probelist,
+                    const char *data_in, uint64_t length_in, char **data_out,
+                    uint64_t *length_out);
 
 /*--- hwplugin.c ------------------------------------------------------------*/
 
-int load_hwplugins(void);
-GSList *list_hwplugins(void);
+GSList *sr_list_hwplugins(void);
 
 /* Generic device instances */
 struct sr_device_instance *sr_device_instance_new(int index,
@@ -83,17 +83,14 @@ struct sr_serial_device_instance *sr_serial_device_instance_new(
                                        const char *port, int fd);
 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);
-void source_remove(int fd);
-void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb,
-               void *user_data);
+int sr_find_hwcap(int *capabilities, int hwcap);
+struct sr_hwcap_option *sr_find_hwcap_option(int hwcap);
+void sr_source_remove(int fd);
+void sr_source_add(int fd, int events, int timeout,
+                  receive_data_callback rcv_cb, void *user_data);
 
 /*--- session.c -------------------------------------------------------------*/
 
-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 sr_device *device,
                                 struct sr_datafeed_packet *packet);
 
@@ -119,8 +116,7 @@ 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 sr_session_save(char *filename);
+int sr_session_save(const char *filename);
 void sr_session_source_add(int fd, int events, int timeout,
                receive_data_callback callback, void *user_data);
 void sr_session_source_remove(int fd);