X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=4105405be5867e836c684573583ce3b86859ed46;hb=d88b9393241e250590333326a4f8d19b53b4bdc6;hp=28dbc01fe6db87624781becbd89092bf2a1707a7;hpb=0e3b143994797cd4685526b9a739089fe83385cf;p=libsigrok.git

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 28dbc01f..4105405b 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -40,23 +40,20 @@ int sr_datastore_put(struct sr_datastore *ds, void *data, unsigned int length,
 /*--- device.c --------------------------------------------------------------*/
 
 int sr_device_scan(void);
-int sr_init_hwplugins(struct sr_device_plugin *plugin);
 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(const struct sr_device_plugin *plugin,
+				int plugin_index);
 int sr_device_clear(struct sr_device *device);
-void sr_device_destroy(struct sr_device *dev);
-
 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(struct sr_device *device, int probenum);
+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(struct sr_device *device, int hwcap);
+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 */
@@ -106,12 +104,6 @@ void sr_session_destroy(void);
 void sr_session_device_clear(void);
 int sr_session_device_add(struct sr_device *device);
 
-#if 0
-/* Protocol analyzers setup */
-void sr_session_pa_clear(void);
-void sr_session_pa_add(struct sr_analyzer *pa);
-#endif
-
 /* Datafeed setup */
 void sr_session_datafeed_callback_clear(void);
 void sr_session_datafeed_callback_add(sr_datafeed_callback callback);