/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
*
DEFAULT_SAMPLERATE);
/* Clear trigger masks, values and stages. */
ols_configure_probes(sdi);
- devc->serial = serial;
+ sdi->inst_type = SR_INST_SERIAL;
+ sdi->conn = serial;
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
static int hw_dev_open(struct sr_dev_inst *sdi)
{
- struct dev_context *devc;
-
- devc = sdi->priv;
+ struct sr_serial_dev_inst *serial;
- if (serial_open(devc->serial, SERIAL_RDWR) != SR_OK)
+ serial = sdi->conn;
+ if (serial_open(serial, SERIAL_RDWR) != SR_OK)
return SR_ERR;
sdi->status = SR_ST_ACTIVE;
static int hw_dev_close(struct sr_dev_inst *sdi)
{
- struct dev_context *devc;
-
- devc = sdi->priv;
+ struct sr_serial_dev_inst *serial;
- if (devc->serial && devc->serial->fd != -1) {
- serial_close(devc->serial);
+ serial = sdi->conn;
+ if (serial && serial->fd != -1) {
+ serial_close(serial);
sdi->status = SR_ST_INACTIVE;
}
struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
int ret = SR_OK;
if (!(drvc = di->priv))
continue;
}
hw_dev_close(sdi);
- sr_serial_dev_inst_free(devc->serial);
+ serial = sdi->conn;
+ sr_serial_dev_inst_free(serial);
sr_dev_inst_free(sdi);
}
g_slist_free(drvc->instances);
*data = g_variant_new_boolean(devc->flag_reg & FLAG_RLE ? TRUE : FALSE);
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
int ret;
uint64_t tmp_u64;
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
devc = sdi->priv;
switch (id) {
ret = SR_OK;
break;
default:
- ret = SR_ERR;
+ ret = SR_ERR_NA;
}
return ret;
*data = g_variant_new_string(TRIGGER_TYPE);
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
void *cb_data)
{
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
uint32_t trigger_config[4];
uint32_t data;
uint16_t readcount, delaycount;
int num_channels;
int i;
- devc = sdi->priv;
-
if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR;
+ return SR_ERR_DEV_CLOSED;
+
+ devc = sdi->priv;
+ serial = sdi->conn;
if (ols_configure_probes(sdi) != SR_OK) {
sr_err("Failed to configure probes.");
readcount = MIN(devc->max_samples / num_channels, devc->limit_samples) / 4;
memset(trigger_config, 0, 16);
- trigger_config[devc->num_stages - 1] |= 0x08;
+ trigger_config[devc->num_stages] |= 0x08;
if (devc->trigger_mask[0]) {
delaycount = readcount * (1 - devc->capture_ratio / 100.0);
devc->trigger_at = (readcount - delaycount) * 4 - devc->num_stages;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_0,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_MASK_0,
reverse32(devc->trigger_mask[0])) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_0,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_VALUE_0,
reverse32(devc->trigger_value[0])) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_0,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_CONFIG_0,
trigger_config[0]) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_1,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_MASK_1,
reverse32(devc->trigger_mask[1])) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_1,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_VALUE_1,
reverse32(devc->trigger_value[1])) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_1,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_CONFIG_1,
trigger_config[1]) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_2,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_MASK_2,
reverse32(devc->trigger_mask[2])) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_2,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_VALUE_2,
reverse32(devc->trigger_value[2])) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_2,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_CONFIG_2,
trigger_config[2]) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_3,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_MASK_3,
reverse32(devc->trigger_mask[3])) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_3,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_VALUE_3,
reverse32(devc->trigger_value[3])) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_3,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_CONFIG_3,
trigger_config[3]) != SR_OK)
return SR_ERR;
} else {
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_MASK_0,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_MASK_0,
devc->trigger_mask[0]) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_VALUE_0,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_VALUE_0,
devc->trigger_value[0]) != SR_OK)
return SR_ERR;
- if (send_longcommand(devc->serial, CMD_SET_TRIGGER_CONFIG_0,
+ if (send_longcommand(serial, CMD_SET_TRIGGER_CONFIG_0,
0x00000008) != SR_OK)
return SR_ERR;
delaycount = readcount;
sr_info("Setting samplerate to %" PRIu64 "Hz (divider %u, "
"demux %s)", devc->cur_samplerate, devc->cur_samplerate_divider,
devc->flag_reg & FLAG_DEMUX ? "on" : "off");
- if (send_longcommand(devc->serial, CMD_SET_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. */
data = ((readcount - 1) & 0xffff) << 16;
data |= (delaycount - 1) & 0xffff;
- if (send_longcommand(devc->serial, CMD_CAPTURE_SIZE, reverse16(data)) != SR_OK)
+ 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". */
devc->flag_reg |= FLAG_FILTER;
devc->rle_count = 0;
data = (devc->flag_reg << 24) | ((devc->flag_reg << 8) & 0xff0000);
- if (send_longcommand(devc->serial, CMD_SET_FLAGS, data) != SR_OK)
+ if (send_longcommand(serial, CMD_SET_FLAGS, data) != SR_OK)
return SR_ERR;
/* Start acquisition on the device. */
- if (send_shortcommand(devc->serial, CMD_RUN) != SR_OK)
+ if (send_shortcommand(serial, CMD_RUN) != SR_OK)
return SR_ERR;
/* Reset all operational states. */
/* Send header packet to the session bus. */
std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
- sr_source_add(devc->serial->fd, G_IO_IN, -1, ols_receive_data,
- cb_data);
+ sr_source_add(serial->fd, G_IO_IN, -1, ols_receive_data, cb_data);
return SR_OK;
}