Constify a few arrays and variables.

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

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 95c9fcfee9e3330102a8456763efb8814c733b6d..284396a3aeee9db173be88829fd9d73b05088dac 100644 (file)
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -168,7 +168,7 @@ static const uint64_t samplerates[] = {
        SR_HZ(1),
 };
 
-static uint8_t pattern_sigrok[] = {
+static const uint8_t pattern_sigrok[] = {
        0x4c, 0x92, 0x92, 0x92, 0x64, 0x00, 0x00, 0x00,
        0x82, 0xfe, 0xfe, 0x82, 0x00, 0x00, 0x00, 0x00,
        0x7c, 0x82, 0x82, 0x92, 0x74, 0x00, 0x00, 0x00,
@@ -180,12 +180,10 @@ static uint8_t pattern_sigrok[] = {
 };
 
 SR_PRIV struct sr_dev_driver demo_driver_info;
-static struct sr_dev_driver *di = &demo_driver_info;
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
-
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
        return std_init(sr_ctx, di, LOG_PREFIX);
 }
@@ -266,7 +264,7 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate)
        }
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct drv_context *drvc;
        struct dev_context *devc;
@@ -320,8 +318,7 @@ static GSList *scan(GSList *options)
        cg->name = g_strdup("Logic");
        for (i = 0; i < num_logic_channels; i++) {
                sprintf(channel_name, "D%d", i);
-               ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name);
-               sdi->channels = g_slist_append(sdi->channels, ch);
+               ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name);
                cg->channels = g_slist_append(cg->channels, ch);
        }
        sdi->channel_groups = g_slist_append(NULL, cg);
@@ -336,9 +333,8 @@ static GSList *scan(GSList *options)
        devc->ch_ag = g_hash_table_new(g_direct_hash, g_direct_equal);
        for (i = 0; i < num_analog_channels; i++) {
                snprintf(channel_name, 16, "A%d", i);
-               ch = sr_channel_new(i + num_logic_channels, SR_CHANNEL_ANALOG,
+               ch = sr_channel_new(sdi, i + num_logic_channels, SR_CHANNEL_ANALOG,
                                TRUE, channel_name);
-               sdi->channels = g_slist_append(sdi->channels, ch);
                acg->channels = g_slist_append(acg->channels, ch);
 
                /* Every analog channel gets its own channel group as well. */
@@ -371,7 +367,7 @@ static GSList *scan(GSList *options)
        return devices;
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
        return ((struct drv_context *)(di->priv))->instances;
 }
@@ -406,7 +402,7 @@ static void clear_helper(void *priv)
        g_free(devc);
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
        return std_dev_clear(di, clear_helper);
 }