Commit 7dffa07ed995aed4ec08e84b57c585b61675c8e5
2012-08-07T20:47:18
Deuglify windows autodetect code for BFL.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
diff --git a/driver-bitforce.c b/driver-bitforce.c
index e1c01e1..f2d8ffe 100644
--- a/driver-bitforce.c
+++ b/driver-bitforce.c
@@ -144,9 +144,16 @@ static bool bitforce_detect_one(const char *devpath)
} \
} while(0)
-static char bitforce_autodetect_ftdi()
-{
#ifdef WIN32
+static char bitforce_autodetect_ftdi(void)
+{
+ char buf[65 * numDevs];
+ char*bufptrs[numDevs + 1];
+ char devpath[] = "\\\\.\\COMnnnnn";
+ char *devpathnum = &devpath[7];
+ char found = 0;
+ int i;
+
FT_STATUS ftStatus;
DWORD numDevs;
HMODULE dll = LoadLibrary("FTD2XX.DLL");
@@ -162,27 +169,19 @@ static char bitforce_autodetect_ftdi()
ftStatus = FT_ListDevices(&numDevs, NULL, FT_LIST_NUMBER_ONLY);
if (ftStatus != FT_OK) {
applog(LOG_DEBUG, "FTDI device count failed, not using FTDI bitforce autodetect");
-nogood:
- dlclose(dll);
- return 0;
+ goto out;
}
applog(LOG_DEBUG, "FTDI reports %u devices", (unsigned)numDevs);
- char buf[65 * numDevs];
- char*bufptrs[numDevs + 1];
- int i;
for (i = 0; i < numDevs; ++i)
bufptrs[i] = &buf[i * 65];
bufptrs[numDevs] = NULL;
ftStatus = FT_ListDevices(bufptrs, &numDevs, FT_LIST_ALL | FT_OPEN_BY_DESCRIPTION);
if (ftStatus != FT_OK) {
applog(LOG_DEBUG, "FTDI device list failed, not using FTDI bitforce autodetect");
- goto nogood;
+ goto out;
}
- char devpath[] = "\\\\.\\COMnnnnn";
- char *devpathnum = &devpath[7];
- char found = 0;
for (i = numDevs; i > 0; ) {
--i;
bufptrs[i][64] = '\0';
@@ -204,14 +203,19 @@ nogood:
if (bitforce_detect_one(devpath))
++found;
}
+
+out:
dlclose(dll);
return found;
-#else /* NOT WIN32 */
+}
+#else
+static char bitforce_autodetect_ftdi(void)
+{
return 0;
-#endif
}
+#endif
-static char bitforce_detect_auto()
+static char bitforce_detect_auto(void)
{
return (serial_autodetect_udev (bitforce_detect_one, "BitFORCE*SHA256") ?:
serial_autodetect_devserial(bitforce_detect_one, "BitFORCE_SHA256") ?:
@@ -219,7 +223,7 @@ static char bitforce_detect_auto()
0);
}
-static void bitforce_detect()
+static void bitforce_detect(void)
{
serial_detect_auto(bitforce_api.dname, bitforce_detect_one, bitforce_detect_auto);
}