Commit 3dd798e6225ae1741477e64b4bbf9a4c61a7e53c
2013-09-29T12:51:33
Merge branch 'master' of github.com:ckolivas/cgminer
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 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
diff --git a/driver-bitfury.c b/driver-bitfury.c
index 9708fe6..6bb4e8c 100644
--- a/driver-bitfury.c
+++ b/driver-bitfury.c
@@ -178,7 +178,7 @@ static uint32_t decnonce(uint32_t in)
}
#define BT_OFFSETS 3
-const uint32_t bf_offsets[] = {0, -0x400000, -0x800000};
+const uint32_t bf_offsets[] = {-0x800000, 0, -0x400000};
static bool bitfury_checkresults(struct thr_info *thr, struct work *work, uint32_t nonce)
{
diff --git a/usbutils.c b/usbutils.c
index 909cd37..c428b04 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -1851,35 +1851,11 @@ static struct usb_find_devices *usb_check(__maybe_unused struct device_drv *drv,
return NULL;
}
-#ifdef USE_BFLSC
- if (drv->drv_id == DRIVER_bflsc)
- return usb_check_each(DRIVER_bflsc, drv, dev);
-#endif
-
-#ifdef USE_BITFORCE
- if (drv->drv_id == DRIVER_bitforce)
- return usb_check_each(DRIVER_bitforce, drv, dev);
-#endif
-
-#ifdef USE_BITFURY
- if (drv->drv_id == DRIVER_bitfury)
- return usb_check_each(DRIVER_bitfury, drv, dev);
-#endif
-
-#ifdef USE_MODMINER
- if (drv->drv_id == DRIVER_modminer)
- return usb_check_each(DRIVER_modminer, drv, dev);
-#endif
-
-#ifdef USE_ICARUS
- if (drv->drv_id == DRIVER_icarus)
- return usb_check_each(DRIVER_icarus, drv, dev);
-#endif
-
-#ifdef USE_AVALON
- if (drv->drv_id == DRIVER_avalon)
- return usb_check_each(DRIVER_avalon, drv, dev);
-#endif
+#define DRIVER_ADD_COMMAND(X) \
+ if (drv->drv_id == DRIVER_##X) \
+ return usb_check_each(DRIVER_##X, drv, dev);
+ DRIVER_PARSE_COMMANDS
+#undef DRIVER_ADD_COMMAND
return NULL;
}
@@ -3234,42 +3210,14 @@ void usb_initialise()
quit(1, "Invalid --usb DRV:limit - limit must be >= 0");
found = false;
-#ifdef USE_BFLSC
- if (strcasecmp(ptr, bflsc_drv.name) == 0) {
- drv_count[bflsc_drv.drv_id].limit = lim;
- found = true;
+ /* Use the DRIVER_PARSE_COMMANDS macro to iterate
+ * over all the drivers. */
+#define DRIVER_ADD_COMMAND(X) if (strcasecmp(ptr, X##_drv.name) == 0) { \
+ drv_count[X##_drv.drv_id].limit = lim; \
+ found = true; \
}
-#endif
-#ifdef USE_BITFORCE
- if (!found && strcasecmp(ptr, bitforce_drv.name) == 0) {
- drv_count[bitforce_drv.drv_id].limit = lim;
- found = true;
- }
-#endif
-#ifdef USE_BITFURY
- if (!found && strcasecmp(ptr, bitfury_drv.name) == 0) {
- drv_count[bitfury_drv.drv_id].limit = lim;
- found = true;
- }
-#endif
-#ifdef USE_MODMINER
- if (!found && strcasecmp(ptr, modminer_drv.name) == 0) {
- drv_count[modminer_drv.drv_id].limit = lim;
- found = true;
- }
-#endif
-#ifdef USE_ICARUS
- if (!found && strcasecmp(ptr, icarus_drv.name) == 0) {
- drv_count[icarus_drv.drv_id].limit = lim;
- found = true;
- }
-#endif
-#ifdef USE_AVALON
- if (!found && strcasecmp(ptr, avalon_drv.name) == 0) {
- drv_count[avalon_drv.drv_id].limit = lim;
- found = true;
- }
-#endif
+ DRIVER_PARSE_COMMANDS
+#undef DRIVER_ADD_COMMAND
if (!found)
quit(1, "Invalid --usb DRV:limit - unknown DRV='%s'", ptr);