X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=cb9963f52eac11389219968cc17570200dc264af;hb=dba024420f934ff10f18eebbaad1f4e97c739259;hp=d0834dedb870dcfb169456c4dce30c0a6cd7a79e;hpb=0abee5076fd7751bd77d0fee940d617a1a40ea34;p=libsigrok.git diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index d0834ded..cb9963f5 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -26,6 +26,7 @@ #include "sigrok.h" #include "sigrok-internal.h" #include "fx2lafw.h" +#include "command.h" static struct fx2lafw_profile supported_fx2[] = { /* USBee AX */ @@ -77,6 +78,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); /** @@ -165,8 +167,8 @@ static int fx2lafw_open_dev(int dev_index) 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) { @@ -368,6 +370,13 @@ static int hw_dev_open(int dev_index) 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 +451,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 +484,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 +514,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 +575,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 +591,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 +606,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 err, 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__); @@ -601,6 +625,11 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) return SR_ERR_MALLOC; } + if ((err = command_start_acquisition (ctx->usb->devhdl, + ctx->cur_samplerate)) != SR_OK) { + return err; + } + /* Start with 2K transfer, subsequently increased to 4K. */ size = 2048; for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) { @@ -631,9 +660,9 @@ 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(session_dev_id, packet); + sr_session_send(cb_data, packet); g_free(header); g_free(packet); @@ -641,19 +670,17 @@ 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 *session_dev_id) +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(session_dev_id, &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; }