X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=c03c6b87391726d59d024743d11fe5803da91d9e;hb=17dff8a1e6faaec02ed99715f2914b15b4cab82e;hp=39f6c1f6729a0729be4d1161dbcdc6ad7d89cc95;hpb=921634ec10feb88dd2110d10d8b1914eaa742fb6;p=libsigrok.git diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index 39f6c1f6..c03c6b87 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -36,13 +36,15 @@ static const struct fx2lafw_profile supported_fx2[] = { * ARMFLY AX-Pro */ { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, - FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", 8 }, + FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", + 0 }, /* * CWAV USBee SX */ { 0x08a9, 0x0009, "CWAV", "USBee SX", NULL, - FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw", 8 }, + FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw", + 0 }, /* * Saleae Logic @@ -51,7 +53,8 @@ static const struct fx2lafw_profile supported_fx2[] = { * Robomotic BugLogic 3 */ { 0x0925, 0x3881, "Saleae", "Logic", NULL, - FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", 8 }, + FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", + 0 }, /* * Default Cypress FX2 without EEPROM, e.g.: @@ -59,18 +62,20 @@ static const struct fx2lafw_profile supported_fx2[] = { * Braintechnology USB Interface V2.x */ { 0x04B4, 0x8613, "Cypress", "FX2", NULL, - FIRMWARE_DIR "/fx2lafw-cypress-fx2.fw", 8 }, + FIRMWARE_DIR "/fx2lafw-cypress-fx2.fw", + DEV_CAPS_16BIT }, /* * Braintechnology USB-LPS */ { 0x16d0, 0x0498, "Braintechnology", "USB-LPS", NULL, - FIRMWARE_DIR "/fx2lafw-braintechnology-usb-lps.fw", 8 }, + FIRMWARE_DIR "/fx2lafw-braintechnology-usb-lps.fw", + DEV_CAPS_16BIT }, { 0, 0, 0, 0, 0, 0, 0 } }; -static int hwcaps[] = { +static const int hwcaps[] = { SR_HWCAP_LOGIC_ANALYZER, SR_HWCAP_SAMPLERATE, @@ -92,10 +97,18 @@ static const char *probe_names[] = { "5", "6", "7", + "8", + "9", + "10", + "11", + "12", + "13", + "14", + "15", NULL, }; -static uint64_t supported_samplerates[] = { +static const uint64_t supported_samplerates[] = { SR_KHZ(20), SR_KHZ(25), SR_KHZ(50), @@ -115,7 +128,7 @@ static uint64_t supported_samplerates[] = { 0, }; -static struct sr_samplerates samplerates = { +static const struct sr_samplerates samplerates = { 0, 0, 0, @@ -125,7 +138,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); /** @@ -251,11 +264,15 @@ 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.%d " - "got %d.%d.", FX2LAFW_VERSION_MAJOR, - FX2LAFW_VERSION_MINOR, vi.major, vi.minor); + /* + * 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; } @@ -309,6 +326,10 @@ static int configure_probes(struct context *ctx, GSList *probes) probe = (struct sr_probe *)l->data; if (probe->enabled == FALSE) continue; + + if (probe->index > 8) + ctx->sample_wide = TRUE; + probe_bit = 1 << (probe->index - 1); if (!(probe->trigger)) continue; @@ -446,8 +467,7 @@ static int hw_dev_open(int dev_index) * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS * milliseconds for the FX2 to renumerate. */ - ret = 0; - + ret = SR_ERR; 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 */ @@ -459,9 +479,8 @@ static int hw_dev_open(int dev_index) g_usleep(100 * 1000); 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); + 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 { @@ -476,7 +495,21 @@ static int hw_dev_open(int dev_index) ret = libusb_claim_interface(ctx->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: %d.", ret); + break; + } + return SR_ERR; } @@ -542,7 +575,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; @@ -555,7 +588,9 @@ static void *hw_dev_info_get(int dev_index, int dev_info_id) case SR_DI_INST: return sdi; case SR_DI_NUM_PROBES: - return GINT_TO_POINTER(ctx->profile->num_probes); + return GINT_TO_POINTER( + (ctx->profile->dev_caps & DEV_CAPS_16BIT) ? + 16 : 8); case SR_DI_PROBE_NAMES: return probe_names; case SR_DI_SAMPLERATES: @@ -580,12 +615,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; @@ -596,12 +631,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; @@ -647,6 +682,44 @@ static void finish_acquisition(struct context *ctx) free(lupfd); /* NOT g_free()! */ } +static void free_transfer(struct libusb_transfer *transfer) +{ + struct context *ctx = transfer->user_data; + + g_free(transfer->buffer); + transfer->buffer = NULL; + libusb_free_transfer(transfer); + + ctx->submitted_transfers--; + if (ctx->submitted_transfers == 0) + finish_acquisition(ctx); + +} + +static void resubmit_transfer(struct libusb_transfer *transfer) +{ + uint8_t *new_buf; + + /* Increase buffer size to 4096 */ + if (transfer->length != 4096) { + new_buf = g_try_malloc(4096); + /* If allocation of the new buffer fails, just vdo not bother and + * continue to use the old one. */ + if (new_buf) { + g_free(transfer->buffer); + transfer->buffer = new_buf; + transfer->length = 4096; + } + } + + 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__); + } +} + static void receive_transfer(struct libusb_transfer *transfer) { /* TODO: These statics have to move to the ctx struct. */ @@ -654,21 +727,14 @@ static void receive_transfer(struct libusb_transfer *transfer) struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; struct context *ctx = transfer->user_data; - int cur_buflen, trigger_offset, i; - unsigned char *cur_buf, *new_buf; + int trigger_offset, i; /* * 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); - + free_transfer(transfer); return; } @@ -676,24 +742,11 @@ static void receive_transfer(struct libusb_transfer *transfer) transfer->status, transfer->actual_length); /* Save incoming transfer before reusing the transfer struct. */ - cur_buf = transfer->buffer; - cur_buflen = transfer->actual_length; - - /* Fire off a new request. */ - if (!(new_buf = g_try_malloc(4096))) { - sr_err("fx2lafw: %s: new_buf malloc failed.", __func__); - return; /* TODO: SR_ERR_MALLOC */ - } + uint8_t *const cur_buf = transfer->buffer; + const int sample_width = ctx->sample_wide ? 2 : 1; + const int cur_sample_count = transfer->actual_length / sample_width; - 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__); - } - - if (cur_buflen == 0) { + if (transfer->actual_length == 0) { empty_transfer_count++; if (empty_transfer_count > MAX_EMPTY_TRANSFERS) { /* @@ -701,6 +754,9 @@ static void receive_transfer(struct libusb_transfer *transfer) * will work out that the samplecount is short. */ abort_acquisition(ctx); + free_transfer(transfer); + } else { + resubmit_transfer(transfer); } return; } else { @@ -709,14 +765,20 @@ static void receive_transfer(struct libusb_transfer *transfer) trigger_offset = 0; if (ctx->trigger_stage >= 0) { - for (i = 0; i < cur_buflen; i++) { + for (i = 0; i < cur_sample_count; i++) { - if ((cur_buf[i] & ctx->trigger_mask[ctx->trigger_stage]) == ctx->trigger_value[ctx->trigger_stage]) { + const uint16_t cur_sample = ctx->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]) { /* Match on this trigger stage. */ - ctx->trigger_buffer[ctx->trigger_stage] = cur_buf[i]; + ctx->trigger_buffer[ctx->trigger_stage] = cur_sample; ctx->trigger_stage++; - if (ctx->trigger_stage == NUM_TRIGGER_STAGES || ctx->trigger_mask[ctx->trigger_stage] == 0) { + if (ctx->trigger_stage == NUM_TRIGGER_STAGES || + ctx->trigger_mask[ctx->trigger_stage] == 0) { /* Match on all trigger stages, we're done. */ trigger_offset = i + 1; @@ -734,25 +796,22 @@ static void receive_transfer(struct libusb_transfer *transfer) */ packet.type = SR_DF_LOGIC; packet.payload = &logic; - logic.length = ctx->trigger_stage; - logic.unitsize = 1; + 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); ctx->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 (ctx->trigger_stage > 0) { + } else if (ctx->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 + * 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. + */ i -= ctx->trigger_stage; if (i < -1) i = -1; /* Oops, went back past this buffer. */ @@ -764,15 +823,15 @@ static void receive_transfer(struct libusb_transfer *transfer) if (ctx->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; packet.payload = &logic; - logic.length = cur_buflen - trigger_offset; - logic.unitsize = 1; - logic.data = cur_buf + trigger_offset; + 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); - g_free(cur_buf); - ctx->num_samples += cur_buflen; + ctx->num_samples += cur_sample_count; if (ctx->limit_samples && (unsigned int)ctx->num_samples > ctx->limit_samples) { abort_acquisition(ctx); @@ -783,13 +842,16 @@ static void receive_transfer(struct libusb_transfer *transfer) * ratio-sized buffer. */ } + + resubmit_transfer(transfer); } 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_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; @@ -802,16 +864,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) 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 (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("fx2lafw: %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++) { @@ -840,18 +892,21 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) 40, receive_data, NULL); free(lupfd); /* NOT g_free()! */ - packet->type = SR_DF_HEADER; - 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); - g_free(header); - g_free(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); if ((ret = command_start_acquisition (ctx->usb->devhdl, - ctx->cur_samplerate)) != SR_OK) { + ctx->cur_samplerate, ctx->sample_wide)) != SR_OK) { return ret; }