X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fapi.c;h=a56feb6f5843fcb22ec9513839b9f75f42538111;hb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;hp=474b96ed624b93f14c7dde000cb3bc9ab0512985;hpb=41f5bd09b0d3c5f9232ff20d076f76cc41acad32;p=libsigrok.git diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c index 474b96ed..a56feb6f 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,9 +37,16 @@ /* TODO tune this properly */ #define TICK 1 -static const int hwcaps[] = { +#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_SAMPLES, + SR_CONF_LIMIT_FRAMES, SR_CONF_CONTINUOUS, SR_CONF_TIMEBASE, SR_CONF_BUFFERSIZE, @@ -49,7 +56,8 @@ static const int hwcaps[] = { SR_CONF_FILTER, SR_CONF_VDIV, SR_CONF_COUPLING, - 0, + SR_CONF_NUM_TIMEBASE, + SR_CONF_NUM_VDIV, }; static const char *probe_names[] = { @@ -57,33 +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", - FIRMWARE_DIR "/hantek-dso-2xxx.fw" }, + buffersizes_32k, + FIRMWARE_DIR "/hantek-dso-2090.fw" }, { 0x04b4, 0x2150, 0x04b5, 0x2150, "Hantek", "DSO-2150", - FIRMWARE_DIR "/hantek-dso-2xxx.fw" }, + buffersizes_32k, + FIRMWARE_DIR "/hantek-dso-2150.fw" }, { 0x04b4, 0x2250, 0x04b5, 0x2250, "Hantek", "DSO-2250", - FIRMWARE_DIR "/hantek-dso-2xxx.fw" }, + buffersizes_512k, + FIRMWARE_DIR "/hantek-dso-2250.fw" }, { 0x04b4, 0x5200, 0x04b5, 0x5200, "Hantek", "DSO-5200", - FIRMWARE_DIR "/hantek-dso-5xxx.fw" }, + buffersizes_14k, + FIRMWARE_DIR "/hantek-dso-5200.fw" }, { 0x04b4, 0x520a, 0x04b5, 0x520a, "Hantek", "DSO-5200A", - FIRMWARE_DIR "/hantek-dso-5xxx.fw" }, - { 0, 0, 0, 0, 0, 0, 0 }, -}; - -static const uint64_t buffersizes[] = { - 10240, - 32768, - /* TODO: 65535 */ - 0, + buffersizes_512k, + FIRMWARE_DIR "/hantek-dso-5200A.fw" }, + { 0, 0, 0, 0, 0, 0, 0, 0 }, }; -static const struct sr_rational timebases[] = { +static const uint64_t timebases[][2] = { /* microseconds */ { 10, 1000000 }, { 20, 1000000 }, @@ -101,10 +117,9 @@ static const struct sr_rational timebases[] = { { 100, 1000 }, { 200, 1000 }, { 400, 1000 }, - { 0, 0}, }; -static const struct sr_rational vdivs[] = { +static const uint64_t vdivs[][2] = { /* millivolts */ { 10, 1000 }, { 20, 1000 }, @@ -116,7 +131,6 @@ static const struct sr_rational vdivs[] = { { 1, 1 }, { 2, 1 }, { 5, 1 }, - { 0, 0 }, }; static const char *trigger_sources[] = { @@ -124,21 +138,18 @@ static const char *trigger_sources[] = { "CH2", "EXT", /* TODO: forced */ - NULL, }; static const char *filter_targets[] = { "CH1", "CH2", /* TODO: "TRIGGER", */ - NULL, }; static const char *coupling[] = { "AC", "DC", "GND", - NULL, }; SR_PRIV struct sr_dev_driver hantek_dso_driver_info; @@ -223,53 +234,24 @@ 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 clear_instances(void) +{ + return std_dev_clear(di, clear_dev_context); } static int hw_init(struct sr_context *sr_ctx) { - struct drv_context *drvc; - - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("Driver context malloc failed."); - return SR_ERR_MALLOC; - } - - drvc->sr_ctx = sr_ctx; - di->priv = drvc; - - return SR_OK; + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); } static GSList *hw_scan(GSList *options) @@ -285,11 +267,12 @@ static GSList *hw_scan(GSList *options) (void)options; - devcnt = 0; - devices = 0; drvc = di->priv; drvc->instances = NULL; + devcnt = 0; + devices = 0; + clear_instances(); /* Find all Hantek DSO devices and upload firmware to all of them. */ @@ -319,7 +302,7 @@ static GSList *hw_scan(GSList *options) sr_err("Firmware upload failed for " "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; @@ -332,7 +315,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++; @@ -350,20 +334,18 @@ static GSList *hw_scan(GSList *options) static GSList *hw_dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int hw_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 @@ -393,7 +375,7 @@ 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)); @@ -422,37 +404,44 @@ static int hw_cleanup(void) return SR_OK; } -static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) { - uint64_t tmp; - - (void)sdi; + struct sr_usb_dev_inst *usb; + char str[128]; switch (id) { - case SR_DI_HWCAPS: - *data = hwcaps; + 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_DI_TRIGGER_SOURCES: - *data = trigger_sources; + case SR_CONF_NUM_TIMEBASE: + *data = g_variant_new_int32(NUM_TIMEBASE); break; - /* TODO remove this */ - case SR_CONF_SAMPLERATE: - *data = &tmp; + case SR_CONF_NUM_VDIV: + *data = g_variant_new_int32(NUM_VDIV); break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; } -static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) { struct dev_context *devc; - struct sr_rational tmp_rat; - float tmp_float; - uint64_t tmp_u64; - int ret, i; + double tmp_double; + uint64_t tmp_u64, p, q; + int tmp_int, ret; + unsigned int i; + const char *tmp_str; char **targets; if (sdi->status != SR_ST_ACTIVE) @@ -462,49 +451,52 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) devc = sdi->priv; switch (id) { case SR_CONF_LIMIT_FRAMES: - devc->limit_frames = *(const uint64_t *)value; + devc->limit_frames = g_variant_get_uint64(data); break; case SR_CONF_TRIGGER_SLOPE: - tmp_u64 = *(const int *)value; + tmp_u64 = g_variant_get_uint64(data); if (tmp_u64 != SLOPE_NEGATIVE && tmp_u64 != SLOPE_POSITIVE) ret = SR_ERR_ARG; devc->triggerslope = tmp_u64; break; case SR_CONF_HORIZ_TRIGGERPOS: - tmp_float = *(const float *)value; - if (tmp_float < 0.0 || tmp_float > 1.0) { + 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_float; + devc->triggerposition = tmp_double; break; case SR_CONF_BUFFERSIZE: - tmp_u64 = *(const int *)value; - for (i = 0; buffersizes[i]; i++) { - if (buffersizes[i] == tmp_u64) { + 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 (buffersizes[i] == 0) + if (i == 2) ret = SR_ERR_ARG; break; case SR_CONF_TIMEBASE: - tmp_rat = *(const struct sr_rational *)value; - for (i = 0; timebases[i].p && timebases[i].q; i++) { - if (timebases[i].p == tmp_rat.p - && timebases[i].q == tmp_rat.q) { - devc->timebase = i; + 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 (timebases[i].p == 0 && timebases[i].q == 0) + 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(value, trigger_sources[i])) { - devc->triggersource = g_strdup(value); + if (!strcmp(tmp_str, trigger_sources[i])) { + devc->triggersource = g_strdup(tmp_str); break; } } @@ -512,8 +504,9 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) 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(value, ",", 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. */ @@ -533,22 +526,25 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) break; case SR_CONF_VDIV: /* TODO: Not supporting vdiv per channel yet. */ - tmp_rat = *(const struct sr_rational *)value; - for (i = 0; vdivs[i].p && vdivs[i].q; i++) { - if (vdivs[i].p == tmp_rat.p - && vdivs[i].q == tmp_rat.q) { - devc->voltage_ch1 = i; - devc->voltage_ch2 = i; + 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 (vdivs[i].p == 0 && vdivs[i].q == 0) + 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(value, coupling[i])) { + if (!strcmp(tmp_str, coupling[i])) { devc->coupling_ch1 = i; devc->coupling_ch2 = i; break; @@ -558,36 +554,72 @@ static int config_set(int id, const void *value, 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, const void **data, const struct sr_dev_inst *sdi) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) { + struct dev_context *devc; + GVariant *tuple, *rational[2]; + GVariantBuilder gvb; + unsigned int i; (void)sdi; + if (!sdi) + return SR_ERR_ARG; + + devc = sdi->priv; 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: - *data = buffersizes; + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64, + devc->profile->buffersizes, 2, sizeof(uint64_t)); break; case SR_CONF_COUPLING: - *data = coupling; + *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); break; case SR_CONF_VDIV: - *data = vdivs; + 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 = filter_targets; + *data = g_variant_new_strv(filter_targets, + ARRAY_SIZE(filter_targets)); break; case SR_CONF_TIMEBASE: - *data = timebases; + 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; @@ -629,14 +661,14 @@ 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].p / vdivs[devc->voltage_ch1].q) * 8; + range = ((float)vdivs[devc->voltage_ch1][0] / vdivs[devc->voltage_ch1][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].p / vdivs[devc->voltage_ch2].q) * 8; + range = ((float)vdivs[devc->voltage_ch2][0] / vdivs[devc->voltage_ch2][1]) * 8; ch2 = range / 255 * *(buf + i * 2); ch2 -= range / 2; analog.data[data_offset++] = ch2; @@ -660,7 +692,7 @@ static void receive_transfer(struct libusb_transfer *transfer) sdi = transfer->user_data; devc = sdi->priv; - sr_dbg("receive_transfer(): status %d received %d bytes.", + sr_spew("receive_transfer(): status %d received %d bytes.", transfer->status, transfer->actual_length); if (transfer->actual_length == 0) @@ -669,7 +701,7 @@ 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, + sr_spew("Got %d-%d/%d samples in frame.", devc->samp_received + 1, devc->samp_received + num_samples, devc->framesize); /* @@ -785,11 +817,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; @@ -798,7 +830,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); @@ -807,11 +839,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."); } @@ -861,8 +893,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { const struct libusb_pollfd **lupfd; - struct sr_datafeed_packet packet; - struct sr_datafeed_header header; struct dev_context *devc; struct drv_context *drvc = di->priv; int i; @@ -878,10 +908,10 @@ 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; @@ -892,11 +922,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, free(lupfd); /* Send header packet to the session bus. */ - packet.type = SR_DF_HEADER; - packet.payload = (unsigned char *)&header; - header.feed_version = 1; - gettimeofday(&header.starttime, NULL); - sr_session_send(cb_data, &packet); + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); return SR_OK; }