BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fx2lafw: Add support for AX analog channel probing

This commit is contained in:
Joel Holdsworth 2016-04-24 20:35:07 +02:00 committed by Uwe Hermann
parent 152e7f4d7c
commit 232a975fe2
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hardware/fx2lafw/api.c
View File

@ -30,7 +30,7 @@ static const struct fx2lafw_profile supported_fx2[] = {
*/ */
{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
"fx2lafw-cwav-usbeeax.fw", "fx2lafw-cwav-usbeeax.fw",
0, NULL, NULL}, DEV_CAPS_AX_ANALOG, NULL, NULL},
/* /*
* CWAV USBee DX * CWAV USBee DX
* XZL-Studio DX * XZL-Studio DX
@ -138,6 +138,10 @@ static const char *channel_names[] = {
"8", "9", "10", "11", "12", "13", "14", "15", "8", "9", "10", "11", "12", "13", "14", "15",
}; };
static const char *ax_channel_names[] = {
"A0",
};
static const int32_t soft_trigger_matches[] = { static const int32_t soft_trigger_matches[] = {
SR_TRIGGER_ZERO, SR_TRIGGER_ZERO,
SR_TRIGGER_ONE, SR_TRIGGER_ONE,
@ -204,7 +208,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
libusb_device **devlist; libusb_device **devlist;
struct libusb_device_handle *hdl; struct libusb_device_handle *hdl;
int num_logic_channels, ret, i, j; int ret, i, j;
int num_logic_channels = 0, num_analog_channels = 0;
const char *conn; const char *conn;
char manufacturer[64], product[64], serial_num[64], connection_id[64]; char manufacturer[64], product[64], serial_num[64], connection_id[64];
@ -309,10 +314,16 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
/* Fill in channellist according to this device's profile. */ /* Fill in channellist according to this device's profile. */
num_logic_channels = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8; num_logic_channels = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8;
num_analog_channels = prof->dev_caps & DEV_CAPS_AX_ANALOG ? 1 : 0;
for (j = 0; j < num_logic_channels; j++) for (j = 0; j < num_logic_channels; j++)
sr_channel_new(sdi, j, SR_CHANNEL_LOGIC, TRUE, sr_channel_new(sdi, j, SR_CHANNEL_LOGIC, TRUE,
channel_names[j]); channel_names[j]);
for (j = 0; j < num_analog_channels; j++)
sr_channel_new(sdi, j, SR_CHANNEL_ANALOG, TRUE,
ax_channel_names[j]);
devc = fx2lafw_dev_new(); devc = fx2lafw_dev_new();
devc->profile = prof; devc->profile = prof;
devc->sample_wide = (prof->dev_caps & DEV_CAPS_16BIT) != 0; devc->sample_wide = (prof->dev_caps & DEV_CAPS_16BIT) != 0;

2
src/hardware/fx2lafw/protocol.h
View File

@ -48,8 +48,10 @@
#define MAX_SAMPLE_DELAY (6 * 256) #define MAX_SAMPLE_DELAY (6 * 256)
#define DEV_CAPS_16BIT_POS 0 #define DEV_CAPS_16BIT_POS 0
#define DEV_CAPS_AX_ANALOG_POS 1
#define DEV_CAPS_16BIT (1 << DEV_CAPS_16BIT_POS) #define DEV_CAPS_16BIT (1 << DEV_CAPS_16BIT_POS)
#define DEV_CAPS_AX_ANALOG (1 << DEV_CAPS_AX_ANALOG_POS)
#define DSLOGIC_FPGA_FIRMWARE "dreamsourcelab-dslogic-fpga.fw" #define DSLOGIC_FPGA_FIRMWARE "dreamsourcelab-dslogic-fpga.fw"
#define DSCOPE_FPGA_FIRMWARE "dreamsourcelab-dscope-fpga.fw" #define DSCOPE_FPGA_FIRMWARE "dreamsourcelab-dscope-fpga.fw"