/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
*
*/
#include "protocol.h"
+#include <libserialport.h>
extern SR_PRIV struct sr_dev_driver ols_driver_info;
static struct sr_dev_driver *di = &ols_driver_info;
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;
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;
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.
return SR_ERR;
}
if (stage > devc->num_stages)
- devc->num_stages = stage;
+ devc->num_stages = stage - 1;
}
return SR_OK;
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;
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);
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.",
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);
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;
}
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;
struct sr_dev_inst *sdi;
GSList *l;
uint32_t sample;
- int num_channels, offset, i, j;
+ int num_channels, offset, j;
+ unsigned int i;
unsigned char byte;
+ int serial_fd;
drvc = di->priv;
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;
}
* 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.");
}
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) {
- if (serial_read(serial, &byte, 1) != 1)
+ if (revents == G_IO_IN && devc->num_samples < devc->limit_samples) {
+ if (serial_read_nonblocking(serial, &byte, 1) != 1)
return FALSE;
/* Ignore it if we've read enough. */
devc->sample[devc->num_bytes++] = byte;
sr_dbg("Received byte 0x%.2x.", byte);
if (devc->num_bytes == num_channels) {
- /* Got a full sample. */
+ /* 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);
if (devc->flag_reg & FLAG_RLE) {
/*
- * In RLE mode -1 should never come in as a
- * sample, because bit 31 is the "count" flag.
+ * In RLE mode the high bit of the sample is the
+ * "count" flag, meaning this sample is the number
+ * of times the previous sample occurred.
*/
if (devc->sample[devc->num_bytes - 1] & 0x80) {
- devc->sample[devc->num_bytes - 1] &= 0x7f;
- /*
- * FIXME: This will only work on
- * little-endian systems.
- */
+ /* Clear the high bit. */
+ sample &= ~(0x80 << (devc->num_bytes - 1) * 8);
devc->rle_count = sample;
- sr_dbg("RLE count: %d.", devc->rle_count);
+ sr_dbg("RLE count: %u.", devc->rle_count);
devc->num_bytes = 0;
return TRUE;
}
* 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);
serial_flush(serial);
abort_acquisition(sdi);
- serial_close(serial);
}
return TRUE;
projects / libsigrok.git / blobdiff