sysclk-lwla: Remove global driver instance pointer

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

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 6a1a2b2a2f552edb21fd27f8b81d701b3ae69ead..1b25872755a451dcecaa0ed242fc4b08010fea0b 100644 (file)
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -98,7 +98,7 @@ struct analog_gen {
        float amplitude;
        float pattern_data[ANALOG_BUFSIZE];
        unsigned int num_samples;
-       struct sr_datafeed_analog packet;
+       struct sr_datafeed_analog_old packet;
        float avg_val; /* Average value */
        unsigned num_avgs; /* Number of samples averaged */
 };
@@ -687,7 +687,7 @@ static void send_analog_packet(struct analog_gen *ag,
        unsigned int i;
 
        devc = sdi->priv;
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &ag->packet;
 
        if (!devc->avg) {
@@ -770,7 +770,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
                todo_us = MAX(0, elapsed_us - devc->spent_us);
 
        /* How many samples are outstanding since the last round? */
-       samples_todo = (todo_us * devc->cur_samplerate + G_USEC_PER_SEC / 2)
+       samples_todo = (todo_us * devc->cur_samplerate + G_USEC_PER_SEC - 1)
                        / G_USEC_PER_SEC;
        if (devc->limit_samples > 0) {
                if (devc->limit_samples < devc->sent_samples)
@@ -833,7 +833,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
                        g_hash_table_iter_init(&iter, devc->ch_ag);
                        while (g_hash_table_iter_next(&iter, NULL, &value)) {
                                ag = value;
-                               packet.type = SR_DF_ANALOG;
+                               packet.type = SR_DF_ANALOG_OLD;
                                packet.payload = &ag->packet;
                                ag->packet.data = &ag->avg_val;
                                ag->packet.num_samples = 1;