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

sr: fx2lafw: s/MAX_RENUM_DELAY/MAX_RENUM_DELAY_MS/.

This commit is contained in:
Uwe Hermann 2012-05-30 09:24:01 +02:00
parent e8bd58ffd2
commit f60fdf6ebe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hardware/fx2lafw/fx2lafw.c
View File

@ -442,8 +442,8 @@ static int hw_dev_open(int dev_index)
ctx = sdi->priv; ctx = sdi->priv;
/* /*
* If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
* for the FX2 to renumerate. * milliseconds for the FX2 to renumerate.
*/ */
ret = 0; 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 */ /* takes at least 300ms for the FX2 to be gone from the USB bus */
g_usleep(300 * 1000); g_usleep(300 * 1000);
timediff_ms = 0; 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) if ((ret = fx2lafw_dev_open(dev_index)) == SR_OK)
break; break;
g_usleep(100 * 1000); g_usleep(100 * 1000);

2
hardware/fx2lafw/fx2lafw.h
View File

@ -27,7 +27,7 @@
#define NUM_TRIGGER_STAGES 4 #define NUM_TRIGGER_STAGES 4
#define TRIGGER_TYPES "01" #define TRIGGER_TYPES "01"
#define MAX_RENUM_DELAY 3000 /* ms */ #define MAX_RENUM_DELAY_MS 3000
#define NUM_SIMUL_TRANSFERS 32 #define NUM_SIMUL_TRANSFERS 32
#define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2) #define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2)