X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=082d05b6add33ca84080a3a14fa7bd6ae244a128;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=6f1580940f32afe4dcf6fc66ddedc2aac37fb254;hpb=aed4ad0beaf64062752039a13f9a95326aa1df87;p=libsigrok.git diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index 6f158094..082d05b6 100644 --- a/src/hardware/hantek-dso/api.c +++ b/src/hardware/hantek-dso/api.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include #include #include #include @@ -29,7 +30,7 @@ #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #include "dso.h" @@ -40,64 +41,71 @@ #define NUM_TIMEBASE 10 #define NUM_VDIV 8 +#define NUM_BUFFER_SIZES 2 + static const uint32_t scanopts[] = { SR_CONF_CONN, }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_OSCILLOSCOPE, - SR_CONF_CONTINUOUS, - SR_CONF_CONN | SR_CONF_GET, +}; + +static const uint32_t devopts[] = { + SR_CONF_CONTINUOUS | SR_CONF_SET, SR_CONF_LIMIT_FRAMES | SR_CONF_SET, - SR_CONF_TIMEBASE | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_BUFFERSIZE | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_TRIGGER_SOURCE | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_TRIGGER_SLOPE | SR_CONF_SET, - SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET, - SR_CONF_FILTER | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_VDIV | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_COUPLING | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_NUM_TIMEBASE | SR_CONF_GET, + SR_CONF_CONN | SR_CONF_GET, + 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_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_NUM_VDIV | SR_CONF_GET, }; +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, +}; + static const char *channel_names[] = { "CH1", "CH2", - NULL, }; static const uint64_t buffersizes_32k[] = { - 10240, 32768, + (10 * 1024), (32 * 1024), }; static const uint64_t buffersizes_512k[] = { - 10240, 524288, + (10 * 1024), (512 * 1024), }; static const uint64_t buffersizes_14k[] = { - 10240, 14336, + (10 * 1024), (14 * 1024), }; 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] = { @@ -141,10 +149,9 @@ static const char *trigger_sources[] = { /* TODO: forced */ }; -static const char *filter_targets[] = { - "CH1", - "CH2", - /* TODO: "TRIGGER", */ +static const char *trigger_slopes[] = { + "r", + "f", }; static const char *coupling[] = { @@ -154,7 +161,6 @@ static const char *coupling[] = { }; SR_PRIV struct sr_dev_driver hantek_dso_driver_info; -static struct sr_dev_driver *di = &hantek_dso_driver_info; static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); @@ -162,41 +168,39 @@ 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; - int i; + unsigned int i; - sdi = sr_dev_inst_new(SR_ST_INITIALIZING, - prof->vendor, prof->model, NULL); - if (!sdi) - return NULL; - sdi->driver = di; + sdi = g_malloc0(sizeof(struct sr_dev_inst)); + 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 * a trigger source internal to the device. */ - for (i = 0; channel_names[i]; i++) { - if (!(ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, - channel_names[i]))) - return NULL; - sdi->channels = g_slist_append(sdi->channels, ch); - } - - if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_err("Device context malloc failed."); - return NULL; + 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->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->voltage_ch1 = DEFAULT_VOLTAGE; - devc->voltage_ch2 = DEFAULT_VOLTAGE; - devc->coupling_ch1 = DEFAULT_COUPLING; - devc->coupling_ch2 = DEFAULT_COUPLING; + devc->voltage[0] = DEFAULT_VOLTAGE; + devc->voltage[1] = DEFAULT_VOLTAGE; + devc->coupling[0] = DEFAULT_COUPLING; + devc->coupling[1] = DEFAULT_COUPLING; devc->voffset_ch1 = DEFAULT_VERT_OFFSET; devc->voffset_ch2 = DEFAULT_VERT_OFFSET; devc->voffset_trigger = DEFAULT_VERT_TRIGGERPOS; @@ -205,7 +209,7 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE); devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS; sdi->priv = devc; - drvc = di->priv; + drvc = hantek_dso_driver_info.context; drvc->instances = g_slist_append(drvc->instances, sdi); return sdi; @@ -245,17 +249,17 @@ static void clear_dev_context(void *priv) } -static int dev_clear(void) +static int dev_clear(const struct sr_dev_driver *di) { return std_dev_clear(di, clear_dev_context); } -static int init(struct sr_context *sr_ctx) +static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); } -static GSList *scan(GSList *options) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { struct drv_context *drvc; struct dev_context *devc; @@ -266,11 +270,11 @@ static GSList *scan(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]; - drvc = di->priv; + drvc = di->context; devices = 0; @@ -304,11 +308,7 @@ static GSList *scan(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)); @@ -323,8 +323,8 @@ static GSList *scan(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 @@ -342,7 +342,6 @@ static GSList *scan(GSList *options) sdi->connection_id = g_strdup(connection_id); sdi->status = SR_ST_INACTIVE; devices = g_slist_append(devices, sdi); - devc = sdi->priv; sdi->inst_type = SR_INST_USB; sdi->conn = sr_usb_dev_inst_new( libusb_get_bus_number(devlist[i]), @@ -359,9 +358,9 @@ static GSList *scan(GSList *options) return devices; } -static GSList *dev_list(void) +static GSList *dev_list(const struct sr_dev_driver *di) { - return ((struct drv_context *)(di->priv))->instances; + return ((struct drv_context *)(di->context))->instances; } static int dev_open(struct sr_dev_inst *sdi) @@ -392,7 +391,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); } @@ -419,39 +418,86 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(void) +static int cleanup(const struct sr_dev_driver *di) { - return dev_clear(); + 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) { + struct dev_context *devc; struct sr_usb_dev_inst *usb; char str[128]; - - (void)cg; + const char *s; + const uint64_t *vdiv; + int ch_idx; switch (key) { - case SR_CONF_CONN: - if (!sdi || !sdi->conn) - return SR_ERR_ARG; - usb = sdi->conn; - if (usb->address == 255) - /* 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); - break; - case SR_CONF_NUM_TIMEBASE: + case SR_CONF_NUM_HDIV: *data = g_variant_new_int32(NUM_TIMEBASE); break; case SR_CONF_NUM_VDIV: *data = g_variant_new_int32(NUM_VDIV); break; - default: - return SR_ERR_NA; + } + + if (!sdi) + return SR_ERR_ARG; + + devc = sdi->priv; + if (!cg) { + switch (key) { + case SR_CONF_CONN: + if (!sdi->conn) + return SR_ERR_ARG; + usb = sdi->conn; + if (usb->address == 255) + /* 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); + break; + case SR_CONF_TIMEBASE: + *data = g_variant_new("(tt)", timebases[devc->timebase][0], + timebases[devc->timebase][1]); + break; + case SR_CONF_BUFFERSIZE: + *data = g_variant_new_uint64(devc->framesize); + break; + case SR_CONF_TRIGGER_SOURCE: + *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); + break; + default: + return SR_ERR_NA; + } + } else { + if (sdi->channel_groups->data == cg) + ch_idx = 0; + else if (sdi->channel_groups->next->data == cg) + ch_idx = 1; + else + return SR_ERR_ARG; + switch (key) { + case SR_CONF_FILTER: + *data = g_variant_new_boolean(devc->filter[ch_idx]); + break; + case SR_CONF_VDIV: + vdiv = vdivs[devc->voltage[ch_idx]]; + *data = g_variant_new("(tt)", vdiv[0], vdiv[1]); + break; + case SR_CONF_COUPLING: + *data = g_variant_new_string(coupling[devc->coupling[ch_idx]]); + break; + } } return SR_OK; @@ -463,126 +509,115 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd struct dev_context *devc; double tmp_double; uint64_t tmp_u64, p, q; - int tmp_int, ret; + int tmp_int, ch_idx, ret; unsigned int i; const char *tmp_str; - char **targets; - - (void)cg; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; ret = SR_OK; devc = sdi->priv; - switch (key) { - case SR_CONF_LIMIT_FRAMES: - devc->limit_frames = g_variant_get_uint64(data); - 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')) - return SR_ERR_ARG; - devc->triggerslope = (tmp_str[0] == 'r') - ? SLOPE_POSITIVE : SLOPE_NEGATIVE; - 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; - break; - case SR_CONF_BUFFERSIZE: - tmp_u64 = g_variant_get_uint64(data); - for (i = 0; i < 2; i++) { - if (devc->profile->buffersizes[i] == tmp_u64) { - devc->framesize = tmp_u64; - break; - } - } - if (i == 2) - ret = SR_ERR_ARG; - 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 (!cg) { + switch (key) { + case SR_CONF_LIMIT_FRAMES: + devc->limit_frames = g_variant_get_uint64(data); + 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')) + return SR_ERR_ARG; + devc->triggerslope = (tmp_str[0] == 'r') + ? SLOPE_POSITIVE : SLOPE_NEGATIVE; + 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; + 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 (tmp_int >= 0) - devc->timebase = tmp_int; - else - ret = SR_ERR_ARG; - 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 (i == NUM_BUFFER_SIZES) + ret = SR_ERR_ARG; + 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 (trigger_sources[i] == 0) - ret = SR_ERR_ARG; - break; - case SR_CONF_FILTER: - tmp_str = g_variant_get_string(data, NULL); - devc->filter_ch1 = devc->filter_ch2 = devc->filter_trigger = 0; - targets = g_strsplit(tmp_str, ",", 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")) - devc->filter_ch1 = TRUE; - else if (!strcmp(targets[i], "CH2")) - devc->filter_ch2 = TRUE; - else if (!strcmp(targets[i], "TRIGGER")) - devc->filter_trigger = TRUE; - else { - sr_err("Invalid filter target %s.", targets[i]); + if (tmp_int >= 0) + devc->timebase = tmp_int; + else ret = SR_ERR_ARG; + 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; + break; + default: + ret = SR_ERR_NA; + break; } - g_strfreev(targets); - break; - case SR_CONF_VDIV: - /* TODO: Not supporting vdiv per channel yet. */ - 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; + } else { + if (sdi->channel_groups->data == cg) + ch_idx = 0; + else if (sdi->channel_groups->next->data == cg) + ch_idx = 1; + else + return SR_ERR_ARG; + switch (key) { + case SR_CONF_FILTER: + 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_ch1 = tmp_int; - devc->voltage_ch2 = tmp_int; - } else - ret = SR_ERR_ARG; - break; - case SR_CONF_COUPLING: - tmp_str = g_variant_get_string(data, NULL); - /* TODO: Not supporting coupling per channel yet. */ - for (i = 0; coupling[i]; i++) { - if (!strcmp(tmp_str, coupling[i])) { - devc->coupling_ch1 = i; - devc->coupling_ch2 = i; - break; + if (tmp_int >= 0) { + devc->voltage[ch_idx] = tmp_int; + } else + ret = SR_ERR_ARG; + break; + case SR_CONF_COUPLING: + tmp_str = g_variant_get_string(data, NULL); + for (i = 0; coupling[i]; i++) { + if (!strcmp(tmp_str, coupling[i])) { + devc->coupling[ch_idx] = i; + break; + } } + if (coupling[i] == 0) + ret = SR_ERR_ARG; + break; + default: + ret = SR_ERR_NA; + break; } - if (coupling[i] == 0) - ret = SR_ERR_ARG; - break; - default: - ret = SR_ERR_NA; - break; } return ret; @@ -596,57 +631,75 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * GVariantBuilder gvb; unsigned int i; - (void)cg; - - switch (key) { - case SR_CONF_SCAN_OPTIONS: + if (key == SR_CONF_SCAN_OPTIONS) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); - break; - case SR_CONF_DEVICE_OPTIONS: + return SR_OK; + } else if (key == SR_CONF_DEVICE_OPTIONS && !sdi) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; - 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, 2, sizeof(uint64_t)); - break; - case SR_CONF_COUPLING: - *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); - break; - case SR_CONF_VDIV: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - for (i = 0; i < ARRAY_SIZE(vdivs); i++) { - 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); + drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); + return SR_OK; + } + + if (!sdi) + return SR_ERR_ARG; + + if (!cg) { + switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); + break; + 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)); + 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); + break; + case SR_CONF_TRIGGER_SOURCE: + *data = g_variant_new_strv(trigger_sources, + ARRAY_SIZE(trigger_sources)); + break; + case SR_CONF_TRIGGER_SLOPE: + *data = g_variant_new_strv(trigger_slopes, + ARRAY_SIZE(trigger_slopes)); + break; + default: + return SR_ERR_NA; } - *data = g_variant_builder_end(&gvb); - break; - case SR_CONF_FILTER: - *data = g_variant_new_strv(filter_targets, - ARRAY_SIZE(filter_targets)); - 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); + } 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)); + break; + case SR_CONF_COUPLING: + *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); + break; + case SR_CONF_VDIV: + g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); + for (i = 0; i < ARRAY_SIZE(vdivs); i++) { + 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); + break; + default: + return SR_ERR_NA; } - *data = g_variant_builder_end(&gvb); - break; - case SR_CONF_TRIGGER_SOURCE: - *data = g_variant_new_strv(trigger_sources, - ARRAY_SIZE(trigger_sources)); - break; - default: - return SR_ERR_NA; } return SR_OK; @@ -656,20 +709,21 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, int num_samples) { struct sr_datafeed_packet packet; - struct sr_datafeed_analog analog; + struct sr_datafeed_analog_old analog; struct dev_context *devc; float ch1, ch2, range; int num_channels, data_offset, i; devc = sdi->priv; num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1; - packet.type = SR_DF_ANALOG; + packet.type = SR_DF_ANALOG_OLD; packet.payload = &analog; /* TODO: support for 5xxx series 9-bit samples */ analog.channels = devc->enabled_channels; analog.num_samples = num_samples; analog.mq = SR_MQ_VOLTAGE; analog.unit = SR_UNIT_VOLT; + analog.mqflags = 0; /* TODO: Check malloc return value. */ analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels); data_offset = 0; @@ -688,20 +742,21 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, */ /* TODO: Support for DSO-5xxx series 9-bit samples. */ if (devc->ch1_enabled) { - range = ((float)vdivs[devc->voltage_ch1][0] / vdivs[devc->voltage_ch1][1]) * 8; + 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_ch2][0] / vdivs[devc->voltage_ch2][1]) * 8; + 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; } } sr_session_send(devc->cb_data, &packet); + g_free(analog.data); } /* @@ -710,7 +765,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, * queued up beforehand, so this just needs to chuck the incoming data onto * the libsigrok session bus. */ -static void receive_transfer(struct libusb_transfer *transfer) +static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) { struct sr_datafeed_packet packet; struct sr_dev_inst *sdi; @@ -719,8 +774,8 @@ static void receive_transfer(struct libusb_transfer *transfer) 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. */ @@ -770,8 +825,7 @@ static void receive_transfer(struct libusb_transfer *transfer) } } else { /* Already past the trigger point, just send it all out. */ - send_chunk(sdi, transfer->buffer, - num_samples); + send_chunk(sdi, transfer->buffer, num_samples); } devc->samp_received += num_samples; @@ -806,8 +860,9 @@ 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; - struct drv_context *drvc = di->priv; + struct drv_context *drvc; int num_channels; uint32_t trigger_offset; uint8_t capturestate; @@ -816,6 +871,8 @@ static int handle_event(int fd, int revents, void *cb_data) (void)revents; sdi = cb_data; + di = sdi->driver; + drvc = di->context; devc = sdi->priv; if (devc->dev_state == STOPPING) { /* We've been told to wind up the acquisition. */ @@ -826,8 +883,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, LOG_PREFIX); devc->dev_state = IDLE; @@ -879,8 +935,7 @@ static int handle_event(int fd, int revents, void *cb_data) devc->trigger_offset = trigger_offset; num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1; - /* TODO: Check malloc return value. */ - devc->framebuf = g_try_malloc(devc->framesize * num_channels * 2); + devc->framebuf = g_malloc(devc->framesize * num_channels * 2); devc->samp_buffered = devc->samp_received = 0; /* Tell the scope to send us the first frame. */ @@ -915,7 +970,8 @@ static int handle_event(int fd, int revents, void *cb_data) static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { struct dev_context *devc; - struct drv_context *drvc = di->priv; + struct sr_dev_driver *di = sdi->driver; + struct drv_context *drvc = di->context; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -937,7 +993,6 @@ 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); return SR_OK; @@ -974,5 +1029,5 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };