X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=70721ea5213755d7caf8e44836e3e2b8cc6225f8;hb=c37d2b1ba12b62d63590509879bf58adf842896d;hp=e5e89d241edc084fef1aaf4b943ae1dda84dea34;hpb=6f5f21f996cb06b518739440e7983fa61d61aea1;p=libsigrok.git diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c index e5e89d24..70721ea5 100644 --- a/hardware/saleae-logic/saleae-logic.c +++ b/hardware/saleae-logic/saleae-logic.c @@ -17,95 +17,90 @@ * along with this program. If not, see . */ +#include "config.h" #include #include #include #include #include #include -#include "config.h" #include "sigrok.h" +#include "sigrok-internal.h" +#include "saleae-logic.h" + +static struct fx2_profile supported_fx2[] = { + /* Saleae Logic */ + { 0x0925, 0x3881, 0x0925, 0x3881, "Saleae", "Logic", NULL, 8 }, + /* default Cypress FX2 without EEPROM */ + { 0x04b4, 0x8613, 0x0925, 0x3881, "Cypress", "FX2", NULL, 16 }, + { 0, 0, 0, 0, 0, 0, 0, 0 } +}; -#define USB_VENDOR 0x0925 -#define USB_PRODUCT 0x3881 -#define USB_VENDOR_NAME "Saleae" -#define USB_MODEL_NAME "Logic" -#define USB_MODEL_VERSION "" - -#define USB_INTERFACE 0 -#define USB_CONFIGURATION 1 -#define NUM_PROBES 8 -#define NUM_TRIGGER_STAGES 4 -#define TRIGGER_TYPES "01" -#define FIRMWARE FIRMWARE_DIR "/saleae-logic.firmware" - -/* delay in ms */ -#define FIRMWARE_RENUM_DELAY 2000 -#define NUM_SIMUL_TRANSFERS 10 -#define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2) - -/* software trigger implementation: positive values indicate trigger stage */ -#define TRIGGER_FIRED -1 - -/* There is only one model Saleae Logic, and this is what it supports: */ static int capabilities[] = { - HWCAP_LOGIC_ANALYZER, - HWCAP_SAMPLERATE, + SR_HWCAP_LOGIC_ANALYZER, + SR_HWCAP_SAMPLERATE, /* These are really implemented in the driver, not the hardware. */ - HWCAP_LIMIT_SAMPLES, + SR_HWCAP_LIMIT_SAMPLES, + SR_HWCAP_CONTINUOUS, 0, }; -/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */ -static GSList *device_instances = NULL; - -/* - * Since we can't keep track of a Saleae Logic device after upgrading the - * firmware -- it re-enumerates into a different device address after the - * upgrade -- this is like a global lock. No device will open until a proper - * delay after the last device was upgraded. - */ -GTimeVal firmware_updated = { 0 }; - -static libusb_context *usb_context = NULL; +static const char *probe_names[] = { + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "13", + "14", + "15", + NULL, +}; static uint64_t supported_samplerates[] = { - KHZ(200), - KHZ(250), - KHZ(500), - MHZ(1), - MHZ(2), - MHZ(4), - MHZ(8), - MHZ(12), - MHZ(16), - MHZ(24), + SR_KHZ(200), + SR_KHZ(250), + SR_KHZ(500), + SR_MHZ(1), + SR_MHZ(2), + SR_MHZ(4), + SR_MHZ(8), + SR_MHZ(12), + SR_MHZ(16), + SR_MHZ(24), 0, }; -static struct samplerates samplerates = { - KHZ(200), - MHZ(24), - 0, +static struct sr_samplerates samplerates = { + SR_KHZ(200), + SR_MHZ(24), + SR_HZ(0), supported_samplerates, }; -/* TODO: All of these should go in a device-specific struct. */ -static uint64_t cur_samplerate = 0; -static uint64_t limit_samples = 0; -static uint8_t probe_mask = 0; -static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 }; -static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 0 }; -static uint8_t trigger_buffer[NUM_TRIGGER_STAGES] = { 0 }; -int trigger_stage = TRIGGER_FIRED; +/* List of struct sr_device_instance, maintained by opendev()/closedev(). */ +static GSList *device_instances = NULL; +static libusb_context *usb_context = NULL; static int hw_set_configuration(int device_index, int capability, void *value); +static void hw_stop_acquisition(int device_index, gpointer session_device_id); -/* returns 1 if the device's configuration profile match the Logic firmware's - * configuration, 0 otherwise +/** + * Check the USB configuration to determine if this is a Saleae Logic. + * + * @return 1 if the device's configuration profile match the Logic firmware's + * configuration, 0 otherwise. */ -int check_conf_profile(libusb_device *dev) +static int check_conf_profile(libusb_device *dev) { struct libusb_device_descriptor des; struct libusb_config_descriptor *conf_dsc = NULL; @@ -159,191 +154,121 @@ int check_conf_profile(libusb_device *dev) return ret; } -struct sigrok_device_instance *sl_open_device(int device_index) +static int sl_open_device(int device_index) { - struct sigrok_device_instance *sdi; libusb_device **devlist; struct libusb_device_descriptor des; + struct sr_device_instance *sdi; + struct fx2_device *fx2; int err, skip, i; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return NULL; + if (!(sdi = sr_get_device_instance(device_instances, device_index))) + return SR_ERR; + fx2 = sdi->priv; + + if (sdi->status == SR_ST_ACTIVE) + /* already in use */ + return SR_ERR; + skip = 0; libusb_get_device_list(usb_context, &devlist); - if (sdi->status == ST_INITIALIZING) { - /* - * This device was renumerating last time we touched it. - * opendev() guarantees we've waited long enough for it to - * have booted properly, so now we need to find it on - * the bus and record its new address. - */ - skip = 0; - for (i = 0; devlist[i]; i++) { - if ((err = libusb_get_device_descriptor(devlist[i], &des))) { - g_warning("failed to get device descriptor: %d", - err); - continue; - } + for (i = 0; devlist[i]; i++) { + if ((err = libusb_get_device_descriptor(devlist[i], &des))) { + sr_warn("failed to get device descriptor: %d", err); + continue; + } - if (des.idVendor == USB_VENDOR - && des.idProduct == USB_PRODUCT) { - if (skip != device_index) { - /* - * Skip past devices of this type that - * aren't the one we want. - */ - skip++; - continue; - } + if (des.idVendor != fx2->profile->fw_vid || des.idProduct != fx2->profile->fw_pid) + continue; - /* - * Should check the bus here, since we know - * that already... but what are we going to do - * if it doesn't match after the right number - * of skips? - */ - if (!(err = libusb_open(devlist[i], - &(sdi->usb->devhdl)))) { - sdi->usb->address = libusb_get_device_address(devlist [i]); - sdi->status = ST_ACTIVE; - g_message("opened device %d on %d.%d " - "interface %d", - sdi->index, sdi->usb->bus, - sdi->usb->address, USB_INTERFACE); - } else { - g_warning("failed to open device: %d", - err); - sdi = NULL; - } - } - } - } else if (sdi->status == ST_INACTIVE) { - /* - * This device is fully enumerated, so we need to find this - * device by vendor, product, bus and address. - */ - libusb_get_device_list(usb_context, &devlist); - for (i = 0; devlist[i]; i++) { - if ((err = - libusb_get_device_descriptor(devlist[i], &des))) { - g_warning("failed to get device descriptor: %d", - err); + if (sdi->status == SR_ST_INITIALIZING) { + if (skip != device_index) { + /* Skip devices of this type that aren't the one we want. */ + skip += 1; continue; } - - if (des.idVendor == USB_VENDOR - && des.idProduct == USB_PRODUCT) { - if (libusb_get_bus_number(devlist[i]) == - sdi->usb->bus - && libusb_get_device_address(devlist[i]) == - sdi->usb->address) { - /* Found it. */ - if (!(err = libusb_open(devlist[i], - &(sdi->usb->devhdl)))) { - sdi->status = ST_ACTIVE; - g_message("opened device %d on " - "%d.%d interface %d", - sdi->index, sdi->usb->bus, - sdi->usb->address, - USB_INTERFACE); - } else { - g_warning("failed to open device: %d", err); - sdi = NULL; - } - } - } + } else if (sdi->status == SR_ST_INACTIVE) { + /* + * This device is fully enumerated, so we need to find this + * device by vendor, product, bus and address. + */ + if (libusb_get_bus_number(devlist[i]) != sdi->usb->bus + || libusb_get_device_address(devlist[i]) != sdi->usb->address) + /* this is not the one */ + continue; } - } else { - /* Status must be ST_ACTIVE, i.e. already in use... */ - sdi = NULL; - } - libusb_free_device_list(devlist, 1); - if (sdi && sdi->status != ST_ACTIVE) - sdi = NULL; - - return sdi; -} - -int upload_firmware(libusb_device *dev) -{ - struct libusb_device_handle *hdl; - int err; - - g_message("uploading firmware to device on %d.%d", - libusb_get_bus_number(dev), libusb_get_device_address(dev)); + if (!(err = libusb_open(devlist[i], &sdi->usb->devhdl))) { + if (sdi->usb->address == 0xff) + /* + * first time we touch this device after firmware upload, + * so we don't know the address yet. + */ + sdi->usb->address = libusb_get_device_address(devlist[i]); - err = libusb_open(dev, &hdl); - if (err != 0) { - g_warning("failed to open device: %d", err); - return 1; - } + sdi->status = SR_ST_ACTIVE; + sr_info("saleae: opened device %d on %d.%d interface %d", + sdi->index, sdi->usb->bus, + sdi->usb->address, USB_INTERFACE); + } else { + sr_warn("failed to open device: %d", err); + } - err = libusb_set_configuration(hdl, USB_CONFIGURATION); - if (err != 0) { - g_warning("Unable to set configuration: %d", err); - return 1; + /* if we made it here, we handled the device one way or another */ + break; } + libusb_free_device_list(devlist, 1); - if ((ezusb_reset(hdl, 1)) < 0) - return 1; - - if (ezusb_install_firmware(hdl, FIRMWARE) != 0) - return 1; - - if ((ezusb_reset(hdl, 0)) < 0) - return 1; - - libusb_close(hdl); - - /* Remember when the last firmware update was done. */ - g_get_current_time(&firmware_updated); + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR; - return 0; + return SR_OK; } -static void close_device(struct sigrok_device_instance *sdi) +static void close_device(struct sr_device_instance *sdi) { - if (sdi->usb->devhdl) { - g_message("closing device %d on %d.%d interface %d", sdi->index, - sdi->usb->bus, sdi->usb->address, USB_INTERFACE); - libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE); - libusb_close(sdi->usb->devhdl); - sdi->usb->devhdl = NULL; - sdi->status = ST_INACTIVE; - } + if (sdi->usb->devhdl == NULL) + return; + + sr_info("saleae: closing device %d on %d.%d interface %d", sdi->index, + sdi->usb->bus, sdi->usb->address, USB_INTERFACE); + libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE); + libusb_close(sdi->usb->devhdl); + sdi->usb->devhdl = NULL; + sdi->status = SR_ST_INACTIVE; } -static int configure_probes(GSList * probes) +static int configure_probes(struct fx2_device *fx2, GSList *probes) { - struct probe *probe; + struct sr_probe *probe; GSList *l; int probe_bit, stage, i; char *tc; - probe_mask = 0; + fx2->probe_mask = 0; for (i = 0; i < NUM_TRIGGER_STAGES; i++) { - trigger_mask[i] = 0; - trigger_value[i] = 0; + fx2->trigger_mask[i] = 0; + fx2->trigger_value[i] = 0; } stage = -1; for (l = probes; l; l = l->next) { - probe = (struct probe *)l->data; + probe = (struct sr_probe *)l->data; if (probe->enabled == FALSE) continue; probe_bit = 1 << (probe->index - 1); - probe_mask |= probe_bit; - if (probe->trigger) { - stage = 0; - for (tc = probe->trigger; *tc; tc++) { - trigger_mask[stage] |= probe_bit; - if (*tc == '1') - trigger_value[stage] |= probe_bit; - stage++; - if (stage > NUM_TRIGGER_STAGES) - return SIGROK_ERR; - } + fx2->probe_mask |= probe_bit; + if (!(probe->trigger)) + continue; + + stage = 0; + for (tc = probe->trigger; *tc; tc++) { + fx2->trigger_mask[stage] |= probe_bit; + if (*tc == '1') + fx2->trigger_value[stage] |= probe_bit; + stage++; + if (stage > NUM_TRIGGER_STAGES) + return SR_ERR; } } @@ -352,75 +277,95 @@ static int configure_probes(GSList * probes) * We didn't configure any triggers, make sure acquisition * doesn't wait for any. */ - trigger_stage = TRIGGER_FIRED; + fx2->trigger_stage = TRIGGER_FIRED; else - trigger_stage = 0; + fx2->trigger_stage = 0; - return SIGROK_OK; + return SR_OK; } +static struct fx2_device *fx2_device_new(void) +{ + struct fx2_device *fx2; + + if (!(fx2 = g_try_malloc0(sizeof(struct fx2_device)))) { + sr_err("saleae: %s: saleae malloc failed", __func__); + return NULL; + } + fx2->trigger_stage = TRIGGER_FIRED; + + return fx2; +} + + /* * API callbacks */ -static int hw_init(char *deviceinfo) +static int hw_init(const char *deviceinfo) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; struct libusb_device_descriptor des; + struct fx2_profile *fx2_prof; + struct fx2_device *fx2; libusb_device **devlist; - int err, devcnt, i; + int err, devcnt, i, j; + + /* Avoid compiler warnings. */ + (void)deviceinfo; if (libusb_init(&usb_context) != 0) { - g_warning("Failed to initialize USB."); + sr_warn("Failed to initialize USB."); return 0; } - libusb_set_debug(usb_context, 3); /* Find all Saleae Logic devices and upload firmware to all of them. */ devcnt = 0; libusb_get_device_list(usb_context, &devlist); for (i = 0; devlist[i]; i++) { + fx2_prof = NULL; err = libusb_get_device_descriptor(devlist[i], &des); if (err != 0) { - g_warning("failed to get device descriptor: %d", err); + sr_warn("failed to get device descriptor: %d", err); continue; } - if (des.idVendor == USB_VENDOR && des.idProduct == USB_PRODUCT) { - /* Definitely a Saleae Logic... */ - - sdi = sigrok_device_instance_new(devcnt, - ST_INITIALIZING, USB_VENDOR_NAME, - USB_MODEL_NAME, USB_MODEL_VERSION); - if (!sdi) - return 0; - device_instances = - g_slist_append(device_instances, sdi); - - if (check_conf_profile(devlist[i]) == 0) { - if (upload_firmware(devlist[i]) > 0) - /* - * Continue on the off chance that the - * device is in a working state. - * TODO: Could maybe try a USB reset, - * or uploading the firmware again. - */ - g_warning("firmware upload failed for device %d", devcnt); - - sdi->usb = usb_device_instance_new - (libusb_get_bus_number(devlist[i]), 0, NULL); - } else { - /* - * Already has the firmware on it, so fix the - * new address. - */ - sdi->usb = usb_device_instance_new - (libusb_get_bus_number(devlist[i]), - libusb_get_device_address(devlist[i]), - NULL); + for (j = 0; supported_fx2[j].orig_vid; j++) { + if (des.idVendor == supported_fx2[j].orig_vid + && des.idProduct == supported_fx2[j].orig_pid) { + fx2_prof = &supported_fx2[j]; + break; } - devcnt++; } + if (!fx2_prof) + /* not a supported VID/PID */ + continue; + + sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING, + fx2_prof->vendor, fx2_prof->model, fx2_prof->model_version); + if (!sdi) + return 0; + fx2 = fx2_device_new(); + fx2->profile = fx2_prof; + sdi->priv = fx2; + device_instances = g_slist_append(device_instances, sdi); + + if (check_conf_profile(devlist[i])) { + /* Already has the firmware, so fix the new address. */ + sdi->status = SR_ST_INACTIVE; + sdi->usb = sr_usb_device_instance_new + (libusb_get_bus_number(devlist[i]), + libusb_get_device_address(devlist[i]), NULL); + } else { + if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, FIRMWARE) == SR_OK) + /* Remember when the firmware on this device was updated */ + g_get_current_time(&fx2->fw_updated); + else + sr_warn("firmware upload failed for device %d", devcnt); + sdi->usb = sr_usb_device_instance_new + (libusb_get_bus_number(devlist[i]), 0xff, NULL); + } + devcnt++; } libusb_free_device_list(devlist, 1); @@ -430,53 +375,71 @@ static int hw_init(char *deviceinfo) static int hw_opendev(int device_index) { GTimeVal cur_time; - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; + struct fx2_device *fx2; int timediff, err; - unsigned int cur, upd; - - if (firmware_updated.tv_sec > 0) { - /* Firmware was recently uploaded. */ - g_get_current_time(&cur_time); - cur = cur_time.tv_sec * 1000 + cur_time.tv_usec / 1000; - upd = firmware_updated.tv_sec * 1000 + - firmware_updated.tv_usec / 1000; - timediff = cur - upd; - if (timediff < FIRMWARE_RENUM_DELAY) { - timediff = FIRMWARE_RENUM_DELAY - timediff; - g_message("waiting %d ms for device to reset", - timediff); - g_usleep(timediff * 1000); - firmware_updated.tv_sec = 0; + + if (!(sdi = sr_get_device_instance(device_instances, device_index))) + return SR_ERR; + fx2 = sdi->priv; + + /* + * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms + * for the FX2 to renumerate + */ + err = 0; + if (GTV_TO_MSEC(fx2->fw_updated) > 0) { + sr_info("saleae: waiting for device to reset"); + /* takes at least 300ms for the FX2 to be gone from the USB bus */ + g_usleep(300*1000); + timediff = 0; + while (timediff < MAX_RENUM_DELAY) { + if ((err = sl_open_device(device_index)) == SR_OK) + break; + g_usleep(100*1000); + g_get_current_time(&cur_time); + timediff = GTV_TO_MSEC(cur_time) - GTV_TO_MSEC(fx2->fw_updated); } + sr_info("saleae: device came back after %d ms", timediff); + } else { + err = sl_open_device(device_index); } - if (!(sdi = sl_open_device(device_index))) { - g_warning("unable to open device"); - return SIGROK_ERR; + if (err != SR_OK) { + sr_warn("unable to open device"); + return SR_ERR; } + fx2 = sdi->priv; err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE); if (err != 0) { - g_warning("Unable to claim interface: %d", err); - return SIGROK_ERR; + sr_warn("Unable to claim interface: %d", err); + return SR_ERR; } - if (cur_samplerate == 0) { + if (fx2->cur_samplerate == 0) { /* Samplerate hasn't been set; default to the slowest one. */ - if (hw_set_configuration(device_index, HWCAP_SAMPLERATE, - &supported_samplerates[0]) == SIGROK_ERR) - return SIGROK_ERR; + if (hw_set_configuration(device_index, SR_HWCAP_SAMPLERATE, + &supported_samplerates[0]) == SR_ERR) + return SR_ERR; } - return SIGROK_OK; + return SR_OK; } -static void hw_closedev(int device_index) +static int hw_closedev(int device_index) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; + + if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + sr_err("logic: %s: sdi was NULL", __func__); + return SR_ERR; /* TODO: SR_ERR_ARG? */ + } - if ((sdi = get_sigrok_device_instance(device_instances, device_index))) - close_device(sdi); + /* TODO */ + close_device(sdi); + + return SR_OK; } static void hw_cleanup(void) @@ -485,7 +448,7 @@ static void hw_cleanup(void) /* Properly close all devices... */ for (l = device_instances; l; l = l->next) - close_device((struct sigrok_device_instance *)l->data); + close_device((struct sr_device_instance *)l->data); /* ...and free all their memory. */ for (l = device_instances; l; l = l->next) @@ -500,27 +463,32 @@ static void hw_cleanup(void) static void *hw_get_device_info(int device_index, int device_info_id) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; + struct fx2_device *fx2; void *info = NULL; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = sr_get_device_instance(device_instances, device_index))) return NULL; + fx2 = sdi->priv; switch (device_info_id) { - case DI_INSTANCE: + case SR_DI_INSTANCE: info = sdi; break; - case DI_NUM_PROBES: - info = GINT_TO_POINTER(NUM_PROBES); + case SR_DI_NUM_PROBES: + info = GINT_TO_POINTER(fx2->profile->num_probes); + break; + case SR_DI_PROBE_NAMES: + info = probe_names; break; - case DI_SAMPLERATES: + case SR_DI_SAMPLERATES: info = &samplerates; break; - case DI_TRIGGER_TYPES: + case SR_DI_TRIGGER_TYPES: info = TRIGGER_TYPES; break; - case DI_CUR_SAMPLERATE: - info = &cur_samplerate; + case SR_DI_CUR_SAMPLERATE: + info = &fx2->cur_samplerate; break; } @@ -529,13 +497,13 @@ static void *hw_get_device_info(int device_index, int device_info_id) static int hw_get_status(int device_index) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; - sdi = get_sigrok_device_instance(device_instances, device_index); + sdi = sr_get_device_instance(device_instances, device_index); if (sdi) return sdi->status; else - return ST_NOT_FOUND; + return SR_ST_NOT_FOUND; } static int *hw_get_capabilities(void) @@ -543,56 +511,62 @@ static int *hw_get_capabilities(void) return capabilities; } -static int set_configuration_samplerate(struct sigrok_device_instance *sdi, +static int set_configuration_samplerate(struct sr_device_instance *sdi, uint64_t samplerate) { + struct fx2_device *fx2; uint8_t divider; int ret, result, i; unsigned char buf[2]; + fx2 = sdi->priv; for (i = 0; supported_samplerates[i]; i++) { if (supported_samplerates[i] == samplerate) break; } if (supported_samplerates[i] == 0) - return SIGROK_ERR_SAMPLERATE; + return SR_ERR_SAMPLERATE; - divider = (uint8_t) (48 / (float)(samplerate / 1000000)) - 1; + divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1; - g_message("setting samplerate to %" PRIu64 " Hz (divider %d)", - samplerate, divider); + sr_info("saleae: setting samplerate to %" PRIu64 " Hz (divider %d)", + samplerate, divider); buf[0] = 0x01; buf[1] = divider; ret = libusb_bulk_transfer(sdi->usb->devhdl, 1 | LIBUSB_ENDPOINT_OUT, buf, 2, &result, 500); if (ret != 0) { - g_warning("failed to set samplerate: %d", ret); - return SIGROK_ERR; + sr_warn("failed to set samplerate: %d", ret); + return SR_ERR; } - cur_samplerate = samplerate; + fx2->cur_samplerate = samplerate; + fx2->period_ps = 1000000000000 / samplerate; - return SIGROK_OK; + return SR_OK; } static int hw_set_configuration(int device_index, int capability, void *value) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; + struct fx2_device *fx2; int ret; uint64_t *tmp_u64; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; + if (!(sdi = sr_get_device_instance(device_instances, device_index))) + return SR_ERR; + fx2 = sdi->priv; - if (capability == HWCAP_SAMPLERATE) { + if (capability == SR_HWCAP_SAMPLERATE) { tmp_u64 = value; ret = set_configuration_samplerate(sdi, *tmp_u64); - } else if (capability == HWCAP_PROBECONFIG) { - ret = configure_probes((GSList *) value); - } else if (capability == HWCAP_LIMIT_SAMPLES) { - limit_samples = strtoull(value, NULL, 10); - ret = SIGROK_OK; + } else if (capability == SR_HWCAP_PROBECONFIG) { + ret = configure_probes(fx2, (GSList *) value); + } else if (capability == SR_HWCAP_LIMIT_SAMPLES) { + tmp_u64 = value; + fx2->limit_samples = *tmp_u64; + ret = SR_OK; } else { - ret = SIGROK_ERR; + ret = SR_ERR; } return ret; @@ -602,217 +576,255 @@ static int receive_data(int fd, int revents, void *user_data) { struct timeval tv; + /* Avoid compiler warnings. */ + (void)fd; + (void)revents; + (void)user_data; + tv.tv_sec = tv.tv_usec = 0; libusb_handle_events_timeout(usb_context, &tv); return TRUE; } -void receive_transfer(struct libusb_transfer *transfer) +static void receive_transfer(struct libusb_transfer *transfer) { + /* TODO: these statics have to move to fx2_device struct */ static int num_samples = 0; static int empty_transfer_count = 0; - struct datafeed_packet packet; - void *user_data; + struct sr_datafeed_packet packet; + struct sr_datafeed_logic logic; + struct fx2_device *fx2; int cur_buflen, trigger_offset, i; unsigned char *cur_buf, *new_buf; - if (transfer == NULL) { - /* hw_stop_acquisition() is telling us to stop. */ + /* hw_stop_acquisition() is telling us to stop. */ + if (transfer == NULL) num_samples = -1; - } + /* + * If acquisition has already ended, just free any queued up + * transfer that come in. + */ if (num_samples == -1) { - /* - * Acquisition has already ended, just free any queued up - * transfer that come in. - */ - libusb_free_transfer(transfer); - } else { - g_message("receive_transfer(): status %d received %d bytes", - transfer->status, transfer->actual_length); - - /* Save incoming transfer before reusing the transfer struct. */ - cur_buf = transfer->buffer; - cur_buflen = transfer->actual_length; - user_data = transfer->user_data; - - /* Fire off a new request. */ - new_buf = g_malloc(4096); - transfer->buffer = new_buf; - transfer->length = 4096; - if (libusb_submit_transfer(transfer) != 0) { - /* TODO: Stop session? */ - g_warning("eek"); - } + if (transfer) + libusb_free_transfer(transfer); + return; + } - if (cur_buflen == 0) { - empty_transfer_count++; - if (empty_transfer_count > MAX_EMPTY_TRANSFERS) { - /* The FX2 gave up. End the acquisition, the - * frontend will work out that the samplecount - * is short. - */ - packet.type = DF_END; - session_bus(user_data, &packet); - num_samples = -1; - } - return; - } else { - empty_transfer_count = 0; + sr_info("saleae: receive_transfer(): status %d received %d bytes", + transfer->status, transfer->actual_length); + + /* Save incoming transfer before reusing the transfer struct. */ + cur_buf = transfer->buffer; + cur_buflen = transfer->actual_length; + fx2 = transfer->user_data; + + /* Fire off a new request. */ + if (!(new_buf = g_try_malloc(4096))) { + sr_err("saleae: %s: new_buf malloc failed", __func__); + // return SR_ERR_MALLOC; + return; /* FIXME */ + } + + transfer->buffer = new_buf; + transfer->length = 4096; + if (libusb_submit_transfer(transfer) != 0) { + /* TODO: Stop session? */ + sr_warn("eek"); + } + + if (cur_buflen == 0) { + empty_transfer_count++; + if (empty_transfer_count > MAX_EMPTY_TRANSFERS) { + /* + * The FX2 gave up. End the acquisition, the frontend + * will work out that the samplecount is short. + */ + hw_stop_acquisition(-1, fx2->session_data); } + return; + } else { + empty_transfer_count = 0; + } + + trigger_offset = 0; + if (fx2->trigger_stage >= 0) { + for (i = 0; i < cur_buflen; i++) { + + if ((cur_buf[i] & fx2->trigger_mask[fx2->trigger_stage]) == fx2->trigger_value[fx2->trigger_stage]) { + /* Match on this trigger stage. */ + fx2->trigger_buffer[fx2->trigger_stage] = cur_buf[i]; + fx2->trigger_stage++; + + if (fx2->trigger_stage == NUM_TRIGGER_STAGES || fx2->trigger_mask[fx2->trigger_stage] == 0) { + /* Match on all trigger stages, we're done. */ + trigger_offset = i + 1; + + /* + * TODO: Send pre-trigger buffer to session bus. + * Tell the frontend we hit the trigger here. + */ + packet.type = SR_DF_TRIGGER; + packet.timeoffset = (num_samples + i) * fx2->period_ps; + packet.duration = 0; + packet.payload = NULL; + sr_session_bus(fx2->session_data, &packet); - trigger_offset = 0; - if (trigger_stage >= 0) { - for (i = 0; i < cur_buflen; i++) { - if ((cur_buf[i] & trigger_mask[trigger_stage]) - == trigger_value[trigger_stage]) { - /* Match on this trigger stage. */ - trigger_buffer[trigger_stage] = - cur_buf[i]; - trigger_stage++; - if (trigger_stage == NUM_TRIGGER_STAGES - || trigger_mask[trigger_stage] == 0) { - /* Match on all trigger stages, we're done */ - trigger_offset = i + 1; - - /* TODO: Send pre-trigger buffer to session bus. Tell the frontend we hit the trigger here. */ - packet.type = DF_TRIGGER; - packet.length = 0; - session_bus(user_data, &packet); - - /* Send the samples that triggered it, since we're skipping past them. */ - packet.type = DF_LOGIC8; - packet.length = trigger_stage; - packet.payload = trigger_buffer; - session_bus(user_data, &packet); - break; - - trigger_stage = TRIGGER_FIRED; - } - } else if (trigger_stage > 0) { /* - * We had a match before, but not in the next sample. However, we may - * have a match on this stage in the next bit -- trigger on 0001 will - * fail on seeing 00001, so we need to go back to stage 0 -- but at - * the next sample from the one that matched originally, which the - * counter increment at the end of the loop takes care of. + * Send the samples that triggered it, since we're + * skipping past them. */ - i -= trigger_stage; - if (i < -1) - /* Oops, went back past this buffer. */ - i = -1; - /* Reset trigger stage. */ - trigger_stage = 0; + packet.type = SR_DF_LOGIC; + packet.timeoffset = (num_samples + i) * fx2->period_ps; + packet.duration = fx2->trigger_stage * fx2->period_ps; + packet.payload = &logic; + logic.length = fx2->trigger_stage; + logic.unitsize = 1; + logic.data = fx2->trigger_buffer; + sr_session_bus(fx2->session_data, &packet); + + fx2->trigger_stage = TRIGGER_FIRED; + break; } + return; } - } - if (trigger_stage == TRIGGER_FIRED) { - /* Send the incoming transfer to the session bus. */ - packet.type = DF_LOGIC8; - packet.length = cur_buflen - trigger_offset; - packet.payload = cur_buf + trigger_offset; - session_bus(user_data, &packet); - g_free(cur_buf); - - num_samples += cur_buflen; - if (num_samples > limit_samples) { - /* End the acquisition. */ - packet.type = DF_END; - session_bus(user_data, &packet); - num_samples = -1; - } - } else { /* - * TODO: Buffer pre-trigger data in capture - * ratio-sized buffer. + * We had a match before, but not in the next sample. However, we may + * have a match on this stage in the next bit -- trigger on 0001 will + * fail on seeing 00001, so we need to go back to stage 0 -- but at + * the next sample from the one that matched originally, which the + * counter increment at the end of the loop takes care of. */ + if (fx2->trigger_stage > 0) { + i -= fx2->trigger_stage; + if (i < -1) + i = -1; /* Oops, went back past this buffer. */ + /* Reset trigger stage. */ + fx2->trigger_stage = 0; + } } } + + if (fx2->trigger_stage == TRIGGER_FIRED) { + /* Send the incoming transfer to the session bus. */ + packet.type = SR_DF_LOGIC; + packet.timeoffset = num_samples * fx2->period_ps; + packet.duration = cur_buflen * fx2->period_ps; + packet.payload = &logic; + logic.length = cur_buflen - trigger_offset; + logic.unitsize = 1; + logic.data = cur_buf + trigger_offset; + sr_session_bus(fx2->session_data, &packet); + g_free(cur_buf); + + num_samples += cur_buflen; + if (fx2->limit_samples && (unsigned int) num_samples > fx2->limit_samples) { + hw_stop_acquisition(-1, fx2->session_data); + } + } else { + /* + * TODO: Buffer pre-trigger data in capture + * ratio-sized buffer. + */ + } } -static int hw_start_acquisition(int device_index, gpointer session_device_id) +static int hw_start_acquisition(int device_index, gpointer session_data) { - struct sigrok_device_instance *sdi; - struct datafeed_packet *packet; - struct datafeed_header *header; + struct sr_device_instance *sdi; + struct sr_datafeed_packet *packet; + struct sr_datafeed_header *header; + struct fx2_device *fx2; struct libusb_transfer *transfer; const struct libusb_pollfd **lupfd; int size, i; unsigned char *buf; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; + if (!(sdi = sr_get_device_instance(device_instances, device_index))) + return SR_ERR; + fx2 = sdi->priv; + fx2->session_data = session_data; + + if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { + sr_err("saleae: %s: packet malloc failed", __func__); + return SR_ERR_MALLOC; + } - packet = g_malloc(sizeof(struct datafeed_packet)); - header = g_malloc(sizeof(struct datafeed_header)); - if (!packet || !header) - return SIGROK_ERR; + if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { + sr_err("saleae: %s: header malloc failed", __func__); + return SR_ERR_MALLOC; + } /* Start with 2K transfer, subsequently increased to 4K. */ size = 2048; for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) { - buf = g_malloc(size); + if (!(buf = g_try_malloc(size))) { + sr_err("saleae: %s: buf malloc failed", __func__); + return SR_ERR_MALLOC; + } transfer = libusb_alloc_transfer(0); libusb_fill_bulk_transfer(transfer, sdi->usb->devhdl, 2 | LIBUSB_ENDPOINT_IN, buf, size, - receive_transfer, session_device_id, 40); + receive_transfer, fx2, 40); if (libusb_submit_transfer(transfer) != 0) { /* TODO: Free them all. */ libusb_free_transfer(transfer); g_free(buf); - return SIGROK_ERR; + return SR_ERR; } size = 4096; } lupfd = libusb_get_pollfds(usb_context); for (i = 0; lupfd[i]; i++) - source_add(lupfd[i]->fd, lupfd[i]->events, -1, receive_data, - NULL); + sr_source_add(lupfd[i]->fd, lupfd[i]->events, 40, receive_data, + NULL); free(lupfd); - packet->type = DF_HEADER; - packet->length = sizeof(struct datafeed_header); - packet->payload = (unsigned char *)header; + packet->type = SR_DF_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); + header->samplerate = fx2->cur_samplerate; + header->num_logic_probes = fx2->profile->num_probes; + header->num_analog_probes = 0; + sr_session_bus(session_data, packet); g_free(header); g_free(packet); - return SIGROK_OK; + return SR_OK; } /* This stops acquisition on ALL devices, ignoring device_index. */ -static void hw_stop_acquisition(int device_index, gpointer session_device_id) +static void hw_stop_acquisition(int device_index, gpointer session_data) { - struct datafeed_packet packet; + struct sr_datafeed_packet packet; + + /* Avoid compiler warnings. */ + (void)device_index; - packet.type = DF_END; - session_bus(session_device_id, &packet); + packet.type = SR_DF_END; + sr_session_bus(session_data, &packet); receive_transfer(NULL); /* TODO: Need to cancel and free any queued up transfers. */ } -struct device_plugin saleae_logic_plugin_info = { - "saleae-logic", - 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, +struct sr_device_plugin saleae_logic_plugin_info = { + .name = "saleae-logic", + .longname = "Saleae Logic", + .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, };