sr: more API cleanup and documentation

[libsigrok.git] / sigrok-proto.h

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 410c0cc452981cb33d13b44f323ec5efb4543f4d..0efdaeec71b84bc1300f87f6dba2154bcfe8bfb1 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -73,21 +73,9 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
 /*--- hwplugin.c ------------------------------------------------------------*/
 
 SR_API GSList *sr_list_hwplugins(void);
-SR_API int sr_init_hwplugins(struct sr_device_plugin *plugin);
-SR_API void sr_cleanup_hwplugins(void);
-
-/* Generic device instances */
-SR_API struct sr_device_instance *sr_device_instance_new(int index,
-       int status, const char *vendor, const char *model, const char *version);
-SR_API struct sr_device_instance *sr_get_device_instance(
-                       GSList *device_instances, int device_index);
-SR_API void sr_device_instance_free(struct sr_device_instance *sdi);
-
-SR_API int sr_find_hwcap(int *capabilities, int hwcap);
+SR_API int sr_init_hwplugin(struct sr_device_plugin *plugin);
+SR_API gboolean sr_has_hwcap(int *capabilities, int hwcap);
 SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap);
-SR_API void sr_source_remove(int fd);
-SR_API void sr_source_add(int fd, int events, int timeout,
-                         sr_receive_data_callback rcv_cb, void *user_data);
 
 /*--- session.c -------------------------------------------------------------*/
 
@@ -110,8 +98,6 @@ SR_API int sr_session_start(void);
 SR_API int sr_session_run(void);
 SR_API int sr_session_halt(void);
 SR_API int sr_session_stop(void);
-SR_API int sr_session_bus(struct sr_device *device,
-                         struct sr_datafeed_packet *packet);
 SR_API int sr_session_save(const char *filename);
 SR_API int sr_session_source_add(int fd, int events, int timeout,
                sr_receive_data_callback callback, void *user_data);
@@ -125,7 +111,7 @@ SR_API struct sr_input_format **sr_input_list(void);
 
 SR_API struct sr_output_format **sr_output_list(void);
 
-/*--- output/common.c -------------------------------------------------------*/
+/*--- strutil.c -------------------------------------------------------*/
 
 SR_API char *sr_samplerate_string(uint64_t samplerate);
 SR_API char *sr_period_string(uint64_t frequency);