X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fols.c;h=4d369bace57cf1bd962e7dfa22198ea4dd8956a1;hb=34f06b903e3529a73feb7a6e74fae934a999f821;hp=8862db242f8c1d610621986e66fcc087fb07a16b;hpb=f366e86c68071fa7888259aa3963b213caa81b51;p=libsigrok.git diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c index 8862db24..4d369bac 100644 --- a/hardware/openbench-logic-sniffer/ols.c +++ b/hardware/openbench-logic-sniffer/ols.c @@ -38,15 +38,13 @@ #include #endif #include -#include "sigrok.h" -#include "sigrok-internal.h" +#include "libsigrok.h" +#include "libsigrok-internal.h" #include "ols.h" -#ifdef _WIN32 -#define O_NONBLOCK FIONBIO -#endif +#define SERIALCOMM "115200/8n1" -static int hwcaps[] = { +static const int hwcaps[] = { SR_HWCAP_LOGIC_ANALYZER, SR_HWCAP_SAMPLERATE, SR_HWCAP_CAPTURE_RATIO, @@ -93,29 +91,31 @@ static const char *probe_names[NUM_PROBES + 1] = { }; /* default supported samplerates, can be overridden by device metadata */ -static struct sr_samplerates samplerates = { +static const struct sr_samplerates samplerates = { SR_HZ(10), SR_MHZ(200), SR_HZ(1), NULL, }; -/* List of struct sr_serial_dev_inst */ -static GSList *dev_insts = NULL; +SR_PRIV struct sr_dev_driver ols_driver_info; +static struct sr_dev_driver *odi = &ols_driver_info; -static int send_shortcommand(int fd, uint8_t command) +static int send_shortcommand(struct sr_serial_dev_inst *serial, + uint8_t command) { char buf[1]; sr_dbg("ols: sending cmd 0x%.2x", command); buf[0] = command; - if (serial_write(fd, buf, 1) != 1) + if (serial_write(serial, buf, 1) != 1) return SR_ERR; return SR_OK; } -static int send_longcommand(int fd, uint8_t command, uint32_t data) +static int send_longcommand(struct sr_serial_dev_inst *serial, + uint8_t command, uint32_t data) { char buf[5]; @@ -125,28 +125,31 @@ static int send_longcommand(int fd, uint8_t command, uint32_t data) buf[2] = (data & 0xff0000) >> 16; buf[3] = (data & 0xff00) >> 8; buf[4] = data & 0xff; - if (serial_write(fd, buf, 5) != 5) + if (serial_write(serial, buf, 5) != 5) return SR_ERR; return SR_OK; } -static int configure_probes(struct context *ctx, GSList *probes) +static int configure_probes(const struct sr_dev_inst *sdi) { - struct sr_probe *probe; - GSList *l; + struct dev_context *devc; + const struct sr_probe *probe; + const GSList *l; int probe_bit, stage, i; char *tc; - ctx->probe_mask = 0; + devc = sdi->priv; + + devc->probe_mask = 0; for (i = 0; i < NUM_TRIGGER_STAGES; i++) { - ctx->trigger_mask[i] = 0; - ctx->trigger_value[i] = 0; + devc->trigger_mask[i] = 0; + devc->trigger_value[i] = 0; } - ctx->num_stages = 0; - for (l = probes; l; l = l->next) { - probe = (struct sr_probe *)l->data; + devc->num_stages = 0; + for (l = sdi->probes; l; l = l->next) { + probe = (const struct sr_probe *)l->data; if (!probe->enabled) continue; @@ -154,8 +157,8 @@ static int configure_probes(struct context *ctx, GSList *probes) * Set up the probe mask for later configuration into the * flag register. */ - probe_bit = 1 << (probe->index - 1); - ctx->probe_mask |= probe_bit; + probe_bit = 1 << (probe->index); + devc->probe_mask |= probe_bit; if (!probe->trigger) continue; @@ -163,9 +166,9 @@ static int configure_probes(struct context *ctx, GSList *probes) /* Configure trigger mask and value. */ stage = 0; for (tc = probe->trigger; tc && *tc; tc++) { - ctx->trigger_mask[stage] |= probe_bit; + devc->trigger_mask[stage] |= probe_bit; if (*tc == '1') - ctx->trigger_value[stage] |= probe_bit; + devc->trigger_value[stage] |= probe_bit; stage++; if (stage > 3) /* @@ -174,8 +177,8 @@ static int configure_probes(struct context *ctx, GSList *probes) */ return SR_ERR; } - if (stage > ctx->num_stages) - ctx->num_stages = stage; + if (stage > devc->num_stages) + devc->num_stages = stage; } return SR_OK; @@ -205,43 +208,44 @@ static uint32_t reverse32(uint32_t in) return out; } -static struct context *ols_dev_new(void) +static struct dev_context *ols_dev_new(void) { - struct context *ctx; + struct dev_context *devc; - /* TODO: Is 'ctx' ever g_free()'d? */ - if (!(ctx = g_try_malloc0(sizeof(struct context)))) { - sr_err("ols: %s: ctx malloc failed", __func__); + if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { + sr_err("ols: %s: devc malloc failed", __func__); return NULL; } - ctx->trigger_at = -1; - ctx->probe_mask = 0xffffffff; - ctx->cur_samplerate = SR_KHZ(200); - ctx->serial = NULL; + devc->trigger_at = -1; + devc->probe_mask = 0xffffffff; + devc->cur_samplerate = SR_KHZ(200); + devc->serial = NULL; - return ctx; + return devc; } -static struct sr_dev_inst *get_metadata(int fd) +static struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) { struct sr_dev_inst *sdi; - struct context *ctx; - uint32_t tmp_int; + struct dev_context *devc; + struct sr_probe *probe; + uint32_t tmp_int, ui; uint8_t key, type, token; GString *tmp_str, *devname, *version; - gchar tmp_c; + guchar tmp_c; sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, NULL, NULL, NULL); - ctx = ols_dev_new(); - sdi->priv = ctx; + sdi->driver = odi; + devc = ols_dev_new(); + sdi->priv = devc; devname = g_string_new(""); version = g_string_new(""); key = 0xff; while (key) { - if (serial_read(fd, &key, 1) != 1 || key == 0x00) + if (serial_read(serial, &key, 1) != 1 || key == 0x00) break; type = key >> 5; token = key & 0x1f; @@ -249,7 +253,7 @@ static struct sr_dev_inst *get_metadata(int fd) case 0: /* NULL-terminated string */ tmp_str = g_string_new(""); - while (serial_read(fd, &tmp_c, 1) == 1 && tmp_c != '\0') + while (serial_read(serial, &tmp_c, 1) == 1 && tmp_c != '\0') g_string_append_c(tmp_str, tmp_c); sr_dbg("ols: got metadata key 0x%.2x value '%s'", key, tmp_str->str); @@ -281,7 +285,7 @@ static struct sr_dev_inst *get_metadata(int fd) break; case 1: /* 32-bit unsigned integer */ - if (serial_read(fd, &tmp_int, 4) != 4) + if (serial_read(serial, &tmp_int, 4) != 4) break; tmp_int = reverse32(tmp_int); sr_dbg("ols: got metadata key 0x%.2x value 0x%.8x", @@ -289,11 +293,16 @@ static struct sr_dev_inst *get_metadata(int fd) switch (token) { case 0x00: /* Number of usable probes */ - ctx->num_probes = tmp_int; + for (ui = 0; ui < tmp_int; ui++) { + if (!(probe = sr_probe_new(ui, SR_PROBE_LOGIC, TRUE, + probe_names[ui]))) + return 0; + sdi->probes = g_slist_append(sdi->probes, probe); + } break; case 0x01: /* Amount of sample memory available (bytes) */ - ctx->max_samples = tmp_int; + devc->max_samples = tmp_int; break; case 0x02: /* Amount of dynamic memory available (bytes) */ @@ -301,11 +310,11 @@ static struct sr_dev_inst *get_metadata(int fd) break; case 0x03: /* Maximum sample rate (hz) */ - ctx->max_samplerate = tmp_int; + devc->max_samplerate = tmp_int; break; case 0x04: /* protocol version */ - ctx->protocol_version = tmp_int; + devc->protocol_version = tmp_int; break; default: sr_info("ols: unknown token 0x%.2x: 0x%.8x", @@ -315,18 +324,23 @@ static struct sr_dev_inst *get_metadata(int fd) break; case 2: /* 8-bit unsigned integer */ - if (serial_read(fd, &tmp_c, 1) != 1) + if (serial_read(serial, &tmp_c, 1) != 1) break; sr_dbg("ols: got metadata key 0x%.2x value 0x%.2x", key, tmp_c); switch (token) { case 0x00: /* Number of usable probes */ - ctx->num_probes = tmp_c; + for (ui = 0; ui < tmp_c; ui++) { + if (!(probe = sr_probe_new(ui, SR_PROBE_LOGIC, TRUE, + probe_names[ui]))) + return 0; + sdi->probes = g_slist_append(sdi->probes, probe); + } break; case 0x01: /* protocol version */ - ctx->protocol_version = tmp_c; + devc->protocol_version = tmp_c; break; default: sr_info("ols: unknown token 0x%.2x: 0x%.2x", @@ -348,152 +362,144 @@ static struct sr_dev_inst *get_metadata(int fd) return sdi; } -static int hw_init(const char *devinfo) +static int hw_init(struct sr_context *sr_ctx) { - struct sr_dev_inst *sdi; - struct context *ctx; - GSList *ports, *l; - GPollFD *fds, probefd; - int devcnt, final_devcnt, num_ports, fd, ret, i; - char buf[8], **dev_names, **serial_params; - - final_devcnt = 0; + struct drv_context *drvc; - if (devinfo) - ports = g_slist_append(NULL, g_strdup(devinfo)); - else - /* No specific device given, so scan all serial ports. */ - ports = list_serial_ports(); + if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { + sr_err("ols: driver context malloc failed."); + return SR_ERR_MALLOC; + } + odi->priv = drvc; - num_ports = g_slist_length(ports); + return SR_OK; +} - if (!(fds = g_try_malloc0(num_ports * sizeof(GPollFD)))) { - sr_err("ols: %s: fds malloc failed", __func__); - goto hw_init_free_ports; /* TODO: SR_ERR_MALLOC. */ +static GSList *hw_scan(GSList *options) +{ + struct sr_hwopt *opt; + struct sr_dev_inst *sdi; + struct drv_context *drvc; + struct dev_context *devc; + struct sr_probe *probe; + struct sr_serial_dev_inst *serial; + GPollFD probefd; + GSList *l, *devices; + int ret, i; + const char *conn, *serialcomm; + char buf[8]; + + (void)options; + drvc = odi->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; + break; + case SR_HWOPT_SERIALCOMM: + serialcomm = opt->value; + break; + } } + if (!conn) + return NULL; - if (!(dev_names = g_try_malloc(num_ports * sizeof(char *)))) { - sr_err("ols: %s: dev_names malloc failed", __func__); - goto hw_init_free_fds; /* TODO: SR_ERR_MALLOC. */ - } + if (serialcomm == NULL) + serialcomm = SERIALCOMM; - if (!(serial_params = g_try_malloc(num_ports * sizeof(char *)))) { - sr_err("ols: %s: serial_params malloc failed", __func__); - goto hw_init_free_dev_names; /* TODO: SR_ERR_MALLOC. */ - } + if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) + return NULL; - devcnt = 0; - for (l = ports; l; l = l->next) { - /* The discovery procedure is like this: first send the Reset - * command (0x00) 5 times, since the device could be anywhere - * in a 5-byte command. Then send the ID command (0x02). - * If the device responds with 4 bytes ("OLS1" or "SLA1"), we - * have a match. - * - * Since it may take the device a while to respond at 115Kb/s, - * we do all the sending first, then wait for all of them to - * respond with g_poll(). - */ - sr_info("ols: probing %s...", (char *)l->data); - fd = serial_open(l->data, O_RDWR | O_NONBLOCK); - if (fd != -1) { - serial_params[devcnt] = serial_backup_params(fd); - serial_set_params(fd, 115200, 8, 0, 1, 2); - ret = SR_OK; - for (i = 0; i < 5; i++) { - if ((ret = send_shortcommand(fd, - CMD_RESET)) != SR_OK) { - /* Serial port is not writable. */ - break; - } - } - if (ret != SR_OK) { - serial_restore_params(fd, - serial_params[devcnt]); - serial_close(fd); - continue; - } - send_shortcommand(fd, CMD_ID); - fds[devcnt].fd = fd; - fds[devcnt].events = G_IO_IN; - dev_names[devcnt] = g_strdup(l->data); - devcnt++; + /* The discovery procedure is like this: first send the Reset + * command (0x00) 5 times, since the device could be anywhere + * in a 5-byte command. Then send the ID command (0x02). + * If the device responds with 4 bytes ("OLS1" or "SLA1"), we + * have a match. + */ + sr_info("ols: probing %s .", conn); + if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + return NULL; + + ret = SR_OK; + for (i = 0; i < 5; i++) { + if ((ret = send_shortcommand(serial, CMD_RESET)) != SR_OK) { + sr_err("ols: port %s is not writable.", conn); + break; } - g_free(l->data); } + if (ret != SR_OK) { + serial_close(serial); + sr_err("ols: Could not use port %s. Quitting.", conn); + return NULL; + } + send_shortcommand(serial, CMD_ID); - /* 2ms isn't enough for reliable transfer with pl2303, let's try 10 */ + /* Wait 10ms for a response. */ usleep(10000); - g_poll(fds, devcnt, 1); - - for (i = 0; i < devcnt; i++) { - if (fds[i].revents != G_IO_IN) - continue; - if (serial_read(fds[i].fd, buf, 4) != 4) - continue; - if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4)) - continue; + probefd.fd = serial->fd; + probefd.events = G_IO_IN; + g_poll(&probefd, 1, 1); - /* definitely using the OLS protocol, check if it supports - * the metadata command - */ - send_shortcommand(fds[i].fd, CMD_METADATA); - probefd.fd = fds[i].fd; - probefd.events = G_IO_IN; - if (g_poll(&probefd, 1, 10) > 0) { - /* got metadata */ - sdi = get_metadata(fds[i].fd); - sdi->index = final_devcnt; - ctx = sdi->priv; - } else { - /* not an OLS -- some other board that uses the sump protocol */ - sdi = sr_dev_inst_new(final_devcnt, SR_ST_INACTIVE, - "Sump", "Logic Analyzer", "v1.0"); - ctx = ols_dev_new(); - ctx->num_probes = 32; - sdi->priv = ctx; - } - ctx->serial = sr_serial_dev_inst_new(dev_names[i], -1); - dev_insts = g_slist_append(dev_insts, sdi); - final_devcnt++; - serial_close(fds[i].fd); - fds[i].fd = 0; - } + if (probefd.revents != G_IO_IN) + return NULL; + if (serial_read(serial, buf, 4) != 4) + return NULL; + if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4)) + return NULL; - /* clean up after all the probing */ - for (i = 0; i < devcnt; i++) { - if (fds[i].fd != 0) { - serial_restore_params(fds[i].fd, serial_params[i]); - serial_close(fds[i].fd); + /* Definitely using the OLS protocol, check if it supports + * the metadata command. + */ + send_shortcommand(serial, CMD_METADATA); + if (g_poll(&probefd, 1, 10) > 0) { + /* Got metadata. */ + sdi = get_metadata(serial); + sdi->index = 0; + devc = sdi->priv; + } else { + /* Not an OLS -- some other board that uses the sump protocol. */ + sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, + "Sump", "Logic Analyzer", "v1.0"); + sdi->driver = odi; + devc = ols_dev_new(); + for (i = 0; i < 32; i++) { + if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, + probe_names[i]))) + return 0; + sdi->probes = g_slist_append(sdi->probes, probe); } - g_free(serial_params[i]); - g_free(dev_names[i]); + sdi->priv = devc; } + devc->serial = serial; + drvc->instances = g_slist_append(drvc->instances, sdi); + devices = g_slist_append(devices, sdi); - g_free(serial_params); -hw_init_free_dev_names: - g_free(dev_names); -hw_init_free_fds: - g_free(fds); -hw_init_free_ports: - g_slist_free(ports); + serial_close(serial); - return final_devcnt; + return devices; } -static int hw_dev_open(int dev_index) +static GSList *hw_dev_list(void) { - struct sr_dev_inst *sdi; - struct context *ctx; + struct drv_context *drvc; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return SR_ERR; + drvc = odi->priv; + + return drvc->instances; +} - ctx = sdi->priv; +static int hw_dev_open(struct sr_dev_inst *sdi) +{ + struct dev_context *devc; - ctx->serial->fd = serial_open(ctx->serial->port, O_RDWR); - if (ctx->serial->fd == -1) + devc = sdi->priv; + + if (serial_open(devc->serial, SERIAL_RDWR) != SR_OK) return SR_ERR; sdi->status = SR_ST_ACTIVE; @@ -501,22 +507,14 @@ static int hw_dev_open(int dev_index) return SR_OK; } -static int hw_dev_close(int dev_index) +static int hw_dev_close(struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { - sr_err("ols: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } + devc = sdi->priv; - ctx = sdi->priv; - - /* TODO */ - if (ctx->serial->fd != -1) { - serial_close(ctx->serial->fd); - ctx->serial->fd = -1; + if (devc->serial && devc->serial->fd != -1) { + serial_close(devc->serial); sdi->status = SR_ST_INACTIVE; } @@ -527,153 +525,135 @@ static int hw_cleanup(void) { GSList *l; struct sr_dev_inst *sdi; - struct context *ctx; + struct drv_context *drvc; + struct dev_context *devc; int ret = SR_OK; + if (!(drvc = odi->priv)) + return SR_OK; + /* Properly close and free all devices. */ - for (l = dev_insts; l; l = l->next) { + for (l = drvc->instances; l; l = l->next) { if (!(sdi = l->data)) { /* Log error, but continue cleaning up the rest. */ sr_err("ols: %s: sdi was NULL, continuing", __func__); ret = SR_ERR_BUG; continue; } - if (!(ctx = sdi->priv)) { + if (!(devc = sdi->priv)) { /* Log error, but continue cleaning up the rest. */ sr_err("ols: %s: sdi->priv was NULL, continuing", __func__); ret = SR_ERR_BUG; continue; } - /* TODO: Check for serial != NULL. */ - if (ctx->serial->fd != -1) - serial_close(ctx->serial->fd); - sr_serial_dev_inst_free(ctx->serial); + hw_dev_close(sdi); + sr_serial_dev_inst_free(devc->serial); sr_dev_inst_free(sdi); } - g_slist_free(dev_insts); - dev_insts = NULL; + g_slist_free(drvc->instances); + drvc->instances = NULL; return ret; } -static void *hw_dev_info_get(int dev_index, int dev_info_id) +static int hw_info_get(int info_id, const void **data, + const struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; - struct context *ctx; - void *info; + struct dev_context *devc; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return NULL; - ctx = sdi->priv; - - info = NULL; - switch (dev_info_id) { - case SR_DI_INST: - info = sdi; + switch (info_id) { + case SR_DI_HWCAPS: + *data = hwcaps; break; case SR_DI_NUM_PROBES: - info = GINT_TO_POINTER(NUM_PROBES); + *data = GINT_TO_POINTER(1); break; case SR_DI_PROBE_NAMES: - info = probe_names; + *data = probe_names; break; case SR_DI_SAMPLERATES: - info = &samplerates; + *data = &samplerates; break; case SR_DI_TRIGGER_TYPES: - info = (char *)TRIGGER_TYPES; + *data = (char *)TRIGGER_TYPES; break; case SR_DI_CUR_SAMPLERATE: - info = &ctx->cur_samplerate; + if (sdi) { + devc = sdi->priv; + *data = &devc->cur_samplerate; + } else + return SR_ERR; break; + default: + return SR_ERR_ARG; } - return info; -} - -static int hw_dev_status_get(int dev_index) -{ - struct sr_dev_inst *sdi; - - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return SR_ST_NOT_FOUND; - - return sdi->status; -} - -static int *hw_hwcap_get_all(void) -{ - return hwcaps; + return SR_OK; } -static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate) +static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate) { - struct context *ctx; + struct dev_context *devc; - ctx = sdi->priv; - if (ctx->max_samplerate) { - if (samplerate > ctx->max_samplerate) + devc = sdi->priv; + if (devc->max_samplerate) { + if (samplerate > devc->max_samplerate) return SR_ERR_SAMPLERATE; } else if (samplerate < samplerates.low || samplerate > samplerates.high) return SR_ERR_SAMPLERATE; if (samplerate > CLOCK_RATE) { - ctx->flag_reg |= FLAG_DEMUX; - ctx->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1; + devc->flag_reg |= FLAG_DEMUX; + devc->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1; } else { - ctx->flag_reg &= ~FLAG_DEMUX; - ctx->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1; + devc->flag_reg &= ~FLAG_DEMUX; + devc->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1; } /* Calculate actual samplerate used and complain if it is different * from the requested. */ - ctx->cur_samplerate = CLOCK_RATE / (ctx->cur_samplerate_divider + 1); - if (ctx->flag_reg & FLAG_DEMUX) - ctx->cur_samplerate *= 2; - if (ctx->cur_samplerate != samplerate) + devc->cur_samplerate = CLOCK_RATE / (devc->cur_samplerate_divider + 1); + if (devc->flag_reg & FLAG_DEMUX) + devc->cur_samplerate *= 2; + if (devc->cur_samplerate != samplerate) sr_err("ols: can't match samplerate %" PRIu64 ", using %" - PRIu64, samplerate, ctx->cur_samplerate); + PRIu64, samplerate, devc->cur_samplerate); return SR_OK; } -static int hw_dev_config_set(int dev_index, int hwcap, void *value) +static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, + const void *value) { - struct sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; int ret; - uint64_t *tmp_u64; + const uint64_t *tmp_u64; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return SR_ERR; - ctx = sdi->priv; + devc = sdi->priv; if (sdi->status != SR_ST_ACTIVE) return SR_ERR; switch (hwcap) { case SR_HWCAP_SAMPLERATE: - ret = set_samplerate(sdi, *(uint64_t *)value); - break; - case SR_HWCAP_PROBECONFIG: - ret = configure_probes(ctx, (GSList *)value); + ret = set_samplerate(sdi, *(const uint64_t *)value); break; case SR_HWCAP_LIMIT_SAMPLES: tmp_u64 = value; if (*tmp_u64 < MIN_NUM_SAMPLES) return SR_ERR; - if (*tmp_u64 > ctx->max_samples) + if (*tmp_u64 > devc->max_samples) sr_err("ols: sample limit exceeds hw max"); - ctx->limit_samples = *tmp_u64; - sr_info("ols: sample limit %" PRIu64, ctx->limit_samples); + devc->limit_samples = *tmp_u64; + sr_info("ols: sample limit %" PRIu64, devc->limit_samples); ret = SR_OK; break; case SR_HWCAP_CAPTURE_RATIO: - ctx->capture_ratio = *(uint64_t *)value; - if (ctx->capture_ratio < 0 || ctx->capture_ratio > 100) { - ctx->capture_ratio = 0; + 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; @@ -681,7 +661,7 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value) case SR_HWCAP_RLE: if (GPOINTER_TO_INT(value)) { sr_info("ols: enabling RLE"); - ctx->flag_reg |= FLAG_RLE; + devc->flag_reg |= FLAG_RLE; } ret = SR_OK; break; @@ -692,31 +672,49 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value) return ret; } +static void abort_acquisition(const struct sr_dev_inst *sdi) +{ + struct sr_datafeed_packet packet; + struct dev_context *devc; + + devc = sdi->priv; + sr_source_remove(devc->serial->fd); + + /* Terminate session */ + packet.type = SR_DF_END; + sr_session_send(sdi, &packet); + +} + + + static int receive_data(int fd, int revents, void *cb_data) { struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; struct sr_dev_inst *sdi; - struct context *ctx; + struct drv_context *drvc; + struct dev_context *devc; GSList *l; int num_channels, offset, i, j; unsigned char byte; - /* Find this device's ctx struct by its fd. */ - ctx = NULL; - for (l = dev_insts; l; l = l->next) { + drvc = odi->priv; + + /* Find this device's devc struct by its fd. */ + devc = NULL; + for (l = drvc->instances; l; l = l->next) { sdi = l->data; - ctx = sdi->priv; - if (ctx->serial->fd == fd) { + devc = sdi->priv; + if (devc->serial->fd == fd) break; - } - ctx = NULL; + devc = NULL; } - if (!ctx) + if (!devc) /* Shouldn't happen. */ return TRUE; - if (ctx->num_transfers++ == 0) { + if (devc->num_transfers++ == 0) { /* * First time round, means the device started sending data, * and will not stop until done. If it stops sending for @@ -725,58 +723,59 @@ static int receive_data(int fd, int revents, void *cb_data) */ sr_source_remove(fd); sr_source_add(fd, G_IO_IN, 30, receive_data, cb_data); - ctx->raw_sample_buf = g_try_malloc(ctx->limit_samples * 4); - if (!ctx->raw_sample_buf) { - sr_err("ols: %s: ctx->raw_sample_buf malloc failed", + /* TODO: Check malloc return code. */ + devc->raw_sample_buf = g_try_malloc(devc->limit_samples * 4); + if (!devc->raw_sample_buf) { + sr_err("ols: %s: devc->raw_sample_buf malloc failed", __func__); return FALSE; } /* fill with 1010... for debugging */ - memset(ctx->raw_sample_buf, 0x82, ctx->limit_samples * 4); + memset(devc->raw_sample_buf, 0x82, devc->limit_samples * 4); } num_channels = 0; for (i = 0x20; i > 0x02; i /= 2) { - if ((ctx->flag_reg & i) == 0) + if ((devc->flag_reg & i) == 0) num_channels++; } if (revents == G_IO_IN) { - if (serial_read(fd, &byte, 1) != 1) + if (serial_read(devc->serial, &byte, 1) != 1) return FALSE; /* Ignore it if we've read enough. */ - if (ctx->num_samples >= ctx->limit_samples) + if (devc->num_samples >= devc->limit_samples) return TRUE; - ctx->sample[ctx->num_bytes++] = byte; + devc->sample[devc->num_bytes++] = byte; sr_dbg("ols: received byte 0x%.2x", byte); - if (ctx->num_bytes == num_channels) { + if (devc->num_bytes == num_channels) { /* Got a full sample. */ sr_dbg("ols: received sample 0x%.*x", - ctx->num_bytes * 2, *(int *)ctx->sample); - if (ctx->flag_reg & FLAG_RLE) { + devc->num_bytes * 2, *(int *)devc->sample); + if (devc->flag_reg & FLAG_RLE) { /* * In RLE mode -1 should never come in as a * sample, because bit 31 is the "count" flag. */ - if (ctx->sample[ctx->num_bytes - 1] & 0x80) { - ctx->sample[ctx->num_bytes - 1] &= 0x7f; + if (devc->sample[devc->num_bytes - 1] & 0x80) { + devc->sample[devc->num_bytes - 1] &= 0x7f; /* * FIXME: This will only work on * little-endian systems. */ - ctx->rle_count = *(int *)(ctx->sample); - sr_dbg("ols: RLE count = %d", ctx->rle_count); - ctx->num_bytes = 0; + devc->rle_count = *(int *)(devc->sample); + sr_dbg("ols: RLE count = %d", devc->rle_count); + devc->num_bytes = 0; return TRUE; } } - ctx->num_samples += ctx->rle_count + 1; - if (ctx->num_samples > ctx->limit_samples) { + devc->num_samples += devc->rle_count + 1; + if (devc->num_samples > devc->limit_samples) { /* Save us from overrunning the buffer. */ - ctx->rle_count -= ctx->num_samples - ctx->limit_samples; - ctx->num_samples = ctx->limit_samples; + devc->rle_count -= devc->num_samples - devc->limit_samples; + devc->num_samples = devc->limit_samples; } if (num_channels < 4) { @@ -790,33 +789,33 @@ static int receive_data(int fd, int revents, void *cb_data) * the number of probes. */ j = 0; - memset(ctx->tmp_sample, 0, 4); + memset(devc->tmp_sample, 0, 4); for (i = 0; i < 4; i++) { - if (((ctx->flag_reg >> 2) & (1 << i)) == 0) { + if (((devc->flag_reg >> 2) & (1 << i)) == 0) { /* * This channel group was * enabled, copy from received * sample. */ - ctx->tmp_sample[i] = ctx->sample[j++]; + devc->tmp_sample[i] = devc->sample[j++]; } } - memcpy(ctx->sample, ctx->tmp_sample, 4); - sr_dbg("ols: full sample 0x%.8x", *(int *)ctx->sample); + memcpy(devc->sample, devc->tmp_sample, 4); + sr_dbg("ols: full sample 0x%.8x", *(int *)devc->sample); } /* the OLS sends its sample buffer backwards. * store it in reverse order here, so we can dump * this on the session bus later. */ - offset = (ctx->limit_samples - ctx->num_samples) * 4; - for (i = 0; i <= ctx->rle_count; i++) { - memcpy(ctx->raw_sample_buf + offset + (i * 4), - ctx->sample, 4); + offset = (devc->limit_samples - devc->num_samples) * 4; + for (i = 0; i <= devc->rle_count; i++) { + memcpy(devc->raw_sample_buf + offset + (i * 4), + devc->sample, 4); } - memset(ctx->sample, 0, 4); - ctx->num_bytes = 0; - ctx->rle_count = 0; + memset(devc->sample, 0, 4); + devc->num_bytes = 0; + devc->rle_count = 0; } } else { /* @@ -824,18 +823,18 @@ static int receive_data(int fd, int revents, void *cb_data) * we've acquired all the samples we asked for -- we're done. * Send the (properly-ordered) buffer to the frontend. */ - if (ctx->trigger_at != -1) { + if (devc->trigger_at != -1) { /* a trigger was set up, so we need to tell the frontend * about it. */ - if (ctx->trigger_at > 0) { + if (devc->trigger_at > 0) { /* there are pre-trigger samples, send those first */ packet.type = SR_DF_LOGIC; packet.payload = &logic; - logic.length = ctx->trigger_at * 4; + logic.length = devc->trigger_at * 4; logic.unitsize = 4; - logic.data = ctx->raw_sample_buf + - (ctx->limit_samples - ctx->num_samples) * 4; + logic.data = devc->raw_sample_buf + + (devc->limit_samples - devc->num_samples) * 4; sr_session_send(cb_data, &packet); } @@ -846,39 +845,38 @@ static int receive_data(int fd, int revents, void *cb_data) /* send post-trigger samples */ packet.type = SR_DF_LOGIC; packet.payload = &logic; - logic.length = (ctx->num_samples * 4) - (ctx->trigger_at * 4); + logic.length = (devc->num_samples * 4) - (devc->trigger_at * 4); logic.unitsize = 4; - logic.data = ctx->raw_sample_buf + ctx->trigger_at * 4 + - (ctx->limit_samples - ctx->num_samples) * 4; + logic.data = devc->raw_sample_buf + devc->trigger_at * 4 + + (devc->limit_samples - devc->num_samples) * 4; sr_session_send(cb_data, &packet); } else { /* no trigger was used */ packet.type = SR_DF_LOGIC; packet.payload = &logic; - logic.length = ctx->num_samples * 4; + logic.length = devc->num_samples * 4; logic.unitsize = 4; - logic.data = ctx->raw_sample_buf + - (ctx->limit_samples - ctx->num_samples) * 4; + logic.data = devc->raw_sample_buf + + (devc->limit_samples - devc->num_samples) * 4; sr_session_send(cb_data, &packet); } - g_free(ctx->raw_sample_buf); + g_free(devc->raw_sample_buf); - serial_flush(fd); - serial_close(fd); - packet.type = SR_DF_END; - sr_session_send(cb_data, &packet); + serial_flush(devc->serial); + abort_acquisition(sdi); + serial_close(devc->serial); } return TRUE; } -static int hw_dev_acquisition_start(int dev_index, void *cb_data) +static int hw_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 sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; uint32_t trigger_config[4]; uint32_t data; uint16_t readcount, delaycount; @@ -886,14 +884,16 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) int num_channels; int i; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return SR_ERR; - - ctx = sdi->priv; + devc = sdi->priv; if (sdi->status != SR_ST_ACTIVE) return SR_ERR; + if (configure_probes(sdi) != SR_OK) { + sr_err("ols: failed to configured probes"); + return SR_ERR; + } + /* * Enable/disable channel groups in the flag register according to the * probe mask. Calculate this here, because num_channels is needed @@ -902,7 +902,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) changrp_mask = 0; num_channels = 0; for (i = 0; i < 4; i++) { - if (ctx->probe_mask & (0xff << (i * 8))) { + if (devc->probe_mask & (0xff << (i * 8))) { changrp_mask |= (1 << i); num_channels++; } @@ -912,92 +912,92 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) * Limit readcount to prevent reading past the end of the hardware * buffer. */ - readcount = MIN(ctx->max_samples / num_channels, ctx->limit_samples) / 4; + readcount = MIN(devc->max_samples / num_channels, devc->limit_samples) / 4; memset(trigger_config, 0, 16); - trigger_config[ctx->num_stages - 1] |= 0x08; - if (ctx->trigger_mask[0]) { - delaycount = readcount * (1 - ctx->capture_ratio / 100.0); - ctx->trigger_at = (readcount - delaycount) * 4 - ctx->num_stages; + trigger_config[devc->num_stages - 1] |= 0x08; + if (devc->trigger_mask[0]) { + delaycount = readcount * (1 - devc->capture_ratio / 100.0); + devc->trigger_at = (readcount - delaycount) * 4 - devc->num_stages; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_MASK_0, - reverse32(ctx->trigger_mask[0])) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_0, + reverse32(devc->trigger_mask[0])) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_VALUE_0, - reverse32(ctx->trigger_value[0])) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_0, + reverse32(devc->trigger_value[0])) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_CONFIG_0, + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_0, trigger_config[0]) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_MASK_1, - reverse32(ctx->trigger_mask[1])) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_1, + reverse32(devc->trigger_mask[1])) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_VALUE_1, - reverse32(ctx->trigger_value[1])) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_1, + reverse32(devc->trigger_value[1])) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_CONFIG_1, + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_1, trigger_config[1]) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_MASK_2, - reverse32(ctx->trigger_mask[2])) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_2, + reverse32(devc->trigger_mask[2])) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_VALUE_2, - reverse32(ctx->trigger_value[2])) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_2, + reverse32(devc->trigger_value[2])) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_CONFIG_2, + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_2, trigger_config[2]) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_MASK_3, - reverse32(ctx->trigger_mask[3])) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_3, + reverse32(devc->trigger_mask[3])) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_VALUE_3, - reverse32(ctx->trigger_value[3])) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_3, + reverse32(devc->trigger_value[3])) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_CONFIG_3, + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_3, trigger_config[3]) != SR_OK) return SR_ERR; } else { - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_MASK_0, - ctx->trigger_mask[0]) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_0, + devc->trigger_mask[0]) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_VALUE_0, - ctx->trigger_value[0]) != SR_OK) + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_0, + devc->trigger_value[0]) != SR_OK) return SR_ERR; - if (send_longcommand(ctx->serial->fd, CMD_SET_TRIGGER_CONFIG_0, + if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_0, 0x00000008) != SR_OK) return SR_ERR; delaycount = readcount; } sr_info("ols: setting samplerate to %" PRIu64 " Hz (divider %u, " - "demux %s)", ctx->cur_samplerate, ctx->cur_samplerate_divider, - ctx->flag_reg & FLAG_DEMUX ? "on" : "off"); - if (send_longcommand(ctx->serial->fd, CMD_SET_DIVIDER, - reverse32(ctx->cur_samplerate_divider)) != SR_OK) + "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) return SR_ERR; /* Send sample limit and pre/post-trigger capture ratio. */ data = ((readcount - 1) & 0xffff) << 16; data |= (delaycount - 1) & 0xffff; - if (send_longcommand(ctx->serial->fd, CMD_CAPTURE_SIZE, reverse16(data)) != SR_OK) + if (send_longcommand(devc->serial, CMD_CAPTURE_SIZE, reverse16(data)) != SR_OK) return SR_ERR; /* The flag register wants them here, and 1 means "disable channel". */ - ctx->flag_reg |= ~(changrp_mask << 2) & 0x3c; - ctx->flag_reg |= FLAG_FILTER; - ctx->rle_count = 0; - data = (ctx->flag_reg << 24) | ((ctx->flag_reg << 8) & 0xff0000); - if (send_longcommand(ctx->serial->fd, CMD_SET_FLAGS, data) != SR_OK) + 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) return SR_ERR; /* Start acquisition on the device. */ - if (send_shortcommand(ctx->serial->fd, CMD_RUN) != SR_OK) + if (send_shortcommand(devc->serial, CMD_RUN) != SR_OK) return SR_ERR; - sr_source_add(ctx->serial->fd, G_IO_IN, -1, receive_data, + sr_source_add(devc->serial->fd, G_IO_IN, -1, receive_data, cb_data); if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { @@ -1021,7 +1021,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) /* Send metadata about the SR_DF_LOGIC packets to come. */ packet->type = SR_DF_META_LOGIC; packet->payload = &meta; - meta.samplerate = ctx->cur_samplerate; + meta.samplerate = devc->cur_samplerate; meta.num_probes = NUM_PROBES; sr_session_send(cb_data, packet); @@ -1032,15 +1032,12 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) } /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ -static int hw_dev_acquisition_stop(int dev_index, void *cb_data) +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - struct sr_datafeed_packet packet; - /* Avoid compiler warnings. */ - (void)dev_index; + (void)cb_data; - packet.type = SR_DF_END; - sr_session_send(cb_data, &packet); + abort_acquisition(sdi); return SR_OK; } @@ -1051,12 +1048,14 @@ SR_PRIV struct sr_dev_driver ols_driver_info = { .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, - .dev_info_get = hw_dev_info_get, - .dev_status_get = hw_dev_status_get, - .hwcap_get_all = hw_hwcap_get_all, + .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, + .priv = NULL, };