/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#define O_NONBLOCK FIONBIO
#endif
-static int capabilities[] = {
+static int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
SR_HWCAP_SAMPLERATE,
SR_HWCAP_CAPTURE_RATIO,
0,
};
+static const char *probe_names[NUM_PROBES + 1] = {
+ "0",
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ "13",
+ "14",
+ "15",
+ "16",
+ "17",
+ "18",
+ "19",
+ "20",
+ "21",
+ "22",
+ "23",
+ "24",
+ "25",
+ "26",
+ "27",
+ "28",
+ "29",
+ "30",
+ "31",
+ NULL,
+};
+
/* default supported samplerates, can be overridden by device metadata */
static struct sr_samplerates samplerates = {
SR_HZ(10),
NULL,
};
-/* List of struct sr_serial_device_instance */
-static GSList *device_instances = NULL;
+/* List of struct sr_serial_dev_inst */
+static GSList *dev_insts = NULL;
static int send_shortcommand(int fd, uint8_t command)
{
return SR_OK;
}
-static int configure_probes(struct ols_device *ols, GSList *probes)
+static int configure_probes(struct ols_dev *ols, GSList *probes)
{
struct sr_probe *probe;
GSList *l;
return out;
}
-static struct ols_device *ols_device_new(void)
+static struct ols_dev *ols_dev_new(void)
{
- struct ols_device *ols;
+ struct ols_dev *ols;
/* TODO: Is 'ols' ever g_free()'d? */
- if (!(ols = g_try_malloc0(sizeof(struct ols_device)))) {
+ if (!(ols = g_try_malloc0(sizeof(struct ols_dev)))) {
sr_err("ols: %s: ols malloc failed", __func__);
return NULL;
}
ols->trigger_at = -1;
ols->probe_mask = 0xffffffff;
ols->cur_samplerate = SR_KHZ(200);
- ols->period_ps = 5000000;
+ ols->serial = NULL;
return ols;
}
-static struct sr_device_instance *get_metadata(int fd)
+static struct sr_dev_inst *get_metadata(int fd)
{
- struct sr_device_instance *sdi;
- struct ols_device *ols;
+ struct sr_dev_inst *sdi;
+ struct ols_dev *ols;
uint32_t tmp_int;
uint8_t key, type, token;
- GString *tmp_str, *devicename, *version;
+ GString *tmp_str, *devname, *version;
gchar tmp_c;
- sdi = sr_device_instance_new(0, SR_ST_INACTIVE, NULL, NULL, NULL);
- ols = ols_device_new();
+ sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, NULL, NULL, NULL);
+ ols = ols_dev_new();
sdi->priv = ols;
- devicename = g_string_new("");
+ devname = g_string_new("");
version = g_string_new("");
key = 0xff;
switch (token) {
case 0x01:
/* Device name */
- devicename = g_string_append(devicename, tmp_str->str);
+ devname = g_string_append(devname, tmp_str->str);
break;
case 0x02:
/* FPGA firmware version */
}
}
- sdi->model = devicename->str;
+ sdi->model = devname->str;
sdi->version = version->str;
- g_string_free(devicename, FALSE);
+ g_string_free(devname, FALSE);
g_string_free(version, FALSE);
return sdi;
}
-static int hw_init(const char *deviceinfo)
+static int hw_init(const char *devinfo)
{
- struct sr_device_instance *sdi;
- struct ols_device *ols;
+ struct sr_dev_inst *sdi;
+ struct ols_dev *ols;
GSList *ports, *l;
GPollFD *fds, probefd;
int devcnt, final_devcnt, num_ports, fd, ret, i;
- char buf[8], **device_names, **serial_params;
+ char buf[8], **dev_names, **serial_params;
final_devcnt = 0;
- if (deviceinfo)
- ports = g_slist_append(NULL, strdup(deviceinfo));
+ if (devinfo)
+ ports = g_slist_append(NULL, g_strdup(devinfo));
else
/* No specific device given, so scan all serial ports. */
ports = list_serial_ports();
goto hw_init_free_ports; /* TODO: SR_ERR_MALLOC. */
}
- if (!(device_names = g_try_malloc(num_ports * sizeof(char *)))) {
- sr_err("ols: %s: device_names malloc failed", __func__);
+ if (!(dev_names = g_try_malloc(num_ports * sizeof(char *)))) {
+ sr_err("ols: %s: dev_names malloc failed", __func__);
goto hw_init_free_fds; /* TODO: SR_ERR_MALLOC. */
}
if (!(serial_params = g_try_malloc(num_ports * sizeof(char *)))) {
sr_err("ols: %s: serial_params malloc failed", __func__);
- goto hw_init_free_device_names; /* TODO: SR_ERR_MALLOC. */
+ goto hw_init_free_dev_names; /* TODO: SR_ERR_MALLOC. */
}
devcnt = 0;
send_shortcommand(fd, CMD_ID);
fds[devcnt].fd = fd;
fds[devcnt].events = G_IO_IN;
- device_names[devcnt] = strdup(l->data);
+ dev_names[devcnt] = g_strdup(l->data);
devcnt++;
}
- free(l->data);
+ g_free(l->data);
}
/* 2ms isn't enough for reliable transfer with pl2303, let's try 10 */
sdi->index = final_devcnt;
} else {
/* not an OLS -- some other board that uses the sump protocol */
- sdi = sr_device_instance_new(final_devcnt, SR_ST_INACTIVE,
+ sdi = sr_dev_inst_new(final_devcnt, SR_ST_INACTIVE,
"Sump", "Logic Analyzer", "v1.0");
- ols = ols_device_new();
+ ols = ols_dev_new();
ols->num_probes = 32;
sdi->priv = ols;
}
- sdi->serial = sr_serial_device_instance_new(device_names[i], -1);
- device_instances = g_slist_append(device_instances, sdi);
+ ols->serial = sr_serial_dev_inst_new(dev_names[i], -1);
+ dev_insts = g_slist_append(dev_insts, sdi);
final_devcnt++;
serial_close(fds[i].fd);
fds[i].fd = 0;
serial_restore_params(fds[i].fd, serial_params[i]);
serial_close(fds[i].fd);
}
- free(serial_params[i]);
- free(device_names[i]);
+ g_free(serial_params[i]);
+ g_free(dev_names[i]);
}
g_free(serial_params);
-hw_init_free_device_names:
- g_free(device_names);
+hw_init_free_dev_names:
+ g_free(dev_names);
hw_init_free_fds:
g_free(fds);
hw_init_free_ports:
return final_devcnt;
}
-static int hw_opendev(int device_index)
+static int hw_dev_open(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
+ struct ols_dev *ols;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
- sdi->serial->fd = serial_open(sdi->serial->port, O_RDWR);
- if (sdi->serial->fd == -1)
+ ols = sdi->priv;
+
+ ols->serial->fd = serial_open(ols->serial->port, O_RDWR);
+ if (ols->serial->fd == -1)
return SR_ERR;
sdi->status = SR_ST_ACTIVE;
return SR_OK;
}
-static int hw_closedev(int device_index)
+static int hw_dev_close(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
+ struct ols_dev *ols;
- if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("ols: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
+ ols = sdi->priv;
+
/* TODO */
- if (sdi->serial->fd != -1) {
- serial_close(sdi->serial->fd);
- sdi->serial->fd = -1;
+ if (ols->serial->fd != -1) {
+ serial_close(ols->serial->fd);
+ ols->serial->fd = -1;
sdi->status = SR_ST_INACTIVE;
}
return SR_OK;
}
-static void hw_cleanup(void)
+static int hw_cleanup(void)
{
GSList *l;
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
+ struct ols_dev *ols;
+ int ret = SR_OK;
/* Properly close and free all devices. */
- for (l = device_instances; l; l = l->next) {
- sdi = l->data;
- if (sdi->serial->fd != -1)
- serial_close(sdi->serial->fd);
- sr_device_instance_free(sdi);
+ for (l = dev_insts; l; l = l->next) {
+ if (!(sdi = l->data)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("ols: %s: sdi was NULL, continuing", __func__);
+ ret = SR_ERR_BUG;
+ continue;
+ }
+ if (!(ols = sdi->priv)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("ols: %s: sdi->priv was NULL, continuing",
+ __func__);
+ ret = SR_ERR_BUG;
+ continue;
+ }
+ /* TODO: Check for serial != NULL. */
+ if (ols->serial->fd != -1)
+ serial_close(ols->serial->fd);
+ sr_serial_dev_inst_free(ols->serial);
+ sr_dev_inst_free(sdi);
}
- g_slist_free(device_instances);
- device_instances = NULL;
+ g_slist_free(dev_insts);
+ dev_insts = NULL;
+
+ return ret;
}
-static void *hw_get_device_info(int device_index, int device_info_id)
+static void *hw_dev_info_get(int dev_index, int dev_info_id)
{
- struct sr_device_instance *sdi;
- struct ols_device *ols;
+ struct sr_dev_inst *sdi;
+ struct ols_dev *ols;
void *info;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return NULL;
ols = sdi->priv;
info = NULL;
- switch (device_info_id) {
- case SR_DI_INSTANCE:
+ switch (dev_info_id) {
+ case SR_DI_INST:
info = sdi;
break;
case SR_DI_NUM_PROBES:
info = GINT_TO_POINTER(NUM_PROBES);
break;
+ case SR_DI_PROBE_NAMES:
+ info = probe_names;
+ break;
case SR_DI_SAMPLERATES:
info = &samplerates;
break;
return info;
}
-static int hw_get_status(int device_index)
+static int hw_dev_status_get(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ST_NOT_FOUND;
return sdi->status;
}
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
{
- return capabilities;
+ return hwcaps;
}
-static int set_configuration_samplerate(struct sr_device_instance *sdi,
- uint64_t samplerate)
+static int config_set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
{
- struct ols_device *ols;
+ struct ols_dev *ols;
ols = sdi->priv;
if (ols->max_samplerate) {
* from the requested.
*/
ols->cur_samplerate = CLOCK_RATE / (ols->cur_samplerate_divider + 1);
- if(ols->flag_reg & FLAG_DEMUX)
+ if (ols->flag_reg & FLAG_DEMUX)
ols->cur_samplerate *= 2;
- ols->period_ps = 1000000000000 / ols->cur_samplerate;
- if(ols->cur_samplerate != samplerate)
- sr_warn("ols: can't match samplerate %" PRIu64 ", using %" PRIu64,
- samplerate, ols->cur_samplerate);
+ if (ols->cur_samplerate != samplerate)
+ sr_err("ols: can't match samplerate %" PRIu64 ", using %"
+ PRIu64, samplerate, ols->cur_samplerate);
return SR_OK;
}
-static int hw_set_configuration(int device_index, int capability, void *value)
+static int hw_config_set(int dev_index, int hwcap, void *value)
{
- struct sr_device_instance *sdi;
- struct ols_device *ols;
+ struct sr_dev_inst *sdi;
+ struct ols_dev *ols;
int ret;
uint64_t *tmp_u64;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
ols = sdi->priv;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR;
- switch (capability) {
+ switch (hwcap) {
case SR_HWCAP_SAMPLERATE:
tmp_u64 = value;
- ret = set_configuration_samplerate(sdi, *tmp_u64);
+ ret = config_set_samplerate(sdi, *tmp_u64);
break;
case SR_HWCAP_PROBECONFIG:
ret = configure_probes(ols, (GSList *) value);
if (*tmp_u64 < MIN_NUM_SAMPLES)
return SR_ERR;
if (*tmp_u64 > ols->max_samples)
- sr_warn("ols: sample limit exceeds hw max");
+ sr_err("ols: sample limit exceeds hw max");
ols->limit_samples = *tmp_u64;
sr_info("ols: sample limit %" PRIu64, ols->limit_samples);
ret = SR_OK;
{
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
- struct sr_device_instance *sdi;
- struct ols_device *ols;
+ struct sr_dev_inst *sdi;
+ struct ols_dev *ols;
GSList *l;
int num_channels, offset, i, j;
unsigned char byte;
- /* find this device's ols_device struct by its fd */
+ /* find this device's ols_dev struct by its fd */
ols = NULL;
- for (l = device_instances; l; l = l->next) {
+ for (l = dev_insts; l; l = l->next) {
sdi = l->data;
- if (sdi->serial->fd == fd) {
+ if (ols->serial->fd == fd) {
ols = sdi->priv;
break;
}
if (ols->trigger_at > 0) {
/* there are pre-trigger samples, send those first */
packet.type = SR_DF_LOGIC;
- packet.timeoffset = 0;
- packet.duration = ols->trigger_at * ols->period_ps;
packet.payload = &logic;
logic.length = ols->trigger_at * 4;
logic.unitsize = 4;
/* send the trigger */
packet.type = SR_DF_TRIGGER;
- packet.timeoffset = ols->trigger_at * ols->period_ps;
- packet.duration = 0;
sr_session_bus(session_data, &packet);
/* send post-trigger samples */
packet.type = SR_DF_LOGIC;
- packet.timeoffset = ols->trigger_at * ols->period_ps;
- packet.duration = (ols->num_samples - ols->trigger_at) * ols->period_ps;
packet.payload = &logic;
logic.length = (ols->num_samples * 4) - (ols->trigger_at * 4);
logic.unitsize = 4;
} else {
/* no trigger was used */
packet.type = SR_DF_LOGIC;
- packet.timeoffset = 0;
- packet.duration = ols->num_samples * ols->period_ps;
packet.payload = &logic;
logic.length = ols->num_samples * 4;
logic.unitsize = 4;
serial_flush(fd);
serial_close(fd);
packet.type = SR_DF_END;
- packet.timeoffset = ols->num_samples * ols->period_ps;
- packet.duration = 0;
sr_session_bus(session_data, &packet);
}
return TRUE;
}
-static int hw_start_acquisition(int device_index, gpointer session_data)
+static int hw_acquisition_start(int dev_index, gpointer session_data)
{
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
- struct sr_device_instance *sdi;
- struct ols_device *ols;
+ struct sr_dev_inst *sdi;
+ struct ols_dev *ols;
uint32_t trigger_config[4];
uint32_t data;
uint16_t readcount, delaycount;
int num_channels;
int i;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
ols = sdi->priv;
delaycount = readcount * (1 - ols->capture_ratio / 100.0);
ols->trigger_at = (readcount - delaycount) * 4 - ols->num_stages;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_0,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_MASK_0,
reverse32(ols->trigger_mask[0])) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_0,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_VALUE_0,
reverse32(ols->trigger_value[0])) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_0,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_CONFIG_0,
trigger_config[0]) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_1,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_MASK_1,
reverse32(ols->trigger_mask[1])) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_1,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_VALUE_1,
reverse32(ols->trigger_value[1])) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_1,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_CONFIG_1,
trigger_config[1]) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_2,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_MASK_2,
reverse32(ols->trigger_mask[2])) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_2,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_VALUE_2,
reverse32(ols->trigger_value[2])) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_2,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_CONFIG_2,
trigger_config[2]) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_3,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_MASK_3,
reverse32(ols->trigger_mask[3])) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_3,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_VALUE_3,
reverse32(ols->trigger_value[3])) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_3,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_CONFIG_3,
trigger_config[3]) != SR_OK)
return SR_ERR;
} else {
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_0,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_MASK_0,
ols->trigger_mask[0]) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_VALUE_0,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_VALUE_0,
ols->trigger_value[0]) != SR_OK)
return SR_ERR;
- if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_CONFIG_0,
+ if (send_longcommand(ols->serial->fd, CMD_SET_TRIGGER_CONFIG_0,
0x00000008) != SR_OK)
return SR_ERR;
delaycount = readcount;
sr_info("ols: setting samplerate to %" PRIu64 " Hz (divider %u, "
"demux %s)", ols->cur_samplerate, ols->cur_samplerate_divider,
ols->flag_reg & FLAG_DEMUX ? "on" : "off");
- if (send_longcommand(sdi->serial->fd, CMD_SET_DIVIDER,
+ if (send_longcommand(ols->serial->fd, CMD_SET_DIVIDER,
reverse32(ols->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(sdi->serial->fd, CMD_CAPTURE_SIZE, reverse16(data)) != SR_OK)
+ if (send_longcommand(ols->serial->fd, CMD_CAPTURE_SIZE, reverse16(data)) != SR_OK)
return SR_ERR;
/* The flag register wants them here, and 1 means "disable channel". */
ols->flag_reg |= FLAG_FILTER;
ols->rle_count = 0;
data = (ols->flag_reg << 24) | ((ols->flag_reg << 8) & 0xff0000);
- if (send_longcommand(sdi->serial->fd, CMD_SET_FLAGS, data) != SR_OK)
+ if (send_longcommand(ols->serial->fd, CMD_SET_FLAGS, data) != SR_OK)
return SR_ERR;
/* Start acquisition on the device. */
- if (send_shortcommand(sdi->serial->fd, CMD_RUN) != SR_OK)
+ if (send_shortcommand(ols->serial->fd, CMD_RUN) != SR_OK)
return SR_ERR;
- sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data,
+ sr_source_add(ols->serial->fd, G_IO_IN, -1, receive_data,
session_data);
if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
gettimeofday(&header->starttime, NULL);
header->samplerate = ols->cur_samplerate;
header->num_logic_probes = NUM_PROBES;
- header->num_analog_probes = 0;
sr_session_bus(session_data, packet);
g_free(header);
return SR_OK;
}
-static void hw_stop_acquisition(int device_index, gpointer session_device_id)
+static int hw_acquisition_stop(int dev_index, gpointer session_dev_id)
{
struct sr_datafeed_packet packet;
/* Avoid compiler warnings. */
- (void)device_index;
+ (void)dev_index;
packet.type = SR_DF_END;
- sr_session_bus(session_device_id, &packet);
+ sr_session_bus(session_dev_id, &packet);
+
+ return SR_OK;
}
-struct sr_device_plugin ols_plugin_info = {
+SR_PRIV struct sr_dev_plugin ols_plugin_info = {
.name = "ols",
.longname = "Openbench Logic Sniffer",
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
- .opendev = hw_opendev,
- .closedev = hw_closedev,
- .get_device_info = hw_get_device_info,
- .get_status = hw_get_status,
- .get_capabilities = hw_get_capabilities,
- .set_configuration = hw_set_configuration,
- .start_acquisition = hw_start_acquisition,
- .stop_acquisition = hw_stop_acquisition,
+ .dev_open = hw_dev_open,
+ .dev_close = hw_dev_close,
+ .dev_info_get = hw_dev_info_get,
+ .dev_status_get = hw_dev_status_get,
+ .hwcap_get_all = hw_hwcap_get_all,
+ .config_set = hw_config_set,
+ .acquisition_start = hw_acquisition_start,
+ .acquisition_stop = hw_acquisition_stop,
};