X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=9897fb9eab91cd7e0173d83b9b7265a9c4d00d0b;hb=1b79df2f57012926927983a8e2829004f0eee4fa;hp=4fc5744da84f5e6090841aa2c3bf7f2c8e2f2705;hpb=1663e4706cd966fcaed40d067ceea4b613e8125d;p=libsigrok.git diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index 4fc5744d..9897fb9e 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -1,6 +1,7 @@ /* * This file is part of the sigrok project. * + * Copyright (C) 2010-2012 Bert Vermeulen * Copyright (C) 2012 Joel Holdsworth * * This program is free software: you can redistribute it and/or modify @@ -21,7 +22,6 @@ #include #include #include -#include #include #include "config.h" #include "sigrok.h" @@ -33,6 +33,7 @@ static const struct fx2lafw_profile supported_fx2[] = { /* * CWAV USBee AX * EE Electronics ESLA201A + * ARMFLY AX-Pro */ { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", 8 }, @@ -69,7 +70,7 @@ static const struct fx2lafw_profile supported_fx2[] = { { 0, 0, 0, 0, 0, 0, 0 } }; -static int hwcaps[] = { +static const int hwcaps[] = { SR_HWCAP_LOGIC_ANALYZER, SR_HWCAP_SAMPLERATE, @@ -95,6 +96,10 @@ static const char *probe_names[] = { }; static uint64_t supported_samplerates[] = { + SR_KHZ(20), + SR_KHZ(25), + SR_KHZ(50), + SR_KHZ(100), SR_KHZ(200), SR_KHZ(250), SR_KHZ(500), @@ -120,7 +125,7 @@ static struct sr_samplerates samplerates = { static GSList *dev_insts = NULL; static libusb_context *usb_context = NULL; -static int hw_dev_config_set(int dev_index, int hwcap, void *value); +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); /** @@ -175,6 +180,7 @@ static int fx2lafw_dev_open(int dev_index) struct context *ctx; struct version_info vi; int ret, skip, i; + uint8_t revid; if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) return SR_ERR; @@ -239,19 +245,29 @@ static int fx2lafw_dev_open(int dev_index) break; } - if (vi.major != FX2LAFW_VERSION_MAJOR || - vi.minor != FX2LAFW_VERSION_MINOR) { - sr_err("fx2lafw: Expected firmware version %d.%02d " - "got %d.%02d.", FX2LAFW_VERSION_MAJOR, - FX2LAFW_VERSION_MINOR, vi.major, vi.minor); + ret = command_get_revid_version(ctx->usb->devhdl, &revid); + if (ret != SR_OK) { + sr_err("fx2lafw: Failed to retrieve REVID."); + break; + } + + /* + * Changes in major version mean incompatible/API changes, so + * bail out if we encounter an incompatible version. + * Different minor versions are OK, they should be compatible. + */ + if (vi.major != FX2LAFW_REQUIRED_VERSION_MAJOR) { + sr_err("fx2lafw: 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 version %d.%02d", + "interface %d, firmware %d.%d, REVID %d.", sdi->index, ctx->usb->bus, ctx->usb->address, - USB_INTERFACE, vi.major, vi.minor); + USB_INTERFACE, vi.major, vi.minor, revid); break; } @@ -361,7 +377,7 @@ static int hw_init(const char *devinfo) return 0; } - /* Find all fx2lafw compatible devices and upload firware to them. */ + /* Find all fx2lafw compatible devices and upload firmware to them. */ libusb_get_device_list(usb_context, &devlist); for (i = 0; devlist[i]; i++) { @@ -404,7 +420,7 @@ static int hw_init(const char *devinfo) if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, prof->firmware) == SR_OK) /* Remember when the firmware on this device was updated */ - g_get_current_time(&ctx->fw_updated); + ctx->fw_updated = g_get_monotonic_time(); else sr_err("fx2lafw: Firmware upload failed for " "device %d.", devcnt); @@ -421,33 +437,37 @@ static int hw_init(const char *devinfo) static int hw_dev_open(int dev_index) { - GTimeVal cur_time; struct sr_dev_inst *sdi; struct context *ctx; - int timediff, ret; + int ret; + int64_t timediff_us, timediff_ms; if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) return SR_ERR; ctx = sdi->priv; /* - * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms - * for the FX2 to renumerate. + * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS + * milliseconds for the FX2 to renumerate. */ ret = 0; - if (GTV_TO_MSEC(ctx->fw_updated) > 0) { + + if (ctx->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 = 0; - while (timediff < MAX_RENUM_DELAY) { + timediff_ms = 0; + while (timediff_ms < MAX_RENUM_DELAY_MS) { if ((ret = fx2lafw_dev_open(dev_index)) == SR_OK) break; g_usleep(100 * 1000); - g_get_current_time(&cur_time); - timediff = GTV_TO_MSEC(cur_time) - GTV_TO_MSEC(ctx->fw_updated); + + timediff_us = g_get_monotonic_time() - ctx->fw_updated; + timediff_ms = timediff_us / G_USEC_PER_SEC; + sr_spew("fx2lafw: timediff: %" PRIi64 " us.", + timediff_us); } - sr_info("fx2lafw: Device came back after %d ms.", timediff); + sr_info("fx2lafw: Device came back after %d ms.", timediff_ms); } else { ret = fx2lafw_dev_open(dev_index); } @@ -526,7 +546,7 @@ static int hw_cleanup(void) return ret; } -static void *hw_dev_info_get(int dev_index, int dev_info_id) +static const void *hw_dev_info_get(int dev_index, int dev_info_id) { struct sr_dev_inst *sdi; struct context *ctx; @@ -564,12 +584,12 @@ static int hw_dev_status_get(int dev_index) return sdi->status; } -static int *hw_hwcap_get_all(void) +static const int *hw_hwcap_get_all(void) { return hwcaps; } -static int hw_dev_config_set(int dev_index, int hwcap, void *value) +static int hw_dev_config_set(int dev_index, int hwcap, const void *value) { struct sr_dev_inst *sdi; struct context *ctx; @@ -580,12 +600,12 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value) ctx = sdi->priv; if (hwcap == SR_HWCAP_SAMPLERATE) { - ctx->cur_samplerate = *(uint64_t *)value; + ctx->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 = *(uint64_t *)value; + ctx->limit_samples = *(const uint64_t *)value; ret = SR_OK; } else { ret = SR_ERR; @@ -774,6 +794,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) struct sr_dev_inst *sdi; struct sr_datafeed_packet *packet; struct sr_datafeed_header *header; + struct sr_datafeed_meta_logic meta; struct context *ctx; struct libusb_transfer *transfer; const struct libusb_pollfd **lupfd; @@ -828,9 +849,15 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) packet->payload = header; header->feed_version = 1; gettimeofday(&header->starttime, NULL); - header->samplerate = ctx->cur_samplerate; - header->num_logic_probes = ctx->profile->num_probes; 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->profile->num_probes; + sr_session_send(cb_data, packet); + g_free(header); g_free(packet);