X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=648b13f48cb0361712a59b8bf032f778b1503280;hb=d4928d7102c6b2f9f7aa51a1b98669bf148fff80;hp=2e88241ecfec61e0b17f71b5a4972172fcf578cf;hpb=3b6c19303db9da2d70a65880fa85883273b17a5a;p=libsigrok.git diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index 2e88241e..648b13f4 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -23,9 +23,8 @@ #include #include #include -#include "config.h" -#include "sigrok.h" -#include "sigrok-internal.h" +#include "libsigrok.h" +#include "libsigrok-internal.h" #include "fx2lafw.h" #include "command.h" @@ -38,6 +37,13 @@ static const struct fx2lafw_profile supported_fx2[] = { { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", 0 }, + /* + * CWAV USBee DX + * XZL-Studio DX + */ + { 0x08a9, 0x0015, "CWAV", "USBee DX", NULL, + FIRMWARE_DIR "/fx2lafw-cwav-usbeedx.fw", + DEV_CAPS_16BIT }, /* * CWAV USBee SX @@ -85,9 +91,6 @@ static const int hwcaps[] = { 0, }; -/* - * TODO: Different probe_names[] for each supported device. - */ static const char *probe_names[] = { "0", "1", @@ -135,11 +138,12 @@ static const struct sr_samplerates samplerates = { supported_samplerates, }; -static GSList *dev_insts = NULL; -static libusb_context *usb_context = NULL; - -static int hw_dev_config_set(int dev_index, int hwcap, const void *value); -static int hw_dev_acquisition_stop(int dev_index, void *cb_data); +SR_PRIV struct sr_dev_driver fx2lafw_driver_info; +static struct sr_dev_driver *fdi = &fx2lafw_driver_info; +static int hw_dev_close(struct sr_dev_inst *sdi); +static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, + const void *value); +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); /** * Check the USB configuration to determine if this is an fx2lafw device. @@ -185,26 +189,25 @@ static gboolean check_conf_profile(libusb_device *dev) return ret; } -static int fx2lafw_dev_open(int dev_index) +static int fx2lafw_dev_open(struct sr_dev_inst *sdi) { libusb_device **devlist; struct libusb_device_descriptor des; - struct sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; + struct drv_context *drvc = fdi->priv; struct version_info vi; int ret, skip, i; uint8_t revid; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return SR_ERR; - ctx = sdi->priv; + devc = sdi->priv; if (sdi->status == SR_ST_ACTIVE) /* already in use */ return SR_ERR; skip = 0; - const int device_count = libusb_get_device_list(usb_context, &devlist); + const int device_count = libusb_get_device_list( + drvc->sr_ctx->libusb_ctx, &devlist); if (device_count < 0) { sr_err("fx2lafw: Failed to retrieve device list (%d)", device_count); @@ -213,17 +216,17 @@ static int fx2lafw_dev_open(int dev_index) for (i = 0; i < device_count; i++) { if ((ret = libusb_get_device_descriptor(devlist[i], &des))) { - sr_err("fx2lafw: Failed to get device descriptor: %d.", - ret); + sr_err("fx2lafw: Failed to get device descriptor: %s.", + libusb_error_name(ret)); continue; } - if (des.idVendor != ctx->profile->vid - || des.idProduct != ctx->profile->pid) + if (des.idVendor != devc->profile->vid + || des.idProduct != devc->profile->pid) continue; if (sdi->status == SR_ST_INITIALIZING) { - if (skip != dev_index) { + if (skip != sdi->index) { /* Skip devices of this type that aren't the one we want. */ skip += 1; continue; @@ -233,32 +236,33 @@ static int fx2lafw_dev_open(int dev_index) * 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]) != ctx->usb->bus - || libusb_get_device_address(devlist[i]) != ctx->usb->address) + if (libusb_get_bus_number(devlist[i]) != devc->usb->bus + || libusb_get_device_address(devlist[i]) != devc->usb->address) /* this is not the one */ continue; } - if (!(ret = libusb_open(devlist[i], &ctx->usb->devhdl))) { - if (ctx->usb->address == 0xff) + if (!(ret = libusb_open(devlist[i], &devc->usb->devhdl))) { + if (devc->usb->address == 0xff) /* * first time we touch this device after firmware upload, * so we don't know the address yet. */ - ctx->usb->address = libusb_get_device_address(devlist[i]); + devc->usb->address = libusb_get_device_address(devlist[i]); } else { - sr_err("fx2lafw: Failed to open device: %d.", ret); + sr_err("fx2lafw: Failed to open device: %s.", + libusb_error_name(ret)); break; } - ret = command_get_fw_version(ctx->usb->devhdl, &vi); + ret = command_get_fw_version(devc->usb->devhdl, &vi); if (ret != SR_OK) { sr_err("fx2lafw: Failed to retrieve " "firmware version information."); break; } - ret = command_get_revid_version(ctx->usb->devhdl, &revid); + ret = command_get_revid_version(devc->usb->devhdl, &revid); if (ret != SR_OK) { sr_err("fx2lafw: Failed to retrieve REVID."); break; @@ -279,7 +283,7 @@ static int fx2lafw_dev_open(int dev_index) sdi->status = SR_ST_ACTIVE; sr_info("fx2lafw: Opened device %d on %d.%d " "interface %d, firmware %d.%d, REVID %d.", - sdi->index, ctx->usb->bus, ctx->usb->address, + sdi->index, devc->usb->bus, devc->usb->address, USB_INTERFACE, vi.major, vi.minor, revid); break; @@ -292,53 +296,38 @@ static int fx2lafw_dev_open(int dev_index) return SR_OK; } -static void close_dev(struct sr_dev_inst *sdi) -{ - struct context *ctx; - - ctx = sdi->priv; - - if (ctx->usb->devhdl == NULL) - return; - - sr_info("fx2lafw: Closing device %d on %d.%d interface %d.", - sdi->index, ctx->usb->bus, ctx->usb->address, USB_INTERFACE); - libusb_release_interface(ctx->usb->devhdl, USB_INTERFACE); - libusb_close(ctx->usb->devhdl); - ctx->usb->devhdl = NULL; - sdi->status = SR_ST_INACTIVE; -} - -static int configure_probes(struct context *ctx, GSList *probes) +static int configure_probes(const struct sr_dev_inst *sdi) { + struct dev_context *devc; struct sr_probe *probe; GSList *l; int probe_bit, stage, i; char *tc; + devc = sdi->priv; for (i = 0; i < NUM_TRIGGER_STAGES; i++) { - ctx->trigger_mask[i] = 0; - ctx->trigger_value[i] = 0; + devc->trigger_mask[i] = 0; + devc->trigger_value[i] = 0; } stage = -1; - for (l = probes; l; l = l->next) { + for (l = sdi->probes; l; l = l->next) { probe = (struct sr_probe *)l->data; if (probe->enabled == FALSE) continue; - if (probe->index > 8) - ctx->sample_wide = TRUE; + if (probe->index > 7) + devc->sample_wide = TRUE; - probe_bit = 1 << (probe->index - 1); + probe_bit = 1 << (probe->index); if (!(probe->trigger)) continue; stage = 0; for (tc = probe->trigger; *tc; tc++) { - ctx->trigger_mask[stage] |= probe_bit; + devc->trigger_mask[stage] |= probe_bit; if (*tc == '1') - ctx->trigger_value[stage] |= probe_bit; + devc->trigger_value[stage] |= probe_bit; stage++; if (stage > NUM_TRIGGER_STAGES) return SR_ERR; @@ -350,57 +339,112 @@ static int configure_probes(struct context *ctx, GSList *probes) * We didn't configure any triggers, make sure acquisition * doesn't wait for any. */ - ctx->trigger_stage = TRIGGER_FIRED; + devc->trigger_stage = TRIGGER_FIRED; else - ctx->trigger_stage = 0; + devc->trigger_stage = 0; return SR_OK; } -static struct context *fx2lafw_dev_new(void) +static struct dev_context *fx2lafw_dev_new(void) { - struct context *ctx; + struct dev_context *devc; - if (!(ctx = g_try_malloc0(sizeof(struct context)))) { - sr_err("fx2lafw: %s: ctx malloc failed.", __func__); + if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { + sr_err("fx2lafw: %s: devc malloc failed.", __func__); return NULL; } - ctx->trigger_stage = TRIGGER_FIRED; + devc->trigger_stage = TRIGGER_FIRED; + + return devc; +} + +static int clear_instances(void) +{ + GSList *l; + struct sr_dev_inst *sdi; + struct drv_context *drvc; + struct dev_context *devc; + int ret; + + drvc = fdi->priv; + ret = SR_OK; + for (l = drvc->instances; l; l = l->next) { + if (!(sdi = l->data)) { + /* Log error, but continue cleaning up the rest. */ + sr_err("fx2lafw: %s: sdi was NULL, continuing.", + __func__); + ret = SR_ERR_BUG; + continue; + } + if (!(devc = sdi->priv)) { + /* Log error, but continue cleaning up the rest. */ + sr_err("fx2lafw: %s: sdi->priv was NULL, continuing", + __func__); + ret = SR_ERR_BUG; + continue; + } + hw_dev_close(sdi); + sr_usb_dev_inst_free(devc->usb); + sdi = l->data; + sr_dev_inst_free(sdi); + } + + g_slist_free(drvc->instances); + drvc->instances = NULL; - return ctx; + return ret; } + /* * API callbacks */ -static int hw_init(const char *devinfo) +static int hw_init(struct sr_context *sr_ctx) { - struct sr_dev_inst *sdi; + struct drv_context *drvc; + + if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { + sr_err("fx2lafw: driver context malloc failed."); + return SR_ERR_MALLOC; + } + + drvc->sr_ctx = sr_ctx; + fdi->priv = drvc; + + return SR_OK; +} + +static GSList *hw_scan(GSList *options) +{ + GSList *devices; struct libusb_device_descriptor des; + struct sr_dev_inst *sdi; const struct fx2lafw_profile *prof; - struct context *ctx; + struct drv_context *drvc; + struct dev_context *devc; + struct sr_probe *probe; libusb_device **devlist; - int ret; - int devcnt = 0; - int i, j; + int devcnt, num_logic_probes, ret, i, j; - /* Avoid compiler warnings. */ - (void)devinfo; + (void)options; - if (libusb_init(&usb_context) != 0) { - sr_warn("fx2lafw: Failed to initialize libusb."); - return 0; - } + drvc = fdi->priv; + + /* This scan always invalidates any previous scans. */ + clear_instances(); /* Find all fx2lafw compatible devices and upload firmware to them. */ - libusb_get_device_list(usb_context, &devlist); + devices = NULL; + libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); for (i = 0; devlist[i]; i++) { if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) { - sr_warn("fx2lafw: Failed to get device descriptor: %d.", ret); + sr_warn("fx2lafw: Failed to get device descriptor: %s.", + libusb_error_name(ret)); continue; } @@ -416,92 +460,123 @@ static int hw_init(const char *devinfo) if (!prof) continue; + devcnt = g_slist_length(drvc->instances); sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING, prof->vendor, prof->model, prof->model_version); if (!sdi) - return 0; + return NULL; + sdi->driver = fdi; + + /* Fill in probelist according to this device's profile. */ + num_logic_probes = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8; + for (j = 0; j < num_logic_probes; j++) { + if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE, + probe_names[j]))) + return NULL; + sdi->probes = g_slist_append(sdi->probes, probe); + } - ctx = fx2lafw_dev_new(); - ctx->profile = prof; - sdi->priv = ctx; - dev_insts = g_slist_append(dev_insts, sdi); + devc = fx2lafw_dev_new(); + devc->profile = prof; + sdi->priv = devc; + drvc->instances = g_slist_append(drvc->instances, sdi); + devices = g_slist_append(devices, sdi); if (check_conf_profile(devlist[i])) { /* Already has the firmware, so fix the new address. */ sr_dbg("fx2lafw: Found an fx2lafw device."); sdi->status = SR_ST_INACTIVE; - ctx->usb = sr_usb_dev_inst_new + devc->usb = sr_usb_dev_inst_new (libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL); } else { if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, prof->firmware) == SR_OK) /* Remember when the firmware on this device was updated */ - ctx->fw_updated = g_get_monotonic_time(); + devc->fw_updated = g_get_monotonic_time(); else sr_err("fx2lafw: Firmware upload failed for " "device %d.", devcnt); - ctx->usb = sr_usb_dev_inst_new + devc->usb = sr_usb_dev_inst_new (libusb_get_bus_number(devlist[i]), 0xff, NULL); } - - devcnt++; } libusb_free_device_list(devlist, 1); - return devcnt; + return devices; } -static int hw_dev_open(int dev_index) +static GSList *hw_dev_list(void) { - struct sr_dev_inst *sdi; - struct context *ctx; + struct drv_context *drvc; + + drvc = fdi->priv; + + return drvc->instances; +} + +static int hw_dev_open(struct sr_dev_inst *sdi) +{ + struct dev_context *devc; int ret; int64_t timediff_us, timediff_ms; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return SR_ERR; - ctx = sdi->priv; + devc = sdi->priv; /* * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS * milliseconds for the FX2 to renumerate. */ ret = SR_ERR; - if (ctx->fw_updated > 0) { + if (devc->fw_updated > 0) { sr_info("fx2lafw: Waiting for device to reset."); /* takes at least 300ms for the FX2 to be gone from the USB bus */ g_usleep(300 * 1000); timediff_ms = 0; while (timediff_ms < MAX_RENUM_DELAY_MS) { - if ((ret = fx2lafw_dev_open(dev_index)) == SR_OK) + if ((ret = fx2lafw_dev_open(sdi)) == SR_OK) break; g_usleep(100 * 1000); - timediff_us = g_get_monotonic_time() - ctx->fw_updated; + timediff_us = g_get_monotonic_time() - devc->fw_updated; timediff_ms = timediff_us / 1000; sr_spew("fx2lafw: waited %" PRIi64 " ms", timediff_ms); } sr_info("fx2lafw: Device came back after %d ms.", timediff_ms); } else { - ret = fx2lafw_dev_open(dev_index); + ret = fx2lafw_dev_open(sdi); } if (ret != SR_OK) { sr_err("fx2lafw: Unable to open device."); return SR_ERR; } - ctx = sdi->priv; + devc = sdi->priv; - ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE); + ret = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE); if (ret != 0) { - sr_err("fx2lafw: Unable to claim interface: %d.", ret); + switch(ret) { + case LIBUSB_ERROR_BUSY: + sr_err("fx2lafw: Unable to claim USB interface. Another " + "program or driver has already claimed it."); + break; + + case LIBUSB_ERROR_NO_DEVICE: + sr_err("fx2lafw: Device has been disconnected."); + break; + + default: + sr_err("fx2lafw: Unable to claim interface: %s.", + libusb_error_name(ret)); + break; + } + return SR_ERR; } - if (ctx->cur_samplerate == 0) { + if (devc->cur_samplerate == 0) { /* Samplerate hasn't been set; default to the slowest one. */ - if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE, + if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE, &supported_samplerates[0]) == SR_ERR) return SR_ERR; } @@ -509,120 +584,94 @@ static int hw_dev_open(int dev_index) return SR_OK; } -static int hw_dev_close(int dev_index) +static int hw_dev_close(struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; + struct dev_context *devc; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { - sr_err("fx2lafw: %s: sdi was NULL.", __func__); - return SR_ERR_BUG; - } + devc = sdi->priv; + if (devc->usb->devhdl == NULL) + return SR_ERR; - /* TODO */ - close_dev(sdi); + sr_info("fx2lafw: Closing device %d on %d.%d interface %d.", + sdi->index, devc->usb->bus, devc->usb->address, USB_INTERFACE); + libusb_release_interface(devc->usb->devhdl, USB_INTERFACE); + libusb_close(devc->usb->devhdl); + devc->usb->devhdl = NULL; + sdi->status = SR_ST_INACTIVE; return SR_OK; } static int hw_cleanup(void) { - GSList *l; - struct sr_dev_inst *sdi; - struct context *ctx; - int ret = SR_OK; + struct drv_context *drvc; + int ret; - for (l = dev_insts; l; l = l->next) { - if (!(sdi = l->data)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("fx2lafw: %s: sdi was NULL, continuing.", - __func__); - ret = SR_ERR_BUG; - continue; - } - if (!(ctx = sdi->priv)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("fx2lafw: %s: sdi->priv was NULL, continuing", - __func__); - ret = SR_ERR_BUG; - continue; - } - close_dev(sdi); - sdi = l->data; - sr_dev_inst_free(sdi); - } + if (!(drvc = fdi->priv)) + return SR_OK; - g_slist_free(dev_insts); - dev_insts = NULL; + ret = clear_instances(); - if (usb_context) - libusb_exit(usb_context); - usb_context = NULL; + g_free(drvc); + fdi->priv = NULL; return ret; } -static const void *hw_dev_info_get(int dev_index, int dev_info_id) +static int hw_info_get(int info_id, const void **data, + const struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; - struct context *ctx; - - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return NULL; - ctx = sdi->priv; + struct dev_context *devc; - switch (dev_info_id) { - case SR_DI_INST: - return sdi; + switch (info_id) { + case SR_DI_HWCAPS: + *data = hwcaps; + break; case SR_DI_NUM_PROBES: - return GINT_TO_POINTER( - (ctx->profile->dev_caps & DEV_CAPS_16BIT) ? - 16 : 8); + if (sdi) { + devc = sdi->priv; + *data = GINT_TO_POINTER( + (devc->profile->dev_caps & DEV_CAPS_16BIT) ? + 16 : 8); + } else + return SR_ERR; + break; case SR_DI_PROBE_NAMES: - return probe_names; + *data = probe_names; + break; case SR_DI_SAMPLERATES: - return &samplerates; + *data = &samplerates; + break; case SR_DI_TRIGGER_TYPES: - return TRIGGER_TYPES; + *data = TRIGGER_TYPES; + break; case SR_DI_CUR_SAMPLERATE: - return &ctx->cur_samplerate; + if (sdi) { + devc = sdi->priv; + *data = &devc->cur_samplerate; + } else + return SR_ERR; + break; + default: + return SR_ERR_ARG; } - return NULL; -} - -static int hw_dev_status_get(int dev_index) -{ - const struct sr_dev_inst *const sdi = - sr_dev_inst_get(dev_insts, dev_index); - - if (!sdi) - return SR_ST_NOT_FOUND; - - return sdi->status; -} - -static const int *hw_hwcap_get_all(void) -{ - return hwcaps; + return SR_OK; } -static int hw_dev_config_set(int dev_index, int hwcap, const void *value) +static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, + const void *value) { - struct sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; int ret; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return SR_ERR; - ctx = sdi->priv; + devc = sdi->priv; if (hwcap == SR_HWCAP_SAMPLERATE) { - ctx->cur_samplerate = *(const uint64_t *)value; + devc->cur_samplerate = *(const uint64_t *)value; ret = SR_OK; - } else if (hwcap == SR_HWCAP_PROBECONFIG) { - ret = configure_probes(ctx, (GSList *) value); } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { - ctx->limit_samples = *(const uint64_t *)value; + devc->limit_samples = *(const uint64_t *)value; ret = SR_OK; } else { ret = SR_ERR; @@ -634,62 +683,101 @@ static int hw_dev_config_set(int dev_index, int hwcap, const void *value) static int receive_data(int fd, int revents, void *cb_data) { struct timeval tv; + struct drv_context *drvc = fdi->priv; - /* Avoid compiler warnings. */ (void)fd; (void)revents; (void)cb_data; tv.tv_sec = tv.tv_usec = 0; - libusb_handle_events_timeout(usb_context, &tv); + libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv); return TRUE; } -static void abort_acquisition(struct context *ctx) +static void abort_acquisition(struct dev_context *devc) { - ctx->num_samples = -1; + int i; + + devc->num_samples = -1; + + for (i = devc->num_transfers - 1; i >= 0; i--) { + if (devc->transfers[i]) + libusb_cancel_transfer(devc->transfers[i]); + } } -static void finish_acquisition(struct context *ctx) +static void finish_acquisition(struct dev_context *devc) { struct sr_datafeed_packet packet; + struct drv_context *drvc = fdi->priv; int i; + /* Terminate session */ packet.type = SR_DF_END; - sr_session_send(ctx->session_dev_id, &packet); + sr_session_send(devc->session_dev_id, &packet); /* Remove fds from polling */ const struct libusb_pollfd **const lupfd = - libusb_get_pollfds(usb_context); + libusb_get_pollfds(drvc->sr_ctx->libusb_ctx); for (i = 0; lupfd[i]; i++) sr_source_remove(lupfd[i]->fd); free(lupfd); /* NOT g_free()! */ + + devc->num_transfers = 0; + g_free(devc->transfers); +} + +static void free_transfer(struct libusb_transfer *transfer) +{ + struct dev_context *devc = transfer->user_data; + unsigned int i; + + g_free(transfer->buffer); + transfer->buffer = NULL; + libusb_free_transfer(transfer); + + for (i = 0; i < devc->num_transfers; i++) { + if (devc->transfers[i] == transfer) { + devc->transfers[i] = NULL; + break; + } + } + + devc->submitted_transfers--; + if (devc->submitted_transfers == 0) + finish_acquisition(devc); + +} + +static void resubmit_transfer(struct libusb_transfer *transfer) +{ + int ret = libusb_submit_transfer(transfer); + + if (LIBUSB_SUCCESS == ret) + return; + + free_transfer(transfer); + /* TODO: Stop session? */ + + sr_err("fx2lafw: %s: %s", __func__, libusb_error_name(ret)); } static void receive_transfer(struct libusb_transfer *transfer) { - /* TODO: These statics have to move to the ctx struct. */ - static int empty_transfer_count = 0; + gboolean packet_has_error = FALSE; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; - struct context *ctx = transfer->user_data; + struct dev_context *devc = transfer->user_data; int trigger_offset, i; - uint8_t *new_buf; /* * If acquisition has already ended, just free any queued up * transfer that come in. */ - if (ctx->num_samples == -1) { - if (transfer) - libusb_free_transfer(transfer); - - ctx->submitted_transfers--; - if (ctx->submitted_transfers == 0) - finish_acquisition(ctx); - + if (devc->num_samples == -1) { + free_transfer(transfer); return; } @@ -698,55 +786,55 @@ static void receive_transfer(struct libusb_transfer *transfer) /* Save incoming transfer before reusing the transfer struct. */ uint8_t *const cur_buf = transfer->buffer; - const int sample_width = ctx->sample_wide ? 2 : 1; + const int sample_width = devc->sample_wide ? 2 : 1; const int cur_sample_count = transfer->actual_length / sample_width; - /* Fire off a new request. */ - if (!(new_buf = g_try_malloc(4096))) { - sr_err("fx2lafw: %s: new_buf malloc failed.", __func__); - libusb_free_transfer(transfer); - return; /* TODO: SR_ERR_MALLOC */ - } - - transfer->buffer = new_buf; - transfer->length = 4096; - if (libusb_submit_transfer(transfer) != 0) { - /* TODO: Stop session? */ - /* TODO: Better error message. */ - sr_err("fx2lafw: %s: libusb_submit_transfer error.", __func__); + switch (transfer->status) { + case LIBUSB_TRANSFER_NO_DEVICE: + abort_acquisition(devc); + free_transfer(transfer); + return; + case LIBUSB_TRANSFER_COMPLETED: + case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */ + break; + default: + packet_has_error = TRUE; + break; } - if (transfer->actual_length == 0) { - empty_transfer_count++; - if (empty_transfer_count > MAX_EMPTY_TRANSFERS) { + if (transfer->actual_length == 0 || packet_has_error) { + devc->empty_transfer_count++; + if (devc->empty_transfer_count > MAX_EMPTY_TRANSFERS) { /* * The FX2 gave up. End the acquisition, the frontend * will work out that the samplecount is short. */ - abort_acquisition(ctx); + abort_acquisition(devc); + free_transfer(transfer); + } else { + resubmit_transfer(transfer); } - g_free(cur_buf); return; } else { - empty_transfer_count = 0; + devc->empty_transfer_count = 0; } trigger_offset = 0; - if (ctx->trigger_stage >= 0) { + if (devc->trigger_stage >= 0) { for (i = 0; i < cur_sample_count; i++) { - const uint16_t cur_sample = ctx->sample_wide ? + const uint16_t cur_sample = devc->sample_wide ? *((const uint16_t*)cur_buf + i) : *((const uint8_t*)cur_buf + i); - if ((cur_sample & ctx->trigger_mask[ctx->trigger_stage]) == - ctx->trigger_value[ctx->trigger_stage]) { + if ((cur_sample & devc->trigger_mask[devc->trigger_stage]) == + devc->trigger_value[devc->trigger_stage]) { /* Match on this trigger stage. */ - ctx->trigger_buffer[ctx->trigger_stage] = cur_sample; - ctx->trigger_stage++; + devc->trigger_buffer[devc->trigger_stage] = cur_sample; + devc->trigger_stage++; - if (ctx->trigger_stage == NUM_TRIGGER_STAGES || - ctx->trigger_mask[ctx->trigger_stage] == 0) { + if (devc->trigger_stage == NUM_TRIGGER_STAGES || + devc->trigger_mask[devc->trigger_stage] == 0) { /* Match on all trigger stages, we're done. */ trigger_offset = i + 1; @@ -756,7 +844,7 @@ static void receive_transfer(struct libusb_transfer *transfer) */ packet.type = SR_DF_TRIGGER; packet.payload = NULL; - sr_session_send(ctx->session_dev_id, &packet); + sr_session_send(devc->session_dev_id, &packet); /* * Send the samples that triggered it, since we're @@ -764,15 +852,15 @@ static void receive_transfer(struct libusb_transfer *transfer) */ packet.type = SR_DF_LOGIC; packet.payload = &logic; - logic.unitsize = sizeof(*ctx->trigger_buffer); - logic.length = ctx->trigger_stage * logic.unitsize; - logic.data = ctx->trigger_buffer; - sr_session_send(ctx->session_dev_id, &packet); + logic.unitsize = sizeof(*devc->trigger_buffer); + logic.length = devc->trigger_stage * logic.unitsize; + logic.data = devc->trigger_buffer; + sr_session_send(devc->session_dev_id, &packet); - ctx->trigger_stage = TRIGGER_FIRED; + devc->trigger_stage = TRIGGER_FIRED; break; } - } else if (ctx->trigger_stage > 0) { + } else if (devc->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 @@ -780,16 +868,16 @@ static void receive_transfer(struct libusb_transfer *transfer) * the next sample from the one that matched originally, which the * counter increment at the end of the loop takes care of. */ - i -= ctx->trigger_stage; + i -= devc->trigger_stage; if (i < -1) i = -1; /* Oops, went back past this buffer. */ /* Reset trigger stage. */ - ctx->trigger_stage = 0; + devc->trigger_stage = 0; } } } - if (ctx->trigger_stage == TRIGGER_FIRED) { + if (devc->trigger_stage == TRIGGER_FIRED) { /* Send the incoming transfer to the session bus. */ const int trigger_offset_bytes = trigger_offset * sample_width; packet.type = SR_DF_LOGIC; @@ -797,12 +885,14 @@ static void receive_transfer(struct libusb_transfer *transfer) logic.length = transfer->actual_length - trigger_offset_bytes; logic.unitsize = sample_width; logic.data = cur_buf + trigger_offset_bytes; - sr_session_send(ctx->session_dev_id, &packet); - - ctx->num_samples += cur_sample_count; - if (ctx->limit_samples && - (unsigned int)ctx->num_samples > ctx->limit_samples) { - abort_acquisition(ctx); + sr_session_send(devc->session_dev_id, &packet); + + devc->num_samples += cur_sample_count; + if (devc->limit_samples && + (unsigned int)devc->num_samples > devc->limit_samples) { + abort_acquisition(devc); + free_transfer(transfer); + return; } } else { /* @@ -810,83 +900,130 @@ static void receive_transfer(struct libusb_transfer *transfer) * ratio-sized buffer. */ } - g_free(cur_buf); + + resubmit_transfer(transfer); } -static int hw_dev_acquisition_start(int dev_index, void *cb_data) +static unsigned int to_bytes_per_ms(unsigned int samplerate) { - struct sr_dev_inst *sdi; - struct sr_datafeed_packet *packet; - struct sr_datafeed_header *header; + return samplerate / 1000; +} + +static size_t get_buffer_size(struct dev_context *devc) +{ + size_t s; + + /* The buffer should be large enough to hold 10ms of data and a multiple + * of 512. */ + s = 10 * to_bytes_per_ms(devc->cur_samplerate); + return (s + 511) & ~511; +} + +static unsigned int get_number_of_transfers(struct dev_context *devc) +{ + unsigned int n; + + /* Total buffer size should be able to hold about 500ms of data */ + n = 500 * to_bytes_per_ms(devc->cur_samplerate) / get_buffer_size(devc); + + if (n > NUM_SIMUL_TRANSFERS) + return NUM_SIMUL_TRANSFERS; + + return n; +} + +static unsigned int get_timeout(struct dev_context *devc) +{ + size_t total_size; + unsigned int timeout; + + total_size = get_buffer_size(devc) * get_number_of_transfers(devc); + timeout = total_size / to_bytes_per_ms(devc->cur_samplerate); + return timeout + timeout / 4; /* Leave a headroom of 25% percent */ +} + +static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, + void *cb_data) +{ + struct sr_datafeed_packet packet; + struct sr_datafeed_header header; struct sr_datafeed_meta_logic meta; - struct context *ctx; + struct dev_context *devc; + struct drv_context *drvc = fdi->priv; struct libusb_transfer *transfer; const struct libusb_pollfd **lupfd; - int ret, size, i; + unsigned int i; + int ret; unsigned char *buf; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) + devc = sdi->priv; + if (devc->submitted_transfers != 0) return SR_ERR; - ctx = sdi->priv; - ctx->session_dev_id = cb_data; - ctx->num_samples = 0; - if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { - sr_err("fx2lafw: %s: packet malloc failed.", __func__); - return SR_ERR_MALLOC; + if (configure_probes(sdi) != SR_OK) { + sr_err("fx2lafw: failed to configured probes"); + return SR_ERR; } - if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("fx2lafw: %s: header malloc failed.", __func__); + devc->session_dev_id = cb_data; + devc->num_samples = 0; + devc->empty_transfer_count = 0; + + const unsigned int timeout = get_timeout(devc); + const unsigned int num_transfers = get_number_of_transfers(devc); + const size_t size = get_buffer_size(devc); + + devc->transfers = g_try_malloc0(sizeof(*devc->transfers) * num_transfers); + if (!devc->transfers) { + sr_err("fx2lafw: USB transfers malloc failed."); return SR_ERR_MALLOC; } - /* Start with 2K transfer, subsequently increased to 4K. */ - size = 2048; - for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) { + devc->num_transfers = num_transfers; + + for (i = 0; i < num_transfers; i++) { if (!(buf = g_try_malloc(size))) { sr_err("fx2lafw: %s: buf malloc failed.", __func__); return SR_ERR_MALLOC; } transfer = libusb_alloc_transfer(0); - libusb_fill_bulk_transfer(transfer, ctx->usb->devhdl, + libusb_fill_bulk_transfer(transfer, devc->usb->devhdl, 2 | LIBUSB_ENDPOINT_IN, buf, size, - receive_transfer, ctx, 40); - if (libusb_submit_transfer(transfer) != 0) { - /* TODO: Free them all. */ + receive_transfer, devc, timeout); + if ((ret = libusb_submit_transfer(transfer)) != 0) { + sr_err("fx2lafw: %s: libusb_submit_transfer: %s.", + __func__, libusb_error_name(ret)); libusb_free_transfer(transfer); g_free(buf); + abort_acquisition(devc); return SR_ERR; } - - ctx->submitted_transfers++; - size = 4096; + devc->transfers[i] = transfer; + devc->submitted_transfers++; } - lupfd = libusb_get_pollfds(usb_context); + lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx); for (i = 0; lupfd[i]; i++) sr_source_add(lupfd[i]->fd, lupfd[i]->events, - 40, receive_data, NULL); + timeout, receive_data, NULL); free(lupfd); /* NOT g_free()! */ - packet->type = SR_DF_HEADER; - packet->payload = header; - header->feed_version = 1; - gettimeofday(&header->starttime, NULL); - sr_session_send(cb_data, packet); + packet.type = SR_DF_HEADER; + packet.payload = &header; + header.feed_version = 1; + gettimeofday(&header.starttime, NULL); + sr_session_send(cb_data, &packet); /* Send metadata about the SR_DF_LOGIC packets to come. */ - packet->type = SR_DF_META_LOGIC; - packet->payload = &meta; - meta.samplerate = ctx->cur_samplerate; - meta.num_probes = ctx->sample_wide ? 16 : 8; - sr_session_send(cb_data, packet); - - g_free(header); - g_free(packet); - - if ((ret = command_start_acquisition (ctx->usb->devhdl, - ctx->cur_samplerate, ctx->sample_wide)) != SR_OK) { + packet.type = SR_DF_META_LOGIC; + packet.payload = &meta; + meta.samplerate = devc->cur_samplerate; + meta.num_probes = devc->sample_wide ? 16 : 8; + sr_session_send(cb_data, &packet); + + if ((ret = command_start_acquisition (devc->usb->devhdl, + devc->cur_samplerate, devc->sample_wide)) != SR_OK) { + abort_acquisition(devc); return ret; } @@ -894,16 +1031,10 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) } /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ -static int hw_dev_acquisition_stop(int dev_index, void *cb_data) +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - struct sr_dev_inst *sdi; - - /* Avoid compiler warnings. */ (void)cb_data; - if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) - return SR_ERR; - abort_acquisition(sdi->priv); return SR_OK; @@ -915,12 +1046,14 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = { .api_version = 1, .init = hw_init, .cleanup = hw_cleanup, + .scan = hw_scan, + .dev_list = hw_dev_list, + .dev_clear = clear_instances, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .dev_info_get = hw_dev_info_get, - .dev_status_get = hw_dev_status_get, - .hwcap_get_all = hw_hwcap_get_all, + .info_get = hw_info_get, .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, + .priv = NULL, };