BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hantek-dso: use driver-private storage for instances and libusb_context

This commit is contained in:
Bert Vermeulen 2012-07-30 00:24:26 +02:00
parent c259726a16
commit 269971ddce
3 changed files with 295 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

279
hardware/hantek-dso/api.c
View File

@ -144,15 +144,17 @@ static const char *coupling[] = {
NULL, NULL,
}; };
SR_PRIV libusb_context *usb_context = NULL;
SR_PRIV struct sr_dev_driver hantek_dso_driver_info; SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
static struct sr_dev_driver *hdi = &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) static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct sr_probe *probe; struct sr_probe *probe;
struct context *ctx; struct drv_context *drvc;
struct dev_context *devc;
int i; int i;
sdi = sr_dev_inst_new(index, SR_ST_INITIALIZING, sdi = sr_dev_inst_new(index, SR_ST_INITIALIZING,
@ -171,44 +173,45 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
sdi->probes = g_slist_append(sdi->probes, probe); sdi->probes = g_slist_append(sdi->probes, probe);
} }
if (!(ctx = g_try_malloc0(sizeof(struct context)))) { if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
sr_err("hantek-dso: ctx malloc failed"); sr_err("hantek-dso: devc malloc failed");
return NULL; return NULL;
} }
ctx->profile = prof; devc->profile = prof;
ctx->dev_state = IDLE; devc->dev_state = IDLE;
ctx->timebase = DEFAULT_TIMEBASE; devc->timebase = DEFAULT_TIMEBASE;
ctx->ch1_enabled = TRUE; devc->ch1_enabled = TRUE;
ctx->ch2_enabled = TRUE; devc->ch2_enabled = TRUE;
ctx->voltage_ch1 = DEFAULT_VOLTAGE; devc->voltage_ch1 = DEFAULT_VOLTAGE;
ctx->voltage_ch2 = DEFAULT_VOLTAGE; devc->voltage_ch2 = DEFAULT_VOLTAGE;
ctx->coupling_ch1 = DEFAULT_COUPLING; devc->coupling_ch1 = DEFAULT_COUPLING;
ctx->coupling_ch2 = DEFAULT_COUPLING; devc->coupling_ch2 = DEFAULT_COUPLING;
ctx->voffset_ch1 = DEFAULT_VERT_OFFSET; devc->voffset_ch1 = DEFAULT_VERT_OFFSET;
ctx->voffset_ch2 = DEFAULT_VERT_OFFSET; devc->voffset_ch2 = DEFAULT_VERT_OFFSET;
ctx->voffset_trigger = DEFAULT_VERT_TRIGGERPOS; devc->voffset_trigger = DEFAULT_VERT_TRIGGERPOS;
ctx->framesize = DEFAULT_FRAMESIZE; devc->framesize = DEFAULT_FRAMESIZE;
ctx->triggerslope = SLOPE_POSITIVE; devc->triggerslope = SLOPE_POSITIVE;
ctx->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE); devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
ctx->triggerposition = DEFAULT_HORIZ_TRIGGERPOS; devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
sdi->priv = ctx; sdi->priv = devc;
hdi->instances = g_slist_append(hdi->instances, sdi); drvc = hdi->priv;
drvc->instances = g_slist_append(drvc->instances, sdi);
return sdi; return sdi;
} }
static int configure_probes(struct context *ctx, const GSList *probes) static int configure_probes(struct dev_context *devc, const GSList *probes)
{ {
const struct sr_probe *probe; const struct sr_probe *probe;
const GSList *l; const GSList *l;
ctx->ch1_enabled = ctx->ch2_enabled = FALSE; devc->ch1_enabled = devc->ch2_enabled = FALSE;
for (l = probes; l; l = l->next) { for (l = probes; l; l = l->next) {
probe = (struct sr_probe *)l->data; probe = (struct sr_probe *)l->data;
if (probe->index == 0) if (probe->index == 0)
ctx->ch1_enabled = probe->enabled; devc->ch1_enabled = probe->enabled;
else if (probe->index == 1) else if (probe->index == 1)
ctx->ch2_enabled = probe->enabled; devc->ch2_enabled = probe->enabled;
} }
return SR_OK; return SR_OK;
@ -218,40 +221,51 @@ static int configure_probes(struct context *ctx, const GSList *probes)
static void clear_instances(void) static void clear_instances(void)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct drv_context *drvc;
struct dev_context *devc;
GSList *l; 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)) { if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */ /* Log error, but continue cleaning up the rest. */
sr_err("hantek-dso: %s: sdi was NULL, continuing", __func__); sr_err("hantek-dso: %s: sdi was NULL, continuing", __func__);
continue; continue;
} }
if (!(ctx = sdi->priv)) { if (!(devc = sdi->priv)) {
/* Log error, but continue cleaning up the rest. */ /* Log error, but continue cleaning up the rest. */
sr_err("hantek-dso: %s: sdi->priv was NULL, continuing", __func__); sr_err("hantek-dso: %s: sdi->priv was NULL, continuing", __func__);
continue; continue;
} }
dso_close(sdi); dso_close(sdi);
sr_usb_dev_inst_free(ctx->usb); sr_usb_dev_inst_free(devc->usb);
g_free(ctx->triggersource); g_free(devc->triggersource);
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);
} }
g_slist_free(hdi->instances); g_slist_free(drvc->instances);
hdi->instances = NULL; drvc->instances = NULL;
} }
static int hw_init(void) 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(&drvc->usb_context) != 0) {
g_free(drvc);
sr_err("hantek-dso: Failed to initialize USB."); sr_err("hantek-dso: Failed to initialize USB.");
return SR_ERR; return SR_ERR;
} }
hdi->priv = drvc;
return SR_OK; return SR_OK;
} }
@ -259,7 +273,8 @@ static GSList *hw_scan(GSList *options)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
const struct dso_profile *prof; const struct dso_profile *prof;
struct context *ctx; struct drv_context *drvc;
struct dev_context *devc;
GSList *devices; GSList *devices;
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
libusb_device **devlist; libusb_device **devlist;
@ -268,12 +283,13 @@ static GSList *hw_scan(GSList *options)
(void)options; (void)options;
devcnt = 0; devcnt = 0;
devices = 0; devices = 0;
hdi->instances = NULL; drvc = hdi->priv;
drvc->instances = NULL;
clear_instances(); clear_instances();
/* Find all Hantek DSO devices and upload firmware to all of them. */ /* Find all Hantek DSO devices and upload firmware to all of them. */
libusb_get_device_list(usb_context, &devlist); libusb_get_device_list(drvc->usb_context, &devlist);
for (i = 0; devlist[i]; i++) { for (i = 0; devlist[i]; i++) {
if ((ret = libusb_get_device_descriptor(devlist[i], &des))) { if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
sr_err("hantek-dso: failed to get device descriptor: %d", ret); sr_err("hantek-dso: failed to get device descriptor: %d", ret);
@ -289,16 +305,16 @@ static GSList *hw_scan(GSList *options)
sr_dbg("hantek-dso: Found a %s %s.", prof->vendor, prof->model); sr_dbg("hantek-dso: Found a %s %s.", prof->vendor, prof->model);
sdi = dso_dev_new(devcnt, prof); sdi = dso_dev_new(devcnt, prof);
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
ctx = sdi->priv; devc = sdi->priv;
if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
prof->firmware) == SR_OK) prof->firmware) == SR_OK)
/* Remember when the firmware on this device was updated */ /* Remember when the firmware on this device was updated */
ctx->fw_updated = g_get_monotonic_time(); devc->fw_updated = g_get_monotonic_time();
else else
sr_err("hantek-dso: firmware upload failed for " sr_err("hantek-dso: firmware upload failed for "
"device %d", devcnt); "device %d", devcnt);
/* Dummy USB address of 0xff will get overwritten later. */ /* 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); libusb_get_bus_number(devlist[i]), 0xff, NULL);
devcnt++; devcnt++;
break; break;
@ -310,8 +326,8 @@ static GSList *hw_scan(GSList *options)
sdi = dso_dev_new(devcnt, prof); sdi = dso_dev_new(devcnt, prof);
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
ctx = sdi->priv; devc = sdi->priv;
ctx->usb = sr_usb_dev_inst_new( devc->usb = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]), libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL); libusb_get_device_address(devlist[i]), NULL);
devcnt++; devcnt++;
@ -329,18 +345,18 @@ static GSList *hw_scan(GSList *options)
static int hw_dev_open(struct sr_dev_inst *sdi) static int hw_dev_open(struct sr_dev_inst *sdi)
{ {
struct context *ctx; struct dev_context *devc;
int64_t timediff_us, timediff_ms; int64_t timediff_us, timediff_ms;
int err; int err;
ctx = sdi->priv; devc = sdi->priv;
/* /*
* if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
* for the FX2 to renumerate * for the FX2 to renumerate
*/ */
err = SR_ERR; err = SR_ERR;
if (ctx->fw_updated > 0) { if (devc->fw_updated > 0) {
sr_info("hantek-dso: waiting for device to reset"); sr_info("hantek-dso: waiting for device to reset");
/* takes at least 300ms for the FX2 to be gone from the USB bus */ /* takes at least 300ms for the FX2 to be gone from the USB bus */
g_usleep(300 * 1000); g_usleep(300 * 1000);
@ -349,7 +365,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
if ((err = dso_open(sdi)) == SR_OK) if ((err = dso_open(sdi)) == SR_OK)
break; break;
g_usleep(100 * 1000); 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; timediff_ms = timediff_us / 1000;
sr_spew("hantek-dso: waited %" PRIi64 " ms", timediff_ms); sr_spew("hantek-dso: waited %" PRIi64 " ms", timediff_ms);
} }
@ -363,7 +379,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
} }
err = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE); err = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
if (err != 0) { if (err != 0) {
sr_err("hantek-dso: Unable to claim interface: %d", err); sr_err("hantek-dso: Unable to claim interface: %d", err);
return SR_ERR; return SR_ERR;
@ -382,12 +398,16 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
static int hw_cleanup(void) static int hw_cleanup(void)
{ {
struct drv_context *drvc;
if (!(drvc = hdi->priv))
return SR_OK;
clear_instances(); clear_instances();
if (usb_context) if (drvc->usb_context)
libusb_exit(usb_context); libusb_exit(drvc->usb_context);
usb_context = NULL; drvc->usb_context = NULL;
return SR_OK; return SR_OK;
} }
@ -441,7 +461,7 @@ static int hw_info_get(int info_id, const void **data,
static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
const void *value) const void *value)
{ {
struct context *ctx; struct dev_context *devc;
struct sr_rational tmp_rat; struct sr_rational tmp_rat;
float tmp_float; float tmp_float;
uint64_t tmp_u64; uint64_t tmp_u64;
@ -452,19 +472,19 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
return SR_ERR; return SR_ERR;
ret = SR_OK; ret = SR_OK;
ctx = sdi->priv; devc = sdi->priv;
switch (hwcap) { switch (hwcap) {
case SR_HWCAP_LIMIT_FRAMES: case SR_HWCAP_LIMIT_FRAMES:
ctx->limit_frames = *(const uint64_t *)value; devc->limit_frames = *(const uint64_t *)value;
break; break;
case SR_HWCAP_PROBECONFIG: case SR_HWCAP_PROBECONFIG:
ret = configure_probes(ctx, (const GSList *)value); ret = configure_probes(devc, (const GSList *)value);
break; break;
case SR_HWCAP_TRIGGER_SLOPE: case SR_HWCAP_TRIGGER_SLOPE:
tmp_u64 = *(const int *)value; tmp_u64 = *(const int *)value;
if (tmp_u64 != SLOPE_NEGATIVE && tmp_u64 != SLOPE_POSITIVE) if (tmp_u64 != SLOPE_NEGATIVE && tmp_u64 != SLOPE_POSITIVE)
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
ctx->triggerslope = tmp_u64; devc->triggerslope = tmp_u64;
break; break;
case SR_HWCAP_HORIZ_TRIGGERPOS: case SR_HWCAP_HORIZ_TRIGGERPOS:
tmp_float = *(const float *)value; tmp_float = *(const float *)value;
@ -472,13 +492,13 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
sr_err("hantek-dso: trigger position should be between 0.0 and 1.0"); sr_err("hantek-dso: trigger position should be between 0.0 and 1.0");
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
} else } else
ctx->triggerposition = tmp_float; devc->triggerposition = tmp_float;
break; break;
case SR_HWCAP_BUFFERSIZE: case SR_HWCAP_BUFFERSIZE:
tmp_u64 = *(const int *)value; tmp_u64 = *(const int *)value;
for (i = 0; buffersizes[i]; i++) { for (i = 0; buffersizes[i]; i++) {
if (buffersizes[i] == tmp_u64) { if (buffersizes[i] == tmp_u64) {
ctx->framesize = tmp_u64; devc->framesize = tmp_u64;
break; break;
} }
} }
@ -490,7 +510,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
for (i = 0; timebases[i].p && timebases[i].q; i++) { for (i = 0; timebases[i].p && timebases[i].q; i++) {
if (timebases[i].p == tmp_rat.p if (timebases[i].p == tmp_rat.p
&& timebases[i].q == tmp_rat.q) { && timebases[i].q == tmp_rat.q) {
ctx->timebase = i; devc->timebase = i;
break; break;
} }
} }
@ -500,7 +520,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
case SR_HWCAP_TRIGGER_SOURCE: case SR_HWCAP_TRIGGER_SOURCE:
for (i = 0; trigger_sources[i]; i++) { for (i = 0; trigger_sources[i]; i++) {
if (!strcmp(value, trigger_sources[i])) { if (!strcmp(value, trigger_sources[i])) {
ctx->triggersource = g_strdup(value); devc->triggersource = g_strdup(value);
break; break;
} }
} }
@ -508,18 +528,18 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
break; break;
case SR_HWCAP_FILTER: 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); targets = g_strsplit(value, ",", 0);
for (i = 0; targets[i]; i++) { for (i = 0; targets[i]; i++) {
if (targets[i] == '\0') if (targets[i] == '\0')
/* Empty filter string can be used to clear them all. */ /* Empty filter string can be used to clear them all. */
; ;
else if (!strcmp(targets[i], "CH1")) else if (!strcmp(targets[i], "CH1"))
ctx->filter_ch1 = TRUE; devc->filter_ch1 = TRUE;
else if (!strcmp(targets[i], "CH2")) else if (!strcmp(targets[i], "CH2"))
ctx->filter_ch2 = TRUE; devc->filter_ch2 = TRUE;
else if (!strcmp(targets[i], "TRIGGER")) else if (!strcmp(targets[i], "TRIGGER"))
ctx->filter_trigger = TRUE; devc->filter_trigger = TRUE;
else { else {
sr_err("invalid filter target %s", targets[i]); sr_err("invalid filter target %s", targets[i]);
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
@ -533,8 +553,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
for (i = 0; vdivs[i].p && vdivs[i].q; i++) { for (i = 0; vdivs[i].p && vdivs[i].q; i++) {
if (vdivs[i].p == tmp_rat.p if (vdivs[i].p == tmp_rat.p
&& vdivs[i].q == tmp_rat.q) { && vdivs[i].q == tmp_rat.q) {
ctx->voltage_ch1 = i; devc->voltage_ch1 = i;
ctx->voltage_ch2 = i; devc->voltage_ch2 = i;
break; break;
} }
} }
@ -545,8 +565,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
/* TODO not supporting coupling per channel yet */ /* TODO not supporting coupling per channel yet */
for (i = 0; coupling[i]; i++) { for (i = 0; coupling[i]; i++) {
if (!strcmp(value, coupling[i])) { if (!strcmp(value, coupling[i])) {
ctx->coupling_ch1 = i; devc->coupling_ch1 = i;
ctx->coupling_ch2 = i; devc->coupling_ch2 = i;
break; break;
} }
} }
@ -560,7 +580,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
return ret; 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) int num_samples)
{ {
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
@ -568,7 +588,7 @@ static void send_chunk(struct context *ctx, unsigned char *buf,
float ch1, ch2, range; float ch1, ch2, range;
int num_probes, data_offset, i; 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.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
/* TODO: support for 5xxx series 9-bit samples */ /* TODO: support for 5xxx series 9-bit samples */
@ -588,21 +608,21 @@ static void send_chunk(struct context *ctx, unsigned char *buf,
* 4V peak-to-peak where 0 = -2V and 255 = +2V. * 4V peak-to-peak where 0 = -2V and 255 = +2V.
*/ */
/* TODO: support for 5xxx series 9-bit samples */ /* TODO: support for 5xxx series 9-bit samples */
if (ctx->ch1_enabled) { if (devc->ch1_enabled) {
range = ((float)vdivs[ctx->voltage_ch1].p / vdivs[ctx->voltage_ch1].q) * 8; range = ((float)vdivs[devc->voltage_ch1].p / vdivs[devc->voltage_ch1].q) * 8;
ch1 = range / 255 * *(buf + i * 2 + 1); ch1 = range / 255 * *(buf + i * 2 + 1);
/* Value is centered around 0V. */ /* Value is centered around 0V. */
ch1 -= range / 2; ch1 -= range / 2;
analog.data[data_offset++] = ch1; analog.data[data_offset++] = ch1;
} }
if (ctx->ch2_enabled) { if (devc->ch2_enabled) {
range = ((float)vdivs[ctx->voltage_ch2].p / vdivs[ctx->voltage_ch2].q) * 8; range = ((float)vdivs[devc->voltage_ch2].p / vdivs[devc->voltage_ch2].q) * 8;
ch2 = range / 255 * *(buf + i * 2); ch2 = range / 255 * *(buf + i * 2);
ch2 -= range / 2; ch2 -= range / 2;
analog.data[data_offset++] = ch2; analog.data[data_offset++] = ch2;
} }
} }
sr_session_send(ctx->cb_data, &packet); sr_session_send(devc->cb_data, &packet);
} }
@ -614,10 +634,10 @@ static void send_chunk(struct context *ctx, unsigned char *buf,
static void receive_transfer(struct libusb_transfer *transfer) static void receive_transfer(struct libusb_transfer *transfer)
{ {
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct context *ctx; struct dev_context *devc;
int num_samples, pre; int num_samples, pre;
ctx = transfer->user_data; devc = transfer->user_data;
sr_dbg("hantek-dso: receive_transfer(): status %d received %d bytes", sr_dbg("hantek-dso: receive_transfer(): status %d received %d bytes",
transfer->status, transfer->actual_length); transfer->status, transfer->actual_length);
@ -627,8 +647,8 @@ static void receive_transfer(struct libusb_transfer *transfer)
num_samples = transfer->actual_length / 2; num_samples = transfer->actual_length / 2;
sr_dbg("hantek-dso: got %d-%d/%d samples in frame", ctx->samp_received + 1, sr_dbg("hantek-dso: got %d-%d/%d samples in frame", devc->samp_received + 1,
ctx->samp_received + num_samples, ctx->framesize); 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 * doesn't represent the trigger point. The offset at which the trigger
@ -637,63 +657,63 @@ static void receive_transfer(struct libusb_transfer *transfer)
* that trigger point came after the end of the device's frame buffer was * 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. * 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. */ /* 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. */ /* 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); transfer->buffer, num_samples * 2);
ctx->samp_buffered += num_samples; devc->samp_buffered += num_samples;
} else { } 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 * 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 = ctx->trigger_offset - ctx->samp_received; pre = devc->trigger_offset - devc->samp_received;
memcpy(ctx->framebuf + ctx->samp_buffered * 2, memcpy(devc->framebuf + devc->samp_buffered * 2,
transfer->buffer, pre * 2); transfer->buffer, pre * 2);
ctx->samp_buffered += pre; devc->samp_buffered += pre;
/* The rest of this chunk starts with the trigger point. */ /* The rest of this chunk starts with the trigger point. */
sr_dbg("hantek-dso: reached trigger point, %d samples buffered", 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 /* Avoid the corner case where the chunk ended at
* exactly the trigger point. */ * exactly the trigger point. */
if (num_samples > pre) if (num_samples > pre)
send_chunk(ctx, transfer->buffer + pre * 2, send_chunk(devc, transfer->buffer + pre * 2,
num_samples - pre); num_samples - pre);
} }
} else { } else {
/* Already past the trigger point, just send it all out. */ /* Already past the trigger point, just send it all out. */
send_chunk(ctx, transfer->buffer, send_chunk(devc, transfer->buffer,
num_samples); num_samples);
} }
ctx->samp_received += num_samples; devc->samp_received += num_samples;
/* Everything in this transfer was either copied to the buffer or /* Everything in this transfer was either copied to the buffer or
* sent to the session bus. */ * sent to the session bus. */
g_free(transfer->buffer); g_free(transfer->buffer);
libusb_free_transfer(transfer); 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 /* That was the last chunk in this frame. Send the buffered
* pre-trigger samples out now, in one big chunk. */ * pre-trigger samples out now, in one big chunk. */
sr_dbg("hantek-dso: end of frame, sending %d pre-trigger buffered samples", sr_dbg("hantek-dso: end of frame, sending %d pre-trigger buffered samples",
ctx->samp_buffered); devc->samp_buffered);
send_chunk(ctx, ctx->framebuf, ctx->samp_buffered); send_chunk(devc, devc->framebuf, devc->samp_buffered);
/* Mark the end of this frame. */ /* Mark the end of this frame. */
packet.type = SR_DF_FRAME_END; 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 */ /* Terminate session */
/* TODO: don't leave pending USB transfers hanging */ /* TODO: don't leave pending USB transfers hanging */
packet.type = SR_DF_END; packet.type = SR_DF_END;
sr_session_send(ctx->cb_data, &packet); sr_session_send(ctx->cb_data, &packet);
} else { } else {
ctx->dev_state = NEW_CAPTURE; devc->dev_state = NEW_CAPTURE;
} }
} }
@ -703,8 +723,9 @@ static int handle_event(int fd, int revents, void *cb_data)
{ {
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct timeval tv; struct timeval tv;
struct context *ctx;
int num_probes; int num_probes;
struct drv_context *drvc;
struct dev_context *devc;
uint32_t trigger_offset; uint32_t trigger_offset;
uint8_t capturestate; uint8_t capturestate;
@ -712,40 +733,43 @@ static int handle_event(int fd, int revents, void *cb_data)
(void)fd; (void)fd;
(void)revents; (void)revents;
drvc = hdi->priv;
sdi = cb_data;
devc = sdi->priv;
/* Always handle pending libusb events. */ /* Always handle pending libusb events. */
tv.tv_sec = tv.tv_usec = 0; tv.tv_sec = tv.tv_usec = 0;
libusb_handle_events_timeout(usb_context, &tv); libusb_handle_events_timeout(drvc->usb_context, &tv);
ctx = cb_data; ctx = cb_data;
/* TODO: ugh */ /* TODO: ugh */
if (ctx->dev_state == NEW_CAPTURE) { if (devc->dev_state == NEW_CAPTURE) {
if (dso_capture_start(ctx) != SR_OK) if (dso_capture_start(devc) != SR_OK)
return TRUE; return TRUE;
if (dso_enable_trigger(ctx) != SR_OK) if (dso_enable_trigger(devc) != SR_OK)
return TRUE; return TRUE;
// if (dso_force_trigger(ctx) != SR_OK) // if (dso_force_trigger(devc) != SR_OK)
// return TRUE; // return TRUE;
sr_dbg("hantek-dso: successfully requested next chunk"); sr_dbg("hantek-dso: successfully requested next chunk");
ctx->dev_state = CAPTURE; devc->dev_state = CAPTURE;
return TRUE; return TRUE;
} }
if (ctx->dev_state != CAPTURE) if (devc->dev_state != CAPTURE)
return TRUE; return TRUE;
if ((dso_get_capturestate(ctx, &capturestate, &trigger_offset)) != SR_OK) if ((dso_get_capturestate(devc, &capturestate, &trigger_offset)) != SR_OK)
return TRUE; return TRUE;
sr_dbg("hantek-dso: capturestate %d", capturestate); sr_dbg("hantek-dso: capturestate %d", capturestate);
sr_dbg("hantek-dso: trigger offset 0x%.6x", trigger_offset); sr_dbg("hantek-dso: trigger offset 0x%.6x", trigger_offset);
switch (capturestate) { switch (capturestate) {
case CAPTURE_EMPTY: case CAPTURE_EMPTY:
if (++ctx->capture_empty_count >= MAX_CAPTURE_EMPTY) { if (++devc->capture_empty_count >= MAX_CAPTURE_EMPTY) {
ctx->capture_empty_count = 0; devc->capture_empty_count = 0;
if (dso_capture_start(ctx) != SR_OK) if (dso_capture_start(devc) != SR_OK)
break; break;
if (dso_enable_trigger(ctx) != SR_OK) if (dso_enable_trigger(devc) != SR_OK)
break; break;
// if (dso_force_trigger(ctx) != SR_OK) // if (dso_force_trigger(devc) != SR_OK)
// break; // break;
sr_dbg("hantek-dso: successfully requested next chunk"); sr_dbg("hantek-dso: successfully requested next chunk");
} }
@ -755,24 +779,24 @@ static int handle_event(int fd, int revents, void *cb_data)
break; break;
case CAPTURE_READY_8BIT: case CAPTURE_READY_8BIT:
/* Remember where in the captured frame the trigger is. */ /* 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; num_probes = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
ctx->framebuf = g_try_malloc(ctx->framesize * num_probes * 2); devc->framebuf = g_try_malloc(devc->framesize * num_probes * 2);
ctx->samp_buffered = ctx->samp_received = 0; devc->samp_buffered = devc->samp_received = 0;
/* Tell the scope to send us the first frame. */ /* 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; 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. * 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. */ /* Tell the frontend a new frame is on the way. */
packet.type = SR_DF_FRAME_BEGIN; packet.type = SR_DF_FRAME_BEGIN;
sr_session_send(cb_data, &packet); sr_session_send(sdi, &packet);
break; break;
case CAPTURE_READY_9BIT: case CAPTURE_READY_9BIT:
/* TODO */ /* TODO */
@ -795,23 +819,25 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_header header; struct sr_datafeed_header header;
struct sr_datafeed_meta_analog meta; struct sr_datafeed_meta_analog meta;
struct context *ctx; struct drv_context *drvc;
struct dev_context *devc;
int i; int i;
drvc = hdi->priv;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR; return SR_ERR;
ctx = sdi->priv; devc = sdi->priv;
ctx->cb_data = cb_data; devc->cb_data = cb_data;
if (dso_init(ctx) != SR_OK) if (dso_init(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if (dso_capture_start(ctx) != SR_OK) if (dso_capture_start(devc) != SR_OK)
return SR_ERR; return SR_ERR;
ctx->dev_state = CAPTURE; devc->dev_state = CAPTURE;
lupfd = libusb_get_pollfds(usb_context); lupfd = libusb_get_pollfds(drvc->usb_context);
for (i = 0; lupfd[i]; i++) for (i = 0; lupfd[i]; i++)
sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK, handle_event, sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK, handle_event,
ctx); ctx);
@ -839,8 +865,9 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
void *cb_data) void *cb_data)
{ {
struct sr_datafeed_packet packet; struct dev_context *devc;
struct context *ctx;
(void)cb_data;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR; return SR_ERR;
@ -867,5 +894,5 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
.dev_config_set = hw_dev_config_set, .dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop, .dev_acquisition_stop = hw_dev_acquisition_stop,
.instances = NULL, .priv = NULL,
}; };

258
hardware/hantek-dso/dso.c
View File

@ -27,11 +27,11 @@
#include <glib.h> #include <glib.h>
#include <libusb.h> #include <libusb.h>
extern libusb_context *usb_context;
extern struct sr_dev_driver hantek_dso_driver_info; extern struct sr_dev_driver hantek_dso_driver_info;
static struct sr_dev_driver *hdi = &hantek_dso_driver_info;
static int send_begin(struct context *ctx) static int send_begin(struct dev_context *devc)
{ {
int ret; int ret;
unsigned char buffer[] = {0x0f, 0x03, 0x03, 0x03, 0x68, 0xac, 0xfe, unsigned char buffer[] = {0x0f, 0x03, 0x03, 0x03, 0x68, 0xac, 0xfe,
@ -39,7 +39,7 @@ static int send_begin(struct context *ctx)
sr_dbg("hantek-dso: sending CTRL_BEGINCOMMAND"); sr_dbg("hantek-dso: sending CTRL_BEGINCOMMAND");
if ((ret = libusb_control_transfer(ctx->usb->devhdl, if ((ret = libusb_control_transfer(devc->usb->devhdl,
LIBUSB_REQUEST_TYPE_VENDOR, CTRL_BEGINCOMMAND, LIBUSB_REQUEST_TYPE_VENDOR, CTRL_BEGINCOMMAND,
0, 0, buffer, sizeof(buffer), 200)) != sizeof(buffer)) { 0, 0, buffer, sizeof(buffer), 200)) != sizeof(buffer)) {
sr_err("failed to send begincommand: %d", ret); sr_err("failed to send begincommand: %d", ret);
@ -49,14 +49,14 @@ static int send_begin(struct context *ctx)
return SR_OK; return SR_OK;
} }
static int send_bulkcmd(struct context *ctx, uint8_t *cmdstring, int cmdlen) static int send_bulkcmd(struct dev_context *devc, uint8_t *cmdstring, int cmdlen)
{ {
int ret, tmp; int ret, tmp;
if (send_begin(ctx) != SR_OK) if (send_begin(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if ((ret = libusb_bulk_transfer(ctx->usb->devhdl, if ((ret = libusb_bulk_transfer(devc->usb->devhdl,
DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
cmdstring, cmdlen, &tmp, 200)) != 0) cmdstring, cmdlen, &tmp, 200)) != 0)
return SR_ERR; return SR_ERR;
@ -108,25 +108,27 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi)
{ {
libusb_device **devlist; libusb_device **devlist;
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
struct context *ctx; struct drv_context *drvc;
struct dev_context *devc;
int err, skip, i; int err, skip, i;
ctx = sdi->priv; drvc = hdi->priv;
devc = sdi->priv;
if (sdi->status == SR_ST_ACTIVE) if (sdi->status == SR_ST_ACTIVE)
/* already in use */ /* already in use */
return SR_ERR; return SR_ERR;
skip = 0; skip = 0;
libusb_get_device_list(usb_context, &devlist); libusb_get_device_list(drvc->usb_context, &devlist);
for (i = 0; devlist[i]; i++) { for (i = 0; devlist[i]; i++) {
if ((err = libusb_get_device_descriptor(devlist[i], &des))) { if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
sr_err("hantek-dso: failed to get device descriptor: %d", err); sr_err("hantek-dso: failed to get device descriptor: %d", err);
continue; continue;
} }
if (des.idVendor != ctx->profile->fw_vid if (des.idVendor != devc->profile->fw_vid
|| des.idProduct != ctx->profile->fw_pid) || des.idProduct != devc->profile->fw_pid)
continue; continue;
if (sdi->status == SR_ST_INITIALIZING) { if (sdi->status == SR_ST_INITIALIZING) {
@ -140,27 +142,27 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi)
* This device is fully enumerated, so we need to find * This device is fully enumerated, so we need to find
* this device by vendor, product, bus and address. * this device by vendor, product, bus and address.
*/ */
if (libusb_get_bus_number(devlist[i]) != ctx->usb->bus if (libusb_get_bus_number(devlist[i]) != devc->usb->bus
|| libusb_get_device_address(devlist[i]) != ctx->usb->address) || libusb_get_device_address(devlist[i]) != devc->usb->address)
/* this is not the one */ /* this is not the one */
continue; continue;
} }
if (!(err = libusb_open(devlist[i], &ctx->usb->devhdl))) { if (!(err = libusb_open(devlist[i], &devc->usb->devhdl))) {
if (ctx->usb->address == 0xff) if (devc->usb->address == 0xff)
/* /*
* first time we touch this device after firmware upload, * first time we touch this device after firmware upload,
* so we don't know the address yet. * so we don't know the address yet.
*/ */
ctx->usb->address = libusb_get_device_address(devlist[i]); devc->usb->address = libusb_get_device_address(devlist[i]);
if(!(ctx->epin_maxpacketsize = dso_getmps(devlist[i]))) if(!(devc->epin_maxpacketsize = dso_getmps(devlist[i])))
sr_err("hantek-dso: wrong endpoint profile"); sr_err("hantek-dso: wrong endpoint profile");
else { else {
sdi->status = SR_ST_ACTIVE; sdi->status = SR_ST_ACTIVE;
sr_info("hantek-dso: opened device %d on %d.%d interface %d", sr_info("hantek-dso: opened device %d on %d.%d interface %d",
sdi->index, ctx->usb->bus, sdi->index, devc->usb->bus,
ctx->usb->address, USB_INTERFACE); devc->usb->address, USB_INTERFACE);
} }
} else { } else {
sr_err("hantek-dso: failed to open device: %d", err); sr_err("hantek-dso: failed to open device: %d", err);
@ -179,35 +181,35 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi)
SR_PRIV void dso_close(struct sr_dev_inst *sdi) SR_PRIV void dso_close(struct sr_dev_inst *sdi)
{ {
struct context *ctx; struct dev_context *devc;
ctx = sdi->priv; devc = sdi->priv;
if (ctx->usb->devhdl == NULL) if (devc->usb->devhdl == NULL)
return; return;
sr_info("hantek-dso: closing device %d on %d.%d interface %d", sdi->index, sr_info("hantek-dso: closing device %d on %d.%d interface %d", sdi->index,
ctx->usb->bus, ctx->usb->address, USB_INTERFACE); devc->usb->bus, devc->usb->address, USB_INTERFACE);
libusb_release_interface(ctx->usb->devhdl, USB_INTERFACE); libusb_release_interface(devc->usb->devhdl, USB_INTERFACE);
libusb_close(ctx->usb->devhdl); libusb_close(devc->usb->devhdl);
ctx->usb->devhdl = NULL; devc->usb->devhdl = NULL;
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
} }
static int get_channel_offsets(struct context *ctx) static int get_channel_offsets(struct dev_context *devc)
{ {
GString *gs; GString *gs;
int chan, v, ret; int chan, v, ret;
sr_dbg("hantek-dso: getting channel offsets"); sr_dbg("hantek-dso: getting channel offsets");
ret = libusb_control_transfer(ctx->usb->devhdl, ret = libusb_control_transfer(devc->usb->devhdl,
LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR, LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR,
CTRL_READ_EEPROM, EEPROM_CHANNEL_OFFSETS, 0, CTRL_READ_EEPROM, EEPROM_CHANNEL_OFFSETS, 0,
(unsigned char *)&ctx->channel_levels, (unsigned char *)&devc->channel_levels,
sizeof(ctx->channel_levels), 200); sizeof(devc->channel_levels), 200);
if (ret != sizeof(ctx->channel_levels)) { if (ret != sizeof(devc->channel_levels)) {
sr_err("failed to get channel offsets: %d", ret); sr_err("failed to get channel offsets: %d", ret);
return SR_ERR; return SR_ERR;
} }
@ -219,8 +221,8 @@ static int get_channel_offsets(struct context *ctx)
*/ */
for (chan = 0; chan < 2; chan++) { for (chan = 0; chan < 2; chan++) {
for (v = 0; v < 9; v++) { for (v = 0; v < 9; v++) {
ctx->channel_levels[chan][v][0] = g_ntohs(ctx->channel_levels[chan][v][0]); devc->channel_levels[chan][v][0] = g_ntohs(devc->channel_levels[chan][v][0]);
ctx->channel_levels[chan][v][1] = g_ntohs(ctx->channel_levels[chan][v][1]); devc->channel_levels[chan][v][1] = g_ntohs(devc->channel_levels[chan][v][1]);
} }
} }
@ -230,8 +232,8 @@ static int get_channel_offsets(struct context *ctx)
g_string_printf(gs, "hantek-dso: CH%d:", chan + 1); g_string_printf(gs, "hantek-dso: CH%d:", chan + 1);
for (v = 0; v < 9; v++) { for (v = 0; v < 9; v++) {
g_string_append_printf(gs, " %.4x-%.4x", g_string_append_printf(gs, " %.4x-%.4x",
ctx->channel_levels[chan][v][0], devc->channel_levels[chan][v][0],
ctx->channel_levels[chan][v][1]); devc->channel_levels[chan][v][1]);
} }
sr_dbg(gs->str); sr_dbg(gs->str);
} }
@ -241,7 +243,7 @@ static int get_channel_offsets(struct context *ctx)
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_set_trigger_samplerate(struct context *ctx) SR_PRIV int dso_set_trigger_samplerate(struct dev_context *devc)
{ {
int ret, tmp; int ret, tmp;
uint8_t cmdstring[12]; uint8_t cmdstring[12];
@ -257,95 +259,95 @@ SR_PRIV int dso_set_trigger_samplerate(struct context *ctx)
cmdstring[0] = CMD_SET_TRIGGER_SAMPLERATE; cmdstring[0] = CMD_SET_TRIGGER_SAMPLERATE;
/* Trigger source */ /* Trigger source */
sr_dbg("hantek-dso: trigger source %s", ctx->triggersource); sr_dbg("hantek-dso: trigger source %s", devc->triggersource);
if (!strcmp("CH2", ctx->triggersource)) if (!strcmp("CH2", devc->triggersource))
tmp = 0; tmp = 0;
else if (!strcmp("CH1", ctx->triggersource)) else if (!strcmp("CH1", devc->triggersource))
tmp = 1; tmp = 1;
else if (!strcmp("EXT", ctx->triggersource)) else if (!strcmp("EXT", devc->triggersource))
tmp = 2; tmp = 2;
else { else {
sr_err("hantek-dso: invalid trigger source %s", ctx->triggersource); sr_err("hantek-dso: invalid trigger source %s", devc->triggersource);
return SR_ERR_ARG; return SR_ERR_ARG;
} }
cmdstring[2] = tmp; cmdstring[2] = tmp;
/* Frame size */ /* Frame size */
sr_dbg("hantek-dso: frame size %d", ctx->framesize); sr_dbg("hantek-dso: frame size %d", devc->framesize);
cmdstring[2] |= (ctx->framesize == FRAMESIZE_SMALL ? 0x01 : 0x02) << 2; cmdstring[2] |= (devc->framesize == FRAMESIZE_SMALL ? 0x01 : 0x02) << 2;
/* Timebase fast */ /* Timebase fast */
sr_dbg("hantek-dso: time base index %d", ctx->timebase); sr_dbg("hantek-dso: time base index %d", devc->timebase);
switch (ctx->framesize) { switch (devc->framesize) {
case FRAMESIZE_SMALL: case FRAMESIZE_SMALL:
if (ctx->timebase < TIME_20us) if (devc->timebase < TIME_20us)
tmp = 0; tmp = 0;
else if (ctx->timebase == TIME_20us) else if (devc->timebase == TIME_20us)
tmp = 1; tmp = 1;
else if (ctx->timebase == TIME_40us) else if (devc->timebase == TIME_40us)
tmp = 2; tmp = 2;
else if (ctx->timebase == TIME_100us) else if (devc->timebase == TIME_100us)
tmp = 3; tmp = 3;
else if (ctx->timebase >= TIME_200us) else if (devc->timebase >= TIME_200us)
tmp = 4; tmp = 4;
break; break;
case FRAMESIZE_LARGE: case FRAMESIZE_LARGE:
if (ctx->timebase < TIME_40us) { if (devc->timebase < TIME_40us) {
sr_err("hantek-dso: timebase < 40us only supported with 10K buffer"); sr_err("hantek-dso: timebase < 40us only supported with 10K buffer");
return SR_ERR_ARG; return SR_ERR_ARG;
} }
else if (ctx->timebase == TIME_40us) else if (devc->timebase == TIME_40us)
tmp = 0; tmp = 0;
else if (ctx->timebase == TIME_100us) else if (devc->timebase == TIME_100us)
tmp = 2; tmp = 2;
else if (ctx->timebase == TIME_200us) else if (devc->timebase == TIME_200us)
tmp = 3; tmp = 3;
else if (ctx->timebase >= TIME_400us) else if (devc->timebase >= TIME_400us)
tmp = 4; tmp = 4;
break; break;
} }
cmdstring[2] |= (tmp & 0x07) << 5; cmdstring[2] |= (tmp & 0x07) << 5;
/* Enabled channels: 00=CH1 01=CH2 10=both */ /* Enabled channels: 00=CH1 01=CH2 10=both */
sr_dbg("hantek-dso: channels CH1=%d CH2=%d", ctx->ch1_enabled, ctx->ch2_enabled); sr_dbg("hantek-dso: channels CH1=%d CH2=%d", devc->ch1_enabled, devc->ch2_enabled);
tmp = (((ctx->ch2_enabled ? 1 : 0) << 1) + (ctx->ch1_enabled ? 1 : 0)) - 1; tmp = (((devc->ch2_enabled ? 1 : 0) << 1) + (devc->ch1_enabled ? 1 : 0)) - 1;
cmdstring[3] = tmp; cmdstring[3] = tmp;
/* Fast rates channel */ /* Fast rates channel */
/* TODO: is this right? */ /* TODO: is this right? */
tmp = ctx->timebase < TIME_10us ? 1 : 0; tmp = devc->timebase < TIME_10us ? 1 : 0;
cmdstring[3] |= tmp << 2; cmdstring[3] |= tmp << 2;
/* Trigger slope: 0=positive 1=negative */ /* Trigger slope: 0=positive 1=negative */
/* TODO: does this work? */ /* TODO: does this work? */
sr_dbg("hantek-dso: trigger slope %d", ctx->triggerslope); sr_dbg("hantek-dso: trigger slope %d", devc->triggerslope);
cmdstring[3] |= (ctx->triggerslope == SLOPE_NEGATIVE ? 1 : 0) << 3; cmdstring[3] |= (devc->triggerslope == SLOPE_NEGATIVE ? 1 : 0) << 3;
/* Timebase slow */ /* Timebase slow */
if (ctx->timebase < TIME_100us) if (devc->timebase < TIME_100us)
tmp = 0; tmp = 0;
else if (ctx->timebase > TIME_400ms) else if (devc->timebase > TIME_400ms)
tmp = 0xffed; tmp = 0xffed;
else { else {
if (ctx->framesize == FRAMESIZE_SMALL) if (devc->framesize == FRAMESIZE_SMALL)
tmp = timebase_small[ctx->timebase - 3]; tmp = timebase_small[devc->timebase - 3];
else else
tmp = timebase_large[ctx->timebase - 3]; tmp = timebase_large[devc->timebase - 3];
} }
cmdstring[4] = tmp & 0xff; cmdstring[4] = tmp & 0xff;
cmdstring[5] = (tmp >> 8) & 0xff; cmdstring[5] = (tmp >> 8) & 0xff;
/* Horizontal trigger position */ /* Horizontal trigger position */
sr_dbg("hantek-dso: trigger position %3.2f", ctx->triggerposition); sr_dbg("hantek-dso: trigger position %3.2f", devc->triggerposition);
tmp = 0x77fff + 0x8000 * ctx->triggerposition; tmp = 0x77fff + 0x8000 * devc->triggerposition;
cmdstring[6] = tmp & 0xff; cmdstring[6] = tmp & 0xff;
cmdstring[7] = (tmp >> 8) & 0xff; cmdstring[7] = (tmp >> 8) & 0xff;
cmdstring[10] = (tmp >> 16) & 0xff; cmdstring[10] = (tmp >> 16) & 0xff;
if (send_begin(ctx) != SR_OK) if (send_begin(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if ((ret = libusb_bulk_transfer(ctx->usb->devhdl, if ((ret = libusb_bulk_transfer(devc->usb->devhdl,
DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
cmdstring, sizeof(cmdstring), cmdstring, sizeof(cmdstring),
&tmp, 100)) != 0) { &tmp, 100)) != 0) {
@ -357,7 +359,7 @@ SR_PRIV int dso_set_trigger_samplerate(struct context *ctx)
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_set_filters(struct context *ctx) SR_PRIV int dso_set_filters(struct dev_context *devc)
{ {
int ret, tmp; int ret, tmp;
uint8_t cmdstring[8]; uint8_t cmdstring[8];
@ -367,24 +369,24 @@ SR_PRIV int dso_set_filters(struct context *ctx)
memset(cmdstring, 0, sizeof(cmdstring)); memset(cmdstring, 0, sizeof(cmdstring));
cmdstring[0] = CMD_SET_FILTERS; cmdstring[0] = CMD_SET_FILTERS;
cmdstring[1] = 0x0f; cmdstring[1] = 0x0f;
if (ctx->filter_ch1) { if (devc->filter_ch1) {
sr_dbg("hantek-dso: turning on CH1 filter"); sr_dbg("hantek-dso: turning on CH1 filter");
cmdstring[2] |= 0x80; cmdstring[2] |= 0x80;
} }
if (ctx->filter_ch2) { if (devc->filter_ch2) {
sr_dbg("hantek-dso: turning on CH2 filter"); sr_dbg("hantek-dso: turning on CH2 filter");
cmdstring[2] |= 0x40; cmdstring[2] |= 0x40;
} }
if (ctx->filter_trigger) { if (devc->filter_trigger) {
/* TODO: supported on the DSO-2090? */ /* TODO: supported on the DSO-2090? */
sr_dbg("hantek-dso: turning on trigger filter"); sr_dbg("hantek-dso: turning on trigger filter");
cmdstring[2] |= 0x20; cmdstring[2] |= 0x20;
} }
if (send_begin(ctx) != SR_OK) if (send_begin(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if ((ret = libusb_bulk_transfer(ctx->usb->devhdl, if ((ret = libusb_bulk_transfer(devc->usb->devhdl,
DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
cmdstring, sizeof(cmdstring), cmdstring, sizeof(cmdstring),
&tmp, 100)) != 0) { &tmp, 100)) != 0) {
@ -396,7 +398,7 @@ SR_PRIV int dso_set_filters(struct context *ctx)
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_set_voltage(struct context *ctx) SR_PRIV int dso_set_voltage(struct dev_context *devc)
{ {
int ret, tmp; int ret, tmp;
uint8_t cmdstring[8]; uint8_t cmdstring[8];
@ -409,8 +411,8 @@ SR_PRIV int dso_set_voltage(struct context *ctx)
cmdstring[2] = 0x30; cmdstring[2] = 0x30;
/* CH1 volts/div is encoded in bits 0-1 */ /* CH1 volts/div is encoded in bits 0-1 */
sr_dbg("hantek-dso: CH1 vdiv index %d", ctx->voltage_ch1); sr_dbg("hantek-dso: CH1 vdiv index %d", devc->voltage_ch1);
switch (ctx->voltage_ch1) { switch (devc->voltage_ch1) {
case VDIV_1V: case VDIV_1V:
case VDIV_100MV: case VDIV_100MV:
case VDIV_10MV: case VDIV_10MV:
@ -429,8 +431,8 @@ SR_PRIV int dso_set_voltage(struct context *ctx)
} }
/* CH2 volts/div is encoded in bits 2-3 */ /* CH2 volts/div is encoded in bits 2-3 */
sr_dbg("hantek-dso: CH2 vdiv index %d", ctx->voltage_ch2); sr_dbg("hantek-dso: CH2 vdiv index %d", devc->voltage_ch2);
switch (ctx->voltage_ch2) { switch (devc->voltage_ch2) {
case VDIV_1V: case VDIV_1V:
case VDIV_100MV: case VDIV_100MV:
case VDIV_10MV: case VDIV_10MV:
@ -448,10 +450,10 @@ SR_PRIV int dso_set_voltage(struct context *ctx)
break; break;
} }
if (send_begin(ctx) != SR_OK) if (send_begin(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if ((ret = libusb_bulk_transfer(ctx->usb->devhdl, if ((ret = libusb_bulk_transfer(devc->usb->devhdl,
DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
cmdstring, sizeof(cmdstring), cmdstring, sizeof(cmdstring),
&tmp, 100)) != 0) { &tmp, 100)) != 0) {
@ -463,7 +465,7 @@ SR_PRIV int dso_set_voltage(struct context *ctx)
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_set_relays(struct context *ctx) SR_PRIV int dso_set_relays(struct dev_context *devc)
{ {
GString *gs; GString *gs;
int ret, i; int ret, i;
@ -472,27 +474,27 @@ SR_PRIV int dso_set_relays(struct context *ctx)
sr_dbg("hantek-dso: preparing CTRL_SETRELAYS"); sr_dbg("hantek-dso: preparing CTRL_SETRELAYS");
if (ctx->voltage_ch1 < VDIV_1V) if (devc->voltage_ch1 < VDIV_1V)
relays[1] = ~relays[1]; relays[1] = ~relays[1];
if (ctx->voltage_ch1 < VDIV_100MV) if (devc->voltage_ch1 < VDIV_100MV)
relays[2] = ~relays[2]; relays[2] = ~relays[2];
sr_dbg("hantek-dso: CH1 coupling %d", ctx->coupling_ch1); sr_dbg("hantek-dso: CH1 coupling %d", devc->coupling_ch1);
if (ctx->coupling_ch1 != COUPLING_AC) if (devc->coupling_ch1 != COUPLING_AC)
relays[3] = ~relays[3]; relays[3] = ~relays[3];
if (ctx->voltage_ch2 < VDIV_1V) if (devc->voltage_ch2 < VDIV_1V)
relays[4] = ~relays[4]; relays[4] = ~relays[4];
if (ctx->voltage_ch2 < VDIV_100MV) if (devc->voltage_ch2 < VDIV_100MV)
relays[5] = ~relays[5]; relays[5] = ~relays[5];
sr_dbg("hantek-dso: CH2 coupling %d", ctx->coupling_ch1); sr_dbg("hantek-dso: CH2 coupling %d", devc->coupling_ch1);
if (ctx->coupling_ch2 != COUPLING_AC) if (devc->coupling_ch2 != COUPLING_AC)
relays[6] = ~relays[6]; relays[6] = ~relays[6];
if (!strcmp(ctx->triggersource, "EXT")) if (!strcmp(devc->triggersource, "EXT"))
relays[7] = ~relays[7]; relays[7] = ~relays[7];
if (sr_log_loglevel_get() >= SR_LOG_DBG) { if (sr_log_loglevel_get() >= SR_LOG_DBG) {
@ -504,7 +506,7 @@ SR_PRIV int dso_set_relays(struct context *ctx)
g_string_free(gs, TRUE); g_string_free(gs, TRUE);
} }
if ((ret = libusb_control_transfer(ctx->usb->devhdl, if ((ret = libusb_control_transfer(devc->usb->devhdl,
LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETRELAYS, LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETRELAYS,
0, 0, relays, 17, 100)) != sizeof(relays)) { 0, 0, relays, 17, 100)) != sizeof(relays)) {
sr_err("failed to set relays: %d", ret); sr_err("failed to set relays: %d", ret);
@ -515,7 +517,7 @@ SR_PRIV int dso_set_relays(struct context *ctx)
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_set_voffsets(struct context *ctx) SR_PRIV int dso_set_voffsets(struct dev_context *devc)
{ {
int offset, ret; int offset, ret;
uint16_t *ch_levels; uint16_t *ch_levels;
@ -525,29 +527,29 @@ SR_PRIV int dso_set_voffsets(struct context *ctx)
memset(offsets, 0, sizeof(offsets)); memset(offsets, 0, sizeof(offsets));
/* Channel 1 */ /* Channel 1 */
ch_levels = ctx->channel_levels[0][ctx->voltage_ch1]; ch_levels = devc->channel_levels[0][devc->voltage_ch1];
offset = (ch_levels[1] - ch_levels[0]) * ctx->voffset_ch1 + ch_levels[0]; offset = (ch_levels[1] - ch_levels[0]) * devc->voffset_ch1 + ch_levels[0];
offsets[0] = (offset >> 8) | 0x20; offsets[0] = (offset >> 8) | 0x20;
offsets[1] = offset & 0xff; offsets[1] = offset & 0xff;
sr_dbg("hantek-dso: CH1 offset %3.2f (%.2x%.2x)", ctx->voffset_ch1, sr_dbg("hantek-dso: CH1 offset %3.2f (%.2x%.2x)", devc->voffset_ch1,
offsets[0], offsets[1]); offsets[0], offsets[1]);
/* Channel 2 */ /* Channel 2 */
ch_levels = ctx->channel_levels[1][ctx->voltage_ch2]; ch_levels = devc->channel_levels[1][devc->voltage_ch2];
offset = (ch_levels[1] - ch_levels[0]) * ctx->voffset_ch2 + ch_levels[0]; offset = (ch_levels[1] - ch_levels[0]) * devc->voffset_ch2 + ch_levels[0];
offsets[2] = (offset >> 8) | 0x20; offsets[2] = (offset >> 8) | 0x20;
offsets[3] = offset & 0xff; offsets[3] = offset & 0xff;
sr_dbg("hantek-dso: CH2 offset %3.2f (%.2x%.2x)", ctx->voffset_ch2, sr_dbg("hantek-dso: CH2 offset %3.2f (%.2x%.2x)", devc->voffset_ch2,
offsets[2], offsets[3]); offsets[2], offsets[3]);
/* Trigger */ /* Trigger */
offset = MAX_VERT_TRIGGER * ctx->voffset_trigger; offset = MAX_VERT_TRIGGER * devc->voffset_trigger;
offsets[4] = (offset >> 8) | 0x20; offsets[4] = (offset >> 8) | 0x20;
offsets[5] = offset & 0xff; offsets[5] = offset & 0xff;
sr_dbg("hantek-dso: trigger offset %3.2f (%.2x%.2x)", ctx->voffset_trigger, sr_dbg("hantek-dso: trigger offset %3.2f (%.2x%.2x)", devc->voffset_trigger,
offsets[4], offsets[5]); offsets[4], offsets[5]);
if ((ret = libusb_control_transfer(ctx->usb->devhdl, if ((ret = libusb_control_transfer(devc->usb->devhdl,
LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETOFFSET, LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETOFFSET,
0, 0, offsets, sizeof(offsets), 100)) != sizeof(offsets)) { 0, 0, offsets, sizeof(offsets), 100)) != sizeof(offsets)) {
sr_err("failed to set offsets: %d", ret); sr_err("failed to set offsets: %d", ret);
@ -558,7 +560,7 @@ SR_PRIV int dso_set_voffsets(struct context *ctx)
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_enable_trigger(struct context *ctx) SR_PRIV int dso_enable_trigger(struct dev_context *devc)
{ {
int ret, tmp; int ret, tmp;
uint8_t cmdstring[2]; uint8_t cmdstring[2];
@ -569,10 +571,10 @@ SR_PRIV int dso_enable_trigger(struct context *ctx)
cmdstring[0] = CMD_ENABLE_TRIGGER; cmdstring[0] = CMD_ENABLE_TRIGGER;
cmdstring[1] = 0x00; cmdstring[1] = 0x00;
if (send_begin(ctx) != SR_OK) if (send_begin(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if ((ret = libusb_bulk_transfer(ctx->usb->devhdl, if ((ret = libusb_bulk_transfer(devc->usb->devhdl,
DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
cmdstring, sizeof(cmdstring), cmdstring, sizeof(cmdstring),
&tmp, 100)) != 0) { &tmp, 100)) != 0) {
@ -583,7 +585,7 @@ SR_PRIV int dso_enable_trigger(struct context *ctx)
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_force_trigger(struct context *ctx) SR_PRIV int dso_force_trigger(struct dev_context *devc)
{ {
int ret, tmp; int ret, tmp;
uint8_t cmdstring[2]; uint8_t cmdstring[2];
@ -594,10 +596,10 @@ SR_PRIV int dso_force_trigger(struct context *ctx)
cmdstring[0] = CMD_FORCE_TRIGGER; cmdstring[0] = CMD_FORCE_TRIGGER;
cmdstring[1] = 0x00; cmdstring[1] = 0x00;
if (send_begin(ctx) != SR_OK) if (send_begin(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if ((ret = libusb_bulk_transfer(ctx->usb->devhdl, if ((ret = libusb_bulk_transfer(devc->usb->devhdl,
DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
cmdstring, sizeof(cmdstring), cmdstring, sizeof(cmdstring),
&tmp, 100)) != 0) { &tmp, 100)) != 0) {
@ -608,36 +610,36 @@ SR_PRIV int dso_force_trigger(struct context *ctx)
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_init(struct context *ctx) SR_PRIV int dso_init(struct dev_context *devc)
{ {
sr_dbg("hantek-dso: initializing dso"); sr_dbg("hantek-dso: initializing dso");
if (get_channel_offsets(ctx) != SR_OK) if (get_channel_offsets(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if (dso_set_trigger_samplerate(ctx) != SR_OK) if (dso_set_trigger_samplerate(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if (dso_set_filters(ctx) != SR_OK) if (dso_set_filters(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if (dso_set_voltage(ctx) != SR_OK) if (dso_set_voltage(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if (dso_set_relays(ctx) != SR_OK) if (dso_set_relays(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if (dso_set_voffsets(ctx) != SR_OK) if (dso_set_voffsets(devc) != SR_OK)
return SR_ERR; return SR_ERR;
if (dso_enable_trigger(ctx) != SR_OK) if (dso_enable_trigger(devc) != SR_OK)
return SR_ERR; return SR_ERR;
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_get_capturestate(struct context *ctx, uint8_t *capturestate, SR_PRIV int dso_get_capturestate(struct dev_context *devc, uint8_t *capturestate,
uint32_t *trigger_offset) uint32_t *trigger_offset)
{ {
int ret, tmp, i; int ret, tmp, i;
@ -649,12 +651,12 @@ SR_PRIV int dso_get_capturestate(struct context *ctx, uint8_t *capturestate,
cmdstring[0] = CMD_GET_CAPTURESTATE; cmdstring[0] = CMD_GET_CAPTURESTATE;
cmdstring[1] = 0; cmdstring[1] = 0;
if ((ret = send_bulkcmd(ctx, cmdstring, sizeof(cmdstring))) != SR_OK) { if ((ret = send_bulkcmd(devc, cmdstring, sizeof(cmdstring))) != SR_OK) {
sr_dbg("Failed to send get_capturestate command: %d", ret); sr_dbg("Failed to send get_capturestate command: %d", ret);
return SR_ERR; return SR_ERR;
} }
if ((ret = libusb_bulk_transfer(ctx->usb->devhdl, if ((ret = libusb_bulk_transfer(devc->usb->devhdl,
DSO_EP_IN | LIBUSB_ENDPOINT_IN, DSO_EP_IN | LIBUSB_ENDPOINT_IN,
inbuf, 512, &tmp, 100)) != 0) { inbuf, 512, &tmp, 100)) != 0) {
sr_dbg("Failed to get capturestate: %d", ret); sr_dbg("Failed to get capturestate: %d", ret);
@ -679,7 +681,7 @@ SR_PRIV int dso_get_capturestate(struct context *ctx, uint8_t *capturestate,
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_capture_start(struct context *ctx) SR_PRIV int dso_capture_start(struct dev_context *devc)
{ {
int ret; int ret;
uint8_t cmdstring[2]; uint8_t cmdstring[2];
@ -689,7 +691,7 @@ SR_PRIV int dso_capture_start(struct context *ctx)
cmdstring[0] = CMD_CAPTURE_START; cmdstring[0] = CMD_CAPTURE_START;
cmdstring[1] = 0; cmdstring[1] = 0;
if ((ret = send_bulkcmd(ctx, cmdstring, sizeof(cmdstring))) != SR_OK) { if ((ret = send_bulkcmd(devc, cmdstring, sizeof(cmdstring))) != SR_OK) {
sr_err("Failed to send capture_start command: %d", ret); sr_err("Failed to send capture_start command: %d", ret);
return SR_ERR; return SR_ERR;
} }
@ -697,7 +699,7 @@ SR_PRIV int dso_capture_start(struct context *ctx)
return SR_OK; return SR_OK;
} }
SR_PRIV int dso_get_channeldata(struct context *ctx, libusb_transfer_cb_fn cb) SR_PRIV int dso_get_channeldata(struct dev_context *devc, libusb_transfer_cb_fn cb)
{ {
struct libusb_transfer *transfer; struct libusb_transfer *transfer;
int num_transfers, ret, i; int num_transfers, ret, i;
@ -709,23 +711,23 @@ SR_PRIV int dso_get_channeldata(struct context *ctx, libusb_transfer_cb_fn cb)
cmdstring[0] = CMD_GET_CHANNELDATA; cmdstring[0] = CMD_GET_CHANNELDATA;
cmdstring[1] = 0; cmdstring[1] = 0;
if ((ret = send_bulkcmd(ctx, cmdstring, sizeof(cmdstring))) != SR_OK) { if ((ret = send_bulkcmd(devc, cmdstring, sizeof(cmdstring))) != SR_OK) {
sr_err("Failed to get channel data: %d", ret); sr_err("Failed to get channel data: %d", ret);
return SR_ERR; return SR_ERR;
} }
/* TODO: dso-2xxx only */ /* TODO: dso-2xxx only */
num_transfers = ctx->framesize * sizeof(unsigned short) / ctx->epin_maxpacketsize; num_transfers = devc->framesize * sizeof(unsigned short) / devc->epin_maxpacketsize;
sr_dbg("hantek-dso: queueing up %d transfers", num_transfers); sr_dbg("hantek-dso: queueing up %d transfers", num_transfers);
for (i = 0; i < num_transfers; i++) { for (i = 0; i < num_transfers; i++) {
if (!(buf = g_try_malloc(ctx->epin_maxpacketsize))) { if (!(buf = g_try_malloc(devc->epin_maxpacketsize))) {
sr_err("hantek-dso: %s: buf malloc failed", __func__); sr_err("hantek-dso: %s: buf malloc failed", __func__);
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
} }
transfer = libusb_alloc_transfer(0); transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, ctx->usb->devhdl, libusb_fill_bulk_transfer(transfer, devc->usb->devhdl,
DSO_EP_IN | LIBUSB_ENDPOINT_IN, buf, DSO_EP_IN | LIBUSB_ENDPOINT_IN, buf,
ctx->epin_maxpacketsize, cb, ctx, 40); devc->epin_maxpacketsize, cb, devc, 40);
if ((ret = libusb_submit_transfer(transfer)) != 0) { if ((ret = libusb_submit_transfer(transfer)) != 0) {
sr_err("failed to submit transfer: %d", ret); sr_err("failed to submit transfer: %d", ret);
/* TODO: Free them all. */ /* TODO: Free them all. */

19
hardware/hantek-dso/dso.h
View File

@ -158,7 +158,12 @@ struct dso_profile {
char *firmware; char *firmware;
}; };
struct context { struct drv_context {
libusb_context *usb_context;
GSList *instances;
};
struct dev_context {
const struct dso_profile *profile; const struct dso_profile *profile;
struct sr_usb_dev_inst *usb; struct sr_usb_dev_inst *usb;
void *cb_data; void *cb_data;
@ -205,12 +210,12 @@ struct context {
SR_PRIV int dso_open(struct sr_dev_inst *sdi); SR_PRIV int dso_open(struct sr_dev_inst *sdi);
SR_PRIV void dso_close(struct sr_dev_inst *sdi); SR_PRIV void dso_close(struct sr_dev_inst *sdi);
SR_PRIV int dso_enable_trigger(struct context *ctx); SR_PRIV int dso_enable_trigger(struct dev_context *devc);
SR_PRIV int dso_force_trigger(struct context *ctx); SR_PRIV int dso_force_trigger(struct dev_context *devc);
SR_PRIV int dso_init(struct context *ctx); SR_PRIV int dso_init(struct dev_context *devc);
SR_PRIV int dso_get_capturestate(struct context *ctx, uint8_t *capturestate, SR_PRIV int dso_get_capturestate(struct dev_context *devc, uint8_t *capturestate,
uint32_t *trigger_offset); uint32_t *trigger_offset);
SR_PRIV int dso_capture_start(struct context *ctx); SR_PRIV int dso_capture_start(struct dev_context *devc);
SR_PRIV int dso_get_channeldata(struct context *ctx, libusb_transfer_cb_fn cb); SR_PRIV int dso_get_channeldata(struct dev_context *devc, libusb_transfer_cb_fn cb);
#endif #endif