X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.c;h=8e69b77fd545eb38641d1fe34252cd6b182c16e0;hb=bee2b0168c087676c1b365861d8c2d4714afa9b9;hp=e12fd0bd5a988ee210d3cb170fc59cdbd835c687;hpb=b9d530920fa97ab92d5f78f6f00a1ffc73259f2f;p=libsigrok.git
diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index e12fd0bd..8e69b77f 100644
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -18,6 +18,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include "protocol.h"
@@ -38,6 +39,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)
{
@@ -45,7 +48,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.",
@@ -65,7 +68,7 @@ static int command_get_revid_version(struct sr_dev_inst *sdi, uint8_t *revid)
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, 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));
@@ -122,11 +125,13 @@ SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
/* Select the sampling width. */
cmd.flags |= devc->sample_wide ? CMD_START_FLAGS_SAMPLE_16BIT :
CMD_START_FLAGS_SAMPLE_8BIT;
+ /* Enable CTL2 clock. */
+ cmd.flags |= (devc->profile->dev_caps & DEV_CAPS_AX_ANALOG) ? CMD_START_FLAGS_CLK_CTL2 : 0;
/* Send the control message. */
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));
@@ -140,7 +145,7 @@ 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 matches fx2lafw
- * configuration, FALSE otherwise.
+ * configuration, FALSE otherwise.
*/
SR_PRIV gboolean match_manuf_prod(libusb_device *dev, const char *manufacturer,
const char *product)
@@ -154,8 +159,7 @@ SR_PRIV gboolean match_manuf_prod(libusb_device *dev, const char *manufacturer,
ret = FALSE;
while (!ret) {
/* Assume the FW has not been loaded, unless proven wrong. */
- if (libusb_get_device_descriptor(dev, &des) != 0)
- break;
+ libusb_get_device_descriptor(dev, &des);
if (libusb_open(dev, &hdl) != 0)
break;
@@ -163,13 +167,13 @@ SR_PRIV gboolean match_manuf_prod(libusb_device *dev, const char *manufacturer,
if (libusb_get_string_descriptor_ascii(hdl,
des.iManufacturer, strdesc, sizeof(strdesc)) < 0)
break;
- if (strncmp((const char *)strdesc, manufacturer, 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, product, 7))
+ if (strcmp((const char *)strdesc, product))
break;
ret = TRUE;
@@ -192,7 +196,7 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
uint8_t revid;
char connection_id[64];
- drvc = di->priv;
+ drvc = di->context;
devc = sdi->priv;
usb = sdi->conn;
@@ -208,11 +212,7 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
}
for (i = 0; i < device_count; i++) {
- if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("Failed to get device descriptor: %s.",
- libusb_error_name(ret));
- continue;
- }
+ libusb_get_device_descriptor(devlist[i], &des);
if (des.idVendor != devc->profile->vid
|| des.idProduct != devc->profile->pid)
@@ -242,6 +242,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.");
@@ -296,6 +306,8 @@ SR_PRIV struct dev_context *fx2lafw_dev_new(void)
devc->limit_samples = 0;
devc->capture_ratio = 0;
devc->sample_wide = FALSE;
+ devc->dslogic_continuous_mode = FALSE;
+ devc->dslogic_clock_edge = DS_EDGE_RISING;
devc->stl = NULL;
return devc;
@@ -315,21 +327,21 @@ SR_PRIV void fx2lafw_abort_acquisition(struct dev_context *devc)
static void finish_acquisition(struct sr_dev_inst *sdi)
{
- struct sr_datafeed_packet packet;
struct dev_context *devc;
devc = sdi->priv;
- /* Terminate session. */
- packet.type = SR_DF_END;
- sr_session_send(sdi, &packet);
+ std_session_send_df_end(sdi);
- /* Remove fds from polling. */
usb_source_remove(sdi->session, devc->ctx);
devc->num_transfers = 0;
g_free(devc->transfers);
+ /* Free the deinterlace buffers if we had them */
+ g_free(devc->logic_buffer);
+ g_free(devc->analog_buffer);
+
if (devc->stl) {
soft_trigger_logic_free(devc->stl);
devc->stl = NULL;
@@ -373,13 +385,78 @@ static void resubmit_transfer(struct libusb_transfer *transfer)
}
-SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi,
+ uint8_t *data, size_t length, size_t sample_width)
+{
+ size_t i;
+ struct dev_context *devc;
+
+ (void)sample_width;
+
+ devc = sdi->priv;
+
+ length /= 2;
+
+ /* Send the logic */
+ for (i = 0; i < length; i++) {
+ devc->logic_buffer[i] = data[i * 2];
+ /* Rescale to -10V - +10V from 0-255. */
+ devc->analog_buffer[i] = data[i * 2 + 1] - 128.0f / 12.8f;
+ };
+
+ const struct sr_datafeed_logic logic = {
+ .length = length,
+ .unitsize = 1,
+ .data = devc->logic_buffer
+ };
+
+ const struct sr_datafeed_packet logic_packet = {
+ .type = SR_DF_LOGIC,
+ .payload = &logic
+ };
+
+ sr_session_send(sdi, &logic_packet);
+
+ const struct sr_datafeed_analog_old analog = {
+ .channels = devc->enabled_analog_channels,
+ .num_samples = length,
+ .mq = SR_MQ_VOLTAGE,
+ .unit = SR_UNIT_VOLT,
+ .mqflags = 0 /*SR_MQFLAG_DC*/,
+ .data = devc->analog_buffer
+ };
+
+ const struct sr_datafeed_packet analog_packet = {
+ .type = SR_DF_ANALOG_OLD,
+ .payload = &analog
+ };
+
+ sr_session_send(sdi, &analog_packet);
+}
+
+SR_PRIV void la_send_data_proc(struct sr_dev_inst *sdi,
+ uint8_t *data, size_t length, size_t sample_width)
+{
+ const struct sr_datafeed_logic logic = {
+ .length = length,
+ .unitsize = sample_width,
+ .data = data
+ };
+
+ const struct sr_datafeed_packet packet = {
+ .type = SR_DF_LOGIC,
+ .payload = &logic
+ };
+
+ sr_session_send(sdi, &packet);
+}
+
+SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transfer)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
gboolean packet_has_error = FALSE;
struct sr_datafeed_packet packet;
- struct sr_datafeed_logic logic;
unsigned int num_samples;
int trigger_offset, cur_sample_count, unitsize;
int pre_trigger_samples;
@@ -396,8 +473,8 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
return;
}
- sr_dbg("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;
@@ -432,37 +509,51 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
} else {
devc->empty_transfer_count = 0;
}
-
if (devc->trigger_fired) {
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->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;
- logic.length = num_samples * unitsize;
- logic.unitsize = unitsize;
- logic.data = transfer->buffer;
- sr_session_send(devc->cb_data, &packet);
- devc->sent_samples += num_samples;
+
+ if (devc->dslogic && devc->trigger_pos > devc->sent_samples
+ && devc->trigger_pos <= devc->sent_samples + num_samples) {
+ /* DSLogic trigger in this block. Send trigger position. */
+ trigger_offset = devc->trigger_pos - devc->sent_samples;
+ /* Pre-trigger samples. */
+ devc->send_data_proc(sdi, (uint8_t *)transfer->buffer,
+ trigger_offset * unitsize, unitsize);
+ devc->sent_samples += trigger_offset;
+ /* Trigger position. */
+ devc->trigger_pos = 0;
+ packet.type = SR_DF_TRIGGER;
+ packet.payload = NULL;
+ sr_session_send(sdi, &packet);
+ /* Post trigger samples. */
+ num_samples -= trigger_offset;
+ devc->send_data_proc(sdi, (uint8_t *)transfer->buffer
+ + trigger_offset * unitsize, num_samples * unitsize, unitsize);
+ devc->sent_samples += num_samples;
+ } else {
+ devc->send_data_proc(sdi, (uint8_t *)transfer->buffer,
+ num_samples * unitsize, unitsize);
+ devc->sent_samples += num_samples;
+ }
}
} else {
trigger_offset = soft_trigger_logic_check(devc->stl,
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;
if (devc->limit_samples &&
num_samples > devc->limit_samples - devc->sent_samples)
num_samples = devc->limit_samples - devc->sent_samples;
- logic.length = num_samples * unitsize;
- logic.unitsize = unitsize;
- logic.data = transfer->buffer + trigger_offset * unitsize;
- sr_session_send(devc->cb_data, &packet);
+
+ devc->send_data_proc(sdi, (uint8_t *)transfer->buffer
+ + trigger_offset * unitsize,
+ num_samples * unitsize, unitsize);
devc->sent_samples += num_samples;
devc->trigger_fired = TRUE;