Drop unneeded std_session_send_df_header() comments.

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

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index ce8249183f5a0fb244800b665be99a63f6ed3e00..50780214d72787a0da64e5223412128d879e2abb 100644 (file)
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -38,7 +38,7 @@
 /* Size of the analog pattern space per channel. */
 #define ANALOG_BUFSIZE       4096
 
-#define DEFAULT_ANALOG_AMPLITUDE 25
+#define DEFAULT_ANALOG_AMPLITUDE 10
 #define ANALOG_SAMPLES_PER_PERIOD 20
 
 /* Logic patterns we can generate. */
@@ -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)
@@ -784,8 +784,8 @@ static int prepare_data(int fd, int revents, void *cb_data)
         */
        todo_us = samples_todo * G_USEC_PER_SEC / devc->cur_samplerate;
 
-       logic_done = 0;
-       analog_done = 0;
+       logic_done  = devc->num_logic_channels  > 0 ? 0 : samples_todo;
+       analog_done = devc->num_analog_channels > 0 ? 0 : samples_todo;
 
        while (logic_done < samples_todo || analog_done < samples_todo) {
                /* Logic */
@@ -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;
@@ -865,9 +865,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        while (g_hash_table_iter_next(&iter, NULL, &value))
                generate_analog_pattern(value, devc->cur_samplerate);
 
-       sr_session_source_add(sdi->session, -1, 0, 40, prepare_data, (void *)sdi);
+       sr_session_source_add(sdi->session, -1, 0, 100,
+                       prepare_data, (struct sr_dev_inst *)sdi);
 
-       /* Send header packet to the session bus. */
        std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* We use this timestamp to decide how many more samples to send. */
@@ -879,17 +879,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       struct sr_datafeed_packet packet;
-
        (void)cb_data;
 
        sr_dbg("Stopping acquisition.");
-
        sr_session_source_remove(sdi->session, -1);
-
-       /* Send last packet. */
-       packet.type = SR_DF_END;
-       sr_session_send(sdi, &packet);
+       std_session_send_df_end(sdi, LOG_PREFIX);
 
        return SR_OK;
 }