sr: remove obsolete SR_DI_INST

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index cdd4d1d3415045605f7adc82fd28c024c32e5295..8f6a4371d7a349df295616070f4b14d6606dd10b 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -71,7 +71,6 @@ struct context {
        uint8_t sample_generator;
        uint8_t thread_running;
        uint64_t samples_counter;
-       int dev_index;
        void *session_dev_id;
        GTimer *timer;
 };
@@ -139,7 +138,8 @@ static int default_pattern = PATTERN_SIGROK;
 static GThread *my_thread;
 static int thread_running;
 
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+               void *cb_data);
 
 static int hw_init(void)
 {
@@ -149,35 +149,50 @@ static int hw_init(void)
        return SR_OK;
 }
 
-static int hw_scan(void)
+static GSList *hw_scan(GSList *options)
 {
        struct sr_dev_inst *sdi;
+       struct sr_probe *probe;
+       GSList *devices;
+       int i;
+
+       (void)options;
+       devices = NULL;
 
        sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
        if (!sdi) {
                sr_err("demo: %s: sr_dev_inst_new failed", __func__);
                return 0;
        }
+       sdi->driver = ddi;
+
+       for (i = 0; probe_names[i]; i++) {
+               if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
+                               probe_names[i])))
+                       return NULL;
+               sdi->probes = g_slist_append(sdi->probes, probe);
+       }
 
+       devices = g_slist_append(devices, sdi);
        ddi->instances = g_slist_append(ddi->instances, sdi);
 
-       return 1;
+       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. */
 
@@ -190,60 +205,45 @@ 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;
-       }
+       (void)sdi;
 
-       switch (dev_info_id) {
-       case SR_DI_INST:
-               info = sdi;
+       switch (info_id) {
+       case SR_DI_HWCAPS:
+               *data = hwcaps;
                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;
+       default:
+               return SR_ERR_ARG;
        }
 
-       return info;
-}
-
-static int hw_dev_status_get(int dev_index)
-{
-       /* Avoid compiler warnings. */
-       (void)dev_index;
-
-       return SR_ST_ACTIVE;
-}
-
-static const int *hw_hwcap_get_all(void)
-{
-       return hwcaps;
+       return SR_OK;
 }
 
-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 */
@@ -419,13 +419,16 @@ static int receive_data(int fd, int revents, void *cb_data)
        return TRUE;
 }
 
-static int hw_dev_acquisition_start(int dev_index, void *cb_data)
+static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+               void *cb_data)
 {
        struct sr_datafeed_packet *packet;
        struct sr_datafeed_header *header;
        struct sr_datafeed_meta_logic meta;
        struct context *ctx;
 
+       (void)sdi;
+
        /* TODO: 'ctx' is never g_free()'d? */
        if (!(ctx = g_try_malloc(sizeof(struct context)))) {
                sr_err("demo: %s: ctx malloc failed", __func__);
@@ -434,7 +437,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 
        ctx->sample_generator = default_pattern;
        ctx->session_dev_id = cb_data;
-       ctx->dev_index = dev_index;
        ctx->samples_counter = 0;
 
        if (pipe(ctx->pipe_fds)) {
@@ -500,11 +502,11 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        return SR_OK;
 }
 
-/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+               void *cb_data)
 {
        /* Avoid compiler warnings. */
-       (void)dev_index;
+       (void)sdi;
        (void)cb_data;
 
        /* Stop generate thread. */
@@ -522,9 +524,7 @@ 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,
-       .dev_status_get = hw_dev_status_get,
-       .hwcap_get_all = hw_hwcap_get_all,
+       .info_get = hw_info_get,
        .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,