X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=7b337d48cbe189900a4ca7ea06e2aca5102ead85;hb=29cbfeaf5c6a5e9112a6830a8fe4b584b33daf2a;hp=d13a3ac2290775da2c1d1d6074c38ab4b5ceff11;hpb=2bf4aca64ad435a09359662446762840ac55db1d;p=libsigrok.git

diff --git a/sigrok-proto.h b/sigrok-proto.h
index d13a3ac2..7b337d48 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -27,10 +27,10 @@ void sr_exit(void);
 
 /*--- datastore.c -----------------------------------------------------------*/
 
-int datastore_new(int unitsize, struct datastore **ds);
-int datastore_destroy(struct datastore *ds);
-void datastore_put(struct datastore *ds, void *data, unsigned int length,
-		   int in_unitsize, int *probelist);
+int sr_datastore_new(int unitsize, struct sr_datastore **ds);
+int sr_datastore_destroy(struct sr_datastore *ds);
+void sr_datastore_put(struct sr_datastore *ds, void *data, unsigned int length,
+		      int in_unitsize, int *probelist);
 
 /*--- device.c --------------------------------------------------------------*/
 
@@ -38,18 +38,19 @@ void sr_device_scan(void);
 int sr_device_plugin_init(struct sr_device_plugin *plugin);
 void sr_device_close_all(void);
 GSList *sr_device_list(void);
-struct sr_device *sr_device_new(struct sr_device_plugin *plugin, int plugin_index,
-			     int num_probes);
+struct sr_device *sr_device_new(struct sr_device_plugin *plugin,
+				int plugin_index, int num_probes);
 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);
-struct sr_probe *probe_find(struct sr_device *device, int probenum);
+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_trigger_clear(struct sr_device *device);
-void sr_device_trigger_set(struct sr_device *device, int probenum, char *trigger);
+void sr_device_trigger_set(struct sr_device *device, int probenum,
+			   char *trigger);
 gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap);
 
 /*--- filter.c --------------------------------------------------------------*/
@@ -82,8 +83,8 @@ 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);
+int sr_find_hwcap(int *capabilities, int hwcap);
+struct sr_hwcap_option *sr_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);
@@ -116,8 +117,8 @@ 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);
+void sr_session_bus(struct sr_device *device,
+		    struct sr_datafeed_packet *packet);
 int sr_session_save(char *filename);
 void sr_session_source_add(int fd, int events, int timeout,
 	        receive_data_callback callback, void *user_data);
@@ -135,7 +136,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);
+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);