#define TRIGGER_TYPES "rf10"
#define NUM_PROBES 16
-static GSList *device_instances = NULL;
+static GSList *dev_insts = NULL;
static uint64_t supported_samplerates[] = {
SR_KHZ(200),
supported_samplerates,
};
-static int capabilities[] = {
+static int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
SR_HWCAP_SAMPLERATE,
SR_HWCAP_CAPTURE_RATIO,
"asix-sigma-phasor.fw", /* Frequency counter */
};
-static void hw_stop_acquisition(int device_index, gpointer session_data);
+static int hw_stop_acquisition(int dev_index, gpointer session_data);
static int sigma_read(void *buf, size_t size, struct sigma *sigma)
{
ret = ftdi_read_data(&sigma->ftdic, (unsigned char *)buf, size);
if (ret < 0) {
- sr_warn("ftdi_read_data failed: %s",
- ftdi_get_error_string(&sigma->ftdic));
+ sr_err("sigma: ftdi_read_data failed: %s",
+ ftdi_get_error_string(&sigma->ftdic));
}
return ret;
ret = ftdi_write_data(&sigma->ftdic, (unsigned char *)buf, size);
if (ret < 0) {
- sr_warn("ftdi_write_data failed: %s",
- ftdi_get_error_string(&sigma->ftdic));
+ sr_err("sigma: ftdi_write_data failed: %s",
+ ftdi_get_error_string(&sigma->ftdic));
} else if ((size_t) ret != size) {
- sr_warn("ftdi_write_data did not complete write\n");
+ sr_err("sigma: ftdi_write_data did not complete write\n");
}
return ret;
uint8_t value;
if (1 != sigma_read_register(reg, &value, 1, sigma)) {
- sr_warn("sigma_get_register: 1 byte expected");
+ sr_err("sigma: sigma_get_register: 1 byte expected");
return 0;
}
f = g_fopen(filename, "rb");
if (!f) {
- sr_warn("g_fopen(\"%s\", \"rb\")", filename);
+ sr_err("sigma: g_fopen(\"%s\", \"rb\")", filename);
return SR_ERR;
}
if (-1 == fseek(f, 0, SEEK_END)) {
- sr_warn("fseek on %s failed", filename);
+ sr_err("sigma: fseek on %s failed", filename);
fclose(f);
return SR_ERR;
}
if (ret < 0) {
g_free(compressed_buf);
g_free(firmware);
- sr_warn("Could not unpack Sigma firmware. (Error %d)\n", ret);
+ sr_err("sigma: Could not unpack Sigma firmware. "
+ "(Error %d)\n", ret);
return SR_ERR;
}
if (offset != *buf_size) {
g_free(*buf);
- sr_warn("Error reading firmware %s "
- "offset=%ld, file_size=%ld, buf_size=%zd\n",
- filename, offset, file_size, *buf_size);
+ sr_err("sigma: Error reading firmware %s "
+ "offset=%ld, file_size=%ld, buf_size=%zd\n",
+ filename, offset, file_size, *buf_size);
return SR_ERR;
}
return SR_OK;
}
-static int hw_init(const char *deviceinfo)
+static int hw_init(const char *devinfo)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct sigma *sigma;
/* Avoid compiler warnings. */
- (void)deviceinfo;
+ (void)devinfo;
if (!(sigma = g_try_malloc(sizeof(struct sigma)))) {
sr_err("sigma: %s: sigma malloc failed", __func__);
sigma->use_triggers = 0;
/* Register SIGMA device. */
- sdi = sr_device_instance_new(0, SR_ST_INITIALIZING,
- USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION);
- if (!sdi)
+ if (!(sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING, USB_VENDOR_NAME,
+ USB_MODEL_NAME, USB_MODEL_VERSION))) {
+ sr_err("sigma: %s: sdi was NULL", __func__);
goto free;
+ }
sdi->priv = sigma;
- device_instances = g_slist_append(device_instances, sdi);
+ dev_insts = g_slist_append(dev_insts, sdi);
/* We will open the device again when we need it. */
ftdi_usb_close(&sigma->ftdic);
/* Make sure it's an ASIX SIGMA. */
if ((ret = ftdi_usb_open_desc(&sigma->ftdic,
USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) {
- sr_warn("ftdi_usb_open failed: %s",
- ftdi_get_error_string(&sigma->ftdic));
+ sr_err("sigma: ftdi_usb_open failed: %s",
+ ftdi_get_error_string(&sigma->ftdic));
return 0;
}
if ((ret = ftdi_set_bitmode(&sigma->ftdic, 0xdf, BITMODE_BITBANG)) < 0) {
- sr_warn("ftdi_set_bitmode failed: %s",
- ftdi_get_error_string(&sigma->ftdic));
+ sr_err("sigma: ftdi_set_bitmode failed: %s",
+ ftdi_get_error_string(&sigma->ftdic));
return 0;
}
/* Four times the speed of sigmalogan - Works well. */
if ((ret = ftdi_set_baudrate(&sigma->ftdic, 750000)) < 0) {
- sr_warn("ftdi_set_baudrate failed: %s",
- ftdi_get_error_string(&sigma->ftdic));
+ sr_err("sigma: ftdi_set_baudrate failed: %s",
+ ftdi_get_error_string(&sigma->ftdic));
return 0;
}
firmware_files[firmware_idx]);
if ((ret = bin2bitbang(firmware_path, &buf, &buf_size)) != SR_OK) {
- sr_warn("An error occured while reading the firmware: %s",
- firmware_path);
+ sr_err("sigma: An error occured while reading the firmware: %s",
+ firmware_path);
return ret;
}
g_free(buf);
if ((ret = ftdi_set_bitmode(&sigma->ftdic, 0x00, BITMODE_RESET)) < 0) {
- sr_warn("ftdi_set_bitmode failed: %s",
- ftdi_get_error_string(&sigma->ftdic));
+ sr_err("sigma: ftdi_set_bitmode failed: %s",
+ ftdi_get_error_string(&sigma->ftdic));
return SR_ERR;
}
ret = sigma_read(result, 3, sigma);
if (ret != 3 ||
result[0] != 0xa6 || result[1] != 0x55 || result[2] != 0xaa) {
- sr_warn("Configuration failed. Invalid reply received.");
+ sr_err("sigma: Configuration failed. Invalid reply received.");
return SR_ERR;
}
return SR_OK;
}
-static int hw_opendev(int device_index)
+static int hw_opendev(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct sigma *sigma;
int ret;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
sigma = sdi->priv;
if ((ret = ftdi_usb_open_desc(&sigma->ftdic,
USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) {
- sr_warn("ftdi_usb_open failed: %s",
- ftdi_get_error_string(&sigma->ftdic));
+ sr_err("sigma: ftdi_usb_open failed: %s",
+ ftdi_get_error_string(&sigma->ftdic));
return 0;
}
return SR_OK;
}
-static int set_samplerate(struct sr_device_instance *sdi,
- uint64_t samplerate)
+static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
{
int i, ret;
struct sigma *sigma = sdi->priv;
sigma->samples_per_event = 16 / sigma->num_probes;
sigma->state.state = SIGMA_IDLE;
- sr_info("Firmware uploaded");
+ sr_info("sigma: Firmware uploaded");
return ret;
}
* The Sigma supports complex triggers using boolean expressions, but this
* has not been implemented yet.
*/
-static int configure_probes(struct sr_device_instance *sdi, GSList *probes)
+static int configure_probes(struct sr_dev_inst *sdi, GSList *probes)
{
struct sigma *sigma = sdi->priv;
struct sr_probe *probe;
if (sigma->cur_samplerate >= SR_MHZ(100)) {
/* Fast trigger support. */
if (trigger_set) {
- sr_warn("ASIX SIGMA only supports a single "
- "pin trigger in 100 and 200MHz mode.");
+ sr_err("sigma: ASIX SIGMA only supports a single "
+ "pin trigger in 100 and 200MHz mode.");
return SR_ERR;
}
if (probe->trigger[0] == 'f')
else if (probe->trigger[0] == 'r')
sigma->trigger.risingmask |= probebit;
else {
- sr_warn("ASIX SIGMA only supports "
- "rising/falling trigger in 100 "
- "and 200MHz mode.");
+ sr_err("sigma: ASIX SIGMA only supports "
+ "rising/falling trigger in 100 "
+ "and 200MHz mode.");
return SR_ERR;
}
* does not permit ORed triggers.
*/
if (trigger_set > 1) {
- sr_warn("ASIX SIGMA only supports 1 rising/"
- "falling triggers.");
+ sr_err("sigma: ASIX SIGMA only supports 1 "
+ "rising/falling triggers.");
return SR_ERR;
}
}
return SR_OK;
}
-static int hw_closedev(int device_index)
+static int hw_closedev(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct sigma *sigma;
- if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("sigma: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
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;
+ int ret = SR_OK;
/* Properly close all devices. */
- for (l = device_instances; l; l = l->next) {
- sdi = l->data;
- if (sdi->priv != NULL)
- free(sdi->priv);
- 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("sigma: %s: sdi was NULL, continuing", __func__);
+ ret = SR_ERR_BUG;
+ continue;
+ }
+ 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_get_dev_info(int dev_index, int dev_info_id)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct sigma *sigma;
void *info = NULL;
- if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
- sr_err("It's NULL.\n");
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+ sr_err("sigma: %s: sdi was NULL", __func__);
return NULL;
}
sigma = sdi->priv;
- switch (device_info_id) {
- case SR_DI_INSTANCE:
+ switch (dev_info_id) {
+ case SR_DI_INST:
info = sdi;
break;
case SR_DI_NUM_PROBES:
return info;
}
-static int hw_get_status(int device_index)
+static int hw_get_status(int dev_index)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
- sdi = sr_get_device_instance(device_instances, device_index);
+ sdi = sr_dev_inst_get(dev_insts, dev_index);
if (sdi)
return sdi->status;
else
return SR_ST_NOT_FOUND;
}
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
{
- return capabilities;
+ return hwcaps;
}
-static int hw_set_configuration(int device_index, int capability, void *value)
+static int hw_set_configuration(int dev_index, int hwcap, void *value)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct sigma *sigma;
int ret;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
sigma = sdi->priv;
- if (capability == SR_HWCAP_SAMPLERATE) {
+ if (hwcap == SR_HWCAP_SAMPLERATE) {
ret = set_samplerate(sdi, *(uint64_t*) value);
- } else if (capability == SR_HWCAP_PROBECONFIG) {
+ } else if (hwcap == SR_HWCAP_PROBECONFIG) {
ret = configure_probes(sdi, value);
- } else if (capability == SR_HWCAP_LIMIT_MSEC) {
+ } else if (hwcap == SR_HWCAP_LIMIT_MSEC) {
sigma->limit_msec = *(uint64_t*) value;
if (sigma->limit_msec > 0)
ret = SR_OK;
else
ret = SR_ERR;
- } else if (capability == SR_HWCAP_CAPTURE_RATIO) {
+ } else if (hwcap == SR_HWCAP_CAPTURE_RATIO) {
sigma->capture_ratio = *(uint64_t*) value;
if (sigma->capture_ratio < 0 || sigma->capture_ratio > 100)
ret = SR_ERR;
uint16_t *lastsample, int triggerpos,
uint16_t limit_chunk, void *session_data)
{
- struct sr_device_instance *sdi = session_data;
+ struct sr_dev_inst *sdi = session_data;
struct sigma *sigma = sdi->priv;
uint16_t tsdiff, ts;
uint16_t samples[65536 * sigma->samples_per_event];
static int receive_data(int fd, int revents, void *session_data)
{
- struct sr_device_instance *sdi = session_data;
+ struct sr_dev_inst *sdi = session_data;
struct sigma *sigma = sdi->priv;
struct sr_datafeed_packet packet;
const int chunks_per_read = 32;
newchunks = MIN(chunks_per_read,
numchunks - sigma->state.chunks_downloaded);
- sr_info("Downloading sample data: %.0f %%",
+ sr_info("sigma: Downloading sample data: %.0f %%",
100.0 * sigma->state.chunks_downloaded / numchunks);
bufsz = sigma_read_dram(sigma->state.chunks_downloaded,
return SR_OK;
}
-static int hw_start_acquisition(int device_index, gpointer session_data)
+static int hw_start_acquisition(int dev_index, gpointer session_data)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct sigma *sigma;
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
/* Avoid compiler warnings. */
(void)session_data;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
sigma = sdi->priv;
gettimeofday(&header.starttime, NULL);
header.samplerate = sigma->cur_samplerate;
header.num_logic_probes = sigma->num_probes;
- header.num_analog_probes = 0;
sr_session_bus(session_data, &packet);
/* Add capture source. */
return SR_OK;
}
-static void hw_stop_acquisition(int device_index, gpointer session_data)
+static int hw_stop_acquisition(int dev_index, gpointer session_data)
{
- struct sr_device_instance *sdi;
+ struct sr_dev_inst *sdi;
struct sigma *sigma;
uint8_t modestatus;
- if (!(sdi = sr_get_device_instance(device_instances, device_index)))
- return;
-
- sigma = sdi->priv;
-
/* Avoid compiler warnings. */
(void)session_data;
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+ sr_err("sigma: %s: sdi was NULL", __func__);
+ return SR_ERR_BUG;
+ }
+
+ if (!(sigma = sdi->priv)) {
+ sr_err("sigma: %s: sdi->priv was NULL", __func__);
+ return SR_ERR_BUG;
+ }
+
/* Stop acquisition. */
sigma_set_register(WRITE_MODE, 0x11, sigma);
/* Check if trigger has fired. */
modestatus = sigma_get_register(READ_MODE, sigma);
- if (modestatus & 0x20) {
+ if (modestatus & 0x20)
sigma->state.triggerchunk = sigma->state.triggerpos / 512;
-
- } else
+ else
sigma->state.triggerchunk = -1;
sigma->state.chunks_downloaded = 0;
sigma->state.state = SIGMA_DOWNLOAD;
+
+ return SR_OK;
}
-struct sr_device_plugin asix_sigma_plugin_info = {
+SR_PRIV struct sr_dev_plugin asix_sigma_plugin_info = {
.name = "asix-sigma",
.longname = "ASIX SIGMA",
.api_version = 1,
.cleanup = hw_cleanup,
.opendev = hw_opendev,
.closedev = hw_closedev,
- .get_device_info = hw_get_device_info,
+ .get_dev_info = hw_get_dev_info,
.get_status = hw_get_status,
- .get_capabilities = hw_get_capabilities,
+ .hwcap_get_all = hw_hwcap_get_all,
.set_configuration = hw_set_configuration,
.start_acquisition = hw_start_acquisition,
.stop_acquisition = hw_stop_acquisition,
projects / libsigrok.git / blobdiff