*/
#include "protocol.h"
+#include <libserialport.h>
#define SERIALCOMM "115200/8n1"
SR_CONF_RLE,
};
-#define STR_PATTERN_EXTERNAL "external"
-#define STR_PATTERN_INTERNAL "internal"
+#define STR_PATTERN_NONE "None"
+#define STR_PATTERN_EXTERNAL "External"
+#define STR_PATTERN_INTERNAL "Internal"
/* Supported methods of test pattern outputs */
enum {
PATTERN_INTERNAL,
};
+static const char *patterns[] = {
+ STR_PATTERN_NONE,
+ STR_PATTERN_EXTERNAL,
+ STR_PATTERN_INTERNAL,
+};
+
/* Probes are numbered 0-31 (on the PCB silkscreen). */
SR_PRIV const char *ols_probe_names[NUM_PROBES + 1] = {
"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
/* Wait 10ms for a response. */
g_usleep(10000);
- probefd.fd = serial->fd;
+ sp_get_port_handle(serial->data, &probefd.fd);
probefd.events = G_IO_IN;
g_poll(&probefd, 1, 1);
if (probefd.revents != G_IO_IN)
return NULL;
- if (serial_read(serial, buf, 4) != 4)
+ if (serial_read_blocking(serial, buf, 4) != 4)
return NULL;
if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4))
return NULL;
return ((struct drv_context *)(di->priv))->instances;
}
-static int dev_open(struct sr_dev_inst *sdi)
-{
- struct sr_serial_dev_inst *serial;
-
- serial = sdi->conn;
- if (serial_open(serial, SERIAL_RDWR) != SR_OK)
- return SR_ERR;
-
- sdi->status = SR_ST_ACTIVE;
-
- return SR_OK;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
- struct sr_serial_dev_inst *serial;
-
- serial = sdi->conn;
- if (serial && serial->fd != -1) {
- serial_close(serial);
- sdi->status = SR_ST_INACTIVE;
- }
-
- return SR_OK;
-}
-
static int cleanup(void)
{
return dev_clear();
}
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
struct dev_context *devc;
+ (void)probe_group;
+
if (!sdi)
return SR_ERR_ARG;
*data = g_variant_new_string(STR_PATTERN_EXTERNAL);
else if (devc->flag_reg & FLAG_INTERNAL_TEST_MODE)
*data = g_variant_new_string(STR_PATTERN_INTERNAL);
+ else
+ *data = g_variant_new_string(STR_PATTERN_NONE);
break;
case SR_CONF_RLE:
*data = g_variant_new_boolean(devc->flag_reg & FLAG_RLE ? TRUE : FALSE);
return SR_OK;
}
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
struct dev_context *devc;
- int ret;
+ uint16_t flag;
uint64_t tmp_u64;
+ int ret;
const char *stropt;
+ (void)probe_group;
+
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
case SR_CONF_PATTERN_MODE:
stropt = g_variant_get_string(data, NULL);
ret = SR_OK;
- if (!strcmp(stropt, STR_PATTERN_INTERNAL)) {
+ flag = 0xffff;
+ if (!strcmp(stropt, STR_PATTERN_NONE)) {
+ sr_info("Disabling test modes.");
+ flag = 0x0000;
+ }else if (!strcmp(stropt, STR_PATTERN_INTERNAL)) {
sr_info("Enabling internal test mode.");
- devc->flag_reg |= FLAG_INTERNAL_TEST_MODE;
+ flag = FLAG_INTERNAL_TEST_MODE;
} else if (!strcmp(stropt, STR_PATTERN_EXTERNAL)) {
sr_info("Enabling external test mode.");
- devc->flag_reg |= FLAG_EXTERNAL_TEST_MODE;
+ flag = FLAG_EXTERNAL_TEST_MODE;
} else {
ret = SR_ERR;
}
+ if (flag != 0xffff) {
+ devc->flag_reg &= ~(FLAG_INTERNAL_TEST_MODE | FLAG_EXTERNAL_TEST_MODE);
+ devc->flag_reg |= flag;
+ }
break;
case SR_CONF_SWAP:
if (g_variant_get_boolean(data)) {
return ret;
}
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group)
{
- GVariant *gvar;
+ struct dev_context *devc;
+ GVariant *gvar, *grange[2];
GVariantBuilder gvb;
+ int num_channels, i;
- (void)sdi;
+ (void)probe_group;
switch (key) {
case SR_CONF_SCAN_OPTIONS:
case SR_CONF_TRIGGER_TYPE:
*data = g_variant_new_string(TRIGGER_TYPE);
break;
+ case SR_CONF_PATTERN_MODE:
+ *data = g_variant_new_strv(patterns, ARRAY_SIZE(patterns));
+ break;
+ case SR_CONF_LIMIT_SAMPLES:
+ if (!sdi)
+ return SR_ERR_ARG;
+ devc = sdi->priv;
+ if (devc->flag_reg & FLAG_RLE)
+ return SR_ERR_NA;
+ if (devc->max_samples == 0)
+ /* Device didn't specify sample memory size in metadata. */
+ return SR_ERR_NA;
+ /*
+ * Channel groups are turned off if no probes in that group are
+ * enabled, making more room for samples for the enabled group.
+ */
+ ols_configure_probes(sdi);
+ num_channels = 0;
+ for (i = 0; i < 4; i++) {
+ if (devc->probe_mask & (0xff << (i * 8)))
+ num_channels++;
+ }
+ grange[0] = g_variant_new_uint64(MIN_NUM_SAMPLES);
+ grange[1] = g_variant_new_uint64(devc->max_samples / num_channels);
+ *data = g_variant_new_tuple(grange, 2);
+ break;
default:
return SR_ERR_NA;
}
delaycount = readcount;
}
- sr_info("Setting samplerate to %" PRIu64 "Hz (divider %u, "
- "demux %s, noise_filter %s)", devc->cur_samplerate,
- devc->cur_samplerate_divider,
- devc->flag_reg & FLAG_DEMUX ? "on" : "off",
- devc->flag_reg & FLAG_FILTER ? "on": "off");
+ /* Samplerate. */
+ sr_info("Setting samplerate to %" PRIu64 "Hz (divider %u)",
+ devc->cur_samplerate, devc->cur_samplerate_divider);
if (send_longcommand(serial, CMD_SET_DIVIDER,
reverse32(devc->cur_samplerate_divider)) != SR_OK)
return SR_ERR;
/* Send sample limit and pre/post-trigger capture ratio. */
+ sr_info("Setting sample limit %d, trigger point at %d",
+ (readcount - 1) * 4, (delaycount - 1) * 4);
data = ((readcount - 1) & 0xffff) << 16;
data |= (delaycount - 1) & 0xffff;
if (send_longcommand(serial, CMD_CAPTURE_SIZE, reverse16(data)) != SR_OK)
return SR_ERR;
- /* The flag register wants them here, and 1 means "disable channel". */
+ /* Flag register. */
+ sr_info("Setting demux %s, noise_filter %s, extpat %s, intpat %s",
+ devc->flag_reg & FLAG_DEMUX ? "on" : "off",
+ devc->flag_reg & FLAG_FILTER ? "on": "off",
+ devc->flag_reg & FLAG_EXTERNAL_TEST_MODE ? "on": "off",
+ devc->flag_reg & FLAG_INTERNAL_TEST_MODE ? "on": "off");
+ /* 1 means "disable channel". */
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(serial, CMD_SET_FLAGS, data) != SR_OK)
return SR_ERR;
return SR_ERR;
/* Reset all operational states. */
- devc->num_transfers = devc->num_samples = devc->num_bytes = 0;
+ devc->rle_count = devc->num_transfers = 0;
+ devc->num_samples = devc->num_bytes = 0;
memset(devc->sample, 0, 4);
/* Send header packet to the session bus. */
std_session_send_df_header(cb_data, LOG_PREFIX);
- sr_source_add(serial->fd, G_IO_IN, -1, ols_receive_data, cb_data);
+ serial_source_add(serial, G_IO_IN, -1, ols_receive_data, cb_data);
return SR_OK;
}
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
- .dev_open = dev_open,
- .dev_close = dev_close,
+ .dev_open = std_serial_dev_open,
+ .dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL,
projects / libsigrok.git / blobdiff