From: Uwe Hermann <redacted>
Date: Wed, 30 May 2012 07:24:01 +0000 (+0200)
Subject: sr: fx2lafw: s/MAX_RENUM_DELAY/MAX_RENUM_DELAY_MS/.
X-Git-Tag: libsigrok-0.1.1~10
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=f60fdf6ebe26a6b8693e515ed1eeedb906b7a17f;p=libsigrok.git

sr: fx2lafw: s/MAX_RENUM_DELAY/MAX_RENUM_DELAY_MS/.
---

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 1109d802..63a4f9f9 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -442,8 +442,8 @@ static int hw_dev_open(int dev_index)
 	ctx = sdi->priv;
 
 	/*
-	 * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
-	 * for the FX2 to renumerate.
+	 * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
+	 * milliseconds for the FX2 to renumerate.
 	 */
 	ret = 0;
 
@@ -452,7 +452,7 @@ static int hw_dev_open(int dev_index)
 		/* takes at least 300ms for the FX2 to be gone from the USB bus */
 		g_usleep(300 * 1000);
 		timediff_ms = 0;
-		while (timediff_ms < MAX_RENUM_DELAY) {
+		while (timediff_ms < MAX_RENUM_DELAY_MS) {
 			if ((ret = fx2lafw_dev_open(dev_index)) == SR_OK)
 				break;
 			g_usleep(100 * 1000);
diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index f8bf99a6..3d738c7a 100644
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -27,7 +27,7 @@
 #define NUM_TRIGGER_STAGES	4
 #define TRIGGER_TYPES		"01"
 
-#define MAX_RENUM_DELAY		3000 /* ms */
+#define MAX_RENUM_DELAY_MS	3000
 #define NUM_SIMUL_TRANSFERS	32
 #define MAX_EMPTY_TRANSFERS	(NUM_SIMUL_TRANSFERS * 2)