sr/drivers: change driver dev_open/dev_close calls to use sdi

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index f5e0f3ac084a2a9437f2627ef498132ce36cc1dc..cb2c15d9a36f974b963cef59299a3fcc27aa98a3 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -162,6 +162,7 @@ static GSList *hw_scan(GSList *options)
                sr_err("demo: %s: sr_dev_inst_new failed", __func__);
                return 0;
        }
+       sdi->driver = ddi;
 
        devices = g_slist_append(devices, sdi);
        ddi->instances = g_slist_append(ddi->instances, sdi);
@@ -169,20 +170,20 @@ static GSList *hw_scan(GSList *options)
        return devices;
 }
 
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
 {
        /* Avoid compiler warnings. */
-       (void)dev_index;
+       (void)sdi;
 
        /* Nothing needed so far. */
 
        return SR_OK;
 }
 
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
 {
        /* Avoid compiler warnings. */
-       (void)dev_index;
+       (void)sdi;
 
        /* Nothing needed so far. */
 
@@ -203,6 +204,9 @@ static int hw_info_get(int info_id, const void **data,
        case SR_DI_INST:
                *data = sdi;
                break;
+       case SR_DI_HWCAPS:
+               *data = hwcaps;
+               break;
        case SR_DI_NUM_PROBES:
                *data = GINT_TO_POINTER(NUM_PROBES);
                break;
@@ -218,6 +222,8 @@ static int hw_info_get(int info_id, const void **data,
        case SR_DI_PATTERNS:
                *data = &pattern_strings;
                break;
+       default:
+               return SR_ERR_ARG;
        }
 
        return SR_OK;
@@ -231,18 +237,13 @@ static int hw_dev_status_get(int dev_index)
        return SR_ST_ACTIVE;
 }
 
-static const int *hw_hwcap_get_all(void)
-{
-       return hwcaps;
-}
-
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+               const void *value)
 {
        int ret;
        const char *stropt;
 
-       /* Avoid compiler warnings. */
-       (void)dev_index;
+       (void)sdi;
 
        if (hwcap == SR_HWCAP_PROBECONFIG) {
                /* Nothing to do, but must be supported */
@@ -523,7 +524,6 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
        .dev_close = hw_dev_close,
        .info_get = hw_info_get,
        .dev_status_get = hw_dev_status_get,
-//     .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,