sr/drivers: remove driver API call dev_status_get()

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index f5e0f3ac084a2a9437f2627ef498132ce36cc1dc..2f845108a934ab7fdf6652a1b78c84cbe84b7b53 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)
 {
@@ -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,31 +222,20 @@ 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;
 }
 
-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;
-}
-
-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 */
@@ -418,13 +411,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__);
@@ -433,7 +429,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)) {
@@ -499,11 +494,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,8 +517,6 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
        .dev_open = hw_dev_open,
        .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,