X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=4cb5e1030ebbdf1f2cd4d78341a4260db2b1fe87;hb=e73ffd4238c6d1be58d3fcdcf7f100200f033856;hp=fe57d857c7dc7d7ad073c5e17cf54e82bc4663b9;hpb=6aac77375bb6f9545475d8d4d5e565f896b28be0;p=libsigrok.git diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index fe57d857..cfd95a11 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -1,7 +1,7 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * - * Copyright (C) 2010 Håvard Espeland , + * Copyright (C) 2010-2012 Håvard Espeland , * Copyright (C) 2010 Martin Stensgård * Copyright (C) 2010 Carl Henrik Lunde * @@ -20,13 +20,15 @@ */ /* - * ASIX Sigma Logic Analyzer Driver + * ASIX SIGMA/SIGMA2 logic analyzer driver */ +#include +#include #include #include -#include -#include +#include "libsigrok.h" +#include "libsigrok-internal.h" #include "asix-sigma.h" #define USB_VENDOR 0xa600 @@ -35,51 +37,42 @@ #define USB_VENDOR_NAME "ASIX" #define USB_MODEL_NAME "SIGMA" #define USB_MODEL_VERSION "" -#define TRIGGER_TYPES "rf10" - -static GSList *device_instances = NULL; - -// XXX These should be per device -static struct ftdi_context ftdic; -static uint64_t cur_samplerate = 0; -static uint32_t limit_msec = 0; -static struct timeval start_tv; -static int cur_firmware = -1; -static int num_probes = 0; -static int samples_per_event = 0; -static int capture_ratio = 50; -static struct sigma_trigger trigger; -static struct sigma_state sigma; - -static uint64_t supported_samplerates[] = { - KHZ(200), - KHZ(250), - KHZ(500), - MHZ(1), - MHZ(5), - MHZ(10), - MHZ(25), - MHZ(50), - MHZ(100), - MHZ(200), - 0, +#define TRIGGER_TYPE "rf10" +#define NUM_PROBES 16 + +SR_PRIV struct sr_dev_driver asix_sigma_driver_info; +static struct sr_dev_driver *di = &asix_sigma_driver_info; +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); + +static const uint64_t samplerates[] = { + SR_KHZ(200), + SR_KHZ(250), + SR_KHZ(500), + SR_MHZ(1), + SR_MHZ(5), + SR_MHZ(10), + SR_MHZ(25), + SR_MHZ(50), + SR_MHZ(100), + SR_MHZ(200), }; -static struct samplerates samplerates = { - KHZ(200), - MHZ(200), - 0, - supported_samplerates, +/* + * Probe numbers seem to go from 1-16, according to this image: + * http://tools.asix.net/img/sigma_sigmacab_pins_720.jpg + * (the cable has two additional GND pins, and a TI and TO pin) + */ +static const char *probe_names[NUM_PROBES + 1] = { + "1", "2", "3", "4", "5", "6", "7", "8", + "9", "10", "11", "12", "13", "14", "15", "16", + NULL, }; -static int capabilities[] = { - HWCAP_LOGIC_ANALYZER, - HWCAP_SAMPLERATE, - HWCAP_CAPTURE_RATIO, - HWCAP_PROBECONFIG, - - HWCAP_LIMIT_MSEC, - 0, +static const int32_t hwcaps[] = { + SR_CONF_LOGIC_ANALYZER, + SR_CONF_SAMPLERATE, + SR_CONF_CAPTURE_RATIO, + SR_CONF_LIMIT_MSEC, }; /* Force the FPGA to reboot. */ @@ -106,37 +99,36 @@ static const char *firmware_files[] = { "asix-sigma-phasor.fw", /* Frequency counter */ }; -static void hw_stop_acquisition(int device_index, gpointer session_device_id); - -static int sigma_read(void *buf, size_t size) +static int sigma_read(void *buf, size_t size, struct dev_context *devc) { int ret; - ret = ftdi_read_data(&ftdic, (unsigned char *)buf, size); + ret = ftdi_read_data(&devc->ftdic, (unsigned char *)buf, size); if (ret < 0) { - g_warning("ftdi_read_data failed: %s", - ftdi_get_error_string(&ftdic)); + sr_err("ftdi_read_data failed: %s", + ftdi_get_error_string(&devc->ftdic)); } return ret; } -static int sigma_write(void *buf, size_t size) +static int sigma_write(void *buf, size_t size, struct dev_context *devc) { int ret; - ret = ftdi_write_data(&ftdic, (unsigned char *)buf, size); + ret = ftdi_write_data(&devc->ftdic, (unsigned char *)buf, size); if (ret < 0) { - g_warning("ftdi_write_data failed: %s", - ftdi_get_error_string(&ftdic)); + sr_err("ftdi_write_data failed: %s", + ftdi_get_error_string(&devc->ftdic)); } else if ((size_t) ret != size) { - g_warning("ftdi_write_data did not complete write\n"); + sr_err("ftdi_write_data did not complete write."); } return ret; } -static int sigma_write_register(uint8_t reg, uint8_t *data, size_t len) +static int sigma_write_register(uint8_t reg, uint8_t *data, size_t len, + struct dev_context *devc) { size_t i; uint8_t buf[len + 2]; @@ -150,15 +142,16 @@ static int sigma_write_register(uint8_t reg, uint8_t *data, size_t len) buf[idx++] = REG_DATA_HIGH_WRITE | (data[i] >> 4); } - return sigma_write(buf, idx); + return sigma_write(buf, idx, devc); } -static int sigma_set_register(uint8_t reg, uint8_t value) +static int sigma_set_register(uint8_t reg, uint8_t value, struct dev_context *devc) { - return sigma_write_register(reg, &value, 1); + return sigma_write_register(reg, &value, 1, devc); } -static int sigma_read_register(uint8_t reg, uint8_t *data, size_t len) +static int sigma_read_register(uint8_t reg, uint8_t *data, size_t len, + struct dev_context *devc) { uint8_t buf[3]; @@ -166,24 +159,25 @@ static int sigma_read_register(uint8_t reg, uint8_t *data, size_t len) buf[1] = REG_ADDR_HIGH | (reg >> 4); buf[2] = REG_READ_ADDR; - sigma_write(buf, sizeof(buf)); + sigma_write(buf, sizeof(buf), devc); - return sigma_read(data, len); + return sigma_read(data, len, devc); } -static uint8_t sigma_get_register(uint8_t reg) +static uint8_t sigma_get_register(uint8_t reg, struct dev_context *devc) { uint8_t value; - if (1 != sigma_read_register(reg, &value, 1)) { - g_warning("Sigma_get_register: 1 byte expected"); + if (1 != sigma_read_register(reg, &value, 1, devc)) { + sr_err("sigma_get_register: 1 byte expected"); return 0; } return value; } -static int sigma_read_pos(uint32_t *stoppos, uint32_t *triggerpos) +static int sigma_read_pos(uint32_t *stoppos, uint32_t *triggerpos, + struct dev_context *devc) { uint8_t buf[] = { REG_ADDR_LOW | READ_TRIGGER_POS_LOW, @@ -197,9 +191,9 @@ static int sigma_read_pos(uint32_t *stoppos, uint32_t *triggerpos) }; uint8_t result[6]; - sigma_write(buf, sizeof(buf)); + sigma_write(buf, sizeof(buf), devc); - sigma_read(result, sizeof(result)); + sigma_read(result, sizeof(result), devc); *triggerpos = result[0] | (result[1] << 8) | (result[2] << 16); *stoppos = result[3] | (result[4] << 8) | (result[5] << 16); @@ -214,7 +208,8 @@ static int sigma_read_pos(uint32_t *stoppos, uint32_t *triggerpos) return 1; } -static int sigma_read_dram(uint16_t startchunk, size_t numchunks, uint8_t *data) +static int sigma_read_dram(uint16_t startchunk, size_t numchunks, + uint8_t *data, struct dev_context *devc) { size_t i; uint8_t buf[4096]; @@ -223,7 +218,7 @@ static int sigma_read_dram(uint16_t startchunk, size_t numchunks, uint8_t *data) /* Send the startchunk. Index start with 1. */ buf[0] = startchunk >> 8; buf[1] = startchunk & 0xff; - sigma_write_register(WRITE_MEMROW, buf, 2); + sigma_write_register(WRITE_MEMROW, buf, 2, devc); /* Read the DRAM. */ buf[idx++] = REG_DRAM_BLOCK; @@ -240,13 +235,13 @@ static int sigma_read_dram(uint16_t startchunk, size_t numchunks, uint8_t *data) buf[idx++] = REG_DRAM_WAIT_ACK; } - sigma_write(buf, idx); + sigma_write(buf, idx, devc); - return sigma_read(data, numchunks * CHUNK_SIZE); + return sigma_read(data, numchunks * CHUNK_SIZE, devc); } /* Upload trigger look-up tables to Sigma. */ -static int sigma_write_trigger_lut(struct triggerlut *lut) +static int sigma_write_trigger_lut(struct triggerlut *lut, struct dev_context *devc) { int i; uint8_t tmp[2]; @@ -292,15 +287,16 @@ static int sigma_write_trigger_lut(struct triggerlut *lut) if (lut->m1d[3] & bit) tmp[1] |= 0x80; - sigma_write_register(WRITE_TRIGGER_SELECT0, tmp, sizeof(tmp)); - sigma_set_register(WRITE_TRIGGER_SELECT1, 0x30 | i); + sigma_write_register(WRITE_TRIGGER_SELECT0, tmp, sizeof(tmp), + devc); + sigma_set_register(WRITE_TRIGGER_SELECT1, 0x30 | i, devc); } /* Send the parameters */ sigma_write_register(WRITE_TRIGGER_SELECT0, (uint8_t *) &lut->params, - sizeof(lut->params)); + sizeof(lut->params), devc); - return SIGROK_OK; + return SR_OK; } /* Generate the bitbang stream for programming the FPGA. */ @@ -308,65 +304,58 @@ static int bin2bitbang(const char *filename, unsigned char **buf, size_t *buf_size) { FILE *f; - long file_size; + unsigned long file_size; unsigned long offset = 0; unsigned char *p; - uint8_t *compressed_buf, *firmware; - uLongf csize, fwsize; + uint8_t *firmware; + unsigned long fwsize = 0; const int buffer_size = 65536; size_t i; - int c, ret, bit, v; + int c, bit, v; uint32_t imm = 0x3f6df2ab; - f = fopen(filename, "r"); + f = g_fopen(filename, "rb"); if (!f) { - g_warning("fopen(\"%s\", \"r\")", filename); - return -1; + sr_err("g_fopen(\"%s\", \"rb\")", filename); + return SR_ERR; } if (-1 == fseek(f, 0, SEEK_END)) { - g_warning("fseek on %s failed", filename); + sr_err("fseek on %s failed", filename); fclose(f); - return -1; + return SR_ERR; } file_size = ftell(f); fseek(f, 0, SEEK_SET); - compressed_buf = g_malloc(file_size); - firmware = g_malloc(buffer_size); - - if (!compressed_buf || !firmware) { - g_warning("Error allocating buffers"); - return -1; + if (!(firmware = g_try_malloc(buffer_size))) { + sr_err("%s: firmware malloc failed", __func__); + fclose(f); + return SR_ERR_MALLOC; } - csize = 0; while ((c = getc(f)) != EOF) { imm = (imm + 0xa853753) % 177 + (imm * 0x8034052); - compressed_buf[csize++] = c ^ imm; + firmware[fwsize++] = c ^ imm; } fclose(f); - fwsize = buffer_size; - ret = uncompress(firmware, &fwsize, compressed_buf, csize); - if (ret < 0) { - g_free(compressed_buf); - g_free(firmware); - g_warning("Could not unpack Sigma firmware. (Error %d)\n", ret); - return -1; + if(fwsize != file_size) { + sr_err("%s: Error reading firmware", filename); + fclose(f); + g_free(firmware); + return SR_ERR; } - g_free(compressed_buf); - *buf_size = fwsize * 2 * 8; - *buf = p = (unsigned char *)g_malloc(*buf_size); - + *buf = p = (unsigned char *)g_try_malloc(*buf_size); if (!p) { - g_warning("Error allocating buffers"); - return -1; + sr_err("%s: buf/p malloc failed", __func__); + g_free(firmware); + return SR_ERR_MALLOC; } for (i = 0; i < fwsize; ++i) { @@ -381,44 +370,143 @@ static int bin2bitbang(const char *filename, if (offset != *buf_size) { g_free(*buf); - g_warning("Error reading firmware %s " - "offset=%ld, file_size=%ld, buf_size=%zd\n", - filename, offset, file_size, *buf_size); + sr_err("Error reading firmware %s " + "offset=%ld, file_size=%ld, buf_size=%zd.", + filename, offset, file_size, *buf_size); + + return SR_ERR; + } + + return SR_OK; +} - return -1; +static int clear_instances(void) +{ + GSList *l; + struct sr_dev_inst *sdi; + struct drv_context *drvc; + struct dev_context *devc; + + drvc = di->priv; + + /* Properly close all devices. */ + for (l = drvc->instances; l; l = l->next) { + if (!(sdi = l->data)) { + /* Log error, but continue cleaning up the rest. */ + sr_err("%s: sdi was NULL, continuing", __func__); + continue; + } + if (sdi->priv) { + devc = sdi->priv; + ftdi_deinit(&devc->ftdic); + } + sr_dev_inst_free(sdi); } + g_slist_free(drvc->instances); + drvc->instances = NULL; - return 0; + return SR_OK; } -static int hw_init(char *deviceinfo) +static int hw_init(struct sr_context *sr_ctx) { - struct sigrok_device_instance *sdi; + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); +} - deviceinfo = deviceinfo; +static GSList *hw_scan(GSList *options) +{ + struct sr_dev_inst *sdi; + struct sr_probe *probe; + struct drv_context *drvc; + struct dev_context *devc; + GSList *devices; + struct ftdi_device_list *devlist; + char serial_txt[10]; + uint32_t serial; + int ret, i; + + (void)options; + + drvc = di->priv; + + devices = NULL; + + clear_instances(); + + if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { + sr_err("%s: devc malloc failed", __func__); + return NULL; + } - ftdi_init(&ftdic); + ftdi_init(&devc->ftdic); /* Look for SIGMAs. */ - if (ftdi_usb_open_desc(&ftdic, USB_VENDOR, USB_PRODUCT, - USB_DESCRIPTION, NULL) < 0) - return 0; + + if ((ret = ftdi_usb_find_all(&devc->ftdic, &devlist, + USB_VENDOR, USB_PRODUCT)) <= 0) { + if (ret < 0) + sr_err("ftdi_usb_find_all(): %d", ret); + goto free; + } + + /* Make sure it's a version 1 or 2 SIGMA. */ + ftdi_usb_get_strings(&devc->ftdic, devlist->dev, NULL, 0, NULL, 0, + serial_txt, sizeof(serial_txt)); + sscanf(serial_txt, "%x", &serial); + + if (serial < 0xa6010000 || serial > 0xa602ffff) { + sr_err("Only SIGMA and SIGMA2 are supported " + "in this version of libsigrok."); + goto free; + } + + sr_info("Found ASIX SIGMA - Serial: %s", serial_txt); + + devc->cur_samplerate = 0; + devc->period_ps = 0; + devc->limit_msec = 0; + devc->cur_firmware = -1; + devc->num_probes = 0; + devc->samples_per_event = 0; + devc->capture_ratio = 50; + devc->use_triggers = 0; /* Register SIGMA device. */ - sdi = sigrok_device_instance_new(0, ST_INITIALIZING, - USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); - if (!sdi) - return 0; + if (!(sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING, USB_VENDOR_NAME, + USB_MODEL_NAME, USB_MODEL_VERSION))) { + sr_err("%s: sdi was NULL", __func__); + goto free; + } + sdi->driver = di; - device_instances = g_slist_append(device_instances, sdi); + for (i = 0; probe_names[i]; i++) { + if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, + probe_names[i]))) + return NULL; + sdi->probes = g_slist_append(sdi->probes, probe); + } + + devices = g_slist_append(devices, sdi); + drvc->instances = g_slist_append(drvc->instances, sdi); + sdi->priv = devc; /* We will open the device again when we need it. */ - ftdi_usb_close(&ftdic); + ftdi_list_free(&devlist); - return 1; + return devices; + +free: + ftdi_deinit(&devc->ftdic); + g_free(devc); + return NULL; } -static int upload_firmware(int firmware_idx) +static GSList *hw_dev_list(void) +{ + return ((struct drv_context *)(di->priv))->instances; +} + +static int upload_firmware(int firmware_idx, struct dev_context *devc) { int ret; unsigned char *buf; @@ -428,40 +516,40 @@ static int upload_firmware(int firmware_idx) char firmware_path[128]; /* Make sure it's an ASIX SIGMA. */ - if ((ret = ftdi_usb_open_desc(&ftdic, + if ((ret = ftdi_usb_open_desc(&devc->ftdic, USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) { - g_warning("ftdi_usb_open failed: %s", - ftdi_get_error_string(&ftdic)); + sr_err("ftdi_usb_open failed: %s", + ftdi_get_error_string(&devc->ftdic)); return 0; } - if ((ret = ftdi_set_bitmode(&ftdic, 0xdf, BITMODE_BITBANG)) < 0) { - g_warning("ftdi_set_bitmode failed: %s", - ftdi_get_error_string(&ftdic)); + if ((ret = ftdi_set_bitmode(&devc->ftdic, 0xdf, BITMODE_BITBANG)) < 0) { + sr_err("ftdi_set_bitmode failed: %s", + ftdi_get_error_string(&devc->ftdic)); return 0; } /* Four times the speed of sigmalogan - Works well. */ - if ((ret = ftdi_set_baudrate(&ftdic, 750000)) < 0) { - g_warning("ftdi_set_baudrate failed: %s", - ftdi_get_error_string(&ftdic)); + if ((ret = ftdi_set_baudrate(&devc->ftdic, 750000)) < 0) { + sr_err("ftdi_set_baudrate failed: %s", + ftdi_get_error_string(&devc->ftdic)); return 0; } /* Force the FPGA to reboot. */ - sigma_write(suicide, sizeof(suicide)); - sigma_write(suicide, sizeof(suicide)); - sigma_write(suicide, sizeof(suicide)); - sigma_write(suicide, sizeof(suicide)); + sigma_write(suicide, sizeof(suicide), devc); + sigma_write(suicide, sizeof(suicide), devc); + sigma_write(suicide, sizeof(suicide), devc); + sigma_write(suicide, sizeof(suicide), devc); /* Prepare to upload firmware (FPGA specific). */ - sigma_write(init, sizeof(init)); + sigma_write(init, sizeof(init), devc); - ftdi_usb_purge_buffers(&ftdic); + ftdi_usb_purge_buffers(&devc->ftdic); /* Wait until the FPGA asserts INIT_B. */ while (1) { - ret = sigma_read(result, 1); + ret = sigma_read(result, 1, devc); if (result[0] & 0x20) break; } @@ -470,100 +558,103 @@ static int upload_firmware(int firmware_idx) snprintf(firmware_path, sizeof(firmware_path), "%s/%s", FIRMWARE_DIR, firmware_files[firmware_idx]); - if (-1 == bin2bitbang(firmware_path, &buf, &buf_size)) { - g_warning("An error occured while reading the firmware: %s", - firmware_path); - return SIGROK_ERR; + if ((ret = bin2bitbang(firmware_path, &buf, &buf_size)) != SR_OK) { + sr_err("An error occured while reading the firmware: %s", + firmware_path); + return ret; } /* Upload firmare. */ - sigma_write(buf, buf_size); + sr_info("Uploading firmware file '%s'.", firmware_files[firmware_idx]); + sigma_write(buf, buf_size, devc); g_free(buf); - if ((ret = ftdi_set_bitmode(&ftdic, 0x00, BITMODE_RESET)) < 0) { - g_warning("ftdi_set_bitmode failed: %s", - ftdi_get_error_string(&ftdic)); - return SIGROK_ERR; + if ((ret = ftdi_set_bitmode(&devc->ftdic, 0x00, BITMODE_RESET)) < 0) { + sr_err("ftdi_set_bitmode failed: %s", + ftdi_get_error_string(&devc->ftdic)); + return SR_ERR; } - ftdi_usb_purge_buffers(&ftdic); + ftdi_usb_purge_buffers(&devc->ftdic); /* Discard garbage. */ - while (1 == sigma_read(&pins, 1)) + while (1 == sigma_read(&pins, 1, devc)) ; /* Initialize the logic analyzer mode. */ - sigma_write(logic_mode_start, sizeof(logic_mode_start)); + sigma_write(logic_mode_start, sizeof(logic_mode_start), devc); /* Expect a 3 byte reply. */ - ret = sigma_read(result, 3); + ret = sigma_read(result, 3, devc); if (ret != 3 || result[0] != 0xa6 || result[1] != 0x55 || result[2] != 0xaa) { - g_warning("Configuration failed. Invalid reply received."); - return SIGROK_ERR; + sr_err("Configuration failed. Invalid reply received."); + return SR_ERR; } - cur_firmware = firmware_idx; + devc->cur_firmware = firmware_idx; + + sr_info("Firmware uploaded."); - return SIGROK_OK; + return SR_OK; } -static int hw_opendev(int device_index) +static int hw_dev_open(struct sr_dev_inst *sdi) { - struct sigrok_device_instance *sdi; + struct dev_context *devc; int ret; + devc = sdi->priv; + /* Make sure it's an ASIX SIGMA. */ - if ((ret = ftdi_usb_open_desc(&ftdic, + if ((ret = ftdi_usb_open_desc(&devc->ftdic, USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) { - g_warning("ftdi_usb_open failed: %s", - ftdi_get_error_string(&ftdic)); + sr_err("ftdi_usb_open failed: %s", + ftdi_get_error_string(&devc->ftdic)); return 0; } - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; - - sdi->status = ST_ACTIVE; + sdi->status = SR_ST_ACTIVE; - return SIGROK_OK; + return SR_OK; } -static int set_samplerate(struct sigrok_device_instance *sdi, - uint64_t samplerate) +static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate) { - int i, ret; + struct dev_context *devc; + unsigned int i; + int ret; - sdi = sdi; + devc = sdi->priv; + ret = SR_OK; - for (i = 0; supported_samplerates[i]; i++) { - if (supported_samplerates[i] == samplerate) + for (i = 0; i < ARRAY_SIZE(samplerates); i++) { + if (samplerates[i] == samplerate) break; } - if (supported_samplerates[i] == 0) - return SIGROK_ERR_SAMPLERATE; + if (samplerates[i] == 0) + return SR_ERR_SAMPLERATE; - if (samplerate <= MHZ(50)) { - ret = upload_firmware(0); - num_probes = 16; + if (samplerate <= SR_MHZ(50)) { + ret = upload_firmware(0, devc); + devc->num_probes = 16; } - if (samplerate == MHZ(100)) { - ret = upload_firmware(1); - num_probes = 8; + if (samplerate == SR_MHZ(100)) { + ret = upload_firmware(1, devc); + devc->num_probes = 8; } - else if (samplerate == MHZ(200)) { - ret = upload_firmware(2); - num_probes = 4; + else if (samplerate == SR_MHZ(200)) { + ret = upload_firmware(2, devc); + devc->num_probes = 4; } - cur_samplerate = samplerate; - samples_per_event = 16 / num_probes; - sigma.state = SIGMA_IDLE; - - g_message("Firmware uploaded"); + devc->cur_samplerate = samplerate; + devc->period_ps = 1000000000000ULL / samplerate; + devc->samples_per_event = 16 / devc->num_probes; + devc->state.state = SIGMA_IDLE; return ret; } @@ -576,155 +667,212 @@ static int set_samplerate(struct sigrok_device_instance *sdi, * The Sigma supports complex triggers using boolean expressions, but this * has not been implemented yet. */ -static int configure_probes(GSList *probes) +static int configure_probes(const struct sr_dev_inst *sdi) { - struct probe *probe; - GSList *l; + struct dev_context *devc = sdi->priv; + const struct sr_probe *probe; + const GSList *l; int trigger_set = 0; int probebit; - memset(&trigger, 0, sizeof(struct sigma_trigger)); + memset(&devc->trigger, 0, sizeof(struct sigma_trigger)); - for (l = probes; l; l = l->next) { - probe = (struct probe *)l->data; - probebit = 1 << (probe->index - 1); + for (l = sdi->probes; l; l = l->next) { + probe = (struct sr_probe *)l->data; + probebit = 1 << (probe->index); if (!probe->enabled || !probe->trigger) continue; - if (cur_samplerate >= MHZ(100)) { + if (devc->cur_samplerate >= SR_MHZ(100)) { /* Fast trigger support. */ if (trigger_set) { - g_warning("Asix Sigma only supports a single " - "pin trigger in 100 and 200 " - "MHz mode."); - return SIGROK_ERR; + sr_err("Only a single pin trigger in 100 and " + "200MHz mode is supported."); + return SR_ERR; } if (probe->trigger[0] == 'f') - trigger.fallingmask |= probebit; + devc->trigger.fallingmask |= probebit; else if (probe->trigger[0] == 'r') - trigger.risingmask |= probebit; + devc->trigger.risingmask |= probebit; else { - g_warning("Asix Sigma only supports " - "rising/falling trigger in 100 " - "and 200 MHz mode."); - return SIGROK_ERR; + sr_err("Only rising/falling trigger in 100 " + "and 200MHz mode is supported."); + return SR_ERR; } ++trigger_set; } else { /* Simple trigger support (event). */ if (probe->trigger[0] == '1') { - trigger.simplevalue |= probebit; - trigger.simplemask |= probebit; + devc->trigger.simplevalue |= probebit; + devc->trigger.simplemask |= probebit; } else if (probe->trigger[0] == '0') { - trigger.simplevalue &= ~probebit; - trigger.simplemask |= probebit; + devc->trigger.simplevalue &= ~probebit; + devc->trigger.simplemask |= probebit; } else if (probe->trigger[0] == 'f') { - trigger.fallingmask |= probebit; + devc->trigger.fallingmask |= probebit; ++trigger_set; } else if (probe->trigger[0] == 'r') { - trigger.risingmask |= probebit; + devc->trigger.risingmask |= probebit; ++trigger_set; } - if (trigger_set > 2) { - g_warning("Asix Sigma only supports 2 rising/" - "falling triggers."); - return SIGROK_ERR; + /* + * Actually, Sigma supports 2 rising/falling triggers, + * but they are ORed and the current trigger syntax + * does not permit ORed triggers. + */ + if (trigger_set > 1) { + sr_err("Only 1 rising/falling trigger " + "is supported."); + return SR_ERR; } } + + if (trigger_set) + devc->use_triggers = 1; } - return SIGROK_OK; + return SR_OK; } -static void hw_closedev(int device_index) +static int hw_dev_close(struct sr_dev_inst *sdi) { - device_index = device_index; + struct dev_context *devc; + + devc = sdi->priv; + + /* TODO */ + if (sdi->status == SR_ST_ACTIVE) + ftdi_usb_close(&devc->ftdic); + + sdi->status = SR_ST_INACTIVE; - ftdi_usb_close(&ftdic); + return SR_OK; } -static void hw_cleanup(void) +static int hw_cleanup(void) { + if (!di->priv) + return SR_OK; + + clear_instances(); + + return SR_OK; } -static void *hw_get_device_info(int device_index, int device_info_id) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) { - struct sigrok_device_instance *sdi; - void *info = NULL; + struct dev_context *devc; + + switch (id) { + case SR_CONF_SAMPLERATE: + if (sdi) { + devc = sdi->priv; + *data = g_variant_new_uint64(devc->cur_samplerate); + } else + return SR_ERR; + break; + default: + return SR_ERR_NA; + } - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) { - fprintf(stderr, "It's NULL.\n"); - return NULL; + return SR_OK; +} + +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + int ret; + + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + + devc = sdi->priv; + + if (id == SR_CONF_SAMPLERATE) { + ret = set_samplerate(sdi, g_variant_get_uint64(data)); + } else if (id == SR_CONF_LIMIT_MSEC) { + devc->limit_msec = g_variant_get_uint64(data); + if (devc->limit_msec > 0) + ret = SR_OK; + else + ret = SR_ERR; + } else if (id == SR_CONF_CAPTURE_RATIO) { + devc->capture_ratio = g_variant_get_uint64(data); + if (devc->capture_ratio < 0 || devc->capture_ratio > 100) + ret = SR_ERR; + else + ret = SR_OK; + } else { + ret = SR_ERR_NA; } - switch (device_info_id) { - case DI_INSTANCE: - info = sdi; - break; - case DI_NUM_PROBES: - info = GINT_TO_POINTER(16); - break; - case DI_SAMPLERATES: - info = &samplerates; + return ret; +} + +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) +{ + GVariant *gvar; + GVariantBuilder gvb; + + (void)sdi; + + switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); break; - case DI_TRIGGER_TYPES: - info = (char *)TRIGGER_TYPES; + case SR_CONF_SAMPLERATE: + g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); + gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates, + ARRAY_SIZE(samplerates), sizeof(uint64_t)); + g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar); + *data = g_variant_builder_end(&gvb); break; - case DI_CUR_SAMPLERATE: - info = &cur_samplerate; + case SR_CONF_TRIGGER_TYPE: + *data = g_variant_new_string(TRIGGER_TYPE); break; + default: + return SR_ERR_NA; } - return info; + return SR_OK; } -static int hw_get_status(int device_index) +/* Software trigger to determine exact trigger position. */ +static int get_trigger_offset(uint16_t *samples, uint16_t last_sample, + struct sigma_trigger *t) { - struct sigrok_device_instance *sdi; + int i; - sdi = get_sigrok_device_instance(device_instances, device_index); - if (sdi) - return sdi->status; - else - return ST_NOT_FOUND; -} + for (i = 0; i < 8; ++i) { + if (i > 0) + last_sample = samples[i-1]; -static int *hw_get_capabilities(void) -{ - return capabilities; -} + /* Simple triggers. */ + if ((samples[i] & t->simplemask) != t->simplevalue) + continue; -static int hw_set_configuration(int device_index, int capability, void *value) -{ - struct sigrok_device_instance *sdi; - int ret; + /* Rising edge. */ + if ((last_sample & t->risingmask) != 0 || (samples[i] & + t->risingmask) != t->risingmask) + continue; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; - - if (capability == HWCAP_SAMPLERATE) { - ret = set_samplerate(sdi, *(uint64_t*) value); - } else if (capability == HWCAP_PROBECONFIG) { - ret = configure_probes(value); - } else if (capability == HWCAP_LIMIT_MSEC) { - limit_msec = strtoull(value, NULL, 10); - ret = SIGROK_OK; - } else if (capability == HWCAP_CAPTURE_RATIO) { - capture_ratio = strtoull(value, NULL, 10); - ret = SIGROK_OK; - } else if (capability == HWCAP_PROBECONFIG) { - ret = configure_probes((GSList *) value); - } else { - ret = SIGROK_ERR; + /* Falling edge. */ + if ((last_sample & t->fallingmask) != t->fallingmask || + (samples[i] & t->fallingmask) != 0) + continue; + + break; } - return ret; + /* If we did not match, return original trigger pos. */ + return i & 0x7; } /* @@ -737,25 +885,26 @@ static int hw_set_configuration(int device_index, int capability, void *value) * spread 20 ns apart. */ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, - uint16_t *lastsample, int triggerpos, void *user_data) + uint16_t *lastsample, int triggerpos, + uint16_t limit_chunk, void *cb_data) { + struct sr_dev_inst *sdi = cb_data; + struct dev_context *devc = sdi->priv; uint16_t tsdiff, ts; - uint16_t samples[65536 * samples_per_event]; - struct datafeed_packet packet; + uint16_t samples[65536 * devc->samples_per_event]; + struct sr_datafeed_packet packet; + struct sr_datafeed_logic logic; int i, j, k, l, numpad, tosend; size_t n = 0, sent = 0; - int clustersize = EVENTS_PER_CLUSTER * samples_per_event; + int clustersize = EVENTS_PER_CLUSTER * devc->samples_per_event; uint16_t *event; uint16_t cur_sample; int triggerts = -1; - int triggeroff = 0; /* Check if trigger is in this chunk. */ if (triggerpos != -1) { - if (cur_samplerate <= MHZ(50)) - triggerpos -= EVENTS_PER_CLUSTER; - else - triggeroff = 3; + if (devc->cur_samplerate <= SR_MHZ(50)) + triggerpos -= EVENTS_PER_CLUSTER - 1; if (triggerpos < 0) triggerpos = 0; @@ -770,8 +919,12 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, tsdiff = ts - *lastts; *lastts = ts; + /* Decode partial chunk. */ + if (limit_chunk && ts > limit_chunk) + return SR_OK; + /* Pad last sample up to current point. */ - numpad = tsdiff * samples_per_event - clustersize; + numpad = tsdiff * devc->samples_per_event - clustersize; if (numpad > 0) { for (j = 0; j < numpad; ++j) samples[j] = *lastsample; @@ -784,10 +937,12 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, while (sent < n) { tosend = MIN(2048, n - sent); - packet.type = DF_LOGIC16; - packet.length = tosend * sizeof(uint16_t); - packet.payload = samples + sent; - session_bus(user_data, &packet); + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + logic.length = tosend * sizeof(uint16_t); + logic.unitsize = 2; + logic.data = samples + sent; + sr_session_send(devc->cb_data, &packet); sent += tosend; } @@ -800,14 +955,13 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, for (j = 0; j < 7; ++j) { /* For each sample in event. */ - for (k = 0; k < samples_per_event; ++k) { + for (k = 0; k < devc->samples_per_event; ++k) { cur_sample = 0; /* For each probe. */ - for (l = 0; l < num_probes; ++l) + for (l = 0; l < devc->num_probes; ++l) cur_sample |= (!!(event[j] & (1 << (l * - samples_per_event + k)))) - << l; + devc->samples_per_event + k)))) << l; samples[n++] = cur_sample; } @@ -817,115 +971,137 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, sent = 0; if (i == triggerts) { /* - * Trigger is presumptively not accurate to sample. - * However, it always trigger before the actual event, - * so it would be possible to forward to correct position - * here by manually checking for trigger condition. + * Trigger is not always accurate to sample because of + * pipeline delay. However, it always triggers before + * the actual event. We therefore look at the next + * samples to pinpoint the exact position of the trigger. */ - - tosend = (triggerpos % 7) - triggeroff; + tosend = get_trigger_offset(samples, *lastsample, + &devc->trigger); if (tosend > 0) { - packet.type = DF_LOGIC16; - packet.length = tosend * sizeof(uint16_t); - packet.payload = samples; - session_bus(user_data, &packet); + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + logic.length = tosend * sizeof(uint16_t); + logic.unitsize = 2; + logic.data = samples; + sr_session_send(devc->cb_data, &packet); sent += tosend; } - packet.type = DF_TRIGGER; - packet.length = 0; - packet.payload = 0; - session_bus(user_data, &packet); + /* Only send trigger if explicitly enabled. */ + if (devc->use_triggers) { + packet.type = SR_DF_TRIGGER; + sr_session_send(devc->cb_data, &packet); + } } /* Send rest of the chunk to sigrok. */ tosend = n - sent; - packet.type = DF_LOGIC16; - packet.length = tosend * sizeof(uint16_t); - packet.payload = samples + sent; - session_bus(user_data, &packet); + if (tosend > 0) { + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + logic.length = tosend * sizeof(uint16_t); + logic.unitsize = 2; + logic.data = samples + sent; + sr_session_send(devc->cb_data, &packet); + } *lastsample = samples[n - 1]; } - return SIGROK_OK; + return SR_OK; } -static int receive_data(int fd, int revents, void *user_data) +static int receive_data(int fd, int revents, void *cb_data) { - struct datafeed_packet packet; + struct sr_dev_inst *sdi = cb_data; + struct dev_context *devc = sdi->priv; + struct sr_datafeed_packet packet; const int chunks_per_read = 32; unsigned char buf[chunks_per_read * CHUNK_SIZE]; int bufsz, numchunks, i, newchunks; - uint32_t running_msec; + uint64_t running_msec; struct timeval tv; - fd = fd; - revents = revents; + (void)fd; + (void)revents; - numchunks = sigma.stoppos / 512; + /* Get the current position. */ + sigma_read_pos(&devc->state.stoppos, &devc->state.triggerpos, devc); - if (sigma.state == SIGMA_IDLE) - return FALSE; + numchunks = (devc->state.stoppos + 511) / 512; - if (sigma.state == SIGMA_CAPTURE) { + if (devc->state.state == SIGMA_IDLE) + return TRUE; + if (devc->state.state == SIGMA_CAPTURE) { /* Check if the timer has expired, or memory is full. */ gettimeofday(&tv, 0); - running_msec = (tv.tv_sec - start_tv.tv_sec) * 1000 + - (tv.tv_usec - start_tv.tv_usec) / 1000; - - if (running_msec < limit_msec && numchunks < 32767) - return FALSE; + running_msec = (tv.tv_sec - devc->start_tv.tv_sec) * 1000 + + (tv.tv_usec - devc->start_tv.tv_usec) / 1000; - hw_stop_acquisition(-1, user_data); + if (running_msec < devc->limit_msec && numchunks < 32767) + return TRUE; /* While capturing... */ + else + hw_dev_acquisition_stop(sdi, sdi); - return FALSE; + } - } else if (sigma.state == SIGMA_DOWNLOAD) { - if (sigma.chunks_downloaded >= numchunks) { + if (devc->state.state == SIGMA_DOWNLOAD) { + if (devc->state.chunks_downloaded >= numchunks) { /* End of samples. */ - packet.type = DF_END; - packet.length = 0; - session_bus(user_data, &packet); + packet.type = SR_DF_END; + sr_session_send(devc->cb_data, &packet); - sigma.state = SIGMA_IDLE; + devc->state.state = SIGMA_IDLE; return TRUE; } newchunks = MIN(chunks_per_read, - numchunks - sigma.chunks_downloaded); + numchunks - devc->state.chunks_downloaded); - g_message("Downloading sample data: %.0f %%", - 100.0 * sigma.chunks_downloaded / numchunks); + sr_info("Downloading sample data: %.0f %%.", + 100.0 * devc->state.chunks_downloaded / numchunks); - bufsz = sigma_read_dram(sigma.chunks_downloaded, - newchunks, buf); + bufsz = sigma_read_dram(devc->state.chunks_downloaded, + newchunks, buf, devc); + /* TODO: Check bufsz. For now, just avoid compiler warnings. */ + (void)bufsz; /* Find first ts. */ - if (sigma.chunks_downloaded == 0) { - sigma.lastts = *(uint16_t *) buf - 1; - sigma.lastsample = 0; + if (devc->state.chunks_downloaded == 0) { + devc->state.lastts = *(uint16_t *) buf - 1; + devc->state.lastsample = 0; } /* Decode chunks and send them to sigrok. */ for (i = 0; i < newchunks; ++i) { - if (sigma.chunks_downloaded + i == sigma.triggerchunk) + int limit_chunk = 0; + + /* The last chunk may potentially be only in part. */ + if (devc->state.chunks_downloaded == numchunks - 1) { + /* Find the last valid timestamp */ + limit_chunk = devc->state.stoppos % 512 + devc->state.lastts; + } + + if (devc->state.chunks_downloaded + i == devc->state.triggerchunk) decode_chunk_ts(buf + (i * CHUNK_SIZE), - &sigma.lastts, &sigma.lastsample, - sigma.triggerpos & 0x1ff, - user_data); + &devc->state.lastts, + &devc->state.lastsample, + devc->state.triggerpos & 0x1ff, + limit_chunk, sdi); else decode_chunk_ts(buf + (i * CHUNK_SIZE), - &sigma.lastts, &sigma.lastsample, - -1, user_data); - } + &devc->state.lastts, + &devc->state.lastsample, + -1, limit_chunk, sdi); - sigma.chunks_downloaded += newchunks; + ++devc->state.chunks_downloaded; + } } return TRUE; @@ -1003,12 +1179,13 @@ static void add_trigger_function(enum triggerop oper, enum triggerfunc func, /* Transpose if neg is set. */ if (neg) { - for (i = 0; i < 2; ++i) + for (i = 0; i < 2; ++i) { for (j = 0; j < 2; ++j) { tmp = x[i][j]; x[i][j] = x[1-i][1-j]; x[1-i][1-j] = tmp; } + } } /* Update mask with function. */ @@ -1041,7 +1218,7 @@ static void add_trigger_function(enum triggerop oper, enum triggerfunc func, * simple pin change and state triggers. Only two transitions (rise/fall) can be * set at any time, but a full mask and value can be set (0/1). */ -static int build_basic_trigger(struct triggerlut *lut) +static int build_basic_trigger(struct triggerlut *lut, struct dev_context *devc) { int i,j; uint16_t masks[2] = { 0, 0 }; @@ -1052,12 +1229,13 @@ static int build_basic_trigger(struct triggerlut *lut) lut->m4 = 0xa000; /* Value/mask trigger support. */ - build_lut_entry(trigger.simplevalue, trigger.simplemask, lut->m2d); + build_lut_entry(devc->trigger.simplevalue, devc->trigger.simplemask, + lut->m2d); /* Rise/fall trigger support. */ for (i = 0, j = 0; i < 16; ++i) { - if (trigger.risingmask & (1 << i) || - trigger.fallingmask & (1 << i)) + if (devc->trigger.risingmask & (1 << i) || + devc->trigger.fallingmask & (1 << i)) masks[j++] = 1 << i; } @@ -1067,13 +1245,13 @@ static int build_basic_trigger(struct triggerlut *lut) /* Add glue logic */ if (masks[0] || masks[1]) { /* Transition trigger. */ - if (masks[0] & trigger.risingmask) + if (masks[0] & devc->trigger.risingmask) add_trigger_function(OP_RISE, FUNC_OR, 0, 0, &lut->m3); - if (masks[0] & trigger.fallingmask) + if (masks[0] & devc->trigger.fallingmask) add_trigger_function(OP_FALL, FUNC_OR, 0, 0, &lut->m3); - if (masks[1] & trigger.risingmask) + if (masks[1] & devc->trigger.risingmask) add_trigger_function(OP_RISE, FUNC_OR, 1, 0, &lut->m3); - if (masks[1] & trigger.fallingmask) + if (masks[1] & devc->trigger.fallingmask) add_trigger_function(OP_FALL, FUNC_OR, 1, 0, &lut->m3); } else { /* Only value/mask trigger. */ @@ -1083,42 +1261,45 @@ static int build_basic_trigger(struct triggerlut *lut) /* Triggertype: event. */ lut->params.selres = 3; - return SIGROK_OK; + return SR_OK; } -static int hw_start_acquisition(int device_index, gpointer session_device_id) +static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, + void *cb_data) { - struct sigrok_device_instance *sdi; - struct datafeed_packet packet; - struct datafeed_header header; + struct dev_context *devc; struct clockselect_50 clockselect; - int frac; - uint8_t triggerselect; + int frac, triggerpin, ret; + uint8_t triggerselect = 0; struct triggerinout triggerinout_conf; struct triggerlut lut; - int triggerpin; - session_device_id = session_device_id; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; + devc = sdi->priv; - device_index = device_index; + if (configure_probes(sdi) != SR_OK) { + sr_err("Failed to configure probes."); + return SR_ERR; + } - /* If the samplerate has not been set, default to 50 MHz. */ - if (cur_firmware == -1) - set_samplerate(sdi, MHZ(50)); + /* If the samplerate has not been set, default to 200 kHz. */ + if (devc->cur_firmware == -1) { + if ((ret = set_samplerate(sdi, SR_KHZ(200))) != SR_OK) + return ret; + } /* Enter trigger programming mode. */ - sigma_set_register(WRITE_TRIGGER_SELECT1, 0x20); + sigma_set_register(WRITE_TRIGGER_SELECT1, 0x20, devc); /* 100 and 200 MHz mode. */ - if (cur_samplerate >= MHZ(100)) { - sigma_set_register(WRITE_TRIGGER_SELECT1, 0x81); + if (devc->cur_samplerate >= SR_MHZ(100)) { + sigma_set_register(WRITE_TRIGGER_SELECT1, 0x81, devc); /* Find which pin to trigger on from mask. */ for (triggerpin = 0; triggerpin < 8; ++triggerpin) - if ((trigger.risingmask | trigger.fallingmask) & + if ((devc->trigger.risingmask | devc->trigger.fallingmask) & (1 << triggerpin)) break; @@ -1126,14 +1307,14 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) triggerselect = (1 << LEDSEL1) | (triggerpin & 0x7); /* Default rising edge. */ - if (trigger.fallingmask) + if (devc->trigger.fallingmask) triggerselect |= 1 << 3; /* All other modes. */ - } else if (cur_samplerate <= MHZ(50)) { - build_basic_trigger(&lut); + } else if (devc->cur_samplerate <= SR_MHZ(50)) { + build_basic_trigger(&lut, devc); - sigma_write_trigger_lut(&lut); + sigma_write_trigger_lut(&lut, devc); triggerselect = (1 << LEDSEL1) | (1 << LEDSEL0); } @@ -1145,24 +1326,24 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) sigma_write_register(WRITE_TRIGGER_OPTION, (uint8_t *) &triggerinout_conf, - sizeof(struct triggerinout)); + sizeof(struct triggerinout), devc); /* Go back to normal mode. */ - sigma_set_register(WRITE_TRIGGER_SELECT1, triggerselect); + sigma_set_register(WRITE_TRIGGER_SELECT1, triggerselect, devc); /* Set clock select register. */ - if (cur_samplerate == MHZ(200)) + if (devc->cur_samplerate == SR_MHZ(200)) /* Enable 4 probes. */ - sigma_set_register(WRITE_CLOCK_SELECT, 0xf0); - else if (cur_samplerate == MHZ(100)) + sigma_set_register(WRITE_CLOCK_SELECT, 0xf0, devc); + else if (devc->cur_samplerate == SR_MHZ(100)) /* Enable 8 probes. */ - sigma_set_register(WRITE_CLOCK_SELECT, 0x00); + sigma_set_register(WRITE_CLOCK_SELECT, 0x00, devc); else { /* * 50 MHz mode (or fraction thereof). Any fraction down to * 50 MHz / 256 can be used, but is not supported by sigrok API. */ - frac = MHZ(50) / cur_samplerate - 1; + frac = SR_MHZ(50) / devc->cur_samplerate - 1; clockselect.async = 0; clockselect.fraction = frac; @@ -1170,75 +1351,82 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) sigma_write_register(WRITE_CLOCK_SELECT, (uint8_t *) &clockselect, - sizeof(clockselect)); + sizeof(clockselect), devc); } /* Setup maximum post trigger time. */ - sigma_set_register(WRITE_POST_TRIGGER, (capture_ratio * 255) / 100); + sigma_set_register(WRITE_POST_TRIGGER, + (devc->capture_ratio * 255) / 100, devc); /* Start acqusition. */ - gettimeofday(&start_tv, 0); - sigma_set_register(WRITE_MODE, 0x0d); + gettimeofday(&devc->start_tv, 0); + sigma_set_register(WRITE_MODE, 0x0d, devc); + + devc->cb_data = cb_data; /* Send header packet to the session bus. */ - packet.type = DF_HEADER; - packet.length = sizeof(struct datafeed_header); - packet.payload = &header; - header.feed_version = 1; - gettimeofday(&header.starttime, NULL); - header.samplerate = cur_samplerate; - header.protocol_id = PROTO_RAW; - header.num_probes = num_probes; - session_bus(session_device_id, &packet); + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); /* Add capture source. */ - source_add(0, G_IO_IN, 10, receive_data, session_device_id); + sr_source_add(0, G_IO_IN, 10, receive_data, (void *)sdi); - sigma.state = SIGMA_CAPTURE; + devc->state.state = SIGMA_CAPTURE; - return SIGROK_OK; + return SR_OK; } -static void hw_stop_acquisition(int device_index, gpointer session_device_id) +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { + struct dev_context *devc; uint8_t modestatus; - device_index = device_index; - session_device_id = session_device_id; + (void)cb_data; + + sr_source_remove(0); + + if (!(devc = sdi->priv)) { + sr_err("%s: sdi->priv was NULL", __func__); + return SR_ERR_BUG; + } /* Stop acquisition. */ - sigma_set_register(WRITE_MODE, 0x11); + sigma_set_register(WRITE_MODE, 0x11, devc); /* Set SDRAM Read Enable. */ - sigma_set_register(WRITE_MODE, 0x02); + sigma_set_register(WRITE_MODE, 0x02, devc); /* Get the current position. */ - sigma_read_pos(&sigma.stoppos, &sigma.triggerpos); + sigma_read_pos(&devc->state.stoppos, &devc->state.triggerpos, devc); /* Check if trigger has fired. */ - modestatus = sigma_get_register(READ_MODE); - if (modestatus & 0x20) { - sigma.triggerchunk = sigma.triggerpos / 512; + modestatus = sigma_get_register(READ_MODE, devc); + if (modestatus & 0x20) + devc->state.triggerchunk = devc->state.triggerpos / 512; + else + devc->state.triggerchunk = -1; - } else - sigma.triggerchunk = -1; + devc->state.chunks_downloaded = 0; - sigma.chunks_downloaded = 0; + devc->state.state = SIGMA_DOWNLOAD; - sigma.state = SIGMA_DOWNLOAD; + return SR_OK; } -struct device_plugin asix_sigma_plugin_info = { - "asix-sigma", - 1, - hw_init, - hw_cleanup, - hw_opendev, - hw_closedev, - hw_get_device_info, - hw_get_status, - hw_get_capabilities, - hw_set_configuration, - hw_start_acquisition, - hw_stop_acquisition, +SR_PRIV struct sr_dev_driver asix_sigma_driver_info = { + .name = "asix-sigma", + .longname = "ASIX SIGMA/SIGMA2", + .api_version = 1, + .init = hw_init, + .cleanup = hw_cleanup, + .scan = hw_scan, + .dev_list = hw_dev_list, + .dev_clear = clear_instances, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, + .dev_open = hw_dev_open, + .dev_close = hw_dev_close, + .dev_acquisition_start = hw_dev_acquisition_start, + .dev_acquisition_stop = hw_dev_acquisition_stop, + .priv = NULL, };