GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-05 11:34:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:ckolivas/cgminer

Browse Source
This commit is contained in:
Con Kolivas 2013-09-29 12:51:33 +10:00
commit 3dd798e622
2 changed files with 13 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver-bitfury.c
View File

@ -178,7 +178,7 @@ static uint32_t decnonce(uint32_t in)
} }
#define BT_OFFSETS 3 #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) static bool bitfury_checkresults(struct thr_info *thr, struct work *work, uint32_t nonce)
{ {

76
usbutils.c
View File

@ -1851,35 +1851,11 @@ static struct usb_find_devices *usb_check(__maybe_unused struct device_drv *drv,
return NULL; return NULL;
} }
#ifdef USE_BFLSC #define DRIVER_ADD_COMMAND(X) \
if (drv->drv_id == DRIVER_bflsc) if (drv->drv_id == DRIVER_##X) \
return usb_check_each(DRIVER_bflsc, drv, dev); return usb_check_each(DRIVER_##X, drv, dev);
#endif DRIVER_PARSE_COMMANDS
#undef DRIVER_ADD_COMMAND
#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
return NULL; return NULL;
} }
@ -3234,42 +3210,14 @@ void usb_initialise()
quit(1, "Invalid --usb DRV:limit - limit must be >= 0"); quit(1, "Invalid --usb DRV:limit - limit must be >= 0");
found = false; found = false;
#ifdef USE_BFLSC /* Use the DRIVER_PARSE_COMMANDS macro to iterate
if (strcasecmp(ptr, bflsc_drv.name) == 0) { * over all the drivers. */
drv_count[bflsc_drv.drv_id].limit = lim; #define DRIVER_ADD_COMMAND(X) if (strcasecmp(ptr, X##_drv.name) == 0) { \
found = true; drv_count[X##_drv.drv_id].limit = lim; \
found = true; \
} }
#endif DRIVER_PARSE_COMMANDS
#ifdef USE_BITFORCE #undef DRIVER_ADD_COMMAND
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
if (!found) if (!found)
quit(1, "Invalid --usb DRV:limit - unknown DRV='%s'", ptr); quit(1, "Invalid --usb DRV:limit - unknown DRV='%s'", ptr);