X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=359df017a56f223817453ce5be5f330b8af15b08;hb=9031ce63f3cee037ffc3e565cf324cafe38522f5;hp=cc353a80f06d378a9df217df7c94d27a5534fb9b;hpb=610dbb70914da9be34d9ac3f0c90a50356275277;p=libsigrok.git diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index cc353a80..359df017 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -19,15 +19,14 @@ #include #include -#include #include #include #include - #include "config.h" #include "sigrok.h" #include "sigrok-internal.h" #include "fx2lafw.h" +#include "command.h" static struct fx2lafw_profile supported_fx2[] = { /* USBee AX */ @@ -42,7 +41,7 @@ static int fx2lafw_capabilities[] = { /* These are really implemented in the driver, not the hardware. */ SR_HWCAP_LIMIT_SAMPLES, SR_HWCAP_CONTINUOUS, - 0 + 0, }; static const char *fx2lafw_probe_names[] = { @@ -54,7 +53,7 @@ static const char *fx2lafw_probe_names[] = { "D5", "D6", "D7", - NULL + NULL, }; static uint64_t fx2lafw_supported_samplerates[] = { @@ -66,33 +65,34 @@ static uint64_t fx2lafw_supported_samplerates[] = { SR_MHZ(8), SR_MHZ(12), SR_MHZ(16), - SR_MHZ(24) + SR_MHZ(24), }; static struct sr_samplerates fx2lafw_samplerates = { SR_MHZ(1), SR_MHZ(24), SR_HZ(0), - fx2lafw_supported_samplerates + fx2lafw_supported_samplerates, }; static GSList *dev_insts = NULL; static libusb_context *usb_context = NULL; -static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id); +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); /** * Check the USB configuration to determine if this is an fx2lafw device. * - * @return true if the device's configuration profile match fx2lafw - * configuration, flase otherwise. + * @return TRUE if the device's configuration profile match fx2lafw + * configuration, FALSE otherwise. */ -static bool check_conf_profile(libusb_device *dev) +static gboolean check_conf_profile(libusb_device *dev) { struct libusb_device_descriptor des; struct libusb_config_descriptor *conf_dsc = NULL; const struct libusb_interface_descriptor *intf_dsc; - bool ret = false; + gboolean ret = FALSE; while (!ret) { /* Assume it's not a Saleae Logic unless proven wrong. */ @@ -117,24 +117,19 @@ static bool 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... */ /* If we made it here, it must be an fx2lafw. */ - ret = true; + ret = TRUE; } if (conf_dsc) @@ -148,7 +143,7 @@ static int fx2lafw_open_dev(int dev_index) libusb_device **devlist; struct libusb_device_descriptor des; struct sr_dev_inst *sdi; - struct fx2lafw_device *ctx; + struct context *ctx; int err, skip, i; if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) @@ -167,8 +162,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) { @@ -217,7 +212,7 @@ static int fx2lafw_open_dev(int dev_index) static void close_dev(struct sr_dev_inst *sdi) { - struct fx2lafw_device *ctx; + struct context *ctx; ctx = sdi->priv; @@ -232,16 +227,16 @@ static void close_dev(struct sr_dev_inst *sdi) sdi->status = SR_ST_INACTIVE; } -static struct fx2lafw_device* fx2lafw_device_new(void) +static struct context *fx2lafw_device_new(void) { - struct fx2lafw_device *fx2lafw; + struct context *ctx; - if (!(fx2lafw = g_try_malloc0(sizeof(struct fx2lafw_device)))) { - sr_err("fx2lafw: %s: fx2lafw_device malloc failed", __func__); + if (!(ctx = g_try_malloc0(sizeof(struct context)))) { + sr_err("fx2lafw: %s: ctx malloc failed", __func__); return NULL; } - return fx2lafw; + return ctx; } /* @@ -253,7 +248,7 @@ static int hw_init(const char *deviceinfo) struct sr_dev_inst *sdi; struct libusb_device_descriptor des; struct fx2lafw_profile *fx2lafw_prof; - struct fx2lafw_device *ctx; + struct context *ctx; libusb_device **devlist; int err; int devcnt = 0; @@ -298,7 +293,7 @@ static int hw_init(const char *deviceinfo) ctx = fx2lafw_device_new(); ctx->profile = fx2lafw_prof; sdi->priv = ctx; - device_instances = g_slist_append(dev_insts, sdi); + dev_insts = g_slist_append(dev_insts, sdi); if (check_conf_profile(devlist[i])) { /* Already has the firmware, so fix the new address. */ @@ -325,14 +320,14 @@ static int hw_init(const char *deviceinfo) return devcnt; } -static int hw_dev_open(int device_index) +static int hw_dev_open(int dev_index) { GTimeVal cur_time; struct sr_dev_inst *sdi; - struct fx2lafw_device *ctx; + struct context *ctx; int timediff, err; - if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) return SR_ERR; ctx = sdi->priv; @@ -347,7 +342,7 @@ static int hw_dev_open(int device_index) g_usleep(300 * 1000); timediff = 0; while (timediff < MAX_RENUM_DELAY) { - if ((err = fx2lafw_open_dev(device_index)) == SR_OK) + if ((err = fx2lafw_open_dev(dev_index)) == SR_OK) break; g_usleep(100 * 1000); g_get_current_time(&cur_time); @@ -355,7 +350,7 @@ static int hw_dev_open(int device_index) } sr_info("fx2lafw: device came back after %d ms", timediff); } else { - err = fx2lafw_open_dev(device_index); + err = fx2lafw_open_dev(dev_index); } if (err != SR_OK) { @@ -370,6 +365,13 @@ static int hw_dev_open(int device_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; } @@ -379,7 +381,7 @@ static int hw_dev_close(int dev_index) if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { sr_err("fx2lafw: %s: sdi was NULL", __func__); - return SR_ERR; /* TODO: SR_ERR_ARG? */ + return SR_ERR_BUG; } /* TODO */ @@ -392,7 +394,7 @@ static int hw_cleanup(void) { GSList *l; struct sr_dev_inst *sdi; - struct fx2lafw_device *ctx; + struct context *ctx; int ret = SR_OK; for(l = dev_insts; l; l = l->next) { @@ -424,16 +426,16 @@ static int hw_cleanup(void) return ret; } -static void *hw_dev_info_get(int device_index, int device_info_id) +static void *hw_dev_info_get(int dev_index, int dev_info_id) { struct sr_dev_inst *sdi; - struct fx2lafw_device *ctx; + struct context *ctx; - if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) return NULL; ctx = sdi->priv; - switch (device_info_id) { + switch (dev_info_id) { case SR_DI_INST: return sdi; case SR_DI_NUM_PROBES: @@ -444,15 +446,17 @@ static void *hw_dev_info_get(int device_index, int device_info_id) return &fx2lafw_samplerates; case SR_DI_TRIGGER_TYPES: return TRIGGER_TYPES; + case SR_DI_CUR_SAMPLERATE: + return &ctx->cur_samplerate; } return NULL; } -static int hw_dev_status_get(int device_index) +static int hw_dev_status_get(int dev_index) { const struct sr_dev_inst *const sdi = - sr_dev_inst_get(dev_insts, device_index); + sr_dev_inst_get(dev_insts, dev_index); if (!sdi) return SR_ST_NOT_FOUND; @@ -468,14 +472,19 @@ static int *hw_hwcap_get_all(void) static int hw_dev_config_set(int dev_index, int hwcap, void *value) { struct sr_dev_inst *sdi; - struct fx2lafw_device *ctx; + struct context *ctx; int ret; if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) 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 { @@ -485,14 +494,14 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value) return ret; } -static int receive_data(int fd, int revents, void *user_data) +static int receive_data(int fd, int revents, void *cb_data) { struct timeval tv; /* Avoid compiler warnings. */ (void)fd; (void)revents; - (void)user_data; + (void)cb_data; tv.tv_sec = tv.tv_usec = 0; libusb_handle_events_timeout(usb_context, &tv); @@ -500,26 +509,33 @@ static int receive_data(int fd, int revents, void *user_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 fx2lafw_device *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; @@ -554,7 +570,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_data); + abort_acquisition(ctx); } return; } else { @@ -567,31 +583,32 @@ static void receive_transfer(struct libusb_transfer *transfer) logic.length = cur_buflen; logic.unitsize = 1; logic.data = cur_buf; - sr_session_bus(ctx->session_data, &packet); + 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_data); + (unsigned int) ctx->num_samples > ctx->limit_samples) { + abort_acquisition(ctx); } } -static int hw_dev_acquisition_start(int dev_index, gpointer session_data) +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 fx2lafw_device *ctx; + 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_data = session_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__); @@ -603,6 +620,11 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_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++) { @@ -633,24 +655,32 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_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_bus(session_data, packet); + sr_session_send(cb_data, packet); g_free(header); g_free(packet); return SR_OK; } -/* This stops acquisition on ALL devices, ignoring device_index. */ -static int hw_dev_acquisition_stop(int dev_index, gpointer session_data) +/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ +static int hw_dev_acquisition_stop(int dev_index, void *cb_data) { - (void)dev_index; - (void)session_data; + struct sr_dev_inst *sdi; + + /* unused parameter */ + (void)cb_data; + + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) + return SR_ERR; + + abort_acquisition(sdi->priv); + return SR_OK; } -SR_PRIV struct sr_dev_plugin fx2lafw_plugin_info = { +SR_PRIV struct sr_dev_driver fx2lafw_driver_info = { .name = "fx2lafw", .longname = "fx2lafw", .api_version = 1,