sr/cli/gtk/qt: s/get_dev_info/dev_info_get/.

[libsigrok.git] / sigrok.h

diff --git a/sigrok.h b/sigrok.h
index a7a92bf212e42fc52c500a5cde30a1558630df75..256ed32e2291bc13abc4a2f9af4ad406d5b8dd06 100644 (file)
--- 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 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;
@@ -279,7 +279,7 @@ struct sr_hwcap_option {
 struct sr_dev_inst {
        int index;
        int status;
-       int instance_type;
+       int inst_type;
        char *vendor;
        char *model;
        char *version;
@@ -288,8 +288,8 @@ struct sr_dev_inst {
 
 /* sr_dev_inst types */
 enum {
-       SR_USB_INSTANCE,
-       SR_SERIAL_INSTANCE,
+       SR_USB_INST,
+       SR_SERIAL_INST,
 };
 
 /* Device instance status */
@@ -311,7 +311,7 @@ enum {
 /* Device info IDs */
 enum {
        /* struct sr_dev_inst for this specific device */
-       SR_DI_INSTANCE,
+       SR_DI_INST,
        /* The number of probes connected to this device */
        SR_DI_NUM_PROBES,
        /* The probe names on this device */
@@ -349,10 +349,10 @@ struct sr_dev_plugin {
        /* Device-specific */
        int (*opendev) (int dev_index);
        int (*closedev) (int dev_index);
-       void *(*get_dev_info) (int dev_index, int dev_info_id);
+       void *(*dev_info_get) (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 *(*hwcap_get_all) (void);
+       int (*config_set) (int dev_index, int hwcap, void *value);
        int (*start_acquisition) (int dev_index, gpointer session_dev_id);
        int (*stop_acquisition) (int dev_index, gpointer session_dev_id);
 };