X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=ddf2f0dc2cdd70996aed382395d882a7ccd883a3;hb=ebc347388240e025181265f7d3d63a22f7bd5da9;hp=20be9f8469319a9dda9c1ca5082f6906533f23f3;hpb=c8f2c9dda4027fe723aabccb4265629c374afcd9;p=libsigrok.git diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index 20be9f84..ddf2f0dc 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -26,11 +26,28 @@ #include "sigrok.h" #include "sigrok-internal.h" #include "fx2lafw.h" +#include "command.h" -static struct fx2lafw_profile supported_fx2[] = { - /* USBee AX */ - { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, 8 }, - { 0, 0, 0, 0, 0, 0 } +static const struct fx2lafw_profile supported_fx2[] = { + /* CWAV USBee AX + * EE Electronics ESLA201A + */ + { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, + FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", 8 }, + + /* CWAV USBee SX + */ + { 0x08a9, 0x0009, "CWAV", "USBee SX", NULL, + FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw", 8 }, + + /* Saleae Logic + * EE Electronics ESLA100 + * Robomotic MiniLogic + */ + { 0x0925, 0x3881, "Saleae", "Logic", NULL, + FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", 8 }, + + { 0, 0, 0, 0, 0, 0, 0 } }; static int fx2lafw_capabilities[] = { @@ -77,6 +94,7 @@ static struct sr_samplerates fx2lafw_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_acquisition_stop(int dev_index, void *session_dev_id); /** @@ -93,7 +111,7 @@ static gboolean check_conf_profile(libusb_device *dev) gboolean ret = FALSE; while (!ret) { - /* Assume it's not a Saleae Logic unless proven wrong. */ + /* Assume the firmware has not been loaded, unless proven wrong. */ ret = 0; if (libusb_get_device_descriptor(dev, &des) != 0) @@ -115,18 +133,13 @@ static gboolean check_conf_profile(libusb_device *dev) break; intf_dsc = &(conf_dsc->interface[0].altsetting[0]); - if (intf_dsc->bNumEndpoints != 3) - /* Need exactly 3 end points. */ + if (intf_dsc->bNumEndpoints != 2) + /* Need exactly 2 end points. */ break; if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) != - (1 | LIBUSB_ENDPOINT_OUT)) - /* The first endpoint should be 1 (outbound). */ - break; - - if ((intf_dsc->endpoint[1].bEndpointAddress & 0x8f) != - (2 | LIBUSB_ENDPOINT_IN)) - /* The second endpoint should be 2 (inbound). */ + (2 | LIBUSB_ENDPOINT_IN)) // 0x82 + /* The first endpoint should be 2 (inbound). */ break; /* TODO: Check the debug channel... */ @@ -147,7 +160,7 @@ static int fx2lafw_open_dev(int dev_index) struct libusb_device_descriptor des; struct sr_dev_inst *sdi; struct context *ctx; - int err, skip, i; + int ret, skip, i; if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) return SR_ERR; @@ -160,13 +173,13 @@ static int fx2lafw_open_dev(int dev_index) skip = 0; libusb_get_device_list(usb_context, &devlist); for (i = 0; devlist[i]; i++) { - if ((err = libusb_get_device_descriptor(devlist[i], &des))) { - sr_err("fx2lafw: failed to get device descriptor: %d", err); + if ((ret = libusb_get_device_descriptor(devlist[i], &des))) { + sr_err("fx2lafw: failed to get device descriptor: %d", ret); continue; } - if (des.idVendor != FIRMWARE_VID - || des.idProduct != FIRMWARE_PID) + if (des.idVendor != ctx->profile->vid + || des.idProduct != ctx->profile->pid) continue; if (sdi->status == SR_ST_INITIALIZING) { @@ -186,7 +199,7 @@ static int fx2lafw_open_dev(int dev_index) continue; } - if (!(err = libusb_open(devlist[i], &ctx->usb->devhdl))) { + if (!(ret = libusb_open(devlist[i], &ctx->usb->devhdl))) { if (ctx->usb->address == 0xff) /* * first time we touch this device after firmware upload, @@ -199,7 +212,7 @@ static int fx2lafw_open_dev(int dev_index) sdi->index, ctx->usb->bus, ctx->usb->address, USB_INTERFACE); } else { - sr_err("fx2lafw: failed to open device: %d", err); + sr_err("fx2lafw: failed to open device: %d", ret); } /* if we made it here, we handled the device one way or another */ @@ -250,10 +263,10 @@ static int hw_init(const char *deviceinfo) { struct sr_dev_inst *sdi; struct libusb_device_descriptor des; - struct fx2lafw_profile *fx2lafw_prof; + const struct fx2lafw_profile *fx2lafw_prof; struct context *ctx; libusb_device **devlist; - int err; + int ret; int devcnt = 0; int i, j; @@ -269,9 +282,9 @@ static int hw_init(const char *deviceinfo) libusb_get_device_list(usb_context, &devlist); for (i = 0; devlist[i]; i++) { - if ((err = libusb_get_device_descriptor( + if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) { - sr_warn("failed to get device descriptor: %d", err); + sr_warn("failed to get device descriptor: %d", ret); continue; } @@ -306,7 +319,8 @@ static int hw_init(const char *deviceinfo) (libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL); } else { - if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, FIRMWARE) == SR_OK) + if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, + fx2lafw_prof->firmware) == SR_OK) /* Remember when the firmware on this device was updated */ g_get_current_time(&ctx->fw_updated); else @@ -328,7 +342,7 @@ static int hw_dev_open(int dev_index) GTimeVal cur_time; struct sr_dev_inst *sdi; struct context *ctx; - int timediff, err; + int timediff, ret; if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) return SR_ERR; @@ -338,14 +352,14 @@ static int hw_dev_open(int dev_index) * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms * for the FX2 to renumerate */ - err = 0; + ret = 0; if (GTV_TO_MSEC(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) { - if ((err = fx2lafw_open_dev(dev_index)) == SR_OK) + if ((ret = fx2lafw_open_dev(dev_index)) == SR_OK) break; g_usleep(100 * 1000); g_get_current_time(&cur_time); @@ -353,21 +367,28 @@ static int hw_dev_open(int dev_index) } sr_info("fx2lafw: device came back after %d ms", timediff); } else { - err = fx2lafw_open_dev(dev_index); + ret = fx2lafw_open_dev(dev_index); } - if (err != SR_OK) { + if (ret != SR_OK) { sr_err("fx2lafw: unable to open device"); return SR_ERR; } ctx = sdi->priv; - err = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE); - if (err != 0) { - sr_err("fx2lafw: Unable to claim interface: %d", err); + ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE); + if (ret != 0) { + sr_err("fx2lafw: Unable to claim interface: %d", ret); return SR_ERR; } + if (ctx->cur_samplerate == 0) { + /* Samplerate hasn't been set; default to the slowest one. */ + if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE, + &fx2lafw_supported_samplerates[0]) == SR_ERR) + return SR_ERR; + } + return SR_OK; } @@ -442,6 +463,8 @@ static void *hw_dev_info_get(int dev_index, int dev_info_id) return &fx2lafw_samplerates; case SR_DI_TRIGGER_TYPES: return TRIGGER_TYPES; + case SR_DI_CUR_SAMPLERATE: + return &ctx->cur_samplerate; } return NULL; @@ -473,7 +496,12 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value) return SR_ERR; ctx = sdi->priv; - if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { + if (hwcap == SR_HWCAP_SAMPLERATE) { + ctx->cur_samplerate = *(uint64_t *)value; + ret = SR_OK; + } else if (hwcap == SR_HWCAP_PROBECONFIG) { + ret = SR_OK; + } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { ctx->limit_samples = *(uint64_t *)value; ret = SR_OK; } else { @@ -498,26 +526,33 @@ static int receive_data(int fd, int revents, void *cb_data) return TRUE; } +static void abort_acquisition(struct context *ctx) +{ + struct sr_datafeed_packet packet; + + packet.type = SR_DF_END; + sr_session_send(ctx->session_dev_id, &packet); + + ctx->num_samples = -1; + + /* TODO: Need to cancel and free any queued up transfers. */ +} + static void receive_transfer(struct libusb_transfer *transfer) { /* TODO: These statics have to move to the ctx struct. */ - static int num_samples = 0; static int empty_transfer_count = 0; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; - struct context *ctx; + struct context *ctx = transfer->user_data; int cur_buflen; unsigned char *cur_buf, *new_buf; - /* hw_dev_acquisition_stop() is telling us to stop. */ - if (transfer == NULL) - num_samples = -1; - /* * If acquisition has already ended, just free any queued up * transfer that come in. */ - if (num_samples == -1) { + if (ctx->num_samples == -1) { if (transfer) libusb_free_transfer(transfer); return; @@ -552,7 +587,7 @@ static void receive_transfer(struct libusb_transfer *transfer) * The FX2 gave up. End the acquisition, the frontend * will work out that the samplecount is short. */ - hw_dev_acquisition_stop(-1, ctx->session_dev_id); + abort_acquisition(ctx); } return; } else { @@ -568,10 +603,10 @@ static void receive_transfer(struct libusb_transfer *transfer) sr_session_send(ctx->session_dev_id, &packet); g_free(cur_buf); - num_samples += cur_buflen; + ctx->num_samples += cur_buflen; if (ctx->limit_samples && - (unsigned int) num_samples > ctx->limit_samples) { - hw_dev_acquisition_stop(-1, ctx->session_dev_id); + (unsigned int) ctx->num_samples > ctx->limit_samples) { + abort_acquisition(ctx); } } @@ -583,13 +618,14 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) struct context *ctx; struct libusb_transfer *transfer; const struct libusb_pollfd **lupfd; - int size, i; + int ret, size, i; unsigned char *buf; if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) 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__); @@ -631,29 +667,32 @@ 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 = 24000000UL; + header->samplerate = ctx->cur_samplerate; header->num_logic_probes = ctx->profile->num_probes; sr_session_send(cb_data, packet); g_free(header); g_free(packet); + if ((ret = command_start_acquisition (ctx->usb->devhdl, + ctx->cur_samplerate)) != SR_OK) { + return ret; + } + return SR_OK; } /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ static int hw_dev_acquisition_stop(int dev_index, void *cb_data) { - struct sr_datafeed_packet packet; - - /* Avoid compiler warnings. */ - (void)dev_index; - - packet.type = SR_DF_END; - sr_session_send(cb_data, &packet); + struct sr_dev_inst *sdi; - receive_transfer(NULL); + /* unused parameter */ + (void)cb_data; - /* TODO: Need to cancel and free any queued up transfers. */ + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) + return SR_ERR; + + abort_acquisition(sdi->priv); return SR_OK; }