X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok.h;h=10a483f377fb6ee47d3b245856c831f725f515c3;hb=aae2fed675fc63aae58569a03c71201dc449344b;hp=29383cf7661b14dcafe2cceddbbe5c79c72aced1;hpb=1d9a8a5fe1458d4b1ecd250161a7962988359350;p=libsigrok.git

diff --git a/sigrok.h b/sigrok.h
index 29383cf7..10a483f3 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -94,7 +94,7 @@ extern "C" {
 
 typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
 
-/* Data types used by hardware plugins for set_configuration() */
+/* Data types used by hardware plugins for dev_config_set() */
 enum {
 	SR_T_UINT64,
 	SR_T_CHAR,
@@ -270,7 +270,7 @@ enum {
 };
 
 struct sr_hwcap_option {
-	int capability;
+	int hwcap;
 	int type;
 	char *description;
 	char *shortname;
@@ -347,14 +347,14 @@ struct sr_dev_plugin {
 	int (*cleanup) (void);
 
 	/* Device-specific */
-	int (*opendev) (int dev_index);
-	int (*closedev) (int dev_index);
-	void *(*get_dev_info) (int dev_index, int dev_info_id);
-	int (*get_status) (int dev_index);
-	int *(*get_capabilities) (void);
-	int (*set_configuration) (int dev_index, int capability, void *value);
-	int (*start_acquisition) (int dev_index, gpointer session_dev_id);
-	int (*stop_acquisition) (int dev_index, gpointer session_dev_id);
+	int (*dev_open) (int dev_index);
+	int (*dev_close) (int dev_index);
+	void *(*dev_info_get) (int dev_index, int dev_info_id);
+	int (*dev_status_get) (int dev_index);
+	int *(*hwcap_get_all) (void);
+	int (*dev_config_set) (int dev_index, int hwcap, void *value);
+	int (*dev_acquisition_start) (int dev_index, gpointer session_dev_id);
+	int (*dev_acquisition_stop) (int dev_index, gpointer session_dev_id);
 };
 
 struct sr_session {