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

[libsigrok.git] / hardware / demo / demo.c

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 0b0ccfa235841afbbebd3eb69944696ba52e5ffc..447a2b318ad1da39d10231db25d24ac6d8dbdecb 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -76,7 +76,7 @@ struct databag {
        GTimer *timer;
 };
 
-static int capabilities[] = {
+static int hwcaps[] = {
        SR_HWCAP_LOGIC_ANALYZER,
        SR_HWCAP_DEMO_DEV,
        SR_HWCAP_SAMPLERATE,
@@ -180,7 +180,7 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static void *hw_get_dev_info(int dev_index, int dev_info_id)
+static void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
        void *info = NULL;
@@ -191,7 +191,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
        }
 
        switch (dev_info_id) {
-       case SR_DI_INSTANCE:
+       case SR_DI_INST:
                info = sdi;
                break;
        case SR_DI_NUM_PROBES:
@@ -222,12 +222,12 @@ static int hw_get_status(int dev_index)
        return SR_ST_ACTIVE;
 }
 
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
 {
-       return capabilities;
+       return hwcaps;
 }
 
-static int hw_set_configuration(int dev_index, int capability, void *value)
+static int hw_config_set(int dev_index, int hwcap, void *value)
 {
        int ret;
        char *stropt;
@@ -235,25 +235,25 @@ static int hw_set_configuration(int dev_index, int capability, void *value)
        /* Avoid compiler warnings. */
        (void)dev_index;
 
-       if (capability == SR_HWCAP_PROBECONFIG) {
+       if (hwcap == SR_HWCAP_PROBECONFIG) {
                /* Nothing to do, but must be supported */
                ret = SR_OK;
-       } else if (capability == SR_HWCAP_SAMPLERATE) {
+       } else if (hwcap == SR_HWCAP_SAMPLERATE) {
                cur_samplerate = *(uint64_t *)value;
                sr_dbg("demo: %s: setting samplerate to %" PRIu64, __func__,
                       cur_samplerate);
                ret = SR_OK;
-       } else if (capability == SR_HWCAP_LIMIT_SAMPLES) {
+       } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
                limit_samples = *(uint64_t *)value;
                sr_dbg("demo: %s: setting limit_samples to %" PRIu64, __func__,
                       limit_samples);
                ret = SR_OK;
-       } else if (capability == SR_HWCAP_LIMIT_MSEC) {
+       } else if (hwcap == SR_HWCAP_LIMIT_MSEC) {
                limit_msec = *(uint64_t *)value;
                sr_dbg("demo: %s: setting limit_msec to %" PRIu64, __func__,
                       limit_msec);
                ret = SR_OK;
-       } else if (capability == SR_HWCAP_PATTERN_MODE) {
+       } else if (hwcap == SR_HWCAP_PATTERN_MODE) {
                stropt = value;
                ret = SR_OK;
                if (!strcmp(stropt, "sigrok")) {
@@ -497,10 +497,10 @@ SR_PRIV struct sr_dev_plugin demo_plugin_info = {
        .cleanup = hw_cleanup,
        .opendev = hw_opendev,
        .closedev = hw_closedev,
-       .get_dev_info = hw_get_dev_info,
+       .dev_info_get = hw_dev_info_get,
        .get_status = hw_get_status,
-       .get_capabilities = hw_get_capabilities,
-       .set_configuration = hw_set_configuration,
+       .hwcap_get_all = hw_hwcap_get_all,
+       .config_set = hw_config_set,
        .start_acquisition = hw_start_acquisition,
        .stop_acquisition = hw_stop_acquisition,
 };