#include <libusb.h>
#include "libsigrok.h"
#include "libsigrok-internal.h"
-#include "config.h"
#include "dso.h"
NULL,
};
-SR_PRIV libusb_context *usb_context = NULL;
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_inst *dso_dev_new(int index, const struct dso_profile *prof)
{
struct sr_dev_inst *sdi;
- struct context *ctx;
+ struct sr_probe *probe;
+ struct drv_context *drvc;
+ struct dev_context *devc;
+ int i;
sdi = sr_dev_inst_new(index, SR_ST_INITIALIZING,
prof->vendor, prof->model, NULL);
return NULL;
sdi->driver = hdi;
- if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
- sr_err("hantek-dso: ctx malloc failed");
+ /* 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++) {
+ if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
+ probe_names[i])))
+ return NULL;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ }
+
+ if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+ sr_err("hantek-dso: devc malloc failed");
return NULL;
}
- ctx->profile = prof;
- ctx->dev_state = IDLE;
- ctx->timebase = DEFAULT_TIMEBASE;
- ctx->ch1_enabled = TRUE;
- ctx->ch2_enabled = TRUE;
- ctx->voltage_ch1 = DEFAULT_VOLTAGE;
- ctx->voltage_ch2 = DEFAULT_VOLTAGE;
- ctx->coupling_ch1 = DEFAULT_COUPLING;
- ctx->coupling_ch2 = DEFAULT_COUPLING;
- ctx->voffset_ch1 = DEFAULT_VERT_OFFSET;
- ctx->voffset_ch2 = DEFAULT_VERT_OFFSET;
- ctx->voffset_trigger = DEFAULT_VERT_TRIGGERPOS;
- ctx->framesize = DEFAULT_FRAMESIZE;
- ctx->triggerslope = SLOPE_POSITIVE;
- ctx->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
- ctx->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
- sdi->priv = ctx;
- hdi->instances = g_slist_append(hdi->instances, sdi);
+ devc->profile = prof;
+ devc->dev_state = IDLE;
+ devc->timebase = DEFAULT_TIMEBASE;
+ devc->ch1_enabled = TRUE;
+ devc->ch2_enabled = TRUE;
+ devc->voltage_ch1 = DEFAULT_VOLTAGE;
+ devc->voltage_ch2 = DEFAULT_VOLTAGE;
+ devc->coupling_ch1 = DEFAULT_COUPLING;
+ devc->coupling_ch2 = DEFAULT_COUPLING;
+ devc->voffset_ch1 = DEFAULT_VERT_OFFSET;
+ devc->voffset_ch2 = DEFAULT_VERT_OFFSET;
+ devc->voffset_trigger = DEFAULT_VERT_TRIGGERPOS;
+ devc->framesize = DEFAULT_FRAMESIZE;
+ devc->triggerslope = SLOPE_POSITIVE;
+ devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
+ devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
+ sdi->priv = devc;
+ drvc = hdi->priv;
+ drvc->instances = g_slist_append(drvc->instances, sdi);
return sdi;
}
-static int configure_probes(struct context *ctx, const GSList *probes)
+static int configure_probes(const struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
const struct sr_probe *probe;
const GSList *l;
- ctx->ch1_enabled = ctx->ch2_enabled = FALSE;
- for (l = probes; l; l = l->next) {
+ devc = sdi->priv;
+
+ devc->ch1_enabled = devc->ch2_enabled = FALSE;
+ for (l = sdi->probes; l; l = l->next) {
probe = (struct sr_probe *)l->data;
- if (probe->index == 1)
- ctx->ch1_enabled = probe->enabled;
- else if (probe->index == 2)
- ctx->ch2_enabled = probe->enabled;
+ if (probe->index == 0)
+ devc->ch1_enabled = probe->enabled;
+ else if (probe->index == 1)
+ devc->ch2_enabled = probe->enabled;
}
return SR_OK;
}
/* Properly close and free all devices. */
-static void clear_instances(void)
+static int clear_instances(void)
{
struct sr_dev_inst *sdi;
- struct context *ctx;
+ struct drv_context *drvc;
+ struct dev_context *devc;
GSList *l;
- for (l = hdi->instances; l; l = l->next) {
+ drvc = hdi->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__);
continue;
}
- if (!(ctx = sdi->priv)) {
+ if (!(devc = sdi->priv)) {
/* Log error, but continue cleaning up the rest. */
sr_err("hantek-dso: %s: sdi->priv was NULL, continuing", __func__);
continue;
}
dso_close(sdi);
- sr_usb_dev_inst_free(ctx->usb);
- g_free(ctx->triggersource);
+ sr_usb_dev_inst_free(devc->usb);
+ g_free(devc->triggersource);
sr_dev_inst_free(sdi);
}
- g_slist_free(hdi->instances);
- hdi->instances = NULL;
+ g_slist_free(drvc->instances);
+ drvc->instances = NULL;
+ return SR_OK;
}
static int hw_init(void)
{
+ struct drv_context *drvc;
- if (libusb_init(&usb_context) != 0) {
+ if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
+ sr_err("hantek-dso: driver context malloc failed.");
+ return SR_ERR;
+ }
+
+ 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;
}
{
struct sr_dev_inst *sdi;
const struct dso_profile *prof;
- struct context *ctx;
+ struct drv_context *drvc;
+ struct dev_context *devc;
GSList *devices;
struct libusb_device_descriptor des;
libusb_device **devlist;
(void)options;
devcnt = 0;
devices = 0;
- hdi->instances = NULL;
+ drvc = hdi->priv;
+ drvc->instances = NULL;
clear_instances();
/* Find all Hantek DSO devices and upload firmware to all of them. */
- libusb_get_device_list(usb_context, &devlist);
+ libusb_get_device_list(NULL, &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_dbg("hantek-dso: Found a %s %s.", prof->vendor, prof->model);
sdi = dso_dev_new(devcnt, prof);
devices = g_slist_append(devices, sdi);
- ctx = sdi->priv;
+ devc = sdi->priv;
if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
prof->firmware) == SR_OK)
/* Remember when the firmware on this device was updated */
- ctx->fw_updated = g_get_monotonic_time();
+ devc->fw_updated = g_get_monotonic_time();
else
sr_err("hantek-dso: firmware upload failed for "
"device %d", devcnt);
/* Dummy USB address of 0xff will get overwritten later. */
- ctx->usb = sr_usb_dev_inst_new(
+ devc->usb = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]), 0xff, NULL);
devcnt++;
break;
sdi = dso_dev_new(devcnt, prof);
sdi->status = SR_ST_INACTIVE;
devices = g_slist_append(devices, sdi);
- ctx = sdi->priv;
- ctx->usb = sr_usb_dev_inst_new(
+ devc = sdi->priv;
+ devc->usb = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
devcnt++;
return devices;
}
+static GSList *hw_dev_list(void)
+{
+ struct drv_context *drvc;
+
+ drvc = hdi->priv;
+
+ return drvc->instances;
+}
+
static int hw_dev_open(struct sr_dev_inst *sdi)
{
- struct context *ctx;
+ struct dev_context *devc;
int64_t timediff_us, timediff_ms;
int err;
- ctx = sdi->priv;
+ devc = sdi->priv;
/*
* if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
* for the FX2 to renumerate
*/
err = SR_ERR;
- if (ctx->fw_updated > 0) {
+ 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 */
g_usleep(300 * 1000);
if ((err = dso_open(sdi)) == SR_OK)
break;
g_usleep(100 * 1000);
- timediff_us = g_get_monotonic_time() - ctx->fw_updated;
+ timediff_us = g_get_monotonic_time() - devc->fw_updated;
timediff_ms = timediff_us / 1000;
sr_spew("hantek-dso: waited %" PRIi64 " ms", timediff_ms);
}
return SR_ERR;
}
- err = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
+ err = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
if (err != 0) {
sr_err("hantek-dso: Unable to claim interface: %d", err);
return SR_ERR;
static int hw_cleanup(void)
{
+ struct drv_context *drvc;
+
+ if (!(drvc = hdi->priv))
+ return SR_OK;
clear_instances();
- if (usb_context)
- libusb_exit(usb_context);
- usb_context = NULL;
+ libusb_exit(NULL);
return SR_OK;
}
{
uint64_t tmp;
+ (void)sdi;
+
switch (info_id) {
- case SR_DI_INST:
- *data = sdi;
- break;
case SR_DI_HWCAPS:
*data = hwcaps;
break;
return SR_OK;
}
-static int hw_dev_status_get(int dev_index)
-{
- struct sr_dev_inst *sdi;
-
- if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
- return SR_ST_NOT_FOUND;
-
- return sdi->status;
-}
-
static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
const void *value)
{
- struct context *ctx;
+ struct dev_context *devc;
struct sr_rational tmp_rat;
float tmp_float;
uint64_t tmp_u64;
return SR_ERR;
ret = SR_OK;
- ctx = sdi->priv;
+ devc = sdi->priv;
switch (hwcap) {
case SR_HWCAP_LIMIT_FRAMES:
- ctx->limit_frames = *(const uint64_t *)value;
- break;
- case SR_HWCAP_PROBECONFIG:
- ret = configure_probes(ctx, (const GSList *)value);
+ devc->limit_frames = *(const uint64_t *)value;
break;
case SR_HWCAP_TRIGGER_SLOPE:
tmp_u64 = *(const int *)value;
if (tmp_u64 != SLOPE_NEGATIVE && tmp_u64 != SLOPE_POSITIVE)
ret = SR_ERR_ARG;
- ctx->triggerslope = tmp_u64;
+ devc->triggerslope = tmp_u64;
break;
case SR_HWCAP_HORIZ_TRIGGERPOS:
tmp_float = *(const float *)value;
sr_err("hantek-dso: trigger position should be between 0.0 and 1.0");
ret = SR_ERR_ARG;
} else
- ctx->triggerposition = tmp_float;
+ devc->triggerposition = tmp_float;
break;
case SR_HWCAP_BUFFERSIZE:
tmp_u64 = *(const int *)value;
for (i = 0; buffersizes[i]; i++) {
if (buffersizes[i] == tmp_u64) {
- ctx->framesize = tmp_u64;
+ devc->framesize = tmp_u64;
break;
}
}
for (i = 0; timebases[i].p && timebases[i].q; i++) {
if (timebases[i].p == tmp_rat.p
&& timebases[i].q == tmp_rat.q) {
- ctx->timebase = i;
+ devc->timebase = i;
break;
}
}
case SR_HWCAP_TRIGGER_SOURCE:
for (i = 0; trigger_sources[i]; i++) {
if (!strcmp(value, trigger_sources[i])) {
- ctx->triggersource = g_strdup(value);
+ devc->triggersource = g_strdup(value);
break;
}
}
ret = SR_ERR_ARG;
break;
case SR_HWCAP_FILTER:
- ctx->filter_ch1 = ctx->filter_ch2 = ctx->filter_trigger = 0;
+ devc->filter_ch1 = devc->filter_ch2 = devc->filter_trigger = 0;
targets = g_strsplit(value, ",", 0);
for (i = 0; targets[i]; i++) {
if (targets[i] == '\0')
/* Empty filter string can be used to clear them all. */
;
else if (!strcmp(targets[i], "CH1"))
- ctx->filter_ch1 = TRUE;
+ devc->filter_ch1 = TRUE;
else if (!strcmp(targets[i], "CH2"))
- ctx->filter_ch2 = TRUE;
+ devc->filter_ch2 = TRUE;
else if (!strcmp(targets[i], "TRIGGER"))
- ctx->filter_trigger = TRUE;
+ devc->filter_trigger = TRUE;
else {
sr_err("invalid filter target %s", targets[i]);
ret = SR_ERR_ARG;
for (i = 0; vdivs[i].p && vdivs[i].q; i++) {
if (vdivs[i].p == tmp_rat.p
&& vdivs[i].q == tmp_rat.q) {
- ctx->voltage_ch1 = i;
- ctx->voltage_ch2 = i;
+ devc->voltage_ch1 = i;
+ devc->voltage_ch2 = i;
break;
}
}
/* TODO not supporting coupling per channel yet */
for (i = 0; coupling[i]; i++) {
if (!strcmp(value, coupling[i])) {
- ctx->coupling_ch1 = i;
- ctx->coupling_ch2 = i;
+ devc->coupling_ch1 = i;
+ devc->coupling_ch2 = i;
break;
}
}
return ret;
}
-static void send_chunk(struct context *ctx, unsigned char *buf,
+static void send_chunk(struct dev_context *devc, unsigned char *buf,
int num_samples)
{
struct sr_datafeed_packet packet;
float ch1, ch2, range;
int num_probes, data_offset, i;
- num_probes = (ctx->ch1_enabled && ctx->ch2_enabled) ? 2 : 1;
+ 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 */
* 4V peak-to-peak where 0 = -2V and 255 = +2V.
*/
/* TODO: support for 5xxx series 9-bit samples */
- if (ctx->ch1_enabled) {
- range = ((float)vdivs[ctx->voltage_ch1].p / vdivs[ctx->voltage_ch1].q) * 8;
+ if (devc->ch1_enabled) {
+ range = ((float)vdivs[devc->voltage_ch1].p / vdivs[devc->voltage_ch1].q) * 8;
ch1 = range / 255 * *(buf + i * 2 + 1);
/* Value is centered around 0V. */
ch1 -= range / 2;
analog.data[data_offset++] = ch1;
}
- if (ctx->ch2_enabled) {
- range = ((float)vdivs[ctx->voltage_ch2].p / vdivs[ctx->voltage_ch2].q) * 8;
+ if (devc->ch2_enabled) {
+ range = ((float)vdivs[devc->voltage_ch2].p / vdivs[devc->voltage_ch2].q) * 8;
ch2 = range / 255 * *(buf + i * 2);
ch2 -= range / 2;
analog.data[data_offset++] = ch2;
}
}
- sr_session_send(ctx->cb_data, &packet);
+ sr_session_send(devc->cb_data, &packet);
}
static void receive_transfer(struct libusb_transfer *transfer)
{
struct sr_datafeed_packet packet;
- struct context *ctx;
+ struct dev_context *devc;
int num_samples, pre;
- ctx = transfer->user_data;
+ devc = transfer->user_data;
sr_dbg("hantek-dso: receive_transfer(): status %d received %d bytes",
transfer->status, transfer->actual_length);
num_samples = transfer->actual_length / 2;
- sr_dbg("hantek-dso: got %d-%d/%d samples in frame", ctx->samp_received + 1,
- ctx->samp_received + num_samples, ctx->framesize);
+ sr_dbg("hantek-dso: 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
* doesn't represent the trigger point. The offset at which the trigger
* 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 (ctx->samp_received < ctx->trigger_offset) {
+ if (devc->samp_received < devc->trigger_offset) {
/* Trigger point not yet reached. */
- if (ctx->samp_received + num_samples < ctx->trigger_offset) {
+ if (devc->samp_received + num_samples < devc->trigger_offset) {
/* The entire chunk is before the trigger point. */
- memcpy(ctx->framebuf + ctx->samp_buffered * 2,
+ memcpy(devc->framebuf + devc->samp_buffered * 2,
transfer->buffer, num_samples * 2);
- ctx->samp_buffered += num_samples;
+ devc->samp_buffered += num_samples;
} else {
/* This chunk hits or overruns the trigger point.
* Store the part before the trigger fired, and
* send the rest up to the session bus. */
- pre = ctx->trigger_offset - ctx->samp_received;
- memcpy(ctx->framebuf + ctx->samp_buffered * 2,
+ pre = devc->trigger_offset - devc->samp_received;
+ memcpy(devc->framebuf + devc->samp_buffered * 2,
transfer->buffer, pre * 2);
- ctx->samp_buffered += pre;
+ devc->samp_buffered += pre;
/* The rest of this chunk starts with the trigger point. */
sr_dbg("hantek-dso: reached trigger point, %d samples buffered",
- ctx->samp_buffered);
+ devc->samp_buffered);
/* Avoid the corner case where the chunk ended at
* exactly the trigger point. */
if (num_samples > pre)
- send_chunk(ctx, transfer->buffer + pre * 2,
+ send_chunk(devc, transfer->buffer + pre * 2,
num_samples - pre);
}
} else {
/* Already past the trigger point, just send it all out. */
- send_chunk(ctx, transfer->buffer,
+ send_chunk(devc, transfer->buffer,
num_samples);
}
- ctx->samp_received += num_samples;
+ devc->samp_received += num_samples;
/* Everything in this transfer was either copied to the buffer or
* sent to the session bus. */
g_free(transfer->buffer);
libusb_free_transfer(transfer);
- if (ctx->samp_received >= ctx->framesize) {
+ 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",
- ctx->samp_buffered);
- send_chunk(ctx, ctx->framebuf, ctx->samp_buffered);
+ devc->samp_buffered);
+ send_chunk(devc, devc->framebuf, devc->samp_buffered);
/* Mark the end of this frame. */
packet.type = SR_DF_FRAME_END;
- sr_session_send(ctx->cb_data, &packet);
+ sr_session_send(devc->cb_data, &packet);
- if (ctx->limit_frames && ++ctx->num_frames == ctx->limit_frames) {
+ if (devc->limit_frames && ++devc->num_frames == devc->limit_frames) {
/* Terminate session */
- /* TODO: don't leave pending USB transfers hanging */
- packet.type = SR_DF_END;
- sr_session_send(ctx->cb_data, &packet);
+ devc->dev_state = STOPPING;
} else {
- ctx->dev_state = NEW_CAPTURE;
+ devc->dev_state = NEW_CAPTURE;
}
}
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 context *ctx;
- int num_probes;
+ struct dev_context *devc;
+ const struct libusb_pollfd **lupfd;
+ int num_probes, i;
uint32_t trigger_offset;
uint8_t capturestate;
(void)fd;
(void)revents;
+ sdi = 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);
+ for (i = 0; lupfd[i]; i++)
+ sr_source_remove(lupfd[i]->fd);
+ free(lupfd);
+
+ packet.type = SR_DF_END;
+ sr_session_send(sdi, &packet);
+
+ devc->dev_state = IDLE;
+
+ return TRUE;
+ }
+
/* Always handle pending libusb events. */
tv.tv_sec = tv.tv_usec = 0;
- libusb_handle_events_timeout(usb_context, &tv);
+ libusb_handle_events_timeout(NULL, &tv);
- ctx = cb_data;
/* TODO: ugh */
- if (ctx->dev_state == NEW_CAPTURE) {
- if (dso_capture_start(ctx) != SR_OK)
+ if (devc->dev_state == NEW_CAPTURE) {
+ if (dso_capture_start(devc) != SR_OK)
return TRUE;
- if (dso_enable_trigger(ctx) != SR_OK)
+ if (dso_enable_trigger(devc) != SR_OK)
return TRUE;
-// if (dso_force_trigger(ctx) != SR_OK)
+// if (dso_force_trigger(devc) != SR_OK)
// return TRUE;
sr_dbg("hantek-dso: successfully requested next chunk");
- ctx->dev_state = CAPTURE;
+ devc->dev_state = CAPTURE;
return TRUE;
}
- if (ctx->dev_state != CAPTURE)
+ if (devc->dev_state != CAPTURE)
return TRUE;
- if ((dso_get_capturestate(ctx, &capturestate, &trigger_offset)) != SR_OK)
+ 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);
switch (capturestate) {
case CAPTURE_EMPTY:
- if (++ctx->capture_empty_count >= MAX_CAPTURE_EMPTY) {
- ctx->capture_empty_count = 0;
- if (dso_capture_start(ctx) != SR_OK)
+ if (++devc->capture_empty_count >= MAX_CAPTURE_EMPTY) {
+ devc->capture_empty_count = 0;
+ if (dso_capture_start(devc) != SR_OK)
break;
- if (dso_enable_trigger(ctx) != SR_OK)
+ if (dso_enable_trigger(devc) != SR_OK)
break;
-// if (dso_force_trigger(ctx) != SR_OK)
+// if (dso_force_trigger(devc) != SR_OK)
// break;
sr_dbg("hantek-dso: successfully requested next chunk");
}
break;
case CAPTURE_READY_8BIT:
/* Remember where in the captured frame the trigger is. */
- ctx->trigger_offset = trigger_offset;
+ devc->trigger_offset = trigger_offset;
- num_probes = (ctx->ch1_enabled && ctx->ch2_enabled) ? 2 : 1;
- ctx->framebuf = g_try_malloc(ctx->framesize * num_probes * 2);
- ctx->samp_buffered = ctx->samp_received = 0;
+ num_probes = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
+ devc->framebuf = g_try_malloc(devc->framesize * num_probes * 2);
+ devc->samp_buffered = devc->samp_received = 0;
/* Tell the scope to send us the first frame. */
- if (dso_get_channeldata(ctx, receive_transfer) != SR_OK)
+ if (dso_get_channeldata(devc, receive_transfer) != SR_OK)
break;
/* Don't hit the state machine again until we're done fetching
* the data we just told the scope to send.
*/
- ctx->dev_state = FETCH_DATA;
+ devc->dev_state = FETCH_DATA;
/* Tell the frontend a new frame is on the way. */
packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
break;
case CAPTURE_READY_9BIT:
/* TODO */
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
struct sr_datafeed_meta_analog meta;
- struct context *ctx;
+ struct dev_context *devc;
int i;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR;
- ctx = sdi->priv;
- ctx->cb_data = cb_data;
+ devc = sdi->priv;
+ devc->cb_data = cb_data;
+
+ if (configure_probes(sdi) != SR_OK) {
+ sr_err("hantek-dso: failed to configured probes");
+ return SR_ERR;
+ }
- if (dso_init(ctx) != SR_OK)
+ if (dso_init(devc) != SR_OK)
return SR_ERR;
- if (dso_capture_start(ctx) != SR_OK)
+ if (dso_capture_start(devc) != SR_OK)
return SR_ERR;
- ctx->dev_state = CAPTURE;
- lupfd = libusb_get_pollfds(usb_context);
+ devc->dev_state = CAPTURE;
+ lupfd = libusb_get_pollfds(NULL);
for (i = 0; lupfd[i]; i++)
sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK, handle_event,
- ctx);
+ (void *)sdi);
free(lupfd);
/* Send header packet to the session bus. */
return SR_OK;
}
-/* TODO: doesn't really cancel pending transfers so they might come in after
- * SR_DF_END is sent.
- */
static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
void *cb_data)
{
- struct sr_datafeed_packet packet;
- struct context *ctx;
+ struct dev_context *devc;
+
+ (void)cb_data;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR;
- ctx = sdi->priv;
- ctx->dev_state = IDLE;
-
- packet.type = SR_DF_END;
- sr_session_send(cb_data, &packet);
+ devc = sdi->priv;
+ devc->dev_state = STOPPING;
return SR_OK;
}
.init = hw_init,
.cleanup = hw_cleanup,
.scan = hw_scan,
+ .dev_list = hw_dev_list,
+ .dev_clear = clear_instances,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
.info_get = hw_info_get,
- .dev_status_get = hw_dev_status_get,
.dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
- .instances = NULL,
+ .priv = NULL,
};
projects / libsigrok.git / blobdiff