X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.c;h=c87f659d07e249a28bfc5a771bf324eeb592934c;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=64b440f642076a49916bd00770403693370bf447;hpb=2f663c826af929b203eb1dfe6f72928d216fb062;p=libsigrok.git
diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index 64b440f6..c87f659d 100644
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -18,21 +18,10 @@
* along with this program. If not, see .
*/
+#include
+#include
#include "protocol.h"
-
-/* Protocol commands */
-#define CMD_GET_FW_VERSION 0xb0
-#define CMD_START 0xb1
-#define CMD_GET_REVID_VERSION 0xb2
-
-#define CMD_START_FLAGS_WIDE_POS 5
-#define CMD_START_FLAGS_CLK_SRC_POS 6
-
-#define CMD_START_FLAGS_SAMPLE_8BIT (0 << CMD_START_FLAGS_WIDE_POS)
-#define CMD_START_FLAGS_SAMPLE_16BIT (1 << CMD_START_FLAGS_WIDE_POS)
-
-#define CMD_START_FLAGS_CLK_30MHZ (0 << CMD_START_FLAGS_CLK_SRC_POS)
-#define CMD_START_FLAGS_CLK_48MHZ (1 << CMD_START_FLAGS_CLK_SRC_POS)
+#include "dslogic.h"
#pragma pack(push, 1)
@@ -49,6 +38,8 @@ struct cmd_start_acquisition {
#pragma pack(pop)
+#define USB_TIMEOUT 100
+
static int command_get_fw_version(libusb_device_handle *devhdl,
struct version_info *vi)
{
@@ -56,7 +47,7 @@ static int command_get_fw_version(libusb_device_handle *devhdl,
ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
LIBUSB_ENDPOINT_IN, CMD_GET_FW_VERSION, 0x0000, 0x0000,
- (unsigned char *)vi, sizeof(struct version_info), 100);
+ (unsigned char *)vi, sizeof(struct version_info), USB_TIMEOUT);
if (ret < 0) {
sr_err("Unable to get version info: %s.",
@@ -69,13 +60,14 @@ static int command_get_fw_version(libusb_device_handle *devhdl,
static int command_get_revid_version(struct sr_dev_inst *sdi, uint8_t *revid)
{
+ struct dev_context *devc = sdi->priv;
struct sr_usb_dev_inst *usb = sdi->conn;
libusb_device_handle *devhdl = usb->devhdl;
- int ret;
+ int cmd, ret;
+ cmd = devc->dslogic ? DS_CMD_GET_REVID_VERSION : CMD_GET_REVID_VERSION;
ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
- LIBUSB_ENDPOINT_IN, CMD_GET_REVID_VERSION, 0x0000, 0x0000,
- revid, 1, 100);
+ LIBUSB_ENDPOINT_IN, cmd, 0x0000, 0x0000, revid, 1, USB_TIMEOUT);
if (ret < 0) {
sr_err("Unable to get REVID: %s.", libusb_error_name(ret));
@@ -87,21 +79,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;
@@ -114,7 +110,7 @@ SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
delay = SR_MHZ(30) / samplerate - 1;
}
- sr_info("GPIF delay = %d, clocksource = %sMHz.", delay,
+ sr_dbg("GPIF delay = %d, clocksource = %sMHz.", delay,
(cmd.flags & CMD_START_FLAGS_CLK_48MHZ) ? "48" : "30");
if (delay <= 0 || delay > MAX_SAMPLE_DELAY) {
@@ -126,13 +122,13 @@ 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);
+ (unsigned char *)&cmd, sizeof(cmd), USB_TIMEOUT);
if (ret < 0) {
sr_err("Unable to send start command: %s.",
libusb_error_name(ret));
@@ -145,10 +141,11 @@ SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
/**
* Check the USB configuration to determine if this is an fx2lafw device.
*
- * @return TRUE if the device's configuration profile match fx2lafw
+ * @return TRUE if the device's configuration profile matches fx2lafw
* configuration, FALSE otherwise.
*/
-SR_PRIV gboolean fx2lafw_check_conf_profile(libusb_device *dev)
+SR_PRIV gboolean match_manuf_prod(libusb_device *dev, const char *manufacturer,
+ const char *product)
{
struct libusb_device_descriptor des;
struct libusb_device_handle *hdl;
@@ -166,18 +163,17 @@ SR_PRIV gboolean fx2lafw_check_conf_profile(libusb_device *dev)
break;
if (libusb_get_string_descriptor_ascii(hdl,
- des.iManufacturer, strdesc, sizeof(strdesc)) < 0)
+ des.iManufacturer, strdesc, sizeof(strdesc)) < 0)
break;
- if (strncmp((const char *)strdesc, "sigrok", 6))
+ if (strcmp((const char *)strdesc, manufacturer))
break;
if (libusb_get_string_descriptor_ascii(hdl,
des.iProduct, strdesc, sizeof(strdesc)) < 0)
break;
- if (strncmp((const char *)strdesc, "fx2lafw", 7))
+ if (strcmp((const char *)strdesc, product))
break;
- /* If we made it here, it must be an fx2lafw. */
ret = TRUE;
}
if (hdl)
@@ -194,10 +190,11 @@ 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;
+ drvc = di->context;
devc = sdi->priv;
usb = sdi->conn;
@@ -205,7 +202,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 +220,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;
}
@@ -254,6 +244,16 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
break;
}
+ if (libusb_has_capability(LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER)) {
+ if (libusb_kernel_driver_active(usb->devhdl, USB_INTERFACE) == 1) {
+ if ((ret = libusb_detach_kernel_driver(usb->devhdl, USB_INTERFACE)) < 0) {
+ sr_err("Failed to detach kernel driver: %s.",
+ libusb_error_name(ret));
+ return SR_ERR;
+ }
+ }
+ }
+
ret = command_get_fw_version(usb->devhdl, &vi);
if (ret != SR_OK) {
sr_err("Failed to get firmware version.");
@@ -279,9 +279,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 +301,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;
@@ -388,7 +385,7 @@ static void resubmit_transfer(struct libusb_transfer *transfer)
}
-SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transfer)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
@@ -397,6 +394,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;
@@ -410,8 +408,8 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
return;
}
- sr_info("receive_transfer(): status %d received %d bytes.",
- transfer->status, transfer->actual_length);
+ sr_dbg("receive_transfer(): status %s received %d bytes.",
+ libusb_error_name(transfer->status), transfer->actual_length);
/* Save incoming transfer before reusing the transfer struct. */
unitsize = devc->sample_wide ? 2 : 1;
@@ -464,8 +462,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;