Drop unneeded std_session_send_df_header() comments.

[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 c176727b8b43bf77c9028e9fc17f408df943317a..71e62c52225af3396f867cf6679903ee4d5dd9c2 100644 (file)
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -43,19 +43,24 @@ static const uint32_t devopts[] = {
 
 static const uint32_t devopts_cg[] = {
        SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 static const char *channel_names[] = {
        "CH1", "CH2",
 };
 
+static const char *coupling[] = {
+       "AC", "DC",
+};
+
 static const struct hantek_6xxx_profile dev_profiles[] = {
        {
                0x04b4, 0x6022, 0x04b5, 0x6022,
                "Hantek", "6022BE", "hantek-6022be.fw",
        },
        {
-               0x8102, 0x8102, 0x04b5, 0x6022,
+               0x8102, 0x8102, 0x1D50, 0x608E,
                "Sainsmart", "DDS120", "sainsmart-dds120.fw",
        },
        ALL_ZERO
@@ -103,6 +108,7 @@ static struct sr_dev_inst *hantek_6xxx_dev_new(const struct hantek_6xxx_profile
        for (i = 0; i < NUM_CHANNELS; i++) {
                devc->ch_enabled[i] = TRUE;
                devc->voltage[i] = DEFAULT_VOLTAGE;
+               devc->coupling[i] = DEFAULT_COUPLING;
        }
 
        devc->sample_buf = NULL;
@@ -149,6 +155,7 @@ static void clear_dev_context(void *priv)
 
        devc = priv;
        g_slist_free(devc->enabled_channels);
+       g_free(devc);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
@@ -382,6 +389,9 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                        vdiv = vdivs[devc->voltage[ch_idx]];
                        *data = g_variant_new("(tt)", vdiv[0], vdiv[1]);
                        break;
+               case SR_CONF_COUPLING:
+                       *data = g_variant_new_string(coupling[devc->coupling[ch_idx]]);
+                       break;
                }
        }
 
@@ -395,6 +405,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        uint64_t p, q;
        int tmp_int, ch_idx, ret;
        unsigned int i;
+       const char *tmp_str;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -440,6 +451,17 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        } else
                                ret = SR_ERR_ARG;
                        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)
+                               ret = SR_ERR_ARG;
+                       break;
                default:
                        ret = SR_ERR_NA;
                        break;
@@ -493,6 +515,9 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
                        break;
+               case SR_CONF_COUPLING:
+                       *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
+                       break;
                case SR_CONF_VDIV:
                        g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
                        for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
@@ -626,6 +651,8 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
        devc = sdi->priv;
 
        if (devc->dev_state == FLUSH) {
+               g_free(transfer->buffer);
+               libusb_free_transfer(transfer);
                devc->dev_state = CAPTURE;
                devc->aq_started = g_get_monotonic_time();
                read_channel(sdi, data_amount(sdi));
@@ -653,7 +680,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
        }
 
        devc->sample_buf[devc->sample_buf_write++] = transfer;
-       devc->samp_received = transfer->actual_length / NUM_CHANNELS;
+       devc->samp_received += transfer->actual_length / NUM_CHANNELS;
 
        sr_spew("receive_transfer(): calculated samplerate == %" PRIu64 "ks/s",
                (uint64_t)(transfer->actual_length * 1000 /
@@ -705,7 +732,6 @@ static int read_channel(const struct sr_dev_inst *sdi, uint32_t amount)
 static int handle_event(int fd, int revents, void *cb_data)
 {
        const struct sr_dev_inst *sdi;
-       struct sr_datafeed_packet packet;
        struct timeval tv;
        struct sr_dev_driver *di;
        struct dev_context *devc;
@@ -734,9 +760,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                 */
                usb_source_remove(sdi->session, drvc->sr_ctx);
 
-               packet.type = SR_DF_END;
-               packet.payload = NULL;
-               sr_session_send(sdi, &packet);
+               std_session_send_df_end(sdi, LOG_PREFIX);
 
                devc->dev_state = IDLE;
 
@@ -766,7 +790,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        if (hantek_6xxx_init(sdi) != SR_OK)
                return SR_ERR;
 
-       /* Send header packet to the session bus. */
        std_session_send_df_header(cb_data, LOG_PREFIX);
 
        devc->samp_received = 0;