demo: sync get/set options

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 8a4bc9a0593c7b15ae5cfdfb44e3c2306716104b..c1faaefb0e41c6efd8d4aa4cdc05338e417ade47 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -49,6 +49,12 @@
 /* TODO: Should be configurable. */
 #define BUFSIZE                4096
 
+#define STR_PATTERN_SIGROK   "sigrok"
+#define STR_PATTERN_RANDOM   "random"
+#define STR_PATTERN_INC      "incremental"
+#define STR_PATTERN_ALL_LOW  "all-low"
+#define STR_PATTERN_ALL_HIGH "all-high"
+
 /* Supported patterns which we can generate */
 enum {
        /**
@@ -79,7 +85,7 @@ struct dev_context {
        GIOChannel *channels[2];
        uint8_t sample_generator;
        uint64_t samples_counter;
-       void *session_dev_id;
+       void *cb_data;
        int64_t starttime;
 };
 
@@ -222,6 +228,31 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        case SR_CONF_SAMPLERATE:
                *data = &cur_samplerate;
                break;
+       case SR_CONF_LIMIT_SAMPLES:
+               *data = &limit_samples;
+               break;
+       case SR_CONF_LIMIT_MSEC:
+               *data = &limit_msec;
+               break;
+       case SR_CONF_PATTERN_MODE:
+               switch (default_pattern) {
+               case PATTERN_SIGROK:
+                       *data = STR_PATTERN_SIGROK;
+                       break;
+               case PATTERN_RANDOM:
+                       *data = STR_PATTERN_RANDOM;
+                       break;
+               case PATTERN_INC:
+                       *data = STR_PATTERN_INC;
+                       break;
+               case PATTERN_ALL_LOW:
+                       *data = STR_PATTERN_ALL_LOW;
+                       break;
+               case PATTERN_ALL_HIGH:
+                       *data = STR_PATTERN_ALL_HIGH;
+                       break;
+               }
+               break;
        default:
                return SR_ERR_ARG;
        }
@@ -256,15 +287,15 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
        } else if (id == SR_CONF_PATTERN_MODE) {
                stropt = value;
                ret = SR_OK;
-               if (!strcmp(stropt, "sigrok")) {
+               if (!strcmp(stropt, STR_PATTERN_SIGROK)) {
                        default_pattern = PATTERN_SIGROK;
-               } else if (!strcmp(stropt, "random")) {
+               } else if (!strcmp(stropt, STR_PATTERN_RANDOM)) {
                        default_pattern = PATTERN_RANDOM;
-               } else if (!strcmp(stropt, "incremental")) {
+               } else if (!strcmp(stropt, STR_PATTERN_INC)) {
                        default_pattern = PATTERN_INC;
-               } else if (!strcmp(stropt, "all-low")) {
+               } else if (!strcmp(stropt, STR_PATTERN_ALL_LOW)) {
                        default_pattern = PATTERN_ALL_LOW;
-               } else if (!strcmp(stropt, "all-high")) {
+               } else if (!strcmp(stropt, STR_PATTERN_ALL_HIGH)) {
                        default_pattern = PATTERN_ALL_HIGH;
                } else {
                        ret = SR_ERR;
@@ -371,7 +402,7 @@ static int receive_data(int fd, int revents, void *cb_data)
                logic.length = sending_now;
                logic.unitsize = 1;
                logic.data = buf;
-               sr_session_send(devc->session_dev_id, &packet);
+               sr_session_send(devc->cb_data, &packet);
                devc->samples_counter += sending_now;
        }
 
@@ -398,7 +429,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        }
 
        devc->sample_generator = default_pattern;
-       devc->session_dev_id = cb_data;
+       devc->cb_data = cb_data;
        devc->samples_counter = 0;
 
        /*
@@ -455,7 +486,7 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
        /* Send last packet. */
        packet.type = SR_DF_END;
-       sr_session_send(devc->session_dev_id, &packet);
+       sr_session_send(devc->cb_data, &packet);
 
        return SR_OK;
 }