zketech-ebd-usb: Style fixes

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

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index 1f9b9d2c04892c988a5dbbbd104ec3027ad9d6b4..ba317fbe4a1b8fa389a8de39966c833956820659 100644 (file)
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -32,10 +32,7 @@
 #define DEFAULT_NUM_LOGIC_CHANNELS             8
 #define DEFAULT_LOGIC_PATTERN                  PATTERN_SIGROK
 
-#define DEFAULT_NUM_ANALOG_CHANNELS            4
-#define DEFAULT_ANALOG_ENCODING_DIGITS 4
-#define DEFAULT_ANALOG_SPEC_DIGITS             4
-#define DEFAULT_ANALOG_AMPLITUDE               10
+#define DEFAULT_NUM_ANALOG_CHANNELS            5
 
 /* Note: No spaces allowed because of sigrok-cli. */
 static const char *logic_pattern_str[] = {
@@ -80,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[] = {
@@ -165,6 +164,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        /* Analog channels, channel groups and pattern generators. */
        devc->ch_ag = g_hash_table_new(g_direct_hash, g_direct_equal);
        if (num_analog_channels > 0) {
+               /*
+                * Have the waveform for analog patterns pre-generated. It's
+                * supposed to be periodic, so the generator just needs to
+                * access the prepared sample data (DDS style).
+                */
+               demo_generate_analog_pattern(devc);
+
                pattern = 0;
                /* An "Analog" channel group with all analog channels in it. */
                acg = g_malloc0(sizeof(struct sr_channel_group));
@@ -190,6 +196,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                        ag->mq_flags = SR_MQFLAG_DC;
                        ag->unit = SR_UNIT_VOLT;
                        ag->amplitude = DEFAULT_ANALOG_AMPLITUDE;
+                       ag->offset = DEFAULT_ANALOG_OFFSET;
                        sr_analog_init(&ag->packet, &ag->encoding, &ag->meaning, &ag->spec, 2);
                        ag->packet.meaning->channels = cg->channels;
                        ag->packet.meaning->mq = ag->mq;
@@ -197,7 +204,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                        ag->packet.meaning->unit = ag->unit;
                        ag->packet.encoding->digits = DEFAULT_ANALOG_ENCODING_DIGITS;
                        ag->packet.spec->spec_digits = DEFAULT_ANALOG_SPEC_DIGITS;
-                       ag->packet.data = ag->pattern_data;
+                       ag->packet.data = devc->analog_patterns[pattern];
                        ag->pattern = pattern;
                        ag->avg_val = 0.0f;
                        ag->num_avgs = 0;
@@ -218,6 +225,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))
@@ -299,6 +308,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;
@@ -401,6 +420,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;
@@ -472,8 +502,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        struct sr_channel *ch;
        int bitpos;
        uint8_t mask;
-       GHashTableIter iter;
-       void *value;
        struct sr_trigger *trigger;
 
        devc = sdi->priv;
@@ -539,22 +567,13 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                devc->first_partial_logic_index,
                devc->first_partial_logic_mask);
 
-       /*
-        * Have the waveform for analog patterns pre-generated. It's
-        * supposed to be periodic, so the generator just needs to
-        * access the prepared sample data (DDS style).
-        */
-       g_hash_table_iter_init(&iter, devc->ch_ag);
-       while (g_hash_table_iter_next(&iter, NULL, &value))
-               demo_generate_analog_pattern(value, devc->cur_samplerate);
-
        sr_session_source_add(sdi->session, -1, 0, 100,
                        demo_prepare_data, (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();
@@ -572,7 +591,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);