X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=de33f23a7d7fa44a72c047fc0dda56d21ac6929c;hb=e10d6e32e4d8766e12b752da6d1806944b0ee85e;hp=2c09f8c44c6910be9a9f2e1fa404ed55a29a8832;hpb=989938f6cd5f9bf76f42e29ab39eca4570e430e2;p=libsigrok.git diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c index 2c09f8c4..de33f23a 100644 --- a/hardware/saleae-logic/saleae-logic.c +++ b/hardware/saleae-logic/saleae-logic.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include "config.h" #include #include #include @@ -24,40 +25,56 @@ #include #include #include -#include "config.h" - -#define USB_VENDOR 0x0925 -#define USB_PRODUCT 0x3881 -#define USB_VENDOR_NAME "Saleae" -#define USB_MODEL_NAME "Logic" -#define USB_MODEL_VERSION "" +#include -#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.fw" +#define USB_INTERFACE 0 +#define USB_CONFIGURATION 1 +#define NUM_TRIGGER_STAGES 4 +#define TRIGGER_TYPES "01" +#define FIRMWARE FIRMWARE_DIR "/saleae-logic.fw" +#define GTV_TO_MSEC(gtv) (gtv.tv_sec * 1000 + gtv.tv_usec / 1000) /* delay in ms */ -#define FIRMWARE_RENUM_DELAY 2000 -#define NUM_SIMUL_TRANSFERS 10 -#define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2) +#define MAX_RENUM_DELAY 3000 +#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 +#define TRIGGER_FIRED -1 + +struct fx2_device { + /* VID/PID when first found */ + uint16_t orig_vid; + uint16_t orig_pid; + /* VID/PID after firmware upload */ + uint16_t fw_vid; + uint16_t fw_pid; + char *vendor; + char *model; + char *model_version; + int num_probes; +}; + +static struct fx2_device 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, NULL, NULL, NULL, 0 } +}; /* 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(). */ +/* List of struct sr_device_instance, maintained by opendev()/closedev(). */ static GSList *device_instances = NULL; /* @@ -66,28 +83,28 @@ static GSList *device_instances = NULL; * 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, 0 }; +static GTimeVal fw_updated = { 0, 0 }; static libusb_context *usb_context = 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, }; @@ -98,8 +115,8 @@ 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; +static struct fx2_device *fx2 = NULL; +static int trigger_stage = TRIGGER_FIRED; static int hw_set_configuration(int device_index, int capability, void *value); static void hw_stop_acquisition(int device_index, gpointer session_device_id); @@ -110,7 +127,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id); * @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; @@ -164,55 +181,74 @@ int check_conf_profile(libusb_device *dev) return ret; } -struct sigrok_device_instance *sl_open_device(int device_index) +static struct sr_device_instance *sl_open_device(int device_index) { - struct sigrok_device_instance *sdi; libusb_device **devlist; struct libusb_device_descriptor des; + struct sr_device_instance *sdi; int err, skip, i; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = sr_get_device_instance(device_instances, device_index))) + return NULL; + + if (sdi->status == SR_ST_ACTIVE) + /* already in use */ return NULL; + 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++) { - /* TODO: Error handling. */ - err = opendev2(device_index, &sdi, devlist[i], &des, - &skip, USB_VENDOR, USB_PRODUCT, - USB_INTERFACE); + 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; } - } 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++) { - /* TODO: Error handling. */ - err = opendev3(&sdi, devlist[i], &des, USB_VENDOR, - USB_PRODUCT, USB_INTERFACE); + + if (des.idVendor != fx2->fw_vid || des.idProduct != fx2->fw_pid) + continue; + + 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; + } + } 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; + } + + 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]); + + sdi->status = SR_ST_ACTIVE; + g_message("saleae: 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 { - /* Status must be ST_ACTIVE, i.e. already in use... */ - sdi = NULL; } libusb_free_device_list(devlist, 1); - if (sdi && sdi->status != ST_ACTIVE) + if (sdi && sdi->status != SR_ST_ACTIVE) sdi = NULL; return sdi; } -int upload_firmware(libusb_device *dev) +static int upload_firmware(libusb_device *dev) { int ret; @@ -221,27 +257,27 @@ int upload_firmware(libusb_device *dev) return 1; /* Remember when the last firmware update was done. */ - g_get_current_time(&firmware_updated); + g_get_current_time(&fw_updated); return 0; } -static void close_device(struct sigrok_device_instance *sdi) +static void close_device(struct sr_device_instance *sdi) { if (sdi->usb->devhdl == NULL) return; - g_message("closing device %d on %d.%d interface %d", sdi->index, - sdi->usb->bus, sdi->usb->address, USB_INTERFACE); + 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 = ST_INACTIVE; + sdi->status = SR_ST_INACTIVE; } static int configure_probes(GSList *probes) { - struct probe *probe; + struct sr_probe *probe; GSList *l; int probe_bit, stage, i; char *tc; @@ -254,7 +290,7 @@ static int configure_probes(GSList *probes) 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); @@ -269,7 +305,7 @@ static int configure_probes(GSList *probes) trigger_value[stage] |= probe_bit; stage++; if (stage > NUM_TRIGGER_STAGES) - return SIGROK_ERR; + return SR_ERR; } } @@ -282,44 +318,52 @@ static int configure_probes(GSList *probes) else trigger_stage = 0; - return SIGROK_OK; + return SR_OK; } /* * 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; libusb_device **devlist; - int err, devcnt, i; + int err, devcnt, i, j; - /* QUICK HACK */ + /* Avoid compiler warnings. */ deviceinfo = 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. */ + fx2 = NULL; devcnt = 0; libusb_get_device_list(usb_context, &devlist); for (i = 0; devlist[i]; i++) { 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) - continue; /* Not a Saleae Logic... */ + 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 = &supported_fx2[j]; + break; + } + } + if (!fx2) + /* not a supported VID/PID */ + continue; - sdi = sigrok_device_instance_new(devcnt, ST_INITIALIZING, - USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); + sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING, + fx2->vendor, fx2->model, fx2->model_version); if (!sdi) return 0; device_instances = g_slist_append(device_instances, sdi); @@ -331,18 +375,22 @@ static int hw_init(char *deviceinfo) * or uploading the firmware again. */ if (upload_firmware(devlist[i]) > 0) - g_warning("firmware upload failed for " - "device %d", devcnt); + sr_warn("firmware upload failed for device %d", + devcnt); - sdi->usb = usb_device_instance_new - (libusb_get_bus_number(devlist[i]), 0, NULL); + sdi->usb = sr_usb_device_instance_new + (libusb_get_bus_number(devlist[i]), 0xff, NULL); } else { /* Already has the firmware, so fix the new address. */ - sdi->usb = usb_device_instance_new + 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); } devcnt++; + + /* not supporting multiple FX2s in this driver yet */ + break; } libusb_free_device_list(devlist, 1); @@ -352,53 +400,65 @@ 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; 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 the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms + * for the FX2 to renumerate + */ + sdi = NULL; + if (fw_updated.tv_sec > 0) { + g_message("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 ((sdi = sl_open_device(device_index))) + break; + g_usleep(100*1000); + g_get_current_time(&cur_time); + timediff = GTV_TO_MSEC(cur_time) - GTV_TO_MSEC(fw_updated); } + g_message("saleae: device came back after %d ms", timediff); + } else { + sdi = sl_open_device(device_index); } - if (!(sdi = sl_open_device(device_index))) { - g_warning("unable to open device"); - return SIGROK_ERR; + if (!sdi) { + sr_warn("unable to open device"); + return SR_ERR; } 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) { /* 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) @@ -407,7 +467,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) @@ -422,26 +482,26 @@ 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; 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; 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->num_probes); 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: + case SR_DI_CUR_SAMPLERATE: info = &cur_samplerate; break; } @@ -451,13 +511,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) @@ -465,7 +525,7 @@ 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) { uint8_t divider; @@ -477,44 +537,45 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi, break; } if (supported_samplerates[i] == 0) - return SIGROK_ERR_SAMPLERATE; + return SR_ERR_SAMPLERATE; 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; - 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; 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; - if (capability == HWCAP_SAMPLERATE) { + if (capability == SR_HWCAP_SAMPLERATE) { tmp_u64 = value; ret = set_configuration_samplerate(sdi, *tmp_u64); - } else if (capability == HWCAP_PROBECONFIG) { + } else if (capability == SR_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_LIMIT_SAMPLES) { + tmp_u64 = value; + limit_samples = *tmp_u64; + ret = SR_OK; } else { - ret = SIGROK_ERR; + ret = SR_ERR; } return ret; @@ -524,7 +585,7 @@ static int receive_data(int fd, int revents, void *user_data) { struct timeval tv; - /* QUICK HACK */ + /* Avoid compiler warnings. */ fd = fd; revents = revents; user_data = user_data; @@ -535,64 +596,11 @@ static int receive_data(int fd, int revents, void *user_data) return TRUE; } -static void trigger_helper(int i, unsigned char *cur_buf, - struct datafeed_packet *packet, void *user_data, - int *trigger_offset) -{ - 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; // FIXME??? - - trigger_stage = TRIGGER_FIRED; - } - return; - } - - /* - * 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 (trigger_stage > 0) { - i -= trigger_stage; - if (i < -1) - i = -1; /* Oops, went back past this buffer. */ - /* Reset trigger stage. */ - trigger_stage = 0; - } -} - void receive_transfer(struct libusb_transfer *transfer) { static int num_samples = 0; static int empty_transfer_count = 0; - struct datafeed_packet packet; + struct sr_datafeed_packet packet; void *user_data; int cur_buflen, trigger_offset, i; unsigned char *cur_buf, *new_buf; @@ -611,8 +619,8 @@ void receive_transfer(struct libusb_transfer *transfer) return; } - g_message("receive_transfer(): status %d received %d bytes", - transfer->status, transfer->actual_length); + 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; @@ -620,12 +628,17 @@ void receive_transfer(struct libusb_transfer *transfer) user_data = transfer->user_data; /* Fire off a new request. */ - new_buf = g_malloc(4096); + 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? */ - g_warning("eek"); + sr_warn("eek"); } if (cur_buflen == 0) { @@ -645,21 +658,69 @@ void receive_transfer(struct libusb_transfer *transfer) trigger_offset = 0; if (trigger_stage >= 0) { for (i = 0; i < cur_buflen; i++) { - trigger_helper(i, cur_buf, &packet, user_data, - &trigger_offset); + + 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 = SR_DF_TRIGGER; + packet.length = 0; + sr_session_bus(user_data, &packet); + + /* + * Send the samples that triggered it, since we're + * skipping past them. + */ + packet.type = SR_DF_LOGIC; + packet.length = trigger_stage; + packet.unitsize = 1; + packet.payload = trigger_buffer; + sr_session_bus(user_data, &packet); + + trigger_stage = TRIGGER_FIRED; + break; + } + return; + } + + /* + * 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 (trigger_stage > 0) { + i -= trigger_stage; + if (i < -1) + i = -1; /* Oops, went back past this buffer. */ + /* Reset trigger stage. */ + trigger_stage = 0; + } + + } } if (trigger_stage == TRIGGER_FIRED) { /* Send the incoming transfer to the session bus. */ - packet.type = DF_LOGIC8; + packet.type = SR_DF_LOGIC; packet.length = cur_buflen - trigger_offset; + packet.unitsize = 1; packet.payload = cur_buf + trigger_offset; - session_bus(user_data, &packet); + sr_session_bus(user_data, &packet); g_free(cur_buf); num_samples += cur_buflen; - if ((unsigned int)num_samples > limit_samples) { + if (limit_samples && (unsigned int) num_samples > limit_samples) { hw_stop_acquisition(-1, user_data); } } else { @@ -672,26 +733,34 @@ void receive_transfer(struct libusb_transfer *transfer) static int hw_start_acquisition(int device_index, gpointer session_device_id) { - 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 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; - packet = g_malloc(sizeof(struct datafeed_packet)); - header = g_malloc(sizeof(struct datafeed_header)); - if (!packet || !header) - return SIGROK_ERR; + if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { + sr_err("saleae: %s: packet malloc failed", __func__); + return SR_ERR_MALLOC; + } + + 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, @@ -700,60 +769,61 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) /* 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, 40, 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->type = SR_DF_HEADER; + packet->length = sizeof(struct sr_datafeed_header); packet->payload = (unsigned char *)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->protocol_id = SR_PROTO_RAW; + header->num_logic_probes = fx2->num_probes; + header->num_analog_probes = 0; + sr_session_bus(session_device_id, 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) { - struct datafeed_packet packet; + struct sr_datafeed_packet packet; - /* QUICK HACK */ + /* Avoid compiler warnings. */ device_index = device_index; - packet.type = DF_END; - session_bus(session_device_id, &packet); + packet.type = SR_DF_END; + sr_session_bus(session_device_id, &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, };