chronovu-la8: use new driver info_get() API call

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 3a6ed9e494c7510a8eebddff6f6de486d226dac5..8f7bfb2966eb418c97baf7e25f8ee999d781bf92 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -64,10 +64,10 @@ enum {
 };
 
 /* FIXME: Should not be global. */
-SR_PRIV GIOChannel *channels[2];
 
 struct context {
        int pipe_fds[2];
+       GIOChannel *channels[2];
        uint8_t sample_generator;
        uint8_t thread_running;
        uint64_t samples_counter;
@@ -130,7 +130,8 @@ static uint8_t pattern_sigrok[] = {
 /* TODO: struct context as with the other drivers. */
 
 /* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
-static GSList *dev_insts = NULL;
+SR_PRIV struct sr_dev_driver demo_driver_info;
+static struct sr_dev_driver *ddi = &demo_driver_info;
 static uint64_t cur_samplerate = SR_KHZ(200);
 static uint64_t limit_samples = 0;
 static uint64_t limit_msec = 0;
@@ -140,12 +141,21 @@ static int thread_running;
 
 static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
 
-static int hw_init(const char *devinfo)
+static int hw_init(void)
+{
+
+       /* Nothing to do. */
+
+       return SR_OK;
+}
+
+static GSList *hw_scan(GSList *options)
 {
        struct sr_dev_inst *sdi;
+       GSList *devices;
 
-       /* Avoid compiler warnings. */
-       (void)devinfo;
+       (void)options;
+       devices = NULL;
 
        sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
        if (!sdi) {
@@ -153,9 +163,10 @@ static int hw_init(const char *devinfo)
                return 0;
        }
 
-       dev_insts = g_slist_append(dev_insts, sdi);
+       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)
@@ -189,7 +200,7 @@ static const void *hw_dev_info_get(int dev_index, int dev_info_id)
        struct sr_dev_inst *sdi;
        const void *info = NULL;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+       if (!(sdi = sr_dev_inst_get(ddi->instances, dev_index))) {
                sr_err("demo: %s: sdi was NULL", __func__);
                return NULL;
        }
@@ -354,7 +365,7 @@ static void thread_func(void *data)
                        samples_generator(buf, nb_to_send, data);
                        ctx->samples_counter += nb_to_send;
 
-                       g_io_channel_write_chars(channels[1], (gchar *)&buf,
+                       g_io_channel_write_chars(ctx->channels[1], (gchar *)&buf,
                                nb_to_send, (gsize *)&bytes_written, NULL);
                }
 
@@ -373,6 +384,7 @@ static void thread_func(void *data)
 /* Callback handling data */
 static int receive_data(int fd, int revents, void *cb_data)
 {
+       struct context *ctx = cb_data;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
        static uint64_t samples_received = 0;
@@ -384,7 +396,7 @@ static int receive_data(int fd, int revents, void *cb_data)
        (void)revents;
 
        do {
-               g_io_channel_read_chars(channels[0],
+               g_io_channel_read_chars(ctx->channels[0],
                                        (gchar *)&c, BUFSIZE, &z, NULL);
 
                if (z > 0) {
@@ -393,18 +405,18 @@ static int receive_data(int fd, int revents, void *cb_data)
                        logic.length = z;
                        logic.unitsize = 1;
                        logic.data = c;
-                       sr_session_send(cb_data, &packet);
+                       sr_session_send(ctx->session_dev_id, &packet);
                        samples_received += z;
                }
        } while (z > 0);
 
        if (!thread_running && z <= 0) {
                /* Make sure we don't receive more packets. */
-               g_io_channel_shutdown(channels[0], FALSE, NULL);
+               g_io_channel_shutdown(ctx->channels[0], FALSE, NULL);
 
                /* Send last packet. */
                packet.type = SR_DF_END;
-               sr_session_send(cb_data, &packet);
+               sr_session_send(ctx->session_dev_id, &packet);
 
                return FALSE;
        }
@@ -436,19 +448,21 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
                return SR_ERR;
        }
 
-       channels[0] = g_io_channel_unix_new(ctx->pipe_fds[0]);
-       channels[1] = g_io_channel_unix_new(ctx->pipe_fds[1]);
+       ctx->channels[0] = g_io_channel_unix_new(ctx->pipe_fds[0]);
+       ctx->channels[1] = g_io_channel_unix_new(ctx->pipe_fds[1]);
+
+       g_io_channel_set_flags(ctx->channels[0], G_IO_FLAG_NONBLOCK, NULL);
 
        /* Set channel encoding to binary (default is UTF-8). */
-       g_io_channel_set_encoding(channels[0], NULL, NULL);
-       g_io_channel_set_encoding(channels[1], NULL, NULL);
+       g_io_channel_set_encoding(ctx->channels[0], NULL, NULL);
+       g_io_channel_set_encoding(ctx->channels[1], NULL, NULL);
 
        /* Make channels to unbuffered. */
-       g_io_channel_set_buffered(channels[0], FALSE);
-       g_io_channel_set_buffered(channels[1], FALSE);
+       g_io_channel_set_buffered(ctx->channels[0], FALSE);
+       g_io_channel_set_buffered(ctx->channels[1], FALSE);
 
-       sr_source_add(ctx->pipe_fds[0], G_IO_IN | G_IO_ERR, 40,
-                     receive_data, ctx->session_dev_id);
+       sr_session_source_add_channel(ctx->channels[0], G_IO_IN | G_IO_ERR,
+                   40, receive_data, ctx);
 
        /* Run the demo thread. */
        g_thread_init(NULL);
@@ -510,6 +524,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
+       .scan = hw_scan,
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
        .dev_info_get = hw_dev_info_get,
@@ -518,4 +533,5 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
        .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,
+       .instances = NULL,
 };