X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=bfad5f7135f07750901e04a9fda5eb4fe1a87fbd;hp=160dbb4d52e777069807db97b30719583499b63b;hb=HEAD;hpb=c442ffda0fc6fa9bc3c5397a21ef1d04f01a64a1
diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 160dbb4d..bfad5f71 100644
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -17,6 +17,8 @@
* along with this program. If not, see .
*/
+#include
+#include
#include
#include
#include
@@ -29,16 +31,16 @@
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
-#include "dso.h"
+#include "protocol.h"
/* Max time in ms before we want to check on USB events */
/* TODO tune this properly */
#define TICK 1
-#define NUM_TIMEBASE 10
-#define NUM_VDIV 8
+#define NUM_TIMEBASE 10
+#define NUM_VDIV 8
#define NUM_BUFFER_SIZES 2
@@ -51,22 +53,24 @@ static const uint32_t drvopts[] = {
};
static const uint32_t devopts[] = {
- SR_CONF_CONTINUOUS | SR_CONF_SET,
- SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
+ SR_CONF_CONTINUOUS,
SR_CONF_CONN | SR_CONF_GET,
+ SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
- SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_NUM_HDIV | SR_CONF_GET,
+ SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_NUM_HDIV | SR_CONF_GET,
+ SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_NUM_VDIV | SR_CONF_GET,
+ SR_CONF_TRIGGER_LEVEL | SR_CONF_GET | SR_CONF_SET,
};
static const uint32_t devopts_cg[] = {
- SR_CONF_FILTER | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_FILTER | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
static const char *channel_names[] = {
@@ -87,24 +91,24 @@ static const struct dso_profile dev_profiles[] = {
{ 0x04b4, 0x2090, 0x04b5, 0x2090,
"Hantek", "DSO-2090",
buffersizes_32k,
- FIRMWARE_DIR "/hantek-dso-2090.fw" },
+ "hantek-dso-2090.fw" },
{ 0x04b4, 0x2150, 0x04b5, 0x2150,
"Hantek", "DSO-2150",
buffersizes_32k,
- FIRMWARE_DIR "/hantek-dso-2150.fw" },
+ "hantek-dso-2150.fw" },
{ 0x04b4, 0x2250, 0x04b5, 0x2250,
"Hantek", "DSO-2250",
buffersizes_512k,
- FIRMWARE_DIR "/hantek-dso-2250.fw" },
+ "hantek-dso-2250.fw" },
{ 0x04b4, 0x5200, 0x04b5, 0x5200,
"Hantek", "DSO-5200",
buffersizes_14k,
- FIRMWARE_DIR "/hantek-dso-5200.fw" },
+ "hantek-dso-5200.fw" },
{ 0x04b4, 0x520a, 0x04b5, 0x520a,
"Hantek", "DSO-5200A",
buffersizes_512k,
- FIRMWARE_DIR "/hantek-dso-5200A.fw" },
- { 0, 0, 0, 0, 0, 0, 0, 0 },
+ "hantek-dso-5200A.fw" },
+ ALL_ZERO
};
static const uint64_t timebases[][2] = {
@@ -127,6 +131,28 @@ static const uint64_t timebases[][2] = {
{ 400, 1000 },
};
+static const uint64_t samplerates[] = {
+ SR_KHZ(20),
+ SR_KHZ(25),
+ SR_KHZ(50),
+ SR_KHZ(100),
+ SR_KHZ(200),
+ SR_KHZ(250),
+ SR_KHZ(500),
+ SR_MHZ(1),
+ SR_MHZ(2),
+ SR_MHZ(5),
+ SR_MHZ(10),
+ SR_MHZ(20),
+ SR_MHZ(25),
+ SR_MHZ(50),
+ SR_MHZ(100),
+ SR_MHZ(125),
+ /* Fast mode not supported yet.
+ SR_MHZ(200),
+ SR_MHZ(250), */
+};
+
static const uint64_t vdivs[][2] = {
/* millivolts */
{ 10, 1000 },
@@ -142,33 +168,22 @@ static const uint64_t vdivs[][2] = {
};
static const char *trigger_sources[] = {
- "CH1",
- "CH2",
- "EXT",
- /* TODO: forced */
+ "CH1", "CH2", "EXT",
};
static const char *trigger_slopes[] = {
- "r",
- "f",
+ "r", "f",
};
static const char *coupling[] = {
- "AC",
- "DC",
- "GND",
+ "AC", "DC", "GND",
};
-SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
-
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
-
static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
{
struct sr_dev_inst *sdi;
struct sr_channel *ch;
struct sr_channel_group *cg;
- struct drv_context *drvc;
struct dev_context *devc;
unsigned int i;
@@ -176,7 +191,6 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
sdi->status = SR_ST_INITIALIZING;
sdi->vendor = g_strdup(prof->vendor);
sdi->model = g_strdup(prof->model);
- sdi->driver = &hantek_dso_driver_info;
/*
* Add only the real channels -- EXT isn't a source of data, only
@@ -184,18 +198,17 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
*/
for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
- cg = g_malloc0(sizeof(struct sr_channel_group));
- cg->name = g_strdup(channel_names[i]);
+ cg = sr_channel_group_new(sdi, channel_names[i], NULL);
cg->channels = g_slist_append(cg->channels, ch);
- sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
}
devc = g_malloc0(sizeof(struct dev_context));
devc->profile = prof;
devc->dev_state = IDLE;
devc->timebase = DEFAULT_TIMEBASE;
- devc->ch1_enabled = TRUE;
- devc->ch2_enabled = TRUE;
+ devc->samplerate = DEFAULT_SAMPLERATE;
+ devc->ch_enabled[0] = TRUE;
+ devc->ch_enabled[1] = TRUE;
devc->voltage[0] = DEFAULT_VOLTAGE;
devc->voltage[1] = DEFAULT_VOLTAGE;
devc->coupling[0] = DEFAULT_COUPLING;
@@ -205,11 +218,9 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
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;
+ devc->triggersource = NULL;
+ devc->capture_ratio = DEFAULT_CAPTURE_RATIO;
sdi->priv = devc;
- drvc = hantek_dso_driver_info.context;
- drvc->instances = g_slist_append(drvc->instances, sdi);
return sdi;
}
@@ -224,13 +235,14 @@ static int configure_channels(const struct sr_dev_inst *sdi)
devc = sdi->priv;
g_slist_free(devc->enabled_channels);
- devc->ch1_enabled = devc->ch2_enabled = FALSE;
+ devc->enabled_channels = NULL;
+ devc->ch_enabled[0] = devc->ch_enabled[1] = FALSE;
for (l = sdi->channels, p = 0; l; l = l->next, p++) {
ch = l->data;
if (p == 0)
- devc->ch1_enabled = ch->enabled;
+ devc->ch_enabled[0] = ch->enabled;
else
- devc->ch2_enabled = ch->enabled;
+ devc->ch_enabled[1] = ch->enabled;
if (ch->enabled)
devc->enabled_channels = g_slist_append(devc->enabled_channels, ch);
}
@@ -238,24 +250,15 @@ static int configure_channels(const struct sr_dev_inst *sdi)
return SR_OK;
}
-static void clear_dev_context(void *priv)
+static void clear_helper(struct dev_context *devc)
{
- struct dev_context *devc;
-
- devc = priv;
g_free(devc->triggersource);
g_slist_free(devc->enabled_channels);
-
}
static int dev_clear(const struct sr_dev_driver *di)
{
- return std_dev_clear(di, clear_dev_context);
-}
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
+ return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
}
static GSList *scan(struct sr_dev_driver *di, GSList *options)
@@ -269,7 +272,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
GSList *l, *devices, *conn_devices;
struct libusb_device_descriptor des;
libusb_device **devlist;
- int ret, i, j;
+ int i, j;
const char *conn;
char connection_id[64];
@@ -307,13 +310,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
continue;
}
- if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("Failed to get device descriptor: %s.",
- libusb_error_name(ret));
- continue;
- }
+ libusb_get_device_descriptor(devlist[i], &des);
- usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+ if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+ continue;
prof = NULL;
for (j = 0; dev_profiles[j].orig_vid; j++) {
@@ -326,12 +326,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sdi->connection_id = g_strdup(connection_id);
devices = g_slist_append(devices, sdi);
devc = sdi->priv;
- if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
- prof->firmware) == SR_OK)
+ if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
+ USB_CONFIGURATION, prof->firmware) == SR_OK) {
/* Remember when the firmware on this device was updated */
devc->fw_updated = g_get_monotonic_time();
- else
- sr_err("Firmware upload failed");
+ } else {
+ sr_err("Firmware upload failed, name %s", prof->firmware);
+ }
/* Dummy USB address of 0xff will get overwritten later. */
sdi->conn = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]), 0xff, NULL);
@@ -358,12 +359,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
}
libusb_free_device_list(devlist, 1);
- return devices;
-}
-
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- return ((struct drv_context *)(di->context))->instances;
+ return std_scan_complete(di, devices);
}
static int dev_open(struct sr_dev_inst *sdi)
@@ -394,7 +390,7 @@ static int dev_open(struct sr_dev_inst *sdi)
timediff_ms = timediff_us / 1000;
sr_spew("Waited %" PRIi64 " ms.", timediff_ms);
}
- sr_info("Device came back after %d ms.", timediff_ms);
+ sr_info("Device came back after %" PRIi64 " ms.", timediff_ms);
} else {
err = dso_open(sdi);
}
@@ -407,7 +403,7 @@ static int dev_open(struct sr_dev_inst *sdi)
err = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
if (err != 0) {
sr_err("Unable to claim interface: %s.",
- libusb_error_name(err));
+ libusb_error_name(err));
return SR_ERR;
}
@@ -421,17 +417,12 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
- char str[128], *s;
+ const char *s;
const uint64_t *vdiv;
int ch_idx;
@@ -450,6 +441,9 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
devc = sdi->priv;
if (!cg) {
switch (key) {
+ case SR_CONF_TRIGGER_LEVEL:
+ *data = g_variant_new_double(devc->voffset_trigger);
+ break;
case SR_CONF_CONN:
if (!sdi->conn)
return SR_ERR_ARG;
@@ -458,25 +452,32 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
/* Device still needs to re-enumerate after firmware
* upload, so we don't know its (future) address. */
return SR_ERR;
- snprintf(str, 128, "%d.%d", usb->bus, usb->address);
- *data = g_variant_new_string(str);
+ *data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
break;
case SR_CONF_TIMEBASE:
*data = g_variant_new("(tt)", timebases[devc->timebase][0],
timebases[devc->timebase][1]);
break;
+ case SR_CONF_SAMPLERATE:
+ *data = g_variant_new_uint64(devc->samplerate);
+ break;
case SR_CONF_BUFFERSIZE:
*data = g_variant_new_uint64(devc->framesize);
break;
case SR_CONF_TRIGGER_SOURCE:
+ if (!devc->triggersource)
+ return SR_ERR_NA;
*data = g_variant_new_string(devc->triggersource);
break;
case SR_CONF_TRIGGER_SLOPE:
s = (devc->triggerslope == SLOPE_POSITIVE) ? "r" : "f";
*data = g_variant_new_string(s);
break;
- case SR_CONF_HORIZ_TRIGGERPOS:
- *data = g_variant_new_double(devc->triggerposition);
+ case SR_CONF_CAPTURE_RATIO:
+ *data = g_variant_new_uint64(devc->capture_ratio);
+ break;
+ case SR_CONF_LIMIT_FRAMES:
+ *data = g_variant_new_uint64(devc->limit_frames);
break;
default:
return SR_ERR_NA;
@@ -505,80 +506,62 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
return SR_OK;
}
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
- double tmp_double;
- uint64_t tmp_u64, p, q;
- int tmp_int, ch_idx, ret;
- unsigned int i;
- const char *tmp_str;
+ int ch_idx, idx;
+ float flt;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
- ret = SR_OK;
devc = sdi->priv;
if (!cg) {
switch (key) {
case SR_CONF_LIMIT_FRAMES:
devc->limit_frames = g_variant_get_uint64(data);
break;
+ case SR_CONF_TRIGGER_LEVEL:
+ flt = g_variant_get_double(data);
+ if (flt < 0.0 || flt > 1.0) {
+ sr_err("Trigger level must be in [0.0,1.0].");
+ return SR_ERR_ARG;
+ }
+ devc->voffset_trigger = flt;
+ if (dso_set_voffsets(sdi) != SR_OK)
+ return SR_ERR;
+ break;
case SR_CONF_TRIGGER_SLOPE:
- tmp_str = g_variant_get_string(data, NULL);
- if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r'))
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
return SR_ERR_ARG;
- devc->triggerslope = (tmp_str[0] == 'r')
- ? SLOPE_POSITIVE : SLOPE_NEGATIVE;
+ devc->triggerslope = idx;
break;
- case SR_CONF_HORIZ_TRIGGERPOS:
- tmp_double = g_variant_get_double(data);
- if (tmp_double < 0.0 || tmp_double > 1.0) {
- sr_err("Trigger position should be between 0.0 and 1.0.");
- ret = SR_ERR_ARG;
- } else
- devc->triggerposition = tmp_double;
+ case SR_CONF_CAPTURE_RATIO:
+ devc->capture_ratio = g_variant_get_uint64(data);
break;
case SR_CONF_BUFFERSIZE:
- tmp_u64 = g_variant_get_uint64(data);
- for (i = 0; i < NUM_BUFFER_SIZES; i++) {
- if (devc->profile->buffersizes[i] == tmp_u64) {
- devc->framesize = tmp_u64;
- break;
- }
- }
- if (i == NUM_BUFFER_SIZES)
- ret = SR_ERR_ARG;
+ if ((idx = std_u64_idx(data, devc->profile->buffersizes, NUM_BUFFER_SIZES)) < 0)
+ return SR_ERR_ARG;
+ devc->framesize = devc->profile->buffersizes[idx];
break;
case SR_CONF_TIMEBASE:
- g_variant_get(data, "(tt)", &p, &q);
- tmp_int = -1;
- for (i = 0; i < ARRAY_SIZE(timebases); i++) {
- if (timebases[i][0] == p && timebases[i][1] == q) {
- tmp_int = i;
- break;
- }
- }
- if (tmp_int >= 0)
- devc->timebase = tmp_int;
- else
- ret = SR_ERR_ARG;
+ if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(timebases))) < 0)
+ return SR_ERR_ARG;
+ devc->timebase = idx;
+ break;
+ case SR_CONF_SAMPLERATE:
+ if ((idx = std_u64_idx(data, ARRAY_AND_SIZE(samplerates))) < 0)
+ return SR_ERR_ARG;
+ devc->samplerate = samplerates[idx];
+ if (dso_set_trigger_samplerate(sdi) != SR_OK)
+ return SR_ERR;
break;
case SR_CONF_TRIGGER_SOURCE:
- tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; trigger_sources[i]; i++) {
- if (!strcmp(tmp_str, trigger_sources[i])) {
- devc->triggersource = g_strdup(tmp_str);
- break;
- }
- }
- if (trigger_sources[i] == 0)
- ret = SR_ERR_ARG;
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
+ return SR_ERR_ARG;
+ g_free(devc->triggersource);
+ devc->triggersource = g_strdup(trigger_sources[idx]);
break;
default:
- ret = SR_ERR_NA;
- break;
+ return SR_ERR_NA;
}
} else {
if (sdi->channel_groups->data == cg)
@@ -592,90 +575,50 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
devc->filter[ch_idx] = g_variant_get_boolean(data);
break;
case SR_CONF_VDIV:
- g_variant_get(data, "(tt)", &p, &q);
- tmp_int = -1;
- for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
- if (vdivs[i][0] == p && vdivs[i][1] == q) {
- tmp_int = i;
- break;
- }
- }
- if (tmp_int >= 0) {
- devc->voltage[ch_idx] = tmp_int;
- } else
- ret = SR_ERR_ARG;
+ if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(vdivs))) < 0)
+ return SR_ERR_ARG;
+ devc->voltage[ch_idx] = idx;
break;
case SR_CONF_COUPLING:
- tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; coupling[i]; i++) {
- if (!strcmp(tmp_str, coupling[i])) {
- devc->coupling[ch_idx] = i;
- break;
- }
- }
- if (coupling[i] == 0)
- ret = SR_ERR_ARG;
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(coupling))) < 0)
+ return SR_ERR_ARG;
+ devc->coupling[ch_idx] = idx;
break;
default:
- ret = SR_ERR_NA;
- break;
+ return SR_ERR_NA;
}
}
- return ret;
+ return SR_OK;
}
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
- GVariant *tuple, *rational[2];
- GVariantBuilder gvb;
- unsigned int i;
-
- if (key == SR_CONF_SCAN_OPTIONS) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
- return SR_OK;
- } else if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
- return SR_OK;
- }
-
- if (!sdi)
- return SR_ERR_ARG;
if (!cg) {
switch (key) {
+ case SR_CONF_SCAN_OPTIONS:
case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
- break;
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
case SR_CONF_BUFFERSIZE:
if (!sdi)
return SR_ERR_ARG;
devc = sdi->priv;
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
- devc->profile->buffersizes, NUM_BUFFER_SIZES, sizeof(uint64_t));
+ *data = std_gvar_array_u64(devc->profile->buffersizes, NUM_BUFFER_SIZES);
+ break;
+ case SR_CONF_SAMPLERATE:
+ *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
break;
case SR_CONF_TIMEBASE:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- for (i = 0; i < ARRAY_SIZE(timebases); i++) {
- rational[0] = g_variant_new_uint64(timebases[i][0]);
- rational[1] = g_variant_new_uint64(timebases[i][1]);
- tuple = g_variant_new_tuple(rational, 2);
- g_variant_builder_add_value(&gvb, tuple);
- }
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_tuple_array(ARRAY_AND_SIZE(timebases));
break;
case SR_CONF_TRIGGER_SOURCE:
- *data = g_variant_new_strv(trigger_sources,
- ARRAY_SIZE(trigger_sources));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_sources));
break;
case SR_CONF_TRIGGER_SLOPE:
- *data = g_variant_new_strv(trigger_slopes,
- ARRAY_SIZE(trigger_slopes));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_slopes));
break;
default:
return SR_ERR_NA;
@@ -683,21 +626,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
} else {
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
+ *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
break;
case SR_CONF_COUPLING:
- *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(coupling));
break;
case SR_CONF_VDIV:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
- rational[0] = g_variant_new_uint64(vdivs[i][0]);
- rational[1] = g_variant_new_uint64(vdivs[i][1]);
- tuple = g_variant_new_tuple(rational, 2);
- g_variant_builder_add_value(&gvb, tuple);
- }
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_tuple_array(ARRAY_AND_SIZE(vdivs));
break;
default:
return SR_ERR_NA;
@@ -712,52 +647,56 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
{
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
- struct dev_context *devc;
- float ch1, ch2, range;
- int num_channels, data_offset, i;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
+ struct dev_context *devc = sdi->priv;
+ GSList *channels = devc->enabled_channels;
- devc = sdi->priv;
- num_channels = (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.channels = devc->enabled_channels;
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
analog.num_samples = num_samples;
- analog.mq = SR_MQ_VOLTAGE;
- analog.unit = SR_UNIT_VOLT;
- analog.mqflags = 0;
+ analog.meaning->mq = SR_MQ_VOLTAGE;
+ analog.meaning->unit = SR_UNIT_VOLT;
+ analog.meaning->mqflags = 0;
/* TODO: Check malloc return value. */
- analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels);
- data_offset = 0;
- for (i = 0; i < analog.num_samples; i++) {
- /*
- * 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.
- *
- * 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 DSO-5xxx series 9-bit samples. */
- if (devc->ch1_enabled) {
- range = ((float)vdivs[devc->voltage[0]][0] / vdivs[devc->voltage[0]][1]) * 8;
- ch1 = range / 255 * *(buf + i * 2 + 1);
- /* Value is centered around 0V. */
- ch1 -= range / 2;
- analog.data[data_offset++] = ch1;
- }
- if (devc->ch2_enabled) {
- range = ((float)vdivs[devc->voltage[1]][0] / vdivs[devc->voltage[1]][1]) * 8;
- ch2 = range / 255 * *(buf + i * 2);
- ch2 -= range / 2;
- analog.data[data_offset++] = ch2;
+ analog.data = g_try_malloc(num_samples * sizeof(float));
+
+ for (int ch = 0; ch < NUM_CHANNELS; ch++) {
+ if (!devc->ch_enabled[ch])
+ continue;
+
+ float range = ((float)vdivs[devc->voltage[ch]][0] / vdivs[devc->voltage[ch]][1]) * 8;
+ float vdivlog = log10f(range / 255);
+ int digits = -(int)vdivlog + (vdivlog < 0.0);
+ analog.encoding->digits = digits;
+ analog.spec->spec_digits = digits;
+ analog.meaning->channels = g_slist_append(NULL, channels->data);
+
+ for (int i = 0; i < num_samples; i++) {
+ /*
+ * 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.
+ *
+ * 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 DSO-5xxx series 9-bit samples. */
+ ((float *)analog.data)[i] = range / 255 * *(buf + i * 2 + 1 - ch) - range / 2;
}
+ sr_session_send(sdi, &packet);
+ g_slist_free(analog.meaning->channels);
+
+ channels = channels->next;
}
- sr_session_send(devc->cb_data, &packet);
+ g_free(analog.data);
}
/*
@@ -768,15 +707,14 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
*/
static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
{
- struct sr_datafeed_packet packet;
struct sr_dev_inst *sdi;
struct dev_context *devc;
int num_samples, pre;
sdi = transfer->user_data;
devc = sdi->priv;
- sr_spew("receive_transfer(): status %d received %d bytes.",
- transfer->status, transfer->actual_length);
+ sr_spew("receive_transfer(): status %s received %d bytes.",
+ libusb_error_name(transfer->status), transfer->actual_length);
if (transfer->actual_length == 0)
/* Nothing to send to the bus. */
@@ -785,7 +723,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
num_samples = transfer->actual_length / 2;
sr_spew("Got %d-%d/%d samples in frame.", devc->samp_received + 1,
- devc->samp_received + num_samples, devc->framesize);
+ devc->samp_received + num_samples, devc->framesize);
/*
* The device always sends a full frame, but the beginning of the frame
@@ -816,7 +754,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
/* The rest of this chunk starts with the trigger point. */
sr_dbg("Reached trigger point, %d samples buffered.",
- devc->samp_buffered);
+ devc->samp_buffered);
/* Avoid the corner case where the chunk ended at
* exactly the trigger point. */
@@ -840,14 +778,15 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
/* That was the last chunk in this frame. Send the buffered
* pre-trigger samples out now, in one big chunk. */
sr_dbg("End of frame, sending %d pre-trigger buffered samples.",
- devc->samp_buffered);
+ devc->samp_buffered);
send_chunk(sdi, devc->framebuf, devc->samp_buffered);
+ g_free(devc->framebuf);
+ devc->framebuf = NULL;
/* Mark the end of this frame. */
- packet.type = SR_DF_FRAME_END;
- sr_session_send(devc->cb_data, &packet);
+ std_session_send_df_frame_end(sdi);
- if (devc->limit_frames && ++devc->num_frames == devc->limit_frames) {
+ if (devc->limit_frames && ++devc->num_frames >= devc->limit_frames) {
/* Terminate session */
devc->dev_state = STOPPING;
} else {
@@ -859,7 +798,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
static int handle_event(int fd, int revents, void *cb_data)
{
const struct sr_dev_inst *sdi;
- struct sr_datafeed_packet packet;
struct timeval tv;
struct sr_dev_driver *di;
struct dev_context *devc;
@@ -884,8 +822,7 @@ static int handle_event(int fd, int revents, void *cb_data)
*/
usb_source_remove(sdi->session, drvc->sr_ctx);
- packet.type = SR_DF_END;
- sr_session_send(sdi, &packet);
+ std_session_send_df_end(sdi);
devc->dev_state = IDLE;
@@ -902,8 +839,10 @@ static int handle_event(int fd, int revents, void *cb_data)
return TRUE;
if (dso_enable_trigger(sdi) != SR_OK)
return TRUE;
-// if (dso_force_trigger(sdi) != SR_OK)
-// return TRUE;
+ if (!devc->triggersource) {
+ if (dso_force_trigger(sdi) != SR_OK)
+ return TRUE;
+ }
sr_dbg("Successfully requested next chunk.");
devc->dev_state = CAPTURE;
return TRUE;
@@ -924,8 +863,10 @@ static int handle_event(int fd, int revents, void *cb_data)
break;
if (dso_enable_trigger(sdi) != SR_OK)
break;
-// if (dso_force_trigger(sdi) != SR_OK)
-// break;
+ if (!devc->triggersource) {
+ if (dso_force_trigger(sdi) != SR_OK)
+ break;
+ }
sr_dbg("Successfully requested next chunk.");
}
break;
@@ -933,10 +874,11 @@ static int handle_event(int fd, int revents, void *cb_data)
/* No data yet. */
break;
case CAPTURE_READY_8BIT:
+ case CAPTURE_READY_2250:
/* Remember where in the captured frame the trigger is. */
devc->trigger_offset = trigger_offset;
- num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
+ num_channels = (devc->ch_enabled[0] && devc->ch_enabled[1]) ? 2 : 1;
devc->framebuf = g_malloc(devc->framesize * num_channels * 2);
devc->samp_buffered = devc->samp_received = 0;
@@ -951,8 +893,7 @@ static int handle_event(int fd, int revents, void *cb_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(sdi, &packet);
+ std_session_send_df_frame_begin(sdi);
break;
case CAPTURE_READY_9BIT:
/* TODO */
@@ -969,17 +910,13 @@ static int handle_event(int fd, int revents, void *cb_data)
return TRUE;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
struct sr_dev_driver *di = sdi->driver;
struct drv_context *drvc = di->context;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
devc = sdi->priv;
- devc->cb_data = cb_data;
if (configure_channels(sdi) != SR_OK) {
sr_err("Failed to configure channels.");
@@ -995,35 +932,30 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
devc->dev_state = CAPTURE;
usb_source_add(sdi->session, drvc->sr_ctx, TICK, handle_event, (void *)sdi);
- /* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi);
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- (void)cb_data;
-
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR;
-
devc = sdi->priv;
devc->dev_state = STOPPING;
+ devc->num_frames = 0;
return SR_OK;
}
-SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
+static struct sr_dev_driver hantek_dso_driver_info = {
.name = "hantek-dso",
.longname = "Hantek DSO",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
+ .dev_list = std_dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
@@ -1034,3 +966,4 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(hantek_dso_driver_info);