probe names: Fix cosmetics, add docs, fix off-by-one.

[libsigrok.git] / sigrok-proto.h

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 2c3be8b12f55184ff6af9cac4579d8e177182128..557730174aa8d46068f987b5133f60c69f4f300d 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -34,29 +34,26 @@ int sr_get_loglevel(void);
 
 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);
+int sr_datastore_put(struct sr_datastore *ds, void *data, unsigned int length,
+                    int in_unitsize, int *probelist);
 
 /*--- device.c --------------------------------------------------------------*/
 
-void sr_device_scan(void);
-int sr_init_hwplugins(struct sr_device_plugin *plugin);
+int sr_device_scan(void);
 GSList *sr_device_list(void);
-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, 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,
-                         const char *name);
-
-void sr_device_trigger_clear(struct sr_device *device);
-void sr_device_trigger_set(struct sr_device *device, int probenum,
-                          const char *trigger);
-gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap);
+struct sr_device *sr_device_new(const struct sr_device_plugin *plugin,
+                               int plugin_index);
+int sr_device_clear(struct sr_device *device);
+int sr_device_probe_clear(struct sr_device *device, int probenum);
+int sr_device_probe_add(struct sr_device *device, const char *name);
+struct sr_probe *sr_device_probe_find(const struct sr_device *device,
+                                     int probenum);
+int sr_device_probe_name(struct sr_device *device, int probenum,
+                        const char *name);
+int sr_device_trigger_clear(struct sr_device *device);
+int sr_device_trigger_set(struct sr_device *device, int probenum,
+                         const char *trigger);
+gboolean sr_device_has_hwcap(const struct sr_device *device, int hwcap);
 
 /*--- filter.c --------------------------------------------------------------*/
 
@@ -67,6 +64,7 @@ int sr_filter_probes(int in_unitsize, int out_unitsize, const int *probelist,
 /*--- hwplugin.c ------------------------------------------------------------*/
 
 GSList *sr_list_hwplugins(void);
+int sr_init_hwplugins(struct sr_device_plugin *plugin);
 void sr_cleanup_hwplugins(void);
 
 /* Generic device instances */