X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fols.c;h=7d80b62e13a10afe40623e6f62e4dfd4a7e980c5;hb=a00ba012288726678e1a270961c8d4f46f3dbd33;hp=5742da195bccdf4c7d080b9d7796b811e9266d8d;hpb=926b866cb624cebf2efca098088dba11afa8ae96;p=libsigrok.git diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c index 5742da19..7d80b62e 100644 --- a/hardware/openbench-logic-sniffer/ols.c +++ b/hardware/openbench-logic-sniffer/ols.c @@ -37,44 +37,49 @@ #endif #include #include +#include -#define NUM_PROBES 32 -#define NUM_TRIGGER_STAGES 4 -#define TRIGGER_TYPES "01" -#define SERIAL_SPEED B115200 -/* TODO: SERIAL_ bits, parity, stop bit */ -#define CLOCK_RATE 100000000 +#ifdef _WIN32 +#define O_NONBLOCK FIONBIO +#endif + +#define NUM_PROBES 32 +#define NUM_TRIGGER_STAGES 4 +#define TRIGGER_TYPES "01" +#define SERIAL_SPEED B115200 +#define CLOCK_RATE MHZ(100) +#define MIN_NUM_SAMPLES 4 /* Command opcodes */ -#define CMD_RESET 0x00 -#define CMD_ID 0x02 -#define CMD_SET_FLAGS 0x82 -#define CMD_SET_DIVIDER 0x80 -#define CMD_RUN 0x01 -#define CMD_CAPTURE_SIZE 0x81 -#define CMD_SET_TRIGGER_MASK_0 0xc0 -#define CMD_SET_TRIGGER_MASK_1 0xc4 -#define CMD_SET_TRIGGER_MASK_2 0xc8 -#define CMD_SET_TRIGGER_MASK_3 0xcc -#define CMD_SET_TRIGGER_VALUE_0 0xc1 -#define CMD_SET_TRIGGER_VALUE_1 0xc5 -#define CMD_SET_TRIGGER_VALUE_2 0xc9 -#define CMD_SET_TRIGGER_VALUE_3 0xcd -#define CMD_SET_TRIGGER_CONFIG_0 0xc2 -#define CMD_SET_TRIGGER_CONFIG_1 0xc6 -#define CMD_SET_TRIGGER_CONFIG_2 0xca -#define CMD_SET_TRIGGER_CONFIG_3 0xce +#define CMD_RESET 0x00 +#define CMD_ID 0x02 +#define CMD_SET_FLAGS 0x82 +#define CMD_SET_DIVIDER 0x80 +#define CMD_RUN 0x01 +#define CMD_CAPTURE_SIZE 0x81 +#define CMD_SET_TRIGGER_MASK_0 0xc0 +#define CMD_SET_TRIGGER_MASK_1 0xc4 +#define CMD_SET_TRIGGER_MASK_2 0xc8 +#define CMD_SET_TRIGGER_MASK_3 0xcc +#define CMD_SET_TRIGGER_VALUE_0 0xc1 +#define CMD_SET_TRIGGER_VALUE_1 0xc5 +#define CMD_SET_TRIGGER_VALUE_2 0xc9 +#define CMD_SET_TRIGGER_VALUE_3 0xcd +#define CMD_SET_TRIGGER_CONFIG_0 0xc2 +#define CMD_SET_TRIGGER_CONFIG_1 0xc6 +#define CMD_SET_TRIGGER_CONFIG_2 0xca +#define CMD_SET_TRIGGER_CONFIG_3 0xce /* Bitmasks for CMD_FLAGS */ -#define FLAG_DEMUX 0x01 -#define FLAG_FILTER 0x02 -#define FLAG_CHANNELGROUP_1 0x04 -#define FLAG_CHANNELGROUP_2 0x08 -#define FLAG_CHANNELGROUP_3 0x10 -#define FLAG_CHANNELGROUP_4 0x20 -#define FLAG_CLOCK_EXTERNAL 0x40 -#define FLAG_CLOCK_INVERTED 0x80 -#define FLAG_RLE 0x0100 +#define FLAG_DEMUX 0x01 +#define FLAG_FILTER 0x02 +#define FLAG_CHANNELGROUP_1 0x04 +#define FLAG_CHANNELGROUP_2 0x08 +#define FLAG_CHANNELGROUP_3 0x10 +#define FLAG_CHANNELGROUP_4 0x20 +#define FLAG_CLOCK_EXTERNAL 0x40 +#define FLAG_CLOCK_INVERTED 0x80 +#define FLAG_RLE 0x0100 static int capabilities[] = { HWCAP_LOGIC_ANALYZER, @@ -104,36 +109,38 @@ static uint64_t limit_samples = 0; * 0 means no pre-trigger data. */ static int capture_ratio = 0; +static int trigger_at = -1; static uint32_t probe_mask = 0xffffffff; static uint32_t trigger_mask[4] = { 0, 0, 0, 0 }; static uint32_t trigger_value[4] = { 0, 0, 0, 0 }; +static int num_stages = 0; static int send_shortcommand(int fd, uint8_t command) { char buf[1]; - g_message("ols: sending cmd 0x%.2x", command); + g_debug("ols: sending cmd 0x%.2x", command); buf[0] = command; - if (write(fd, buf, 1) != 1) - return SIGROK_ERR; + if (serial_write(fd, buf, 1) != 1) + return SR_ERR; - return SIGROK_OK; + return SR_OK; } static int send_longcommand(int fd, uint8_t command, uint32_t data) { char buf[5]; - g_message("ols: sending cmd 0x%.2x data 0x%.8x", command, data); + g_debug("ols: sending cmd 0x%.2x data 0x%.8x", command, data); buf[0] = command; buf[1] = (data & 0xff000000) >> 24; buf[2] = (data & 0xff0000) >> 16; buf[3] = (data & 0xff00) >> 8; buf[4] = data & 0xff; - if (write(fd, buf, 5) != 5) - return SIGROK_ERR; + if (serial_write(fd, buf, 5) != 5) + return SR_ERR; - return SIGROK_OK; + return SR_OK; } static int configure_probes(GSList *probes) @@ -149,6 +156,7 @@ static int configure_probes(GSList *probes) trigger_value[i] = 0; } + num_stages = 0; for (l = probes; l; l = l->next) { probe = (struct probe *)l->data; if (!probe->enabled) @@ -161,7 +169,7 @@ static int configure_probes(GSList *probes) probe_bit = 1 << (probe->index - 1); probe_mask |= probe_bit; - if (probe->trigger) + if (!probe->trigger) continue; /* Configure trigger mask and value. */ @@ -176,27 +184,42 @@ static int configure_probes(GSList *probes) * TODO: Only supporting parallel mode, with * up to 4 stages. */ - return SIGROK_ERR; + return SR_ERR; } + if (stage > num_stages) + num_stages = stage; } - return SIGROK_OK; + return SR_OK; +} + +static uint32_t reverse16(uint32_t in) +{ + uint32_t out; + + out = (in & 0xff) << 8; + out |= (in & 0xff00) >> 8; + out |= (in & 0xff0000) << 8; + out |= (in & 0xff000000) >> 8; + + return out; } -static void byteswap(uint32_t * in) +static uint32_t reverse32(uint32_t in) { uint32_t out; - out = (*in & 0xff) << 8; - out |= (*in & 0xff00) >> 8; - out |= (*in & 0xff0000) << 8; - out |= (*in & 0xff000000) >> 8; - *in = out; + out = (in & 0xff) << 24; + out |= (in & 0xff00) << 8; + out |= (in & 0xff0000) >> 8; + out |= (in & 0xff000000) >> 24; + + return out; } static int hw_init(char *deviceinfo) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; GSList *ports, *l; GPollFD *fds; int devcnt, final_devcnt, num_ports, fd, ret, i; @@ -224,25 +247,20 @@ static int hw_init(char *deviceinfo) * we do all the sending first, then wait for all of them to * respond with g_poll(). */ - g_message("probing %s...", (char *)l->data); -#ifdef _WIN32 - // FIXME - // hdl = serial_open(l->data, 0); -#else + g_message("ols: probing %s...", (char *)l->data); fd = serial_open(l->data, O_RDWR | O_NONBLOCK); -#endif if (fd != -1) { serial_params[devcnt] = serial_backup_params(fd); serial_set_params(fd, 115200, 8, 0, 1, 2); - ret = SIGROK_OK; + ret = SR_OK; for (i = 0; i < 5; i++) { if ((ret = send_shortcommand(fd, - CMD_RESET)) != SIGROK_OK) { + CMD_RESET)) != SR_OK) { /* Serial port is not writable. */ break; } } - if (ret != SIGROK_OK) { + if (ret != SR_OK) { serial_restore_params(fd, serial_params[devcnt]); serial_close(fd); @@ -257,25 +275,25 @@ static int hw_init(char *deviceinfo) free(l->data); } - /* 2ms should do (enough time for 28 bytes to go over the bus). */ - usleep(2000); + /* 2ms isn't enough for reliable transfer with pl2303, let's try 10 */ + usleep(10000); final_devcnt = 0; g_poll(fds, devcnt, 1); for (i = 0; i < devcnt; i++) { if (fds[i].revents == G_IO_IN) { - if (read(fds[i].fd, buf, 4) == 4) { + if (serial_read(fds[i].fd, buf, 4) == 4) { if (!strncmp(buf, "1SLO", 4) || !strncmp(buf, "1ALS", 4)) { if (!strncmp(buf, "1SLO", 4)) - sdi = sigrok_device_instance_new + sdi = sr_device_instance_new (final_devcnt, ST_INACTIVE, "Openbench", "Logic Sniffer", "v1.0"); else - sdi = sigrok_device_instance_new + sdi = sr_device_instance_new (final_devcnt, ST_INACTIVE, - "Sump", "Logic Analyzer", + "Openbench", "Logic Sniffer", "v1.0"); sdi->serial = serial_device_instance_new (device_names[i], -1); @@ -308,25 +326,25 @@ static int hw_init(char *deviceinfo) static int hw_opendev(int device_index) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; + if (!(sdi = get_sr_device_instance(device_instances, device_index))) + return SR_ERR; sdi->serial->fd = serial_open(sdi->serial->port, O_RDWR); if (sdi->serial->fd == -1) - return SIGROK_ERR; + return SR_ERR; sdi->status = ST_ACTIVE; - return SIGROK_OK; + return SR_OK; } static void hw_closedev(int device_index) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = get_sr_device_instance(device_instances, device_index))) return; if (sdi->serial->fd != -1) { @@ -339,14 +357,14 @@ static void hw_closedev(int device_index) static void hw_cleanup(void) { GSList *l; - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; /* Properly close all devices. */ for (l = device_instances; l; l = l->next) { sdi = l->data; if (sdi->serial->fd != -1) serial_close(sdi->serial->fd); - sigrok_device_instance_free(sdi); + sr_device_instance_free(sdi); } g_slist_free(device_instances); device_instances = NULL; @@ -354,10 +372,10 @@ static void hw_cleanup(void) static void *hw_get_device_info(int device_index, int device_info_id) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; void *info; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = get_sr_device_instance(device_instances, device_index))) return NULL; info = NULL; @@ -384,9 +402,9 @@ static void *hw_get_device_info(int device_index, int device_info_id) static int hw_get_status(int device_index) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = get_sr_device_instance(device_instances, device_index))) return ST_NOT_FOUND; return sdi->status; @@ -397,13 +415,13 @@ static int *hw_get_capabilities(void) return capabilities; } -static int set_configuration_samplerate(struct sigrok_device_instance *sdi, +static int set_configuration_samplerate(struct sr_device_instance *sdi, uint64_t samplerate) { uint32_t divider; if (samplerate < samplerates.low || samplerate > samplerates.high) - return SIGROK_ERR_SAMPLERATE; + return SR_ERR_SAMPLERATE; if (samplerate > CLOCK_RATE) { flag_reg |= FLAG_DEMUX; @@ -412,53 +430,56 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi, flag_reg &= ~FLAG_DEMUX; divider = (CLOCK_RATE / samplerate) - 1; } -#ifdef _WIN32 - // FIXME - // divider = htonl(divider); -#else - divider = htonl(divider); -#endif - g_message("setting samplerate to %" PRIu64 " Hz (divider %u, demux %s)", - samplerate, divider, flag_reg & FLAG_DEMUX ? "on" : "off"); + g_message("ols: setting samplerate to %" PRIu64 " Hz (divider %u, demux %s)", + samplerate, divider, flag_reg & FLAG_DEMUX ? "on" : "off"); - if (send_longcommand(sdi->serial->fd, CMD_SET_DIVIDER, - divider) != SIGROK_OK) - return SIGROK_ERR; + if (send_longcommand(sdi->serial->fd, CMD_SET_DIVIDER, reverse32(divider)) != SR_OK) + return SR_ERR; cur_samplerate = samplerate; - return SIGROK_OK; + return SR_OK; } static int hw_set_configuration(int device_index, int capability, void *value) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; int ret; uint64_t *tmp_u64; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; + if (!(sdi = get_sr_device_instance(device_instances, device_index))) + return SR_ERR; if (sdi->status != ST_ACTIVE) - return SIGROK_ERR; + return SR_ERR; - if (capability == HWCAP_SAMPLERATE) { + switch (capability) { + case HWCAP_SAMPLERATE: tmp_u64 = value; ret = set_configuration_samplerate(sdi, *tmp_u64); - } else if (capability == HWCAP_PROBECONFIG) { + break; + case HWCAP_PROBECONFIG: ret = configure_probes((GSList *) value); - } else if (capability == HWCAP_LIMIT_SAMPLES) { - limit_samples = strtoull(value, NULL, 10); - ret = SIGROK_OK; - } else if (capability == HWCAP_CAPTURE_RATIO) { - capture_ratio = strtol(value, NULL, 10); + break; + case HWCAP_LIMIT_SAMPLES: + tmp_u64 = value; + if (*tmp_u64 < MIN_NUM_SAMPLES) + return SR_ERR; + limit_samples = *tmp_u64; + g_message("ols: sample limit %" PRIu64, limit_samples); + ret = SR_OK; + break; + case HWCAP_CAPTURE_RATIO: + tmp_u64 = value; + capture_ratio = *tmp_u64; if (capture_ratio < 0 || capture_ratio > 100) { capture_ratio = 0; - ret = SIGROK_ERR; + ret = SR_ERR; } else - ret = SIGROK_OK; - } else { - ret = SIGROK_ERR; + ret = SR_OK; + break; + default: + ret = SR_ERR; } return ret; @@ -471,7 +492,8 @@ static int receive_data(int fd, int revents, void *user_data) static char last_sample[4] = { 0xff, 0xff, 0xff, 0xff }; static unsigned char sample[4] = { 0, 0, 0, 0 }; static unsigned char tmp_sample[4]; - int count, buflen, num_channels, i, j; + static unsigned char *raw_sample_buf = NULL; + int count, buflen, num_channels, offset, i, j; struct datafeed_packet packet; unsigned char byte, *buffer; @@ -483,7 +505,10 @@ static int receive_data(int fd, int revents, void *user_data) * finished. We'll double that to 30ms to be sure... */ source_remove(fd); - source_add(fd, G_IO_IN, 100, receive_data, user_data); + source_add(fd, G_IO_IN, 30, receive_data, user_data); + raw_sample_buf = malloc(limit_samples * 4); + /* fill with 1010... for debugging */ + memset(raw_sample_buf, 0x82, limit_samples * 4); } num_channels = 0; @@ -494,11 +519,13 @@ static int receive_data(int fd, int revents, void *user_data) if (revents == G_IO_IN && num_transfers / num_channels <= limit_samples) { - if (read(fd, &byte, 1) != 1) + if (serial_read(fd, &byte, 1) != 1) return FALSE; sample[num_bytes++] = byte; + g_debug("ols: received byte 0x%.2x", byte); if (num_bytes == num_channels) { + g_debug("ols: received sample 0x%.*x", num_bytes * 2, (int) *sample); /* Got a full sample. */ if (flag_reg & FLAG_RLE) { /* @@ -513,8 +540,7 @@ static int receive_data(int fd, int revents, void *user_data) buffer = g_malloc(count); buflen = 0; for (i = 0; i < count; i++) { - memcpy(buffer + buflen, - last_sample, 4); + memcpy(buffer + buflen, last_sample, 4); buflen += 4; } } else { @@ -546,7 +572,7 @@ static int receive_data(int fd, int revents, void *user_data) j = 0; memset(tmp_sample, 0, 4); for (i = 0; i < 4; i++) { - if ((flag_reg & (8 >> i)) == 0) { + if (((flag_reg >> 2) & (1 << i)) == 0) { /* * This channel group was * enabled, copy from received @@ -556,13 +582,16 @@ static int receive_data(int fd, int revents, void *user_data) } } memcpy(sample, tmp_sample, 4); + g_debug("ols: full sample 0x%.8x", (int) *sample); } - /* Send it all to the session bus. */ - packet.type = DF_LOGIC32; - packet.length = buflen; - packet.payload = buffer; - session_bus(user_data, &packet); + /* the OLS sends its sample buffer backwards. + * store it in reverse order here, so we can dump + * this on the session bus later. + */ + offset = (limit_samples - num_transfers / num_channels) * 4; + memcpy(raw_sample_buf + offset, sample, 4); + if (buffer == sample) memcpy(last_sample, buffer, num_channels); else @@ -575,11 +604,40 @@ static int receive_data(int fd, int revents, void *user_data) /* * This is the main loop telling us a timeout was reached, or * we've acquired all the samples we asked for -- we're done. + * Send the (properly-ordered) buffer to the frontend. */ -#ifndef _WIN32 - /* TODO: Move to serial.c? */ - tcflush(fd, TCIOFLUSH); -#endif + if (trigger_at != -1) { + /* a trigger was set up, so we need to tell the frontend + * about it. + */ + if (trigger_at > 0) { + /* there are pre-trigger samples, send those first */ + packet.type = DF_LOGIC; + packet.length = trigger_at * 4; + packet.unitsize = 4; + packet.payload = raw_sample_buf; + session_bus(user_data, &packet); + } + + packet.type = DF_TRIGGER; + packet.length = 0; + session_bus(user_data, &packet); + + packet.type = DF_LOGIC; + packet.length = (limit_samples * 4) - (trigger_at * 4); + packet.unitsize = 4; + packet.payload = raw_sample_buf + trigger_at * 4; + session_bus(user_data, &packet); + } else { + packet.type = DF_LOGIC; + packet.length = limit_samples * 4; + packet.unitsize = 4; + packet.payload = raw_sample_buf; + session_bus(user_data, &packet); + } + free(raw_sample_buf); + + serial_flush(fd); serial_close(fd); packet.type = DF_END; packet.length = 0; @@ -594,115 +652,106 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) int i; struct datafeed_packet *packet; struct datafeed_header *header; - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; + uint32_t trigger_config[4]; uint32_t data; uint16_t readcount, delaycount; uint8_t changrp_mask; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; + if (!(sdi = get_sr_device_instance(device_instances, device_index))) + return SR_ERR; if (sdi->status != ST_ACTIVE) - return SIGROK_ERR; + return SR_ERR; + readcount = limit_samples / 4; + + memset(trigger_config, 0, 16); + trigger_config[num_stages-1] |= 0x08; if (trigger_mask[0]) { - /* Trigger masks */ - if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_0, - trigger_mask[0]) != SIGROK_OK) - return SIGROK_ERR; - if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_1, - trigger_mask[1]) != SIGROK_OK) - return SIGROK_ERR; - if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_2, - trigger_mask[2]) != SIGROK_OK) - return SIGROK_ERR; - if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_3, - trigger_mask[3]) != SIGROK_OK) - return SIGROK_ERR; + delaycount = readcount * (1 - capture_ratio / 100.0); + trigger_at = (readcount - delaycount) * 4 - num_stages; + if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_0, + reverse32(trigger_mask[0])) != SR_OK) + return SR_ERR; if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_0, - trigger_value[0]) != SIGROK_OK) - return SIGROK_ERR; - if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_1, - trigger_value[1]) != SIGROK_OK) - return SIGROK_ERR; - if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_2, - trigger_value[2]) != SIGROK_OK) - return SIGROK_ERR; - if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_3, - trigger_value[3]) != SIGROK_OK) - return SIGROK_ERR; - - /* Trigger configuration */ - /* - * TODO: The start flag should only be on the last used - * stage I think... - */ + reverse32(trigger_value[0])) != SR_OK) + return SR_ERR; if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_0, - 0x00000008) != SIGROK_OK) - return SIGROK_ERR; + trigger_config[0]) != SR_OK) + return SR_ERR; + + if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_1, + reverse32(trigger_mask[1])) != SR_OK) + return SR_ERR; + if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_1, + reverse32(trigger_value[1])) != SR_OK) + return SR_ERR; if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_1, - 0x00000000) != SIGROK_OK) - return SIGROK_ERR; + trigger_config[1]) != SR_OK) + return SR_ERR; + + if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_2, + reverse32(trigger_mask[2])) != SR_OK) + return SR_ERR; + if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_2, + reverse32(trigger_value[2])) != SR_OK) + return SR_ERR; if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_2, - 0x00000000) != SIGROK_OK) - return SIGROK_ERR; + trigger_config[2]) != SR_OK) + return SR_ERR; + + if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_3, + reverse32(trigger_mask[3])) != SR_OK) + return SR_ERR; + if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_3, + reverse32(trigger_value[3])) != SR_OK) + return SR_ERR; if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_3, - 0x00000000) != SIGROK_OK) - return SIGROK_ERR; - delaycount = limit_samples / 4 * (capture_ratio / 100); + trigger_config[3]) != SR_OK) + return SR_ERR; } else { if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_0, - trigger_mask[0]) != SIGROK_OK) - return SIGROK_ERR; + trigger_mask[0]) != SR_OK) + return SR_ERR; if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_0, - trigger_value[0]) != SIGROK_OK) - return SIGROK_ERR; + trigger_value[0]) != SR_OK) + return SR_ERR; if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_0, - 0x00000008) != SIGROK_OK) - return SIGROK_ERR; - delaycount = limit_samples / 4; + 0x00000008) != SR_OK) + return SR_ERR; + delaycount = readcount; } set_configuration_samplerate(sdi, cur_samplerate); /* Send sample limit and pre/post-trigger capture ratio. */ - readcount = limit_samples / 4; - if (flag_reg & FLAG_DEMUX) { - data = (delaycount - 8) & 0xfff8 << 13; - data |= (readcount - 4) & 0xffff; - } else { - flag_reg |= FLAG_FILTER; - data = (readcount - 1) << 16; - data |= (delaycount - 1); - } - /* TODO: htonl()? */ - byteswap(&data); - if (send_longcommand(sdi->serial->fd, CMD_CAPTURE_SIZE, - data) != SIGROK_OK) - return SIGROK_ERR; + data = ((readcount - 1) & 0xffff) << 16; + data |= (delaycount - 1) & 0xffff; + if (send_longcommand(sdi->serial->fd, CMD_CAPTURE_SIZE, reverse16(data)) != SR_OK) + return SR_ERR; /* * Enable/disable channel groups in the flag register according to the - * probe mask. The register stores them backwards, hence shift right - * from 1000. + * probe mask. */ changrp_mask = 0; for (i = 0; i < 4; i++) { if (probe_mask & (0xff << (i * 8))) - changrp_mask |= (8 >> i); + changrp_mask |= (1 << i); } /* The flag register wants them here, and 1 means "disable channel". */ flag_reg |= ~(changrp_mask << 2) & 0x3c; - + flag_reg |= FLAG_FILTER; data = flag_reg << 24; - if (send_longcommand(sdi->serial->fd, CMD_SET_FLAGS, data) != SIGROK_OK) - return SIGROK_ERR; + if (send_longcommand(sdi->serial->fd, CMD_SET_FLAGS, data) != SR_OK) + return SR_ERR; /* Start acquisition on the device. */ - if (send_shortcommand(sdi->serial->fd, CMD_RUN) != SIGROK_OK) - return SIGROK_ERR; + if (send_shortcommand(sdi->serial->fd, CMD_RUN) != SR_OK) + return SR_ERR; source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, session_device_id); @@ -711,7 +760,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) packet = g_malloc(sizeof(struct datafeed_packet)); header = g_malloc(sizeof(struct datafeed_header)); if (!packet || !header) - return SIGROK_ERR; + return SR_ERR; packet->type = DF_HEADER; packet->length = sizeof(struct datafeed_header); packet->payload = (unsigned char *)header; @@ -719,19 +768,20 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) gettimeofday(&header->starttime, NULL); header->samplerate = cur_samplerate; header->protocol_id = PROTO_RAW; - header->num_probes = NUM_PROBES; + header->num_logic_probes = NUM_PROBES; + header->num_analog_probes = 0; session_bus(session_device_id, packet); g_free(header); g_free(packet); - return SIGROK_OK; + return SR_OK; } static void hw_stop_acquisition(int device_index, gpointer session_device_id) { struct datafeed_packet packet; - /* QUICK HACK */ + /* Avoid compiler warnings. */ device_index = device_index; packet.type = DF_END; @@ -740,7 +790,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) } struct device_plugin ols_plugin_info = { - "sump", + "ols", 1, hw_init, hw_cleanup,