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

fx2lafw: Moved firmware path into fx2lafw_profile

This commit is contained in:
Joel Holdsworth 2012-03-12 21:31:43 +00:00
parent 4679d14db3
commit f8b07fc6c3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/fx2lafw/fx2lafw.c
View File

@ -32,8 +32,9 @@ static const struct fx2lafw_profile supported_fx2[] = {
/* CWAV USBee AX /* CWAV USBee AX
* EE Electronics ESLA201A * EE Electronics ESLA201A
*/ */
{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, 8 }, { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
{ 0, 0, 0, 0, 0, 0 } FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", 8 },
{ 0, 0, 0, 0, 0, 0, 0 }
}; };
static int fx2lafw_capabilities[] = { static int fx2lafw_capabilities[] = {
@ -305,7 +306,8 @@ static int hw_init(const char *deviceinfo)
(libusb_get_bus_number(devlist[i]), (libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL); libusb_get_device_address(devlist[i]), NULL);
} else { } else {
if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, FIRMWARE) == SR_OK) if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
fx2lafw_prof->firmware) == SR_OK)
/* Remember when the firmware on this device was updated */ /* Remember when the firmware on this device was updated */
g_get_current_time(&ctx->fw_updated); g_get_current_time(&ctx->fw_updated);
else else

3
hardware/fx2lafw/fx2lafw.h
View File

@ -23,7 +23,6 @@
#define USB_INTERFACE 0 #define USB_INTERFACE 0
#define USB_CONFIGURATION 1 #define USB_CONFIGURATION 1
#define TRIGGER_TYPES "01rf" #define TRIGGER_TYPES "01rf"
#define FIRMWARE FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw"
#define MAX_RENUM_DELAY 3000 /* ms */ #define MAX_RENUM_DELAY 3000 /* ms */
#define NUM_SIMUL_TRANSFERS 10 #define NUM_SIMUL_TRANSFERS 10
@ -37,6 +36,8 @@ struct fx2lafw_profile {
const char *model; const char *model;
const char *model_version; const char *model_version;
const char *firmware;
int num_probes; int num_probes;
}; };