X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fapi.c;h=3da04264b5279b3c43af0f2ae1da43f0d3a721d1;hb=2388ae860c369171d8728539ce2e9aab5810896b;hp=c989d80146ebd4b68e7bed3e6ce1a1ac0fb5a57a;hpb=f627afd65b5b544b1c10345bddf1b3a490fb8c93;p=libsigrok.git diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c index c989d801..3da04264 100644 --- a/hardware/hantek-dso/api.c +++ b/hardware/hantek-dso/api.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2012 Bert Vermeulen * @@ -37,6 +37,13 @@ /* TODO tune this properly */ #define TICK 1 +#define NUM_TIMEBASE 10 +#define NUM_VDIV 8 + +static const int32_t scanopts[] = { + SR_CONF_CONN, +}; + static const int32_t devopts[] = { SR_CONF_OSCILLOSCOPE, SR_CONF_LIMIT_FRAMES, @@ -49,6 +56,8 @@ static const int32_t devopts[] = { SR_CONF_FILTER, SR_CONF_VDIV, SR_CONF_COUPLING, + SR_CONF_NUM_TIMEBASE, + SR_CONF_NUM_VDIV, }; static const char *probe_names[] = { @@ -56,32 +65,41 @@ static const char *probe_names[] = { NULL, }; +static const uint64_t buffersizes_32k[] = { + 10240, 32768, +}; +static const uint64_t buffersizes_512k[] = { + 10240, 524288, +}; +static const uint64_t buffersizes_14k[] = { + 10240, 14336, +}; + static const struct dso_profile dev_profiles[] = { { 0x04b4, 0x2090, 0x04b5, 0x2090, "Hantek", "DSO-2090", + buffersizes_32k, FIRMWARE_DIR "/hantek-dso-2090.fw" }, { 0x04b4, 0x2150, 0x04b5, 0x2150, "Hantek", "DSO-2150", + buffersizes_32k, FIRMWARE_DIR "/hantek-dso-2150.fw" }, { 0x04b4, 0x2250, 0x04b5, 0x2250, "Hantek", "DSO-2250", + buffersizes_512k, FIRMWARE_DIR "/hantek-dso-2250.fw" }, { 0x04b4, 0x5200, 0x04b5, 0x5200, "Hantek", "DSO-5200", + buffersizes_14k, FIRMWARE_DIR "/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, 0, 0, 0, 0, 0, 0, 0 }, }; -static const uint64_t buffersizes[] = { - 10240, - 32768, - /* TODO: 65535 */ -}; - -static const int32_t timebases[][2] = { +static const uint64_t timebases[][2] = { /* microseconds */ { 10, 1000000 }, { 20, 1000000 }, @@ -101,7 +119,7 @@ static const int32_t timebases[][2] = { { 400, 1000 }, }; -static const int32_t vdivs[][2] = { +static const uint64_t vdivs[][2] = { /* millivolts */ { 10, 1000 }, { 20, 1000 }, @@ -137,7 +155,7 @@ 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 hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof) { @@ -216,72 +234,78 @@ static int configure_probes(const struct sr_dev_inst *sdi) return SR_OK; } -/* Properly close and free all devices. */ -static int clear_instances(void) +static void clear_dev_context(void *priv) { - struct sr_dev_inst *sdi; - struct drv_context *drvc; struct dev_context *devc; - GSList *l; - drvc = di->priv; - for (l = drvc->instances; l; l = l->next) { - if (!(sdi = l->data)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("%s: sdi was NULL, continuing", __func__); - continue; - } - if (!(devc = sdi->priv)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("%s: sdi->priv was NULL, continuing", __func__); - continue; - } - dso_close(sdi); - sr_usb_dev_inst_free(devc->usb); - g_free(devc->triggersource); - g_slist_free(devc->enabled_probes); - - sr_dev_inst_free(sdi); - } + devc = priv; + g_free(devc->triggersource); + g_slist_free(devc->enabled_probes); - g_slist_free(drvc->instances); - drvc->instances = NULL; +} - return SR_OK; +static int dev_clear(void) +{ + return std_dev_clear(di, clear_dev_context); } -static int hw_init(struct sr_context *sr_ctx) +static int init(struct sr_context *sr_ctx) { - return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); + return std_init(sr_ctx, di, LOG_PREFIX); } -static GSList *hw_scan(GSList *options) +static GSList *scan(GSList *options) { - struct sr_dev_inst *sdi; - const struct dso_profile *prof; struct drv_context *drvc; struct dev_context *devc; - GSList *devices; + struct sr_dev_inst *sdi; + struct sr_usb_dev_inst *usb; + struct sr_config *src; + const struct dso_profile *prof; + GSList *l, *devices, *conn_devices; struct libusb_device_descriptor des; libusb_device **devlist; int devcnt, ret, i, j; - - (void)options; + const char *conn; drvc = di->priv; - drvc->instances = NULL; devcnt = 0; devices = 0; - clear_instances(); + conn = NULL; + for (l = options; l; l = l->next) { + src = l->data; + if (src->key == SR_CONF_CONN) { + conn = g_variant_get_string(src->data, NULL); + break; + } + } + if (conn) + conn_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn); + else + conn_devices = NULL; /* Find all Hantek DSO devices and upload firmware to all of them. */ libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); for (i = 0; devlist[i]; i++) { + if (conn) { + usb = NULL; + for (l = conn_devices; l; l = l->next) { + usb = l->data; + if (usb->bus == libusb_get_bus_number(devlist[i]) + && usb->address == libusb_get_device_address(devlist[i])) + break; + } + if (!l) + /* This device matched none of the ones that + * matched the conn specification. */ + continue; + } + if ((ret = libusb_get_device_descriptor(devlist[i], &des))) { sr_err("Failed to get device descriptor: %s.", - libusb_error_name(ret)); + libusb_error_name(ret)); continue; } @@ -301,9 +325,9 @@ static GSList *hw_scan(GSList *options) devc->fw_updated = g_get_monotonic_time(); else sr_err("Firmware upload failed for " - "device %d.", devcnt); + "device %d.", devcnt); /* Dummy USB address of 0xff will get overwritten later. */ - devc->usb = sr_usb_dev_inst_new( + sdi->conn = sr_usb_dev_inst_new( libusb_get_bus_number(devlist[i]), 0xff, NULL); devcnt++; break; @@ -316,7 +340,8 @@ static GSList *hw_scan(GSList *options) sdi->status = SR_ST_INACTIVE; devices = g_slist_append(devices, sdi); devc = sdi->priv; - devc->usb = sr_usb_dev_inst_new( + sdi->inst_type = SR_INST_USB; + sdi->conn = sr_usb_dev_inst_new( libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL); devcnt++; @@ -332,18 +357,20 @@ static GSList *hw_scan(GSList *options) return devices; } -static GSList *hw_dev_list(void) +static GSList *dev_list(void) { return ((struct drv_context *)(di->priv))->instances; } -static int hw_dev_open(struct sr_dev_inst *sdi) +static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; + struct sr_usb_dev_inst *usb; int64_t timediff_us, timediff_ms; int err; devc = sdi->priv; + usb = sdi->conn; /* * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS @@ -373,48 +400,76 @@ static int hw_dev_open(struct sr_dev_inst *sdi) return SR_ERR; } - err = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE); + 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; } return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int dev_close(struct sr_dev_inst *sdi) { dso_close(sdi); return SR_OK; } -static int hw_cleanup(void) +static int cleanup(void) { - struct drv_context *drvc; + return dev_clear(); +} + +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) +{ + struct sr_usb_dev_inst *usb; + char str[128]; - if (!(drvc = di->priv)) - return SR_OK; + (void)probe_group; - clear_instances(); + switch (id) { + 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: + *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; + } return SR_OK; } -static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { struct dev_context *devc; double tmp_double; - uint64_t tmp_u64; - int32_t p, q; + uint64_t tmp_u64, p, q; int tmp_int, ret; unsigned int i; const char *tmp_str; char **targets; + (void)probe_group; + if (sdi->status != SR_ST_ACTIVE) - return SR_ERR; + return SR_ERR_DEV_CLOSED; ret = SR_OK; devc = sdi->priv; @@ -438,17 +493,17 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) break; case SR_CONF_BUFFERSIZE: tmp_u64 = g_variant_get_uint64(data); - for (i = 0; buffersizes[i]; i++) { - if (buffersizes[i] == tmp_u64) { + for (i = 0; i < 2; i++) { + if (devc->profile->buffersizes[i] == tmp_u64) { devc->framesize = tmp_u64; break; } } - if (buffersizes[i] == 0) + if (i == 2) ret = SR_ERR_ARG; break; case SR_CONF_TIMEBASE: - g_variant_get(data, "(ii)", &p, &q); + 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) { @@ -495,7 +550,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) break; case SR_CONF_VDIV: /* TODO: Not supporting vdiv per channel yet. */ - g_variant_get(data, "(ii)", &p, &q); + 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) { @@ -523,48 +578,72 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) ret = SR_ERR_ARG; break; default: - ret = SR_ERR_ARG; + ret = SR_ERR_NA; break; } return ret; } -static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { + struct dev_context *devc; + GVariant *tuple, *rational[2]; + GVariantBuilder gvb; + unsigned int i; - (void)sdi; + (void)probe_group; switch (key) { + case SR_CONF_SCAN_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t)); + break; case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, devopts, ARRAY_SIZE(devopts), sizeof(int32_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, - buffersizes, ARRAY_SIZE(buffersizes), sizeof(uint64_t)); + 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: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - vdivs, ARRAY_SIZE(vdivs) * 2, sizeof(int32_t)); + 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; case SR_CONF_FILTER: *data = g_variant_new_strv(filter_targets, ARRAY_SIZE(filter_targets)); break; case SR_CONF_TIMEBASE: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - timebases, ARRAY_SIZE(timebases) * 2, sizeof(int32_t)); + 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; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; @@ -637,8 +716,8 @@ static void receive_transfer(struct libusb_transfer *transfer) sdi = transfer->user_data; devc = sdi->priv; - sr_dbg("receive_transfer(): status %d received %d bytes.", - transfer->status, transfer->actual_length); + sr_spew("receive_transfer(): status %d received %d bytes.", + transfer->status, transfer->actual_length); if (transfer->actual_length == 0) /* Nothing to send to the bus. */ @@ -646,8 +725,8 @@ static void receive_transfer(struct libusb_transfer *transfer) num_samples = transfer->actual_length / 2; - sr_dbg("Got %d-%d/%d samples in frame.", devc->samp_received + 1, - devc->samp_received + num_samples, devc->framesize); + sr_spew("Got %d-%d/%d samples in frame.", devc->samp_received + 1, + devc->samp_received + num_samples, devc->framesize); /* * The device always sends a full frame, but the beginning of the frame @@ -678,7 +757,7 @@ static void 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. */ @@ -703,7 +782,7 @@ static void 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); /* Mark the end of this frame. */ @@ -726,8 +805,7 @@ static int handle_event(int fd, int revents, void *cb_data) struct timeval tv; struct dev_context *devc; struct drv_context *drvc = di->priv; - const struct libusb_pollfd **lupfd; - int num_probes, i; + int num_probes; uint32_t trigger_offset; uint8_t capturestate; @@ -743,10 +821,7 @@ static int handle_event(int fd, int revents, void *cb_data) * TODO: Doesn't really cancel pending transfers so they might * come in after SR_DF_END is sent. */ - lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx); - for (i = 0; lupfd[i]; i++) - sr_source_remove(lupfd[i]->fd); - free(lupfd); + usb_source_remove(drvc->sr_ctx); packet.type = SR_DF_END; sr_session_send(sdi, &packet); @@ -762,11 +837,11 @@ static int handle_event(int fd, int revents, void *cb_data) /* TODO: ugh */ if (devc->dev_state == NEW_CAPTURE) { - if (dso_capture_start(devc) != SR_OK) + if (dso_capture_start(sdi) != SR_OK) return TRUE; - if (dso_enable_trigger(devc) != SR_OK) + if (dso_enable_trigger(sdi) != SR_OK) return TRUE; -// if (dso_force_trigger(devc) != SR_OK) +// if (dso_force_trigger(sdi) != SR_OK) // return TRUE; sr_dbg("Successfully requested next chunk."); devc->dev_state = CAPTURE; @@ -775,7 +850,7 @@ static int handle_event(int fd, int revents, void *cb_data) if (devc->dev_state != CAPTURE) return TRUE; - if ((dso_get_capturestate(devc, &capturestate, &trigger_offset)) != SR_OK) + if ((dso_get_capturestate(sdi, &capturestate, &trigger_offset)) != SR_OK) return TRUE; sr_dbg("Capturestate %d.", capturestate); @@ -784,11 +859,11 @@ static int handle_event(int fd, int revents, void *cb_data) case CAPTURE_EMPTY: if (++devc->capture_empty_count >= MAX_CAPTURE_EMPTY) { devc->capture_empty_count = 0; - if (dso_capture_start(devc) != SR_OK) + if (dso_capture_start(sdi) != SR_OK) break; - if (dso_enable_trigger(devc) != SR_OK) + if (dso_enable_trigger(sdi) != SR_OK) break; -// if (dso_force_trigger(devc) != SR_OK) +// if (dso_force_trigger(sdi) != SR_OK) // break; sr_dbg("Successfully requested next chunk."); } @@ -834,16 +909,13 @@ static int handle_event(int fd, int revents, void *cb_data) return TRUE; } -static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { - const struct libusb_pollfd **lupfd; struct dev_context *devc; struct drv_context *drvc = di->priv; - int i; if (sdi->status != SR_ST_ACTIVE) - return SR_ERR; + return SR_ERR_DEV_CLOSED; devc = sdi->priv; devc->cb_data = cb_data; @@ -853,26 +925,22 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_ERR; } - if (dso_init(devc) != SR_OK) + if (dso_init(sdi) != SR_OK) return SR_ERR; - if (dso_capture_start(devc) != SR_OK) + if (dso_capture_start(sdi) != SR_OK) return SR_ERR; devc->dev_state = CAPTURE; - lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx); - for (i = 0; lupfd[i]; i++) - sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK, - handle_event, (void *)sdi); - free(lupfd); + usb_source_add(drvc->sr_ctx, TICK, handle_event, (void *)sdi); /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); + std_session_send_df_header(cb_data, LOG_PREFIX); return SR_OK; } -static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { struct dev_context *devc; @@ -891,17 +959,17 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = { .name = "hantek-dso", .longname = "Hantek DSO", .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .scan = hw_scan, - .dev_list = hw_dev_list, - .dev_clear = clear_instances, - .config_get = NULL, + .init = init, + .cleanup = cleanup, + .scan = scan, + .dev_list = dev_list, + .dev_clear = dev_clear, + .config_get = config_get, .config_set = config_set, .config_list = config_list, - .dev_open = hw_dev_open, - .dev_close = hw_dev_close, - .dev_acquisition_start = hw_dev_acquisition_start, - .dev_acquisition_stop = hw_dev_acquisition_stop, + .dev_open = dev_open, + .dev_close = dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };