hantek-dso: dso2250: Report the sample rate back.

[libsigrok.git] / src / hardware / hantek-dso / api.c

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 78b7f3b304e7d725733c53f9b70485e1c9cc4fa9..4903eab2061ab5eb8c04c1e7ade4e82852ec08bd 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -62,6 +62,7 @@ static const uint32_t devopts[] = {
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_NUM_VDIV | SR_CONF_GET,
 };
 
@@ -392,12 +393,11 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        struct sr_usb_dev_inst *usb;
-       char str[128];
        const char *s;
        const uint64_t *vdiv;
        int ch_idx;
@@ -425,13 +425,17 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                                /* Device still needs to re-enumerate after firmware
                                 * upload, so we don't know its (future) address. */
                                return SR_ERR;
-                       snprintf(str, 128, "%d.%d", usb->bus, usb->address);
-                       *data = g_variant_new_string(str);
+                       *data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
                        break;
                case SR_CONF_TIMEBASE:
                        *data = g_variant_new("(tt)", timebases[devc->timebase][0],
                                        timebases[devc->timebase][1]);
                        break;
+               case SR_CONF_SAMPLERATE:
+                       *data = g_variant_new_uint64(
+                                       timebases[devc->timebase][1]/
+                                       timebases[devc->timebase][0]);
+                       break;
                case SR_CONF_BUFFERSIZE:
                        *data = g_variant_new_uint64(devc->framesize);
                        break;
@@ -472,15 +476,12 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        return SR_OK;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        double tmp_double;
-       uint64_t tmp_u64, p, q;
-       int tmp_int, ch_idx;
-       unsigned int i;
-       const char *tmp_str;
+       int ch_idx, idx;
 
        devc = sdi->priv;
        if (!cg) {
@@ -489,11 +490,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        devc->limit_frames = g_variant_get_uint64(data);
                        break;
                case SR_CONF_TRIGGER_SLOPE:
-                       tmp_str = g_variant_get_string(data, NULL);
-                       if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r'))
+                       if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
                                return SR_ERR_ARG;
-                       devc->triggerslope = (tmp_str[0] == 'r')
-                               ? SLOPE_POSITIVE : SLOPE_NEGATIVE;
+                       devc->triggerslope = idx;
                        break;
                case SR_CONF_HORIZ_TRIGGERPOS:
                        tmp_double = g_variant_get_double(data);
@@ -504,40 +503,19 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                                devc->triggerposition = tmp_double;
                        break;
                case SR_CONF_BUFFERSIZE:
-                       tmp_u64 = g_variant_get_uint64(data);
-                       for (i = 0; i < NUM_BUFFER_SIZES; i++) {
-                               if (devc->profile->buffersizes[i] == tmp_u64) {
-                                       devc->framesize = tmp_u64;
-                                       break;
-                               }
-                       }
-                       if (i == NUM_BUFFER_SIZES)
+                       if ((idx = std_u64_idx(data, devc->profile->buffersizes, NUM_BUFFER_SIZES)) < 0)
                                return SR_ERR_ARG;
+                       devc->framesize = devc->profile->buffersizes[idx];
                        break;
                case SR_CONF_TIMEBASE:
-                       g_variant_get(data, "(tt)", &p, &q);
-                       tmp_int = -1;
-                       for (i = 0; i < ARRAY_SIZE(timebases); i++) {
-                               if (timebases[i][0] == p && timebases[i][1] == q) {
-                                       tmp_int = i;
-                                       break;
-                               }
-                       }
-                       if (tmp_int >= 0)
-                               devc->timebase = tmp_int;
-                       else
+                       if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(timebases))) < 0)
                                return SR_ERR_ARG;
+                       devc->timebase = idx;
                        break;
                case SR_CONF_TRIGGER_SOURCE:
-                       tmp_str = g_variant_get_string(data, NULL);
-                       for (i = 0; trigger_sources[i]; i++) {
-                               if (!strcmp(tmp_str, trigger_sources[i])) {
-                                       devc->triggersource = g_strdup(tmp_str);
-                                       break;
-                               }
-                       }
-                       if (trigger_sources[i] == 0)
+                       if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
                                return SR_ERR_ARG;
+                       devc->triggersource = g_strdup(trigger_sources[idx]);
                        break;
                default:
                        return SR_ERR_NA;
@@ -554,29 +532,14 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        devc->filter[ch_idx] = g_variant_get_boolean(data);
                        break;
                case SR_CONF_VDIV:
-                       g_variant_get(data, "(tt)", &p, &q);
-                       tmp_int = -1;
-                       for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
-                               if (vdivs[i][0] == p && vdivs[i][1] == q) {
-                                       tmp_int = i;
-                                       break;
-                               }
-                       }
-                       if (tmp_int >= 0) {
-                               devc->voltage[ch_idx] = tmp_int;
-                       } else
+                       if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(vdivs))) < 0)
                                return SR_ERR_ARG;
+                       devc->voltage[ch_idx] = idx;
                        break;
                case SR_CONF_COUPLING:
-                       tmp_str = g_variant_get_string(data, NULL);
-                       for (i = 0; coupling[i]; i++) {
-                               if (!strcmp(tmp_str, coupling[i])) {
-                                       devc->coupling[ch_idx] = i;
-                                       break;
-                               }
-                       }
-                       if (coupling[i] == 0)
+                       if ((idx = std_str_idx(data, ARRAY_AND_SIZE(coupling))) < 0)
                                return SR_ERR_ARG;
+                       devc->coupling[ch_idx] = idx;
                        break;
                default:
                        return SR_ERR_NA;
@@ -586,8 +549,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        return SR_OK;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
@@ -655,7 +618,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
        /* TODO: Check malloc return value. */
        analog.data = g_try_malloc(num_samples * sizeof(float));
 
-       for (int ch = 0; ch < 2; ch++) {
+       for (int ch = 0; ch < NUM_CHANNELS; ch++) {
                if (!devc->ch_enabled[ch])
                        continue;
 
@@ -862,6 +825,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                /* No data yet. */
                break;
        case CAPTURE_READY_8BIT:
+       case CAPTURE_READY2250:
                /* Remember where in the captured frame the trigger is. */
                devc->trigger_offset = trigger_offset;