X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fapi.c;h=258897118161ee9cd26d0488d5beb574734a34e5;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hp=8bc32b3900a50ff2d7ae20e77ffdc9569efd05e3;hpb=0aba65da9f4031ca6eb7d0c268e4d06b0d0bfa06;p=libsigrok.git diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c index 8bc32b39..25889711 100644 --- a/hardware/openbench-logic-sniffer/api.c +++ b/hardware/openbench-logic-sniffer/api.c @@ -1,7 +1,7 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2013 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,87 +18,79 @@ */ #include "protocol.h" +#include #define SERIALCOMM "115200/8n1" -static const int hwcaps[] = { - SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_SAMPLERATE, - SR_HWCAP_CAPTURE_RATIO, - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_RLE, - 0, +static const int32_t hwopts[] = { + SR_CONF_CONN, + SR_CONF_SERIALCOMM, }; -/* Probes are numbered 0-31 (on the PCB silkscreen). */ -SR_PRIV const char *ols_probe_names[NUM_PROBES + 1] = { - "0", - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "13", - "14", - "15", - "16", - "17", - "18", - "19", - "20", - "21", - "22", - "23", - "24", - "25", - "26", - "27", - "28", - "29", - "30", - "31", +static const int32_t hwcaps[] = { + SR_CONF_LOGIC_ANALYZER, + SR_CONF_SAMPLERATE, + SR_CONF_TRIGGER_TYPE, + SR_CONF_CAPTURE_RATIO, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_EXTERNAL_CLOCK, + SR_CONF_PATTERN_MODE, + SR_CONF_SWAP, + SR_CONF_RLE, +}; + +#define STR_PATTERN_NONE "None" +#define STR_PATTERN_EXTERNAL "External" +#define STR_PATTERN_INTERNAL "Internal" + +/* Supported methods of test pattern outputs */ +enum { + /** + * Capture pins 31:16 (unbuffered wing) output a test pattern + * that can captured on pins 0:15. + */ + PATTERN_EXTERNAL, + + /** Route test pattern internally to capture buffer. */ + PATTERN_INTERNAL, +}; + +static const char *patterns[] = { + STR_PATTERN_NONE, + STR_PATTERN_EXTERNAL, + STR_PATTERN_INTERNAL, +}; + +/* Channels are numbered 0-31 (on the PCB silkscreen). */ +SR_PRIV const char *ols_channel_names[NUM_PROBES + 1] = { + "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", + "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", + "24", "25", "26", "27", "28", "29", "30", "31", NULL, }; -/* default supported samplerates, can be overridden by device metadata */ -static const struct sr_samplerates samplerates = { +/* Default supported samplerates, can be overridden by device metadata. */ +static const uint64_t samplerates[] = { SR_HZ(10), SR_MHZ(200), SR_HZ(1), - NULL, }; SR_PRIV struct sr_dev_driver ols_driver_info; static struct sr_dev_driver *di = &ols_driver_info; -static int hw_init(struct sr_context *sr_ctx) +static int 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_init(sr_ctx, di, LOG_PREFIX); } -static GSList *hw_scan(GSList *options) +static GSList *scan(GSList *options) { - struct sr_hwopt *opt; + struct sr_config *src; struct sr_dev_inst *sdi; struct drv_context *drvc; struct dev_context *devc; - struct sr_probe *probe; + struct sr_channel *ch; struct sr_serial_dev_inst *serial; GPollFD probefd; GSList *l, *devices; @@ -106,19 +98,19 @@ static GSList *hw_scan(GSList *options) const char *conn, *serialcomm; char buf[8]; - (void)options; drvc = di->priv; + devices = NULL; conn = serialcomm = NULL; for (l = options; l; l = l->next) { - opt = l->data; - switch (opt->hwopt) { - case SR_HWOPT_CONN: - conn = opt->value; + src = l->data; + switch (src->key) { + case SR_CONF_CONN: + conn = g_variant_get_string(src->data, NULL); break; - case SR_HWOPT_SERIALCOMM: - serialcomm = opt->value; + case SR_CONF_SERIALCOMM: + serialcomm = g_variant_get_string(src->data, NULL); break; } } @@ -158,13 +150,13 @@ static GSList *hw_scan(GSList *options) /* Wait 10ms for a response. */ g_usleep(10000); - probefd.fd = serial->fd; + sp_get_port_handle(serial->data, &probefd.fd); probefd.events = G_IO_IN; g_poll(&probefd, 1, 1); if (probefd.revents != G_IO_IN) return NULL; - if (serial_read(serial, buf, 4) != 4) + if (serial_read_blocking(serial, buf, 4) != 4) return NULL; if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4)) return NULL; @@ -180,19 +172,28 @@ static GSList *hw_scan(GSList *options) devc = sdi->priv; } else { /* Not an OLS -- some other board that uses the sump protocol. */ + sr_info("Device does not support metadata."); sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Sump", "Logic Analyzer", "v1.0"); sdi->driver = di; - devc = ols_dev_new(); for (i = 0; i < 32; i++) { - if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, - ols_probe_names[i]))) + if (!(ch = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, + ols_channel_names[i]))) return 0; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); } + devc = ols_dev_new(); sdi->priv = devc; } - devc->serial = serial; + /* Configure samplerate and divider. */ + if (ols_set_samplerate(sdi, DEFAULT_SAMPLERATE) != SR_OK) + sr_dbg("Failed to set default samplerate (%"PRIu64").", + DEFAULT_SAMPLERATE); + /* Clear trigger masks, values and stages. */ + ols_configure_channels(sdi); + sdi->inst_type = SR_INST_SERIAL; + sdi->conn = serial; + drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); @@ -201,195 +202,281 @@ static GSList *hw_scan(GSList *options) return devices; } -static GSList *hw_dev_list(void) +static GSList *dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; + return ((struct drv_context *)(di->priv))->instances; +} - return drvc->instances; +static int cleanup(void) +{ + return std_dev_clear(di, NULL); } -static int hw_dev_open(struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { struct dev_context *devc; - devc = sdi->priv; + (void)cg; - if (serial_open(devc->serial, SERIAL_RDWR) != SR_OK) - return SR_ERR; + if (!sdi) + return SR_ERR_ARG; - sdi->status = SR_ST_ACTIVE; + devc = sdi->priv; + switch (id) { + case SR_CONF_SAMPLERATE: + *data = g_variant_new_uint64(devc->cur_samplerate); + break; + case SR_CONF_CAPTURE_RATIO: + *data = g_variant_new_uint64(devc->capture_ratio); + break; + case SR_CONF_LIMIT_SAMPLES: + *data = g_variant_new_uint64(devc->limit_samples); + break; + case SR_CONF_PATTERN_MODE: + if (devc->flag_reg & FLAG_EXTERNAL_TEST_MODE) + *data = g_variant_new_string(STR_PATTERN_EXTERNAL); + else if (devc->flag_reg & FLAG_INTERNAL_TEST_MODE) + *data = g_variant_new_string(STR_PATTERN_INTERNAL); + else + *data = g_variant_new_string(STR_PATTERN_NONE); + break; + case SR_CONF_RLE: + *data = g_variant_new_boolean(devc->flag_reg & FLAG_RLE ? TRUE : FALSE); + break; + default: + return SR_ERR_NA; + } return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { struct dev_context *devc; + uint16_t flag; + uint64_t tmp_u64; + int ret; + const char *stropt; - devc = sdi->priv; + (void)cg; - if (devc->serial && devc->serial->fd != -1) { - serial_close(devc->serial); - sdi->status = SR_ST_INACTIVE; - } + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; - return SR_OK; -} + devc = sdi->priv; -static int hw_cleanup(void) -{ - GSList *l; - struct sr_dev_inst *sdi; - struct drv_context *drvc; - struct dev_context *devc; - int ret = SR_OK; - - if (!(drvc = di->priv)) - return SR_OK; - - /* Properly close and free all devices. */ - 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__); - ret = SR_ERR_BUG; - continue; + switch (id) { + case SR_CONF_SAMPLERATE: + tmp_u64 = g_variant_get_uint64(data); + if (tmp_u64 < samplerates[0] || tmp_u64 > samplerates[1]) + return SR_ERR_SAMPLERATE; + ret = ols_set_samplerate(sdi, g_variant_get_uint64(data)); + break; + case SR_CONF_LIMIT_SAMPLES: + tmp_u64 = g_variant_get_uint64(data); + if (tmp_u64 < MIN_NUM_SAMPLES) + return SR_ERR; + devc->limit_samples = tmp_u64; + ret = SR_OK; + break; + case SR_CONF_CAPTURE_RATIO: + devc->capture_ratio = g_variant_get_uint64(data); + if (devc->capture_ratio < 0 || devc->capture_ratio > 100) { + devc->capture_ratio = 0; + ret = SR_ERR; + } else + ret = SR_OK; + break; + case SR_CONF_EXTERNAL_CLOCK: + if (g_variant_get_boolean(data)) { + sr_info("Enabling external clock."); + devc->flag_reg |= FLAG_CLOCK_EXTERNAL; + } else { + sr_info("Disabled external clock."); + devc->flag_reg &= ~FLAG_CLOCK_EXTERNAL; } - if (!(devc = sdi->priv)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("%s: sdi->priv was NULL, continuing", __func__); - ret = SR_ERR_BUG; - continue; + ret = SR_OK; + break; + case SR_CONF_PATTERN_MODE: + stropt = g_variant_get_string(data, NULL); + ret = SR_OK; + flag = 0xffff; + if (!strcmp(stropt, STR_PATTERN_NONE)) { + sr_info("Disabling test modes."); + flag = 0x0000; + }else if (!strcmp(stropt, STR_PATTERN_INTERNAL)) { + sr_info("Enabling internal test mode."); + flag = FLAG_INTERNAL_TEST_MODE; + } else if (!strcmp(stropt, STR_PATTERN_EXTERNAL)) { + sr_info("Enabling external test mode."); + flag = FLAG_EXTERNAL_TEST_MODE; + } else { + ret = SR_ERR; } - hw_dev_close(sdi); - sr_serial_dev_inst_free(devc->serial); - sr_dev_inst_free(sdi); + if (flag != 0xffff) { + devc->flag_reg &= ~(FLAG_INTERNAL_TEST_MODE | FLAG_EXTERNAL_TEST_MODE); + devc->flag_reg |= flag; + } + break; + case SR_CONF_SWAP: + if (g_variant_get_boolean(data)) { + sr_info("Enabling channel swapping."); + devc->flag_reg |= FLAG_SWAP_PROBES; + } else { + sr_info("Disabling channel swapping."); + devc->flag_reg &= ~FLAG_SWAP_PROBES; + } + ret = SR_OK; + break; + + case SR_CONF_RLE: + if (g_variant_get_boolean(data)) { + sr_info("Enabling RLE."); + devc->flag_reg |= FLAG_RLE; + } else { + sr_info("Disabling RLE."); + devc->flag_reg &= ~FLAG_RLE; + } + ret = SR_OK; + break; + default: + ret = SR_ERR_NA; } - g_slist_free(drvc->instances); - drvc->instances = NULL; return ret; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { struct dev_context *devc; + GVariant *gvar, *grange[2]; + GVariantBuilder gvb; + int num_channels, i; + + (void)cg; - switch (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; + switch (key) { + case SR_CONF_SCAN_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t)); break; - case SR_DI_NUM_PROBES: - *data = GINT_TO_POINTER(1); + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); break; - case SR_DI_PROBE_NAMES: - *data = ols_probe_names; + case SR_CONF_SAMPLERATE: + g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); + gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates, + ARRAY_SIZE(samplerates), sizeof(uint64_t)); + g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar); + *data = g_variant_builder_end(&gvb); break; - case SR_DI_SAMPLERATES: - *data = &samplerates; + case SR_CONF_TRIGGER_TYPE: + *data = g_variant_new_string(TRIGGER_TYPE); break; - case SR_DI_TRIGGER_TYPES: - *data = (char *)TRIGGER_TYPES; + case SR_CONF_PATTERN_MODE: + *data = g_variant_new_strv(patterns, ARRAY_SIZE(patterns)); break; - case SR_DI_CUR_SAMPLERATE: - if (sdi) { - devc = sdi->priv; - *data = &devc->cur_samplerate; - } else - return SR_ERR; + case SR_CONF_LIMIT_SAMPLES: + if (!sdi) + return SR_ERR_ARG; + devc = sdi->priv; + if (devc->flag_reg & FLAG_RLE) + return SR_ERR_NA; + if (devc->max_samples == 0) + /* Device didn't specify sample memory size in metadata. */ + return SR_ERR_NA; + /* + * Channel groups are turned off if no channels in that group are + * enabled, making more room for samples for the enabled group. + */ + ols_configure_channels(sdi); + num_channels = 0; + for (i = 0; i < 4; i++) { + if (devc->channel_mask & (0xff << (i * 8))) + num_channels++; + } + grange[0] = g_variant_new_uint64(MIN_NUM_SAMPLES); + grange[1] = g_variant_new_uint64(devc->max_samples / num_channels); + *data = g_variant_new_tuple(grange, 2); break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int set_trigger(const struct sr_dev_inst *sdi, int stage) { struct dev_context *devc; - int ret; - const uint64_t *tmp_u64; + struct sr_serial_dev_inst *serial; + uint8_t cmd, arg[4]; devc = sdi->priv; + serial = sdi->conn; + + cmd = CMD_SET_TRIGGER_MASK + stage * 4; + arg[0] = devc->trigger_mask[stage] & 0xff; + arg[1] = (devc->trigger_mask[stage] >> 8) & 0xff; + arg[2] = (devc->trigger_mask[stage] >> 16) & 0xff; + arg[3] = (devc->trigger_mask[stage] >> 24) & 0xff; + if (send_longcommand(serial, cmd, arg) != SR_OK) + return SR_ERR; - if (sdi->status != SR_ST_ACTIVE) + cmd = CMD_SET_TRIGGER_VALUE + stage * 4; + arg[0] = devc->trigger_value[stage] & 0xff; + arg[1] = (devc->trigger_value[stage] >> 8) & 0xff; + arg[2] = (devc->trigger_value[stage] >> 16) & 0xff; + arg[3] = (devc->trigger_value[stage] >> 24) & 0xff; + if (send_longcommand(serial, cmd, arg) != SR_OK) return SR_ERR; - switch (hwcap) { - case SR_HWCAP_SAMPLERATE: - ret = ols_set_samplerate(sdi, *(const uint64_t *)value, - &samplerates); - break; - case SR_HWCAP_LIMIT_SAMPLES: - tmp_u64 = value; - if (*tmp_u64 < MIN_NUM_SAMPLES) - return SR_ERR; - if (*tmp_u64 > devc->max_samples) - sr_err("Sample limit exceeds hardware maximum."); - devc->limit_samples = *tmp_u64; - sr_info("Sample limit is %" PRIu64 ".", devc->limit_samples); - ret = SR_OK; - break; - case SR_HWCAP_CAPTURE_RATIO: - devc->capture_ratio = *(const uint64_t *)value; - if (devc->capture_ratio < 0 || devc->capture_ratio > 100) { - devc->capture_ratio = 0; - ret = SR_ERR; - } else - ret = SR_OK; - break; - case SR_HWCAP_RLE: - if (GPOINTER_TO_INT(value)) { - sr_info("Enabling RLE."); - devc->flag_reg |= FLAG_RLE; - } - ret = SR_OK; - break; - default: - ret = SR_ERR; - } + cmd = CMD_SET_TRIGGER_CONFIG + stage * 4; + arg[0] = arg[1] = arg[3] = 0x00; + arg[2] = stage; + if (stage == devc->num_stages) + /* Last stage, fire when this one matches. */ + arg[3] |= TRIGGER_START; + if (send_longcommand(serial, cmd, arg) != SR_OK) + return SR_ERR; - return ret; + return SR_OK; } -static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, +static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { - struct sr_datafeed_packet *packet; - struct sr_datafeed_header *header; - struct sr_datafeed_meta_logic meta; struct dev_context *devc; - uint32_t trigger_config[4]; - uint32_t data; - uint16_t readcount, delaycount; - uint8_t changrp_mask; + struct sr_serial_dev_inst *serial; + uint16_t samplecount, readcount, delaycount; + uint8_t changrp_mask, arg[4]; int num_channels; - int i; - - devc = sdi->priv; + int ret, i; if (sdi->status != SR_ST_ACTIVE) - return SR_ERR; + return SR_ERR_DEV_CLOSED; - if (ols_configure_probes(sdi) != SR_OK) { - sr_err("Failed to configure probes."); + devc = sdi->priv; + serial = sdi->conn; + + if (ols_configure_channels(sdi) != SR_OK) { + sr_err("Failed to configure channels."); return SR_ERR; } /* * Enable/disable channel groups in the flag register according to the - * probe mask. Calculate this here, because num_channels is needed + * channel mask. Calculate this here, because num_channels is needed * to limit readcount. */ changrp_mask = 0; num_channels = 0; for (i = 0; i < 4; i++) { - if (devc->probe_mask & (0xff << (i * 8))) { + if (devc->channel_mask & (0xff << (i * 8))) { changrp_mask |= (1 << i); num_channels++; } @@ -399,129 +486,86 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, * Limit readcount to prevent reading past the end of the hardware * buffer. */ - readcount = MIN(devc->max_samples / num_channels, devc->limit_samples) / 4; + samplecount = MIN(devc->max_samples / num_channels, devc->limit_samples); + readcount = samplecount / 4; - memset(trigger_config, 0, 16); - trigger_config[devc->num_stages - 1] |= 0x08; - if (devc->trigger_mask[0]) { + /* Rather read too many samples than too few. */ + if (samplecount % 4 != 0) + readcount++; + + /* Basic triggers. */ + if (devc->trigger_mask[0] != 0x00000000) { + /* At least one channel has a trigger on it. */ delaycount = readcount * (1 - devc->capture_ratio / 100.0); devc->trigger_at = (readcount - delaycount) * 4 - devc->num_stages; - - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_0, - reverse32(devc->trigger_mask[0])) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_0, - reverse32(devc->trigger_value[0])) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_0, - trigger_config[0]) != SR_OK) - return SR_ERR; - - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_1, - reverse32(devc->trigger_mask[1])) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_1, - reverse32(devc->trigger_value[1])) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_1, - trigger_config[1]) != SR_OK) - return SR_ERR; - - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_2, - reverse32(devc->trigger_mask[2])) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_2, - reverse32(devc->trigger_value[2])) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_2, - trigger_config[2]) != SR_OK) - return SR_ERR; - - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_3, - reverse32(devc->trigger_mask[3])) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_3, - reverse32(devc->trigger_value[3])) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_3, - trigger_config[3]) != SR_OK) - return SR_ERR; + for (i = 0; i <= devc->num_stages; i++) { + sr_dbg("Setting stage %d trigger.", i); + if ((ret = set_trigger(sdi, i)) != SR_OK) + return ret; + } } else { - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_0, - devc->trigger_mask[0]) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_0, - devc->trigger_value[0]) != SR_OK) - return SR_ERR; - if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_0, - 0x00000008) != SR_OK) - return SR_ERR; + /* No triggers configured, force trigger on first stage. */ + sr_dbg("Forcing trigger at stage 0."); + if ((ret = set_trigger(sdi, 0)) != SR_OK) + return ret; delaycount = readcount; } - sr_info("Setting samplerate to %" PRIu64 "Hz (divider %u, " - "demux %s)", devc->cur_samplerate, devc->cur_samplerate_divider, - devc->flag_reg & FLAG_DEMUX ? "on" : "off"); - if (send_longcommand(devc->serial, CMD_SET_DIVIDER, - reverse32(devc->cur_samplerate_divider)) != SR_OK) + /* Samplerate. */ + sr_dbg("Setting samplerate to %" PRIu64 "Hz (divider %u)", + devc->cur_samplerate, devc->cur_samplerate_divider); + arg[0] = devc->cur_samplerate_divider & 0xff; + arg[1] = (devc->cur_samplerate_divider & 0xff00) >> 8; + arg[2] = (devc->cur_samplerate_divider & 0xff0000) >> 16; + arg[3] = 0x00; + if (send_longcommand(serial, CMD_SET_DIVIDER, arg) != SR_OK) return SR_ERR; /* Send sample limit and pre/post-trigger capture ratio. */ - data = ((readcount - 1) & 0xffff) << 16; - data |= (delaycount - 1) & 0xffff; - if (send_longcommand(devc->serial, CMD_CAPTURE_SIZE, reverse16(data)) != SR_OK) + sr_dbg("Setting sample limit %d, trigger point at %d", + (readcount - 1) * 4, (delaycount - 1) * 4); + arg[0] = ((readcount - 1) & 0xff); + arg[1] = ((readcount - 1) & 0xff00) >> 8; + arg[2] = ((delaycount - 1) & 0xff); + arg[3] = ((delaycount - 1) & 0xff00) >> 8; + if (send_longcommand(serial, CMD_CAPTURE_SIZE, arg) != SR_OK) return SR_ERR; - /* The flag register wants them here, and 1 means "disable channel". */ + /* Flag register. */ + sr_dbg("Setting intpat %s, extpat %s, RLE %s, noise_filter %s, demux %s", + devc->flag_reg & FLAG_INTERNAL_TEST_MODE ? "on": "off", + devc->flag_reg & FLAG_EXTERNAL_TEST_MODE ? "on": "off", + devc->flag_reg & FLAG_RLE ? "on" : "off", + devc->flag_reg & FLAG_FILTER ? "on": "off", + devc->flag_reg & FLAG_DEMUX ? "on" : "off"); + /* 1 means "disable channel". */ devc->flag_reg |= ~(changrp_mask << 2) & 0x3c; - devc->flag_reg |= FLAG_FILTER; - devc->rle_count = 0; - data = (devc->flag_reg << 24) | ((devc->flag_reg << 8) & 0xff0000); - if (send_longcommand(devc->serial, CMD_SET_FLAGS, data) != SR_OK) + arg[0] = devc->flag_reg & 0xff; + arg[1] = devc->flag_reg >> 8; + arg[2] = arg[3] = 0x00; + if (send_longcommand(serial, CMD_SET_FLAGS, arg) != SR_OK) return SR_ERR; /* Start acquisition on the device. */ - if (send_shortcommand(devc->serial, CMD_RUN) != SR_OK) + if (send_shortcommand(serial, CMD_RUN) != SR_OK) return SR_ERR; - sr_source_add(devc->serial->fd, G_IO_IN, -1, ols_receive_data, - cb_data); - - if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { - sr_err("Datafeed packet malloc failed."); - return SR_ERR_MALLOC; - } - - if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("Datafeed header malloc failed."); - g_free(packet); - return SR_ERR_MALLOC; - } + /* Reset all operational states. */ + devc->rle_count = devc->num_transfers = 0; + devc->num_samples = devc->num_bytes = 0; + devc->cnt_bytes = devc->cnt_samples = devc->cnt_samples_rle = 0; + memset(devc->sample, 0, 4); /* 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); - - /* Send metadata about the SR_DF_LOGIC packets to come. */ - packet->type = SR_DF_META_LOGIC; - packet->payload = &meta; - meta.samplerate = devc->cur_samplerate; - meta.num_probes = NUM_PROBES; - sr_session_send(cb_data, packet); - - g_free(header); - g_free(packet); + std_session_send_df_header(cb_data, LOG_PREFIX); + + serial_source_add(serial, G_IO_IN, -1, ols_receive_data, cb_data); return SR_OK; } -/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ -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) { - /* Avoid compiler warnings. */ (void)cb_data; abort_acquisition(sdi); @@ -533,16 +577,17 @@ SR_PRIV struct sr_dev_driver ols_driver_info = { .name = "ols", .longname = "Openbench Logic Sniffer", .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .scan = hw_scan, - .dev_list = hw_dev_list, - .dev_clear = hw_cleanup, - .dev_open = hw_dev_open, - .dev_close = hw_dev_close, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, - .dev_acquisition_start = hw_dev_acquisition_start, - .dev_acquisition_stop = hw_dev_acquisition_stop, + .init = init, + .cleanup = cleanup, + .scan = scan, + .dev_list = dev_list, + .dev_clear = NULL, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, + .dev_open = std_serial_dev_open, + .dev_close = std_serial_dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };