]> sigrok.org Git - libsigrok.git/blobdiff - hardware/hantek-dso/api.c
Add and use std_session_send_df_header().
[libsigrok.git] / hardware / hantek-dso / api.c
index 8c7a9dce7e4e6738f713ced9ec849d0b791dfdd2..ebcc0f253fbc23016f70b506725fd30047c4d8e3 100644 (file)
 #include "libsigrok-internal.h"
 #include "dso.h"
 
-
 /* Max time in ms before we want to check on USB events */
 /* TODO tune this properly */
-#define TICK    1
+#define TICK 1
 
 static const int hwcaps[] = {
-       SR_HWCAP_OSCILLOSCOPE,
-       SR_HWCAP_LIMIT_SAMPLES,
-       SR_HWCAP_CONTINUOUS,
-       SR_HWCAP_TIMEBASE,
-       SR_HWCAP_BUFFERSIZE,
-       SR_HWCAP_TRIGGER_SOURCE,
-       SR_HWCAP_TRIGGER_SLOPE,
-       SR_HWCAP_HORIZ_TRIGGERPOS,
-       SR_HWCAP_FILTER,
-       SR_HWCAP_VDIV,
-       SR_HWCAP_COUPLING,
+       SR_CONF_OSCILLOSCOPE,
+       SR_CONF_LIMIT_SAMPLES,
+       SR_CONF_CONTINUOUS,
+       SR_CONF_TIMEBASE,
+       SR_CONF_BUFFERSIZE,
+       SR_CONF_TRIGGER_SOURCE,
+       SR_CONF_TRIGGER_SLOPE,
+       SR_CONF_HORIZ_TRIGGERPOS,
+       SR_CONF_FILTER,
+       SR_CONF_VDIV,
+       SR_CONF_COUPLING,
        0,
 };
 
 static const char *probe_names[] = {
-       "CH1",
-       "CH2",
+       "CH1", "CH2",
        NULL,
 };
 
@@ -144,9 +142,9 @@ static const char *coupling[] = {
 };
 
 SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
-static struct sr_dev_driver *hdi = &hantek_dso_driver_info;
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-               void *cb_data);
+static struct sr_dev_driver *di = &hantek_dso_driver_info;
+
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
 static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof)
 {
@@ -160,9 +158,10 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
                prof->vendor, prof->model, NULL);
        if (!sdi)
                return NULL;
-       sdi->driver = hdi;
+       sdi->driver = di;
 
-       /* Add only the real probes -- EXT isn't a source of data, only
+       /*
+        * Add only the real probes -- EXT isn't a source of data, only
         * a trigger source internal to the device.
         */
        for (i = 0; probe_names[i]; i++) {
@@ -173,9 +172,10 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
        }
 
        if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-               sr_err("hantek-dso: devc malloc failed");
+               sr_err("Device context malloc failed.");
                return NULL;
        }
+
        devc->profile = prof;
        devc->dev_state = IDLE;
        devc->timebase = DEFAULT_TIMEBASE;
@@ -193,7 +193,7 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
        devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
        devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
        sdi->priv = devc;
-       drvc = hdi->priv;
+       drvc = di->priv;
        drvc->instances = g_slist_append(drvc->instances, sdi);
 
        return sdi;
@@ -202,18 +202,22 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
 static int configure_probes(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-       const struct sr_probe *probe;
+       struct sr_probe *probe;
        const GSList *l;
+       int p;
 
        devc = sdi->priv;
 
+       g_slist_free(devc->enabled_probes);
        devc->ch1_enabled = devc->ch2_enabled = FALSE;
-       for (l = sdi->probes; l; l = l->next) {
-               probe = (struct sr_probe *)l->data;
-               if (probe->index == 0)
+       for (l = sdi->probes, p = 0; l; l = l->next, p++) {
+               probe = l->data;
+               if (p == 0)
                        devc->ch1_enabled = probe->enabled;
-               else if (probe->index == 1)
+               else
                        devc->ch2_enabled = probe->enabled;
+               if (probe->enabled)
+                       devc->enabled_probes = g_slist_append(devc->enabled_probes, probe);
        }
 
        return SR_OK;
@@ -227,21 +231,22 @@ static int clear_instances(void)
        struct dev_context *devc;
        GSList *l;
 
-       drvc = hdi->priv;
+       drvc = di->priv;
        for (l = drvc->instances; l; l = l->next) {
                if (!(sdi = l->data)) {
                        /* Log error, but continue cleaning up the rest. */
-                       sr_err("hantek-dso: %s: sdi was NULL, continuing", __func__);
+                       sr_err("%s: sdi was NULL, continuing", __func__);
                        continue;
                }
                if (!(devc = sdi->priv)) {
                        /* Log error, but continue cleaning up the rest. */
-                       sr_err("hantek-dso: %s: sdi->priv was NULL, continuing", __func__);
+                       sr_err("%s: sdi->priv was NULL, continuing", __func__);
                        continue;
                }
                dso_close(sdi);
                sr_usb_dev_inst_free(devc->usb);
                g_free(devc->triggersource);
+               g_slist_free(devc->enabled_probes);
 
                sr_dev_inst_free(sdi);
        }
@@ -252,24 +257,9 @@ static int clear_instances(void)
        return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
-       struct drv_context *drvc;
-
-       if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-               sr_err("hantek-dso: driver context malloc failed.");
-               return SR_ERR_MALLOC;
-       }
-
-       if (libusb_init(NULL) != 0) {
-               g_free(drvc);
-               sr_err("hantek-dso: Failed to initialize USB.");
-               return SR_ERR;
-       }
-
-       hdi->priv = drvc;
-
-       return SR_OK;
+       return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -284,18 +274,21 @@ static GSList *hw_scan(GSList *options)
        int devcnt, ret, i, j;
 
        (void)options;
+
+       drvc = di->priv;
+       drvc->instances = NULL;
+
        devcnt = 0;
        devices = 0;
-       drvc = hdi->priv;
-       drvc->instances = NULL;
 
        clear_instances();
 
        /* Find all Hantek DSO devices and upload firmware to all of them. */
-       libusb_get_device_list(NULL, &devlist);
+       libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
        for (i = 0; devlist[i]; i++) {
                if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
-                       sr_err("hantek-dso: failed to get device descriptor: %d", ret);
+                       sr_err("Failed to get device descriptor: %s.",
+                              libusb_error_name(ret));
                        continue;
                }
 
@@ -305,7 +298,7 @@ static GSList *hw_scan(GSList *options)
                                && des.idProduct == dev_profiles[j].orig_pid) {
                                /* Device matches the pre-firmware profile. */
                                prof = &dev_profiles[j];
-                               sr_dbg("hantek-dso: Found a %s %s.", prof->vendor, prof->model);
+                               sr_dbg("Found a %s %s.", prof->vendor, prof->model);
                                sdi = dso_dev_new(devcnt, prof);
                                devices = g_slist_append(devices, sdi);
                                devc = sdi->priv;
@@ -314,8 +307,8 @@ static GSList *hw_scan(GSList *options)
                                        /* Remember when the firmware on this device was updated */
                                        devc->fw_updated = g_get_monotonic_time();
                                else
-                                       sr_err("hantek-dso: firmware upload failed for "
-                                              "device %d", devcnt);
+                                       sr_err("Firmware upload failed for "
+                                              "device %d.", devcnt);
                                /* Dummy USB address of 0xff will get overwritten later. */
                                devc->usb = sr_usb_dev_inst_new(
                                                libusb_get_bus_number(devlist[i]), 0xff, NULL);
@@ -325,7 +318,7 @@ static GSList *hw_scan(GSList *options)
                                && des.idProduct == dev_profiles[j].fw_pid) {
                                /* Device matches the post-firmware profile. */
                                prof = &dev_profiles[j];
-                               sr_dbg("hantek-dso: Found a %s %s.", prof->vendor, prof->model);
+                               sr_dbg("Found a %s %s.", prof->vendor, prof->model);
                                sdi = dso_dev_new(devcnt, prof);
                                sdi->status = SR_ST_INACTIVE;
                                devices = g_slist_append(devices, sdi);
@@ -348,11 +341,7 @@ static GSList *hw_scan(GSList *options)
 
 static GSList *hw_dev_list(void)
 {
-       struct drv_context *drvc;
-
-       drvc = hdi->priv;
-
-       return drvc->instances;
+       return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -364,13 +353,13 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
        devc = sdi->priv;
 
        /*
-        * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
-        * for the FX2 to renumerate
+        * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
+        * for the FX2 to renumerate.
         */
        err = SR_ERR;
        if (devc->fw_updated > 0) {
-               sr_info("hantek-dso: waiting for device to reset");
-               /* takes at least 300ms for the FX2 to be gone from the USB bus */
+               sr_info("Waiting for device to reset.");
+               /* Takes >= 300ms for the FX2 to be gone from the USB bus. */
                g_usleep(300 * 1000);
                timediff_ms = 0;
                while (timediff_ms < MAX_RENUM_DELAY_MS) {
@@ -379,21 +368,22 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
                        g_usleep(100 * 1000);
                        timediff_us = g_get_monotonic_time() - devc->fw_updated;
                        timediff_ms = timediff_us / 1000;
-                       sr_spew("hantek-dso: waited %" PRIi64 " ms", timediff_ms);
+                       sr_spew("Waited %" PRIi64 " ms.", timediff_ms);
                }
-               sr_info("hantek-dso: device came back after %d ms", timediff_ms);
+               sr_info("Device came back after %d ms.", timediff_ms);
        } else {
                err = dso_open(sdi);
        }
 
        if (err != SR_OK) {
-               sr_err("hantek-dso: unable to open device");
+               sr_err("Unable to open device.");
                return SR_ERR;
        }
 
        err = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
        if (err != 0) {
-               sr_err("hantek-dso: Unable to claim interface: %d", err);
+               sr_err("Unable to claim interface: %s.",
+                      libusb_error_name(err));
                return SR_ERR;
        }
 
@@ -402,7 +392,6 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-
        dso_close(sdi);
 
        return SR_OK;
@@ -412,64 +401,15 @@ static int hw_cleanup(void)
 {
        struct drv_context *drvc;
 
-       if (!(drvc = hdi->priv))
+       if (!(drvc = di->priv))
                return SR_OK;
 
        clear_instances();
 
-       libusb_exit(NULL);
-
-       return SR_OK;
-}
-
-static int hw_info_get(int info_id, const void **data,
-       const struct sr_dev_inst *sdi)
-{
-       uint64_t tmp;
-
-       (void)sdi;
-
-       switch (info_id) {
-       case SR_DI_HWCAPS:
-               *data = hwcaps;
-               break;
-       case SR_DI_NUM_PROBES:
-               *data = GINT_TO_POINTER(NUM_PROBES);
-               break;
-       case SR_DI_PROBE_NAMES:
-               *data = probe_names;
-               break;
-       case SR_DI_BUFFERSIZES:
-               *data = buffersizes;
-               break;
-       case SR_DI_TIMEBASES:
-               *data = timebases;
-               break;
-       case SR_DI_TRIGGER_SOURCES:
-               *data = trigger_sources;
-               break;
-       case SR_DI_FILTERS:
-               *data = filter_targets;
-               break;
-       case SR_DI_VDIVS:
-               *data = vdivs;
-               break;
-       case SR_DI_COUPLING:
-               *data = coupling;
-               break;
-       /* TODO remove this */
-       case SR_DI_CUR_SAMPLERATE:
-               *data = &tmp;
-               break;
-       default:
-               return SR_ERR_ARG;
-       }
-
        return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-               const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_rational tmp_rat;
@@ -483,25 +423,25 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 
        ret = SR_OK;
        devc = sdi->priv;
-       switch (hwcap) {
-       case SR_HWCAP_LIMIT_FRAMES:
+       switch (id) {
+       case SR_CONF_LIMIT_FRAMES:
                devc->limit_frames = *(const uint64_t *)value;
                break;
-       case SR_HWCAP_TRIGGER_SLOPE:
+       case SR_CONF_TRIGGER_SLOPE:
                tmp_u64 = *(const int *)value;
                if (tmp_u64 != SLOPE_NEGATIVE && tmp_u64 != SLOPE_POSITIVE)
                        ret = SR_ERR_ARG;
                devc->triggerslope = tmp_u64;
                break;
-       case SR_HWCAP_HORIZ_TRIGGERPOS:
+       case SR_CONF_HORIZ_TRIGGERPOS:
                tmp_float = *(const float *)value;
                if (tmp_float < 0.0 || tmp_float > 1.0) {
-                       sr_err("hantek-dso: trigger position should be between 0.0 and 1.0");
+                       sr_err("Trigger position should be between 0.0 and 1.0.");
                        ret = SR_ERR_ARG;
                } else
                        devc->triggerposition = tmp_float;
                break;
-       case SR_HWCAP_BUFFERSIZE:
+       case SR_CONF_BUFFERSIZE:
                tmp_u64 = *(const int *)value;
                for (i = 0; buffersizes[i]; i++) {
                        if (buffersizes[i] == tmp_u64) {
@@ -512,7 +452,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                if (buffersizes[i] == 0)
                        ret = SR_ERR_ARG;
                break;
-       case SR_HWCAP_TIMEBASE:
+       case SR_CONF_TIMEBASE:
                tmp_rat = *(const struct sr_rational *)value;
                for (i = 0; timebases[i].p && timebases[i].q; i++) {
                        if (timebases[i].p == tmp_rat.p
@@ -524,7 +464,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                if (timebases[i].p == 0 && timebases[i].q == 0)
                        ret = SR_ERR_ARG;
                break;
-       case SR_HWCAP_TRIGGER_SOURCE:
+       case SR_CONF_TRIGGER_SOURCE:
                for (i = 0; trigger_sources[i]; i++) {
                        if (!strcmp(value, trigger_sources[i])) {
                                devc->triggersource = g_strdup(value);
@@ -534,7 +474,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                if (trigger_sources[i] == 0)
                        ret = SR_ERR_ARG;
                break;
-       case SR_HWCAP_FILTER:
+       case SR_CONF_FILTER:
                devc->filter_ch1 = devc->filter_ch2 = devc->filter_trigger = 0;
                targets = g_strsplit(value, ",", 0);
                for (i = 0; targets[i]; i++) {
@@ -548,14 +488,14 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                        else if (!strcmp(targets[i], "TRIGGER"))
                                devc->filter_trigger = TRUE;
                        else {
-                               sr_err("invalid filter target %s", targets[i]);
+                               sr_err("Invalid filter target %s.", targets[i]);
                                ret = SR_ERR_ARG;
                        }
                }
                g_strfreev(targets);
                break;
-       case SR_HWCAP_VDIV:
-               /* TODO not supporting vdiv per channel yet */
+       case SR_CONF_VDIV:
+               /* TODO: Not supporting vdiv per channel yet. */
                tmp_rat = *(const struct sr_rational *)value;
                for (i = 0; vdivs[i].p && vdivs[i].q; i++) {
                        if (vdivs[i].p == tmp_rat.p
@@ -568,8 +508,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                if (vdivs[i].p == 0 && vdivs[i].q == 0)
                        ret = SR_ERR_ARG;
                break;
-       case SR_HWCAP_COUPLING:
-               /* TODO not supporting coupling per channel yet */
+       case SR_CONF_COUPLING:
+               /* TODO: Not supporting coupling per channel yet. */
                for (i = 0; coupling[i]; i++) {
                        if (!strcmp(value, coupling[i])) {
                                devc->coupling_ch1 = i;
@@ -582,23 +522,61 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                break;
        default:
                ret = SR_ERR_ARG;
+               break;
        }
 
        return ret;
 }
 
-static void send_chunk(struct dev_context *devc, unsigned char *buf,
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+       (void)sdi;
+
+       switch (key) {
+       case SR_CONF_DEVICE_OPTIONS:
+               *data = hwcaps;
+               break;
+       case SR_CONF_BUFFERSIZE:
+               *data = buffersizes;
+               break;
+       case SR_CONF_COUPLING:
+               *data = coupling;
+               break;
+       case SR_CONF_VDIV:
+               *data = vdivs;
+               break;
+       case SR_CONF_FILTER:
+               *data = filter_targets;
+               break;
+       case SR_CONF_TIMEBASE:
+               *data = timebases;
+               break;
+       case SR_CONF_TRIGGER_SOURCE:
+               *data = trigger_sources;
+               break;
+       default:
+               return SR_ERR_ARG;
+       }
+
+       return SR_OK;
+}
+
+static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
                int num_samples)
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog analog;
+       struct dev_context *devc;
        float ch1, ch2, range;
        int num_probes, data_offset, i;
 
+       devc = sdi->priv;
        num_probes = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
        packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
        /* TODO: support for 5xxx series 9-bit samples */
+       analog.probes = devc->enabled_probes;
        analog.num_samples = num_samples;
        analog.mq = SR_MQ_VOLTAGE;
        analog.unit = SR_UNIT_VOLT;
@@ -606,16 +584,19 @@ static void send_chunk(struct dev_context *devc, unsigned char *buf,
        analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_probes);
        data_offset = 0;
        for (i = 0; i < analog.num_samples; i++) {
-               /* The device always sends data for both channels. If a channel
+               /*
+                * The device always sends data for both channels. If a channel
                 * is disabled, it contains a copy of the enabled channel's
-                * data. However, we only send the requested channels to the bus.
+                * data. However, we only send the requested channels to
+                * the bus.
                 *
-                * Voltage values are encoded as a value 0-255 (0-512 on the 5200*),
-                * where the value is a point in the range represented by the vdiv
-                * setting. There are 8 vertical divs, so e.g. 500mV/div represents
-                * 4V peak-to-peak where 0 = -2V and 255 = +2V.
+                * Voltage values are encoded as a value 0-255 (0-512 on the
+                * DSO-5200*), where the value is a point in the range
+                * represented by the vdiv setting. There are 8 vertical divs,
+                * so e.g. 500mV/div represents 4V peak-to-peak where 0 = -2V
+                * and 255 = +2V.
                 */
-               /* TODO: support for 5xxx series 9-bit samples */
+               /* TODO: Support for DSO-5xxx series 9-bit samples. */
                if (devc->ch1_enabled) {
                        range = ((float)vdivs[devc->voltage_ch1].p / vdivs[devc->voltage_ch1].q) * 8;
                        ch1 = range / 255 * *(buf + i * 2 + 1);
@@ -631,23 +612,25 @@ static void send_chunk(struct dev_context *devc, unsigned char *buf,
                }
        }
        sr_session_send(devc->cb_data, &packet);
-
 }
 
-/* Called by libusb (as triggered by handle_event()) when a transfer comes in.
+/*
+ * 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
- * queued up beforehand, so this just needs so chuck the incoming data onto
+ * queued up beforehand, so this just needs to chuck the incoming data onto
  * the libsigrok session bus.
  */
 static void receive_transfer(struct libusb_transfer *transfer)
 {
        struct sr_datafeed_packet packet;
+       struct sr_dev_inst *sdi;
        struct dev_context *devc;
        int num_samples, pre;
 
-       devc = transfer->user_data;
-       sr_dbg("hantek-dso: receive_transfer(): status %d received %d bytes",
-                       transfer->status, transfer->actual_length);
+       sdi = transfer->user_data;
+       devc = sdi->priv;
+       sr_dbg("receive_transfer(): status %d received %d bytes.",
+              transfer->status, transfer->actual_length);
 
        if (transfer->actual_length == 0)
                /* Nothing to send to the bus. */
@@ -655,15 +638,17 @@ static void receive_transfer(struct libusb_transfer *transfer)
 
        num_samples = transfer->actual_length / 2;
 
-       sr_dbg("hantek-dso: got %d-%d/%d samples in frame", devc->samp_received + 1,
-                       devc->samp_received + num_samples, devc->framesize);
+       sr_dbg("Got %d-%d/%d samples in frame.", devc->samp_received + 1,
+              devc->samp_received + num_samples, devc->framesize);
 
-       /* The device always sends a full frame, but the beginning of the frame
+       /*
+        * The device always sends a full frame, but the beginning of the frame
         * doesn't represent the trigger point. The offset at which the trigger
         * happened came in with the capture state, so we need to start sending
-        * from there up the session bus. The samples in the frame buffer before
-        * that trigger point came after the end of the device's frame buffer was
-        * reached, and it wrapped around to overwrite up until the trigger point.
+        * from there up the session bus. The samples in the frame buffer
+        * before that trigger point came after the end of the device's frame
+        * buffer was reached, and it wrapped around to overwrite up until the
+        * trigger point.
         */
        if (devc->samp_received < devc->trigger_offset) {
                /* Trigger point not yet reached. */
@@ -673,27 +658,29 @@ static void receive_transfer(struct libusb_transfer *transfer)
                                        transfer->buffer, num_samples * 2);
                        devc->samp_buffered += num_samples;
                } else {
-                       /* This chunk hits or overruns the trigger point.
+                       /*
+                        * This chunk hits or overruns the trigger point.
                         * Store the part before the trigger fired, and
-                        * send the rest up to the session bus. */
+                        * send the rest up to the session bus.
+                        */
                        pre = devc->trigger_offset - devc->samp_received;
                        memcpy(devc->framebuf + devc->samp_buffered * 2,
                                        transfer->buffer, pre * 2);
                        devc->samp_buffered += pre;
 
                        /* The rest of this chunk starts with the trigger point. */
-                       sr_dbg("hantek-dso: reached trigger point, %d samples buffered",
-                                       devc->samp_buffered);
+                       sr_dbg("Reached trigger point, %d samples buffered.",
+                              devc->samp_buffered);
 
                        /* Avoid the corner case where the chunk ended at
                         * exactly the trigger point. */
                        if (num_samples > pre)
-                               send_chunk(devc, transfer->buffer + pre * 2,
+                               send_chunk(sdi, transfer->buffer + pre * 2,
                                                num_samples - pre);
                }
        } else {
                /* Already past the trigger point, just send it all out. */
-               send_chunk(devc, transfer->buffer,
+               send_chunk(sdi, transfer->buffer,
                                num_samples);
        }
 
@@ -707,9 +694,9 @@ static void receive_transfer(struct libusb_transfer *transfer)
        if (devc->samp_received >= devc->framesize) {
                /* That was the last chunk in this frame. Send the buffered
                 * pre-trigger samples out now, in one big chunk. */
-               sr_dbg("hantek-dso: end of frame, sending %d pre-trigger buffered samples",
-                               devc->samp_buffered);
-               send_chunk(devc, devc->framebuf, devc->samp_buffered);
+               sr_dbg("End of frame, sending %d pre-trigger buffered samples.",
+                      devc->samp_buffered);
+               send_chunk(sdi, devc->framebuf, devc->samp_buffered);
 
                /* Mark the end of this frame. */
                packet.type = SR_DF_FRAME_END;
@@ -722,7 +709,6 @@ static void receive_transfer(struct libusb_transfer *transfer)
                        devc->dev_state = NEW_CAPTURE;
                }
        }
-
 }
 
 static int handle_event(int fd, int revents, void *cb_data)
@@ -731,12 +717,12 @@ static int handle_event(int fd, int revents, void *cb_data)
        struct sr_datafeed_packet packet;
        struct timeval tv;
        struct dev_context *devc;
+       struct drv_context *drvc = di->priv;
        const struct libusb_pollfd **lupfd;
        int num_probes, i;
        uint32_t trigger_offset;
        uint8_t capturestate;
 
-       /* Avoid compiler warnings. */
        (void)fd;
        (void)revents;
 
@@ -744,10 +730,12 @@ static int handle_event(int fd, int revents, void *cb_data)
        devc = sdi->priv;
        if (devc->dev_state == STOPPING) {
                /* We've been told to wind up the acquisition. */
-               sr_dbg("hantek-dso: stopping acquisition");
-               /* TODO: doesn't really cancel pending transfers so they might
-                * come in after SR_DF_END is sent. */
-               lupfd = libusb_get_pollfds(NULL);
+               sr_dbg("Stopping acquisition.");
+               /*
+                * TODO: Doesn't really cancel pending transfers so they might
+                * come in after SR_DF_END is sent.
+                */
+               lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
                for (i = 0; lupfd[i]; i++)
                        sr_source_remove(lupfd[i]->fd);
                free(lupfd);
@@ -762,7 +750,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 
        /* Always handle pending libusb events. */
        tv.tv_sec = tv.tv_usec = 0;
-       libusb_handle_events_timeout(NULL, &tv);
+       libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
 
        /* TODO: ugh */
        if (devc->dev_state == NEW_CAPTURE) {
@@ -772,7 +760,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                        return TRUE;
 //             if (dso_force_trigger(devc) != SR_OK)
 //                     return TRUE;
-               sr_dbg("hantek-dso: successfully requested next chunk");
+               sr_dbg("Successfully requested next chunk.");
                devc->dev_state = CAPTURE;
                return TRUE;
        }
@@ -782,8 +770,8 @@ static int handle_event(int fd, int revents, void *cb_data)
        if ((dso_get_capturestate(devc, &capturestate, &trigger_offset)) != SR_OK)
                return TRUE;
 
-       sr_dbg("hantek-dso: capturestate %d", capturestate);
-       sr_dbg("hantek-dso: trigger offset 0x%.6x", trigger_offset);
+       sr_dbg("Capturestate %d.", capturestate);
+       sr_dbg("Trigger offset 0x%.6x.", trigger_offset);
        switch (capturestate) {
        case CAPTURE_EMPTY:
                if (++devc->capture_empty_count >= MAX_CAPTURE_EMPTY) {
@@ -794,11 +782,11 @@ static int handle_event(int fd, int revents, void *cb_data)
                                break;
 //                     if (dso_force_trigger(devc) != SR_OK)
 //                             break;
-                       sr_dbg("hantek-dso: successfully requested next chunk");
+                       sr_dbg("Successfully requested next chunk.");
                }
                break;
        case CAPTURE_FILLING:
-               /* no data yet */
+               /* No data yet. */
                break;
        case CAPTURE_READY_8BIT:
                /* Remember where in the captured frame the trigger is. */
@@ -810,10 +798,11 @@ static int handle_event(int fd, int revents, void *cb_data)
                devc->samp_buffered = devc->samp_received = 0;
 
                /* Tell the scope to send us the first frame. */
-               if (dso_get_channeldata(devc, receive_transfer) != SR_OK)
+               if (dso_get_channeldata(sdi, receive_transfer) != SR_OK)
                        break;
 
-               /* Don't hit the state machine again until we're done fetching
+               /*
+                * Don't hit the state machine again until we're done fetching
                 * the data we just told the scope to send.
                 */
                devc->dev_state = FETCH_DATA;
@@ -824,26 +813,25 @@ static int handle_event(int fd, int revents, void *cb_data)
                break;
        case CAPTURE_READY_9BIT:
                /* TODO */
-               sr_err("not yet supported");
+               sr_err("Not yet supported.");
                break;
        case CAPTURE_TIMEOUT:
                /* Doesn't matter, we'll try again next time. */
                break;
        default:
-               sr_dbg("unknown capture state");
+               sr_dbg("Unknown capture state: %d.", capturestate);
+               break;
        }
 
        return TRUE;
 }
 
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
-               void *cb_data)
+                                   void *cb_data)
 {
        const struct libusb_pollfd **lupfd;
-       struct sr_datafeed_packet packet;
-       struct sr_datafeed_header header;
-       struct sr_datafeed_meta_analog meta;
        struct dev_context *devc;
+       struct drv_context *drvc = di->priv;
        int i;
 
        if (sdi->status != SR_ST_ACTIVE)
@@ -853,7 +841,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        devc->cb_data = cb_data;
 
        if (configure_probes(sdi) != SR_OK) {
-               sr_err("hantek-dso: failed to configured probes");
+               sr_err("Failed to configure probes.");
                return SR_ERR;
        }
 
@@ -864,30 +852,19 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_ERR;
 
        devc->dev_state = CAPTURE;
-       lupfd = libusb_get_pollfds(NULL);
+       lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
        for (i = 0; lupfd[i]; i++)
-               sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK, handle_event,
-                               (void *)sdi);
+               sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK,
+                             handle_event, (void *)sdi);
        free(lupfd);
 
        /* Send header packet to the session bus. */
-       packet.type = SR_DF_HEADER;
-       packet.payload = (unsigned char *)&header;
-       header.feed_version = 1;
-       gettimeofday(&header.starttime, NULL);
-       sr_session_send(cb_data, &packet);
-
-       /* Send metadata about the SR_DF_ANALOG packets to come. */
-       packet.type = SR_DF_META_ANALOG;
-       packet.payload = &meta;
-       meta.num_probes = NUM_PROBES;
-       sr_session_send(cb_data, &packet);
+       std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
        return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-               void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        struct dev_context *devc;
 
@@ -911,10 +888,10 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
+       .config_set = config_set,
+       .config_list = config_list,
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
-       .info_get = hw_info_get,
-       .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,
        .priv = NULL,