demo: use new driver info_get() API call

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 8f7bfb2966eb418c97baf7e25f8ee999d781bf92..f5e0f3ac084a2a9437f2627ef498132ce36cc1dc 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -195,38 +195,32 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static const void *hw_dev_info_get(int dev_index, int dev_info_id)
+static int hw_info_get(int info_id, const void **data,
+       const struct sr_dev_inst *sdi)
 {
-       struct sr_dev_inst *sdi;
-       const void *info = NULL;
-
-       if (!(sdi = sr_dev_inst_get(ddi->instances, dev_index))) {
-               sr_err("demo: %s: sdi was NULL", __func__);
-               return NULL;
-       }
 
-       switch (dev_info_id) {
+       switch (info_id) {
        case SR_DI_INST:
-               info = sdi;
+               *data = sdi;
                break;
        case SR_DI_NUM_PROBES:
-               info = GINT_TO_POINTER(NUM_PROBES);
+               *data = GINT_TO_POINTER(NUM_PROBES);
                break;
        case SR_DI_PROBE_NAMES:
-               info = probe_names;
+               *data = probe_names;
                break;
        case SR_DI_SAMPLERATES:
-               info = &samplerates;
+               *data = &samplerates;
                break;
        case SR_DI_CUR_SAMPLERATE:
-               info = &cur_samplerate;
+               *data = &cur_samplerate;
                break;
        case SR_DI_PATTERNS:
-               info = &pattern_strings;
+               *data = &pattern_strings;
                break;
        }
 
-       return info;
+       return SR_OK;
 }
 
 static int hw_dev_status_get(int dev_index)
@@ -527,9 +521,9 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
        .scan = hw_scan,
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
-       .dev_info_get = hw_dev_info_get,
+       .info_get = hw_info_get,
        .dev_status_get = hw_dev_status_get,
-       .hwcap_get_all = hw_hwcap_get_all,
+//     .hwcap_get_all = hw_hwcap_get_all,
        .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,