X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Fproto.h;h=6ae3be8f856d2567fe58755d7717f7141c8a3410;hb=f2a66a8ee669df5afa1b7bdade6e25ac0857fe4b;hp=9dc128274bc72c066cf2920de156e353312ad212;hpb=8f3168b89bcd79b555d86601270d81e5c8e3bdfe;p=libsigrok.git

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 9dc12827..6ae3be8f 100644
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -56,7 +56,7 @@ SR_API int sr_dev_channel_name_set(struct sr_channel *channel,
 SR_API int sr_dev_channel_enable(struct sr_channel *channel,
 		gboolean state);
 SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key);
-SR_API int sr_dev_config_capabilities(const struct sr_dev_inst *sdi,
+SR_API int sr_dev_config_capabilities_list(const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg, int key);
 SR_API GArray *sr_dev_options(const struct sr_dev_driver *driver,
 		const struct sr_dev_inst *sdi, const struct sr_channel_group *cg);
@@ -83,7 +83,7 @@ SR_API int sr_dev_inst_channel_add(struct sr_dev_inst *sdi, int index, int type,
 SR_API struct sr_dev_driver **sr_driver_list(const struct sr_context *ctx);
 SR_API int sr_driver_init(struct sr_context *ctx,
 		struct sr_dev_driver *driver);
-SR_API GArray *sr_driver_scan_options(const struct sr_dev_driver *driver);
+SR_API GArray *sr_driver_scan_options_list(const struct sr_dev_driver *driver);
 SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options);
 SR_API int sr_config_get(const struct sr_dev_driver *driver,
 		const struct sr_dev_inst *sdi,
@@ -206,7 +206,7 @@ typedef int (*sr_resource_open_callback)(struct sr_resource *res,
 		const char *name, void *cb_data);
 typedef int (*sr_resource_close_callback)(struct sr_resource *res,
 		void *cb_data);
-typedef ssize_t (*sr_resource_read_callback)(const struct sr_resource *res,
+typedef gssize (*sr_resource_read_callback)(const struct sr_resource *res,
 		void *buf, size_t count, void *cb_data);
 
 SR_API int sr_resource_set_hooks(struct sr_context *ctx,