X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fprotocol.c;h=742025ce2a4f13e99012b3ee8a5ca159dfb76479;hb=fe9d5abefcebb3a382d990e069d93c28e9541e35;hp=6082fb3e41adcdcf29429a2f2b905f62e060b5fd;hpb=00d04d3b0eca2898409fe78b33c1bbf177cd8504;p=libsigrok.git diff --git a/hardware/openbench-logic-sniffer/protocol.c b/hardware/openbench-logic-sniffer/protocol.c index 6082fb3e..742025ce 100644 --- a/hardware/openbench-logic-sniffer/protocol.c +++ b/hardware/openbench-logic-sniffer/protocol.c @@ -18,6 +18,7 @@ */ #include "protocol.h" +#include extern SR_PRIV struct sr_dev_driver ols_driver_info; static struct sr_dev_driver *di = &ols_driver_info; @@ -29,7 +30,7 @@ SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial, sr_dbg("Sending cmd 0x%.2x.", command); buf[0] = command; - if (serial_write(serial, buf, 1) != 1) + if (serial_write_blocking(serial, buf, 1) != 1) return SR_ERR; return SR_OK; @@ -46,7 +47,7 @@ SR_PRIV int send_longcommand(struct sr_serial_dev_inst *serial, buf[2] = (data & 0xff0000) >> 16; buf[3] = (data & 0xff00) >> 8; buf[4] = data & 0xff; - if (serial_write(serial, buf, 5) != 5) + if (serial_write_blocking(serial, buf, 5) != 5) return SR_ERR; return SR_OK; @@ -74,6 +75,11 @@ SR_PRIV int ols_configure_probes(const struct sr_dev_inst *sdi) if (!probe->enabled) continue; + if (probe->index >= devc->max_probes) { + sr_err("Channels over the limit of %d\n", devc->max_probes); + return SR_ERR; + } + /* * Set up the probe mask for later configuration into the * flag register. @@ -170,7 +176,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) key = 0xff; while (key) { - if (serial_read(serial, &key, 1) != 1 || key == 0x00) + if (serial_read_blocking(serial, &key, 1) != 1 || key == 0x00) break; type = key >> 5; token = key & 0x1f; @@ -178,7 +184,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) case 0: /* NULL-terminated string */ tmp_str = g_string_new(""); - while (serial_read(serial, &tmp_c, 1) == 1 && tmp_c != '\0') + while (serial_read_blocking(serial, &tmp_c, 1) == 1 && tmp_c != '\0') g_string_append_c(tmp_str, tmp_c); sr_dbg("Got metadata key 0x%.2x value '%s'.", key, tmp_str->str); @@ -210,7 +216,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) break; case 1: /* 32-bit unsigned integer */ - if (serial_read(serial, &tmp_int, 4) != 4) + if (serial_read_blocking(serial, &tmp_int, 4) != 4) break; tmp_int = reverse32(tmp_int); sr_dbg("Got metadata key 0x%.2x value 0x%.8x.", @@ -249,7 +255,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) break; case 2: /* 8-bit unsigned integer */ - if (serial_read(serial, &tmp_c, 1) != 1) + if (serial_read_blocking(serial, &tmp_c, 1) != 1) break; sr_dbg("Got metadata key 0x%.2x value 0x%.2x.", key, tmp_c); @@ -297,10 +303,16 @@ SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi, return SR_ERR_SAMPLERATE; if (samplerate > CLOCK_RATE) { + sr_info("Enabling demux mode."); devc->flag_reg |= FLAG_DEMUX; + devc->flag_reg &= ~FLAG_FILTER; + devc->max_probes = NUM_PROBES / 2; devc->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1; } else { + sr_info("Disabling demux mode."); devc->flag_reg &= ~FLAG_DEMUX; + devc->flag_reg |= FLAG_FILTER; + devc->max_probes = NUM_PROBES; devc->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1; } @@ -323,7 +335,7 @@ SR_PRIV void abort_acquisition(const struct sr_dev_inst *sdi) struct sr_serial_dev_inst *serial; serial = sdi->conn; - sr_source_remove(serial->fd); + serial_source_remove(serial); /* Terminate session */ packet.type = SR_DF_END; @@ -343,6 +355,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) int num_channels, offset, j; unsigned int i; unsigned char byte; + int serial_fd; drvc = di->priv; @@ -352,7 +365,8 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) sdi = l->data; devc = sdi->priv; serial = sdi->conn; - if (serial->fd == fd) + sp_get_port_handle(serial->data, &serial_fd); + if (serial_fd == fd) break; devc = NULL; } @@ -367,8 +381,8 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) * longer than it takes to send a byte, that means it's * finished. We'll double that to 30ms to be sure... */ - sr_source_remove(fd); - sr_source_add(fd, G_IO_IN, 30, ols_receive_data, cb_data); + serial_source_remove(serial); + serial_source_add(serial, G_IO_IN, 30, ols_receive_data, cb_data); devc->raw_sample_buf = g_try_malloc(devc->limit_samples * 4); if (!devc->raw_sample_buf) { sr_err("Sample buffer malloc failed."); @@ -379,13 +393,15 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) } num_channels = 0; - for (i = 0x20; i > 0x02; i /= 2) { - if ((devc->flag_reg & i) == 0) + + for (i = NUM_PROBES; i > 0x02; i /= 2) { + if ((devc->flag_reg & i) == 0) { num_channels++; + } } if (revents == G_IO_IN && devc->num_samples < devc->limit_samples) { - if (serial_read(serial, &byte, 1) != 1) + if (serial_read_nonblocking(serial, &byte, 1) != 1) return FALSE; /* Ignore it if we've read enough. */ @@ -393,13 +409,13 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) return TRUE; devc->sample[devc->num_bytes++] = byte; - sr_dbg("Received byte 0x%.2x.", byte); + sr_spew("Received byte 0x%.2x.", byte); if (devc->num_bytes == num_channels) { /* Got a full sample. Convert from the OLS's little-endian * sample to the local format. */ sample = devc->sample[0] | (devc->sample[1] << 8) \ | (devc->sample[2] << 16) | (devc->sample[3] << 24); - sr_dbg("Received sample 0x%.*x.", devc->num_bytes * 2, sample); + sr_spew("Received sample 0x%.*x.", devc->num_bytes * 2, sample); if (devc->flag_reg & FLAG_RLE) { /* * In RLE mode the high bit of the sample is the @@ -442,6 +458,9 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) * sample. */ devc->tmp_sample[i] = devc->sample[j++]; + } else if (devc->flag_reg & FLAG_DEMUX && (i > 2)) { + /* group 2 & 3 get added to 0 & 1 */ + devc->tmp_sample[i - 2] = devc->sample[j++]; } } memcpy(devc->sample, devc->tmp_sample, 4);