X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.c;h=bc3228f12d23fff44b4013da873011c4d4c5932c;hb=7bfcb25cf1aa4fe7ddc177292bcf2ee4d9b1446d;hp=433f9075c03c2d9cf804ec8d02962ebfef28e466;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c index 433f9075..bc3228f1 100644 --- a/src/hardware/fx2lafw/protocol.c +++ b/src/hardware/fx2lafw/protocol.c @@ -87,21 +87,25 @@ static int command_get_revid_version(struct sr_dev_inst *sdi, uint8_t *revid) SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi) { - struct dev_context *devc = sdi->priv; - struct sr_usb_dev_inst *usb = sdi->conn; - libusb_device_handle *devhdl = usb->devhdl; - uint64_t samplerate = devc->cur_samplerate; - gboolean samplewide = devc->sample_wide; - struct cmd_start_acquisition cmd = { 0 }; - int delay = 0, ret; + struct dev_context *devc; + struct sr_usb_dev_inst *usb; + uint64_t samplerate; + struct cmd_start_acquisition cmd; + int delay, ret; + + devc = sdi->priv; + usb = sdi->conn; + samplerate = devc->cur_samplerate; /* Compute the sample rate. */ - if (samplewide && samplerate > MAX_16BIT_SAMPLE_RATE) { + if (devc->sample_wide && samplerate > MAX_16BIT_SAMPLE_RATE) { sr_err("Unable to sample at %" PRIu64 "Hz " "when collecting 16-bit samples.", samplerate); return SR_ERR; } + delay = 0; + cmd.flags = cmd.sample_delay_h = cmd.sample_delay_l = 0; if ((SR_MHZ(48) % samplerate) == 0) { cmd.flags = CMD_START_FLAGS_CLK_48MHZ; delay = SR_MHZ(48) / samplerate - 1; @@ -126,11 +130,11 @@ SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi) cmd.sample_delay_l = delay & 0xff; /* Select the sampling width. */ - cmd.flags |= samplewide ? CMD_START_FLAGS_SAMPLE_16BIT : + cmd.flags |= devc->sample_wide ? CMD_START_FLAGS_SAMPLE_16BIT : CMD_START_FLAGS_SAMPLE_8BIT; /* Send the control message. */ - ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR | + ret = libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT, CMD_START, 0x0000, 0x0000, (unsigned char *)&cmd, sizeof(cmd), 100); if (ret < 0) { @@ -194,8 +198,9 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di) struct dev_context *devc; struct drv_context *drvc; struct version_info vi; - int ret, skip, i, device_count; + int ret, i, device_count; uint8_t revid; + char connection_id[64]; drvc = di->priv; devc = sdi->priv; @@ -205,7 +210,6 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di) /* Device is already in use. */ return SR_ERR; - skip = 0; device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); if (device_count < 0) { sr_err("Failed to get device list: %s.", @@ -224,19 +228,13 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di) || des.idProduct != devc->profile->pid) continue; - if (sdi->status == SR_ST_INITIALIZING) { - if (skip != sdi->index) { - /* Skip devices of this type that aren't the one we want. */ - skip += 1; - continue; - } - } else if (sdi->status == SR_ST_INACTIVE) { + if ((sdi->status == SR_ST_INITIALIZING) || + (sdi->status == SR_ST_INACTIVE)) { /* - * This device is fully enumerated, so we need to find - * this device by vendor, product, bus and address. + * Check device by its physical USB bus/port address. */ - if (libusb_get_bus_number(devlist[i]) != usb->bus - || libusb_get_device_address(devlist[i]) != usb->address) + usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)); + if (strcmp(sdi->connection_id, connection_id)) /* This is not the one. */ continue; } @@ -279,9 +277,9 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di) } sdi->status = SR_ST_ACTIVE; - sr_info("Opened device %d on %d.%d, " + sr_info("Opened device on %d.%d (logical) / %s (physical), " "interface %d, firmware %d.%d.", - sdi->index, usb->bus, usb->address, + usb->bus, usb->address, connection_id, USB_INTERFACE, vi.major, vi.minor); sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.", @@ -301,15 +299,12 @@ SR_PRIV struct dev_context *fx2lafw_dev_new(void) { struct dev_context *devc; - if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { - sr_err("Device context malloc failed."); - return NULL; - } - + devc = g_malloc0(sizeof(struct dev_context)); devc->profile = NULL; devc->fw_updated = 0; devc->cur_samplerate = 0; devc->limit_samples = 0; + devc->capture_ratio = 0; devc->sample_wide = FALSE; devc->stl = NULL; @@ -397,6 +392,7 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer) struct sr_datafeed_logic logic; unsigned int num_samples; int trigger_offset, cur_sample_count, unitsize; + int pre_trigger_samples; sdi = transfer->user_data; devc = sdi->priv; @@ -448,11 +444,11 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer) } if (devc->trigger_fired) { - if (devc->sent_samples < devc->limit_samples) { + if (!devc->limit_samples || devc->sent_samples < devc->limit_samples) { /* Send the incoming transfer to the session bus. */ packet.type = SR_DF_LOGIC; packet.payload = &logic; - if (devc->sent_samples + cur_sample_count > devc->limit_samples) + if (devc->limit_samples && devc->sent_samples + cur_sample_count > devc->limit_samples) num_samples = devc->limit_samples - devc->sent_samples; else num_samples = cur_sample_count; @@ -464,8 +460,9 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer) } } else { trigger_offset = soft_trigger_logic_check(devc->stl, - transfer->buffer, transfer->actual_length); + transfer->buffer, transfer->actual_length, &pre_trigger_samples); if (trigger_offset > -1) { + devc->sent_samples += pre_trigger_samples; packet.type = SR_DF_LOGIC; packet.payload = &logic; num_samples = cur_sample_count - trigger_offset;