From: Joel Holdsworth <redacted>
Date: Thu, 1 Mar 2012 19:45:08 +0000 (+0000)
Subject: fx2lafw: Devices now retain the same PID/VID after fw load
X-Git-Tag: libsigrok-0.1.0~64
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=74fcfb806d5b66ae4372b982f7836be12328e664;p=libsigrok.git

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

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 9cc97f21..2bf1bda6 100644
--- 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 6da663c9..fd1b5012 100644
--- 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)