X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=2260cddfc3508f781fbb37fa23db63eb5a61884a;hb=98494dc8a393f6e1b73fddb1e59aa3a3f590d764;hp=368b0245c0086f3abc39657483065ecfddccd320;hpb=dc9dbe949a2c195ec0c5afff34bec3cc03a5613b;p=libsigrok.git diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index 368b0245..2260cddf 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -1,7 +1,7 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2013 Bert Vermeulen * Copyright (C) 2012 Joel Holdsworth * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,6 @@ #include #include #include -#include "config.h" #include "libsigrok.h" #include "libsigrok-internal.h" #include "fx2lafw.h" @@ -82,37 +81,27 @@ static const struct fx2lafw_profile supported_fx2[] = { { 0, 0, 0, 0, 0, 0, 0 } }; -static const int hwcaps[] = { - SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_SAMPLERATE, +static const int32_t hwopts[] = { + SR_CONF_CONN, +}; + +static const int32_t hwcaps[] = { + SR_CONF_LOGIC_ANALYZER, + SR_CONF_TRIGGER_TYPE, + SR_CONF_SAMPLERATE, /* These are really implemented in the driver, not the hardware. */ - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_CONTINUOUS, - 0, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_CONTINUOUS, }; static const char *probe_names[] = { - "0", - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "13", - "14", - "15", + "0", "1", "2", "3", "4", "5", "6", "7", + "8", "9", "10", "11", "12", "13", "14", "15", NULL, }; -static const uint64_t supported_samplerates[] = { +static const uint64_t samplerates[] = { SR_KHZ(20), SR_KHZ(25), SR_KHZ(50), @@ -129,23 +118,10 @@ static const uint64_t supported_samplerates[] = { SR_MHZ(12), SR_MHZ(16), SR_MHZ(24), - 0, -}; - -static const struct sr_samplerates samplerates = { - 0, - 0, - 0, - supported_samplerates, }; 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(const struct sr_dev_inst *sdi, - void *cb_data); +static struct sr_dev_driver *di = &fx2lafw_driver_info; /** * Check the USB configuration to determine if this is an fx2lafw device. @@ -171,7 +147,7 @@ static gboolean check_conf_profile(libusb_device *dev) break; if (libusb_get_string_descriptor_ascii(hdl, - des.iManufacturer, strdesc, sizeof(strdesc)) < 0) + des.iManufacturer, strdesc, sizeof(strdesc)) < 0) break; if (strncmp((const char *)strdesc, "sigrok", 6)) break; @@ -194,32 +170,34 @@ static gboolean check_conf_profile(libusb_device *dev) static int fx2lafw_dev_open(struct sr_dev_inst *sdi) { libusb_device **devlist; + struct sr_usb_dev_inst *usb; struct libusb_device_descriptor des; - struct drv_context *drvc; struct dev_context *devc; + struct drv_context *drvc; struct version_info vi; - int ret, skip, i; + int ret, skip, i, device_count; uint8_t revid; - drvc = fdi->priv; + drvc = di->priv; devc = sdi->priv; + usb = sdi->conn; if (sdi->status == SR_ST_ACTIVE) - /* already in use */ + /* Device is already in use. */ return SR_ERR; skip = 0; - const int device_count = libusb_get_device_list(drvc->usb_context, &devlist); + 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); + sr_err("Failed to get device list: %s.", + libusb_error_name(device_count)); return SR_ERR; } 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("Failed to get device descriptor: %s.", + libusb_error_name(ret)); continue; } @@ -238,34 +216,34 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi) * 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]) != devc->usb->bus - || libusb_get_device_address(devlist[i]) != devc->usb->address) - /* this is not the one */ + if (libusb_get_bus_number(devlist[i]) != usb->bus + || libusb_get_device_address(devlist[i]) != usb->address) + /* This is not the one. */ continue; } - if (!(ret = libusb_open(devlist[i], &devc->usb->devhdl))) { - if (devc->usb->address == 0xff) + if (!(ret = libusb_open(devlist[i], &usb->devhdl))) { + if (usb->address == 0xff) /* - * first time we touch this device after firmware upload, - * so we don't know the address yet. + * First time we touch this device after FW + * upload, so we don't know the address yet. */ - devc->usb->address = libusb_get_device_address(devlist[i]); + usb->address = libusb_get_device_address(devlist[i]); } else { - sr_err("fx2lafw: Failed to open device: %d.", ret); + sr_err("Failed to open device: %s.", + libusb_error_name(ret)); break; } - ret = command_get_fw_version(devc->usb->devhdl, &vi); + ret = command_get_fw_version(usb->devhdl, &vi); if (ret != SR_OK) { - sr_err("fx2lafw: Failed to retrieve " - "firmware version information."); + sr_err("Failed to get firmware version."); break; } - ret = command_get_revid_version(devc->usb->devhdl, &revid); + ret = command_get_revid_version(usb->devhdl, &revid); if (ret != SR_OK) { - sr_err("fx2lafw: Failed to retrieve REVID."); + sr_err("Failed to get REVID."); break; } @@ -275,17 +253,20 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi) * Different minor versions are OK, they should be compatible. */ if (vi.major != FX2LAFW_REQUIRED_VERSION_MAJOR) { - sr_err("fx2lafw: Expected firmware version %d.x, " + sr_err("Expected firmware version %d.x, " "got %d.%d.", FX2LAFW_REQUIRED_VERSION_MAJOR, vi.major, vi.minor); break; } sdi->status = SR_ST_ACTIVE; - sr_info("fx2lafw: Opened device %d on %d.%d " - "interface %d, firmware %d.%d, REVID %d.", - sdi->index, devc->usb->bus, devc->usb->address, - USB_INTERFACE, vi.major, vi.minor, revid); + sr_info("Opened device %d on %d.%d, " + "interface %d, firmware %d.%d.", + sdi->index, usb->bus, usb->address, + USB_INTERFACE, vi.major, vi.minor); + + sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.", + revid, (revid != 1) ? " (FX2)" : "A (FX2LP)"); break; } @@ -297,20 +278,22 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi) return SR_OK; } -static int configure_probes(struct dev_context *devc, 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++) { 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; @@ -349,104 +332,82 @@ static struct dev_context *fx2lafw_dev_new(void) { struct dev_context *devc; - if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_err("fx2lafw: %s: devc malloc failed.", __func__); + if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { + sr_err("Device context malloc failed."); return NULL; } - devc->trigger_stage = TRIGGER_FIRED; + devc->profile = NULL; + devc->fw_updated = 0; + devc->cur_samplerate = 0; + devc->limit_samples = 0; + devc->sample_wide = 0; return devc; } -static int clear_instances(void) +static int dev_clear(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); - sdi = l->data; - sr_dev_inst_free(sdi); - } - - g_slist_free(drvc->instances); - drvc->instances = NULL; - - return ret; + return std_dev_clear(di, NULL); } - -/* - * API callbacks - */ - -static int hw_init(void) +static int init(struct sr_context *sr_ctx) { - struct drv_context *drvc; - - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("fx2lafw: driver context malloc failed."); - return SR_ERR; - } - - if (libusb_init(&drvc->usb_context) != 0) { - g_free(drvc); - sr_warn("fx2lafw: Failed to initialize libusb."); - return SR_ERR; - } - - fdi->priv = drvc; - - return SR_OK; + return std_init(sr_ctx, di, LOG_PREFIX); } -static GSList *hw_scan(GSList *options) +static GSList *scan(GSList *options) { - GSList *devices; - struct libusb_device_descriptor des; - struct sr_dev_inst *sdi; - const struct fx2lafw_profile *prof; struct drv_context *drvc; struct dev_context *devc; + struct sr_dev_inst *sdi; + struct sr_usb_dev_inst *usb; struct sr_probe *probe; + struct sr_config *src; + const struct fx2lafw_profile *prof; + GSList *l, *devices, *conn_devices; + struct libusb_device_descriptor des; libusb_device **devlist; int devcnt, num_logic_probes, ret, i, j; + const char *conn; - /* Avoid compiler warnings. */ - (void)options; - drvc = fdi->priv; + drvc = di->priv; - /* This scan always invalidates any previous scans. */ - clear_instances(); + conn = NULL; + for (l = options; l; l = l->next) { + src = l->data; + switch (src->key) { + case SR_CONF_CONN: + conn = g_variant_get_string(src->data, NULL); + break; + } + } + if (conn) + conn_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn); + else + conn_devices = NULL; /* Find all fx2lafw compatible devices and upload firmware to them. */ devices = NULL; - libusb_get_device_list(drvc->usb_context, &devlist); + libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); for (i = 0; devlist[i]; i++) { + if (conn) { + usb = NULL; + for (l = conn_devices; l; l = l->next) { + usb = l->data; + if (usb->bus == libusb_get_bus_number(devlist[i]) + && usb->address == libusb_get_device_address(devlist[i])) + break; + } + if (!l) + /* This device matched none of the ones that + * matched the conn specification. */ + continue; + } - if ((ret = libusb_get_device_descriptor( - devlist[i], &des)) != 0) { - sr_warn("fx2lafw: Failed to get device descriptor: %d.", ret); + if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) { + sr_warn("Failed to get device descriptor: %s.", + libusb_error_name(ret)); continue; } @@ -458,7 +419,7 @@ static GSList *hw_scan(GSList *options) } } - /* Skip if the device was not found */ + /* Skip if the device was not found. */ if (!prof) continue; @@ -467,7 +428,7 @@ static GSList *hw_scan(GSList *options) prof->vendor, prof->model, prof->model_version); if (!sdi) return NULL; - sdi->driver = fdi; + sdi->driver = di; /* Fill in probelist according to this device's profile. */ num_logic_probes = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8; @@ -486,35 +447,44 @@ static GSList *hw_scan(GSList *options) if (check_conf_profile(devlist[i])) { /* Already has the firmware, so fix the new address. */ - sr_dbg("fx2lafw: Found an fx2lafw device."); + sr_dbg("Found an fx2lafw device."); sdi->status = SR_ST_INACTIVE; - devc->usb = sr_usb_dev_inst_new - (libusb_get_bus_number(devlist[i]), - libusb_get_device_address(devlist[i]), NULL); + sdi->inst_type = SR_INST_USB; + sdi->conn = 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 */ + /* Store when this device's FW was updated. */ devc->fw_updated = g_get_monotonic_time(); else - sr_err("fx2lafw: Firmware upload failed for " + sr_err("Firmware upload failed for " "device %d.", devcnt); - devc->usb = sr_usb_dev_inst_new - (libusb_get_bus_number(devlist[i]), 0xff, NULL); + sdi->inst_type = SR_INST_USB; + sdi->conn = sr_usb_dev_inst_new (libusb_get_bus_number(devlist[i]), + 0xff, NULL); } } libusb_free_device_list(devlist, 1); + g_slist_free_full(conn_devices, (GDestroyNotify)sr_usb_dev_inst_free); return devices; } -static int hw_dev_open(struct sr_dev_inst *sdi) +static GSList *dev_list(void) { + return ((struct drv_context *)(di->priv))->instances; +} + +static int dev_open(struct sr_dev_inst *sdi) +{ + struct sr_usb_dev_inst *usb; struct dev_context *devc; int ret; int64_t timediff_us, timediff_ms; devc = sdi->priv; + usb = sdi->conn; /* * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS @@ -522,8 +492,8 @@ static int hw_dev_open(struct sr_dev_inst *sdi) */ ret = SR_ERR; 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 */ + sr_info("Waiting for device to reset."); + /* Takes >= 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) { @@ -533,33 +503,36 @@ static int hw_dev_open(struct sr_dev_inst *sdi) timediff_us = g_get_monotonic_time() - devc->fw_updated; timediff_ms = timediff_us / 1000; - sr_spew("fx2lafw: waited %" PRIi64 " ms", timediff_ms); + sr_spew("Waited %" PRIi64 "ms.", timediff_ms); } - sr_info("fx2lafw: Device came back after %d ms.", timediff_ms); + if (ret != SR_OK) { + sr_err("Device failed to renumerate."); + return SR_ERR; + } + sr_info("Device came back after %" PRIi64 "ms.", timediff_ms); } else { + sr_info("Firmware upload was not needed."); ret = fx2lafw_dev_open(sdi); } if (ret != SR_OK) { - sr_err("fx2lafw: Unable to open device."); + sr_err("Unable to open device."); return SR_ERR; } - devc = sdi->priv; - ret = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE); + ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE); if (ret != 0) { switch(ret) { case LIBUSB_ERROR_BUSY: - sr_err("fx2lafw: Unable to claim USB interface. Another " - "program or driver has already claimed it."); + sr_err("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."); + sr_err("Device has been disconnected."); break; - default: - sr_err("fx2lafw: Unable to claim interface: %d.", ret); + sr_err("Unable to claim interface: %s.", + libusb_error_name(ret)); break; } @@ -568,130 +541,146 @@ static int hw_dev_open(struct sr_dev_inst *sdi) if (devc->cur_samplerate == 0) { /* Samplerate hasn't been set; default to the slowest one. */ - if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE, - &supported_samplerates[0]) == SR_ERR) - return SR_ERR; + devc->cur_samplerate = samplerates[0]; } return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int dev_close(struct sr_dev_inst *sdi) { - struct dev_context *devc; + struct sr_usb_dev_inst *usb; - devc = sdi->priv; - if (devc->usb->devhdl == NULL) + usb = sdi->conn; + if (usb->devhdl == NULL) return SR_ERR; 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->index, usb->bus, usb->address, USB_INTERFACE); + libusb_release_interface(usb->devhdl, USB_INTERFACE); + libusb_close(usb->devhdl); + usb->devhdl = NULL; sdi->status = SR_ST_INACTIVE; return SR_OK; } -static int hw_cleanup(void) +static int cleanup(void) { - struct drv_context *drvc; int ret; + struct drv_context *drvc; - if (!(drvc = fdi->priv)) + if (!(drvc = di->priv)) return SR_OK; - drvc = fdi->priv; - ret = clear_instances(); - - if (drvc->usb_context) - libusb_exit(drvc->usb_context); - drvc->usb_context = NULL; + ret = dev_clear(); g_free(drvc); - fdi->priv = NULL; + di->priv = NULL; return ret; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) { struct dev_context *devc; - - switch (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_NUM_PROBES: - if (sdi) { - devc = sdi->priv; - *data = GINT_TO_POINTER( - (devc->profile->dev_caps & DEV_CAPS_16BIT) ? - 16 : 8); - } else + struct sr_usb_dev_inst *usb; + char str[128]; + + switch (id) { + case SR_CONF_CONN: + if (!sdi || !sdi->conn) + return SR_ERR_ARG; + usb = sdi->conn; + if (usb->address == 255) + /* Device still needs to re-enumerate after firmware + * upload, so we don't know its (future) address. */ return SR_ERR; + snprintf(str, 128, "%d.%d", usb->bus, usb->address); + *data = g_variant_new_string(str); break; - case SR_DI_PROBE_NAMES: - *data = probe_names; - break; - case SR_DI_SAMPLERATES: - *data = &samplerates; - break; - case SR_DI_TRIGGER_TYPES: - *data = TRIGGER_TYPES; - break; - case SR_DI_CUR_SAMPLERATE: - if (sdi) { - devc = sdi->priv; - *data = &devc->cur_samplerate; - } else + case SR_CONF_SAMPLERATE: + if (!sdi) return SR_ERR; + devc = sdi->priv; + *data = g_variant_new_uint64(devc->cur_samplerate); break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +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; + devc = sdi->priv; - if (hwcap == SR_HWCAP_SAMPLERATE) { - devc->cur_samplerate = *(const uint64_t *)value; + if (id == SR_CONF_SAMPLERATE) { + devc->cur_samplerate = g_variant_get_uint64(data); ret = SR_OK; - } else if (hwcap == SR_HWCAP_PROBECONFIG) { - ret = configure_probes(devc, (GSList *) value); - } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { - devc->limit_samples = *(const uint64_t *)value; + } else if (id == SR_CONF_LIMIT_SAMPLES) { + devc->limit_samples = g_variant_get_uint64(data); ret = SR_OK; } else { - ret = SR_ERR; + ret = SR_ERR_NA; } 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_SCAN_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t)); + break; + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); + break; + 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 SR_CONF_TRIGGER_TYPE: + *data = g_variant_new_string(TRIGGER_TYPE); + break; + default: + return SR_ERR_NA; + } + + return SR_OK; +} + static int receive_data(int fd, int revents, void *cb_data) { - struct drv_context *drvc; struct timeval tv; + struct drv_context *drvc; - /* Avoid compiler warnings. */ (void)fd; (void)revents; (void)cb_data; - drvc = fdi->priv; + drvc = di->priv; + tv.tv_sec = tv.tv_usec = 0; - libusb_handle_events_timeout(drvc->usb_context, &tv); + libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv); return TRUE; } @@ -710,22 +699,17 @@ static void abort_acquisition(struct dev_context *devc) static void finish_acquisition(struct dev_context *devc) { - struct drv_context *drvc; struct sr_datafeed_packet packet; int i; - drvc = fdi->priv; - - /* Terminate session */ + /* Terminate session. */ packet.type = SR_DF_END; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); - /* Remove fds from polling */ - const struct libusb_pollfd **const lupfd = - libusb_get_pollfds(drvc->usb_context); - for (i = 0; lupfd[i]; i++) - sr_source_remove(lupfd[i]->fd); - free(lupfd); /* NOT g_free()! */ + /* Remove fds from polling. */ + for (i = 0; devc->usbfd[i] != -1; i++) + sr_source_remove(devc->usbfd[i]); + g_free(devc->usbfd); devc->num_transfers = 0; g_free(devc->transfers); @@ -733,9 +717,11 @@ static void finish_acquisition(struct dev_context *devc) static void free_transfer(struct libusb_transfer *transfer) { - struct dev_context *devc = transfer->user_data; + struct dev_context *devc; unsigned int i; + devc = transfer->user_data; + g_free(transfer->buffer); transfer->buffer = NULL; libusb_free_transfer(transfer); @@ -750,17 +736,19 @@ static void free_transfer(struct libusb_transfer *transfer) devc->submitted_transfers--; if (devc->submitted_transfers == 0) finish_acquisition(devc); - } static void resubmit_transfer(struct libusb_transfer *transfer) { - if (libusb_submit_transfer(transfer) != 0) { - free_transfer(transfer); - /* TODO: Stop session? */ - /* TODO: Better error message. */ - sr_err("fx2lafw: %s: libusb_submit_transfer error.", __func__); - } + int ret; + + if ((ret = libusb_submit_transfer(transfer)) == LIBUSB_SUCCESS) + return; + + free_transfer(transfer); + /* TODO: Stop session? */ + + sr_err("%s: %s", __func__, libusb_error_name(ret)); } static void receive_transfer(struct libusb_transfer *transfer) @@ -768,8 +756,12 @@ static void receive_transfer(struct libusb_transfer *transfer) gboolean packet_has_error = FALSE; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; - struct dev_context *devc = transfer->user_data; - int trigger_offset, i; + struct dev_context *devc; + int trigger_offset, i, sample_width, cur_sample_count; + int trigger_offset_bytes; + uint8_t *cur_buf; + + devc = transfer->user_data; /* * If acquisition has already ended, just free any queued up @@ -780,13 +772,13 @@ static void receive_transfer(struct libusb_transfer *transfer) return; } - sr_info("fx2lafw: receive_transfer(): status %d received %d bytes.", + sr_info("receive_transfer(): status %d received %d bytes.", transfer->status, transfer->actual_length); /* Save incoming transfer before reusing the transfer struct. */ - uint8_t *const cur_buf = transfer->buffer; - const int sample_width = devc->sample_wide ? 2 : 1; - const int cur_sample_count = transfer->actual_length / sample_width; + cur_buf = transfer->buffer; + sample_width = devc->sample_wide ? 2 : 1; + cur_sample_count = transfer->actual_length / sample_width; switch (transfer->status) { case LIBUSB_TRANSFER_NO_DEVICE: @@ -794,7 +786,7 @@ static void receive_transfer(struct libusb_transfer *transfer) free_transfer(transfer); return; case LIBUSB_TRANSFER_COMPLETED: - case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */ + case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though. */ break; default: packet_has_error = TRUE; @@ -843,18 +835,18 @@ static void receive_transfer(struct libusb_transfer *transfer) */ packet.type = SR_DF_TRIGGER; packet.payload = NULL; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); /* - * Send the samples that triggered it, since we're - * skipping past them. + * Send the samples that triggered it, + * since we're skipping past them. */ packet.type = SR_DF_LOGIC; packet.payload = &logic; 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); + sr_session_send(devc->cb_data, &packet); devc->trigger_stage = TRIGGER_FIRED; break; @@ -878,13 +870,13 @@ static void receive_transfer(struct libusb_transfer *transfer) if (devc->trigger_stage == TRIGGER_FIRED) { /* Send the incoming transfer to the session bus. */ - const int trigger_offset_bytes = trigger_offset * sample_width; + trigger_offset_bytes = trigger_offset * sample_width; packet.type = SR_DF_LOGIC; packet.payload = &logic; logic.length = transfer->actual_length - trigger_offset_bytes; logic.unitsize = sample_width; logic.data = cur_buf + trigger_offset_bytes; - sr_session_send(devc->session_dev_id, &packet); + sr_session_send(devc->cb_data, &packet); devc->num_samples += cur_sample_count; if (devc->limit_samples && @@ -912,8 +904,10 @@ 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. */ + /* + * 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; } @@ -922,7 +916,7 @@ 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 */ + /* 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) @@ -938,52 +932,62 @@ static unsigned int get_timeout(struct dev_context *devc) 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 */ + 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) +static int 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 drv_context *drvc; struct dev_context *devc; + struct drv_context *drvc; + struct sr_usb_dev_inst *usb; struct libusb_transfer *transfer; const struct libusb_pollfd **lupfd; - unsigned int i; + unsigned int i, timeout, num_transfers; int ret; unsigned char *buf; + size_t size; + + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; - drvc = fdi->priv; + drvc = di->priv; devc = sdi->priv; - if (devc->submitted_transfers != 0) + usb = sdi->conn; + + /* Configures devc->trigger_* and devc->sample_wide */ + if (configure_probes(sdi) != SR_OK) { + sr_err("Failed to configure probes."); return SR_ERR; + } - devc->session_dev_id = cb_data; + devc->cb_data = 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); + timeout = get_timeout(devc); + num_transfers = get_number_of_transfers(devc); + size = get_buffer_size(devc); + devc->submitted_transfers = 0; devc->transfers = g_try_malloc0(sizeof(*devc->transfers) * num_transfers); - if (!devc->transfers) - return SR_ERR; + if (!devc->transfers) { + sr_err("USB transfers malloc failed."); + return SR_ERR_MALLOC; + } 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__); + sr_err("USB transfer buffer malloc failed."); return SR_ERR_MALLOC; } transfer = libusb_alloc_transfer(0); - libusb_fill_bulk_transfer(transfer, devc->usb->devhdl, + libusb_fill_bulk_transfer(transfer, usb->devhdl, 2 | LIBUSB_ENDPOINT_IN, buf, size, receive_transfer, devc, timeout); - if (libusb_submit_transfer(transfer) != 0) { + if ((ret = libusb_submit_transfer(transfer)) != 0) { + sr_err("Failed to submit transfer: %s.", + libusb_error_name(ret)); libusb_free_transfer(transfer); g_free(buf); abort_acquisition(devc); @@ -993,26 +997,22 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->submitted_transfers++; } - lupfd = libusb_get_pollfds(drvc->usb_context); - for (i = 0; lupfd[i]; i++) + lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx); + for (i = 0; lupfd[i]; i++); + if (!(devc->usbfd = g_try_malloc(sizeof(struct libusb_pollfd) * (i + 1)))) + return SR_ERR; + for (i = 0; lupfd[i]; i++) { sr_source_add(lupfd[i]->fd, lupfd[i]->events, 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); - - /* Send metadata about the SR_DF_LOGIC packets to come. */ - 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->usbfd[i] = lupfd[i]->fd; + } + devc->usbfd[i] = -1; + free(lupfd); + + /* Send header packet to the session bus. */ + std_session_send_df_header(cb_data, LOG_PREFIX); + + if ((ret = command_start_acquisition (usb->devhdl, devc->cur_samplerate, devc->sample_wide)) != SR_OK) { abort_acquisition(devc); return ret; @@ -1021,12 +1021,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_OK; } -/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ -static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - - /* Avoid compiler warnings. */ (void)cb_data; abort_acquisition(sdi->priv); @@ -1038,14 +1034,17 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = { .name = "fx2lafw", .longname = "fx2lafw (generic driver for FX2 based LAs)", .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .scan = hw_scan, - .dev_open = hw_dev_open, - .dev_close = hw_dev_close, - .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, + .init = init, + .cleanup = cleanup, + .scan = scan, + .dev_list = dev_list, + .dev_clear = dev_clear, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, + .dev_open = dev_open, + .dev_close = dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };