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

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 9cc97f21d1dcdaf30ab579018c2837159cbd77f2..2bf1bda6b229be9070bdc7696e944dba1321b59a 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -165,8 +165,8 @@ static int fx2lafw_open_dev(int dev_index)
                        continue;
                }
 
-               if (des.idVendor != FIRMWARE_VID
-                   || des.idProduct != FIRMWARE_PID)
+               if (des.idVendor != ctx->profile->vid
+                   || des.idProduct != ctx->profile->pid)
                        continue;
 
                if (sdi->status == SR_ST_INITIALIZING) {

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 6da663c90f5a66c102785f5ada10cb87f6123cb6..fd1b5012be7c22fe4ed218d7f8a5a711dafcbb26 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -25,9 +25,6 @@
 #define TRIGGER_TYPES          "01rf"
 #define FIRMWARE               FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw"
 
-#define FIRMWARE_VID           0x0925
-#define FIRMWARE_PID           0x3881
-
 #define MAX_RENUM_DELAY                3000 /* ms */
 #define NUM_SIMUL_TRANSFERS    10
 #define MAX_EMPTY_TRANSFERS    (NUM_SIMUL_TRANSFERS * 2)