X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fols.c;h=57d7aa0aba31078db7291bf22871458838a5f868;hb=1924f59f4b788046f5eaf7ef3272a14c79a7c6f3;hp=2138aa7033abb5a4e10b5a1e0329e4d78f2ef98e;hpb=06d64eb880876bd8a81c249e7b2f690eb03e12c1;p=libsigrok.git diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c index 2138aa70..57d7aa0a 100644 --- a/hardware/openbench-logic-sniffer/ols.c +++ b/hardware/openbench-logic-sniffer/ols.c @@ -37,43 +37,49 @@ #endif #include #include +#include -#define NUM_PROBES 32 -#define NUM_TRIGGER_STAGES 4 -#define TRIGGER_TYPES "01" -#define SERIAL_SPEED B115200 -#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, @@ -115,7 +121,7 @@ static int send_shortcommand(int fd, uint8_t command) g_debug("ols: sending cmd 0x%.2x", command); buf[0] = command; - if (write(fd, buf, 1) != 1) + if (serial_write(fd, buf, 1) != 1) return SIGROK_ERR; return SIGROK_OK; @@ -131,7 +137,7 @@ 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 (write(fd, buf, 5) != 5) + if (serial_write(fd, buf, 5) != 5) return SIGROK_ERR; return SIGROK_OK; @@ -241,7 +247,7 @@ 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); + g_message("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); @@ -276,7 +282,7 @@ static int hw_init(char *deviceinfo) 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)) @@ -287,7 +293,7 @@ static int hw_init(char *deviceinfo) else sdi = sigrok_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); @@ -425,7 +431,7 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi, divider = (CLOCK_RATE / samplerate) - 1; } - g_message("setting samplerate to %" PRIu64 " Hz (divider %u, demux %s)", + 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, reverse32(divider)) != SIGROK_OK) @@ -457,7 +463,10 @@ static int hw_set_configuration(int device_index, int capability, void *value) break; case HWCAP_LIMIT_SAMPLES: tmp_u64 = value; + if (*tmp_u64 < MIN_NUM_SAMPLES) + return SIGROK_ERR; limit_samples = *tmp_u64; + g_message("ols: sample limit %" PRIu64, limit_samples); ret = SIGROK_OK; break; case HWCAP_CAPTURE_RATIO: @@ -510,13 +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("received byte 0x%.2x", byte); + g_debug("ols: received byte 0x%.2x", byte); if (num_bytes == num_channels) { - g_debug("received sample 0x%.*x", num_bytes * 2, (int) *sample); + g_debug("ols: received sample 0x%.*x", num_bytes * 2, (int) *sample); /* Got a full sample. */ if (flag_reg & FLAG_RLE) { /* @@ -573,7 +582,7 @@ static int receive_data(int fd, int revents, void *user_data) } } memcpy(sample, tmp_sample, 4); - g_debug("full sample 0x%.8x", (int) *sample); + g_debug("ols: full sample 0x%.8x", (int) *sample); } /* the OLS sends its sample buffer backwards. @@ -603,8 +612,9 @@ static int receive_data(int fd, int revents, void *user_data) */ if (trigger_at > 0) { /* there are pre-trigger samples, send those first */ - packet.type = DF_LOGIC32; + packet.type = DF_LOGIC; packet.length = trigger_at * 4; + packet.unitsize = 4; packet.payload = raw_sample_buf; session_bus(user_data, &packet); } @@ -613,13 +623,15 @@ static int receive_data(int fd, int revents, void *user_data) packet.length = 0; session_bus(user_data, &packet); - packet.type = DF_LOGIC32; + 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_LOGIC32; + packet.type = DF_LOGIC; packet.length = limit_samples * 4; + packet.unitsize = 4; packet.payload = raw_sample_buf; session_bus(user_data, &packet); } @@ -659,7 +671,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) if (trigger_mask[0]) { delaycount = readcount * (1 - capture_ratio / 100.0); trigger_at = (readcount - delaycount) * 4 - num_stages; - g_message("ta %d", trigger_at); if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_0, reverse32(trigger_mask[0])) != SIGROK_OK) @@ -730,12 +741,9 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) if (probe_mask & (0xff << (i * 8))) changrp_mask |= (1 << i); } - g_message("changrp_mask 0x%.2x", changrp_mask); /* The flag register wants them here, and 1 means "disable channel". */ flag_reg |= ~(changrp_mask << 2) & 0x3c; - g_message("flag_reg 0x%.2x", flag_reg & 0x3c); - flag_reg |= FLAG_FILTER; data = flag_reg << 24; if (send_longcommand(sdi->serial->fd, CMD_SET_FLAGS, data) != SIGROK_OK) @@ -760,7 +768,8 @@ 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); @@ -772,7 +781,7 @@ 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; @@ -781,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,