]> sigrok.org Git - libsigrok.git/commitdiff
sr: fx2lafw: s/MAX_RENUM_DELAY/MAX_RENUM_DELAY_MS/.
authorUwe Hermann <redacted>
Wed, 30 May 2012 07:24:01 +0000 (09:24 +0200)
committerUwe Hermann <redacted>
Wed, 30 May 2012 07:30:50 +0000 (09:30 +0200)
hardware/fx2lafw/fx2lafw.c
hardware/fx2lafw/fx2lafw.h

index 1109d802824801537a3febe62de4665bbf6873f3..63a4f9f9b87847eb0c4d64bf06deb51fd1d2c77b 100644 (file)
@@ -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);
index f8bf99a6285b28a68c7bdd996f3de839c66a4330..3d738c7a51427c5432b30d335435c37a1aa8f2e2 100644 (file)
@@ -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)