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

fx2lafw: Devices now retain the same PID/VID after fw load

This commit is contained in:
Joel Holdsworth 2012-03-01 19:45:08 +00:00
parent e318664793
commit 74fcfb806d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/fx2lafw/fx2lafw.c
View File

@ -165,8 +165,8 @@ static int fx2lafw_open_dev(int dev_index)
continue; continue;
} }
if (des.idVendor != FIRMWARE_VID if (des.idVendor != ctx->profile->vid
|| des.idProduct != FIRMWARE_PID) || des.idProduct != ctx->profile->pid)
continue; continue;
if (sdi->status == SR_ST_INITIALIZING) { if (sdi->status == SR_ST_INITIALIZING) {

3
hardware/fx2lafw/fx2lafw.h
View File

@ -25,9 +25,6 @@
#define TRIGGER_TYPES "01rf" #define TRIGGER_TYPES "01rf"
#define FIRMWARE FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw" #define FIRMWARE FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw"
#define FIRMWARE_VID 0x0925
#define FIRMWARE_PID 0x3881
#define MAX_RENUM_DELAY 3000 /* ms */ #define MAX_RENUM_DELAY 3000 /* ms */
#define NUM_SIMUL_TRANSFERS 10 #define NUM_SIMUL_TRANSFERS 10
#define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2) #define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2)