output/csv: use intermediate time_t var, silence compiler warning

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

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index e5ee21b71debde80b167aa21afeb65e7be2f2497..bea35d068f63042a04fd7b27b6d691f3778ad0fb 100644 (file)
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -32,7 +32,7 @@
 #define DEFAULT_NUM_LOGIC_CHANNELS             8
 #define DEFAULT_LOGIC_PATTERN                  PATTERN_SIGROK
 
-#define DEFAULT_NUM_ANALOG_CHANNELS            4
+#define DEFAULT_NUM_ANALOG_CHANNELS            5
 
 /* Note: No spaces allowed because of sigrok-cli. */
 static const char *logic_pattern_str[] = {
@@ -77,12 +77,14 @@ static const uint32_t devopts_cg_logic[] = {
 
 static const uint32_t devopts_cg_analog_group[] = {
        SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_OFFSET | SR_CONF_GET | SR_CONF_SET,
 };
 
 static const uint32_t devopts_cg_analog_channel[] = {
        SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_OFFSET | SR_CONF_GET | SR_CONF_SET,
 };
 
 static const int32_t trigger_matches[] = {
@@ -149,14 +151,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        if (num_logic_channels > 0) {
                /* Logic channels, all in one channel group. */
-               cg = g_malloc0(sizeof(struct sr_channel_group));
-               cg->name = g_strdup("Logic");
+               cg = sr_channel_group_new(sdi, "Logic", NULL);
                for (i = 0; i < num_logic_channels; i++) {
                        sprintf(channel_name, "D%d", i);
                        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);
        }
 
        /* Analog channels, channel groups and pattern generators. */
@@ -171,9 +171,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
                pattern = 0;
                /* An "Analog" channel group with all analog channels in it. */
-               acg = g_malloc0(sizeof(struct sr_channel_group));
-               acg->name = g_strdup("Analog");
-               sdi->channel_groups = g_slist_append(sdi->channel_groups, acg);
+               acg = sr_channel_group_new(sdi, "Analog", NULL);
 
                for (i = 0; i < num_analog_channels; i++) {
                        snprintf(channel_name, 16, "A%d", i);
@@ -182,10 +180,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                        acg->channels = g_slist_append(acg->channels, ch);
 
                        /* Every analog channel gets its own channel group as well. */
-                       cg = g_malloc0(sizeof(struct sr_channel_group));
-                       cg->name = g_strdup(channel_name);
+                       cg = sr_channel_group_new(sdi, channel_name, NULL);
                        cg->channels = g_slist_append(NULL, ch);
-                       sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
 
                        /* Every channel gets a generator struct. */
                        ag = g_malloc(sizeof(struct analog_gen));
@@ -223,6 +219,8 @@ static void clear_helper(struct dev_context *devc)
        GHashTableIter iter;
        void *value;
 
+       demo_free_analog_pattern(devc);
+
        /* Analog generators. */
        g_hash_table_iter_init(&iter, devc->ch_ag);
        while (g_hash_table_iter_next(&iter, NULL, &value))
@@ -304,6 +302,16 @@ static int config_get(uint32_t key, GVariant **data,
                ag = g_hash_table_lookup(devc->ch_ag, ch);
                *data = g_variant_new_double(ag->amplitude);
                break;
+       case SR_CONF_OFFSET:
+               if (!cg)
+                       return SR_ERR_CHANNEL_GROUP;
+               /* Any channel in the group will do. */
+               ch = cg->channels->data;
+               if (ch->type != SR_CHANNEL_ANALOG)
+                       return SR_ERR_ARG;
+               ag = g_hash_table_lookup(devc->ch_ag, ch);
+               *data = g_variant_new_double(ag->offset);
+               break;
        case SR_CONF_CAPTURE_RATIO:
                *data = g_variant_new_uint64(devc->capture_ratio);
                break;
@@ -406,6 +414,17 @@ static int config_set(uint32_t key, GVariant *data,
                        ag->amplitude = g_variant_get_double(data);
                }
                break;
+       case SR_CONF_OFFSET:
+               if (!cg)
+                       return SR_ERR_CHANNEL_GROUP;
+               for (l = cg->channels; l; l = l->next) {
+                       ch = l->data;
+                       if (ch->type != SR_CHANNEL_ANALOG)
+                               return SR_ERR_ARG;
+                       ag = g_hash_table_lookup(devc->ch_ag, ch);
+                       ag->offset = g_variant_get_double(data);
+               }
+               break;
        case SR_CONF_CAPTURE_RATIO:
                devc->capture_ratio = g_variant_get_uint64(data);
                break;
@@ -548,7 +567,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        std_session_send_df_header(sdi);
 
        if (devc->limit_frames > 0)
-               std_session_send_frame_begin(sdi);
+               std_session_send_df_frame_begin(sdi);
 
        /* We use this timestamp to decide how many more samples to send. */
        devc->start_us = g_get_monotonic_time();
@@ -566,7 +585,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
        if (devc->limit_frames > 0)
-               std_session_send_frame_end(sdi);
+               std_session_send_df_frame_end(sdi);
 
        std_session_send_df_end(sdi);