hantek-6xxx: FIFO sampling

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

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index c5bb94eb9958a9a278353f13be543164c8dd2cf0..f8940d8f3a5296b401b4e13e8d8dc43f96d07fce 100644 (file)
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -217,7 +217,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
                libusb_get_device_descriptor(devlist[i], &des);
 
-               usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+               if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+                       continue;
 
                prof = NULL;
                for (j = 0; dev_profiles[j].orig_vid; j++) {
@@ -390,10 +391,7 @@ 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;
-       uint64_t p, q;
-       int tmp_int, ch_idx;
-       unsigned int i;
-       const char *tmp_str;
+       int ch_idx, idx;
 
        devc = sdi->priv;
        if (!cg) {
@@ -420,30 +418,16 @@ static int config_set(uint32_t key, GVariant *data,
                        return SR_ERR_ARG;
                switch (key) {
                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;
-                               hantek_6xxx_update_vdiv(sdi);
-                       } else
+                       if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(vdivs))) < 0)
                                return SR_ERR_ARG;
+                       devc->voltage[ch_idx] = idx;
+                       hantek_6xxx_update_vdiv(sdi);
                        break;
                case SR_CONF_COUPLING:
-                       tmp_str = g_variant_get_string(data, NULL);
-                       for (i = 0; i < devc->coupling_tab_size; i++) {
-                               if (!strcmp(tmp_str, devc->coupling_vals[i])) {
-                                       devc->coupling[ch_idx] = i;
-                                       break;
-                               }
-                       }
-                       if (i == devc->coupling_tab_size)
+                       if ((idx = std_str_idx(data, devc->coupling_vals,
+                                               devc->coupling_tab_size)) < 0)
                                return SR_ERR_ARG;
+                       devc->coupling[ch_idx] = idx;
                        break;
                default:
                        return SR_ERR_NA;
@@ -477,6 +461,8 @@ static int config_list(uint32_t key, GVariant **data,
                        *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
                        break;
                case SR_CONF_COUPLING:
+                       if (!devc)
+                               return SR_ERR_ARG;
                        *data = g_variant_new_strv(devc->coupling_vals, devc->coupling_tab_size);
                        break;
                case SR_CONF_VDIV:
@@ -547,7 +533,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
                return;
        }
 
-       for (int ch = 0; ch < 2; ch++) {
+       for (int ch = 0; ch < NUM_CHANNELS; ch++) {
                if (!devc->ch_enabled[ch])
                        continue;
 
@@ -580,27 +566,6 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
        g_free(analog.data);
 }
 
-static void send_data(struct sr_dev_inst *sdi, struct libusb_transfer *buf[], uint64_t samples)
-{
-       int i = 0;
-       uint64_t send = 0;
-       uint32_t chunk;
-
-       while (send < samples) {
-               chunk = MIN(samples - send, (uint64_t)(buf[i]->actual_length / NUM_CHANNELS));
-               send += chunk;
-               send_chunk(sdi, buf[i]->buffer, chunk);
-
-               /*
-                * Everything in this transfer was either copied to the buffer
-                * or sent to the session bus.
-                */
-               g_free(buf[i]->buffer);
-               libusb_free_transfer(buf[i]);
-               i++;
-       }
-}
-
 /*
  * Called by libusb (as triggered by handle_event()) when a transfer comes in.
  * Only channel data comes in asynchronously, and all transfers for this are
@@ -627,26 +592,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
        if (devc->dev_state != CAPTURE)
                return;
 
-       if (!devc->sample_buf) {
-               devc->sample_buf_size = 10;
-               devc->sample_buf = g_try_malloc(devc->sample_buf_size * sizeof(transfer));
-               devc->sample_buf_write = 0;
-       }
-
-       if (devc->sample_buf_write >= devc->sample_buf_size) {
-               devc->sample_buf_size += 10;
-               devc->sample_buf = g_try_realloc(devc->sample_buf,
-                               devc->sample_buf_size * sizeof(transfer));
-               if (!devc->sample_buf) {
-                       sr_err("Sample buffer malloc failed.");
-                       devc->dev_state = STOPPING;
-                       return;
-               }
-       }
-
-       devc->sample_buf[devc->sample_buf_write++] = transfer;
-       devc->samp_received += transfer->actual_length / NUM_CHANNELS;
-
        sr_spew("receive_transfer(): calculated samplerate == %" PRIu64 "ks/s",
                (uint64_t)(transfer->actual_length * 1000 /
                (g_get_monotonic_time() - devc->read_start_ts + 1) /
@@ -659,20 +604,23 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
                /* Nothing to send to the bus. */
                return;
 
+       unsigned samples_received = transfer->actual_length / NUM_CHANNELS;
+       send_chunk(sdi, transfer->buffer, samples_received);
+       devc->samp_received += samples_received;
+
+       g_free(transfer->buffer);
+       libusb_free_transfer(transfer);
+
        if (devc->limit_samples && devc->samp_received >= devc->limit_samples) {
                sr_info("Requested number of samples reached, stopping. %"
                        PRIu64 " <= %" PRIu64, devc->limit_samples,
                        devc->samp_received);
-               send_data(sdi, devc->sample_buf, devc->limit_samples);
                sr_dev_acquisition_stop(sdi);
        } else if (devc->limit_msec && (g_get_monotonic_time() -
                        devc->aq_started) / 1000 >= devc->limit_msec) {
                sr_info("Requested time limit reached, stopping. %d <= %d",
                        (uint32_t)devc->limit_msec,
                        (uint32_t)(g_get_monotonic_time() - devc->aq_started) / 1000);
-               send_data(sdi, devc->sample_buf, devc->samp_received);
-               g_free(devc->sample_buf);
-               devc->sample_buf = NULL;
                sr_dev_acquisition_stop(sdi);
        } else {
                read_channel(sdi, data_amount(sdi));