demo: scan/info_get fixes

[libsigrok.git] / proto.h

diff --git a/proto.h b/proto.h
index 3481c582756b2a3aa18c3a522e27731e7baaee3b..ff5cb9411028b4bd06c01bfa3419da9c77d429a4 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -73,8 +73,12 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
 
 SR_API struct sr_dev_driver **sr_driver_list(void);
 SR_API int sr_driver_init(struct sr_dev_driver *driver);
+SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options);
 SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap);
+SR_API const struct sr_hwcap_option *sr_drvopt_get(int hwopt);
 SR_API const struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap);
+SR_API int sr_info_get(struct sr_dev_driver *driver, int id,
+               const void **data, const struct sr_dev_inst *sdi);
 
 /*--- session.c -------------------------------------------------------------*/
 
@@ -100,7 +104,13 @@ SR_API int sr_session_stop(void);
 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_t cb, void *cb_data);
+SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
+               sr_receive_data_callback_t cb, void *cb_data);
+SR_API int sr_session_source_add_channel(GIOChannel *channel, int events,
+               int timeout, sr_receive_data_callback_t cb, void *cb_data);
 SR_API int sr_session_source_remove(int fd);
+SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd);
+SR_API int sr_session_source_remove_channel(GIOChannel *channel);
 
 /*--- input/input.c ---------------------------------------------------------*/
 
@@ -135,4 +145,9 @@ SR_API int sr_lib_version_revision_get(void);
 SR_API int sr_lib_version_age_get(void);
 SR_API const char *sr_lib_version_string_get(void);
 
+/*--- error.c ---------------------------------------------------------------*/
+
+SR_API const char *sr_strerror(int error_code);
+SR_API const char *sr_strerror_name(int error_code);
+
 #endif