GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Use the driver add commands macros in api.c to avoid individually listing them.

nfactor-troky
Con Kolivas 11 years ago
parent
1ef38f82e8
commit
55f29b8179
1 changed files with 18 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      api.c

72
api.c
Unescape View File

@ -1212,25 +1212,18 @@ static struct api_data *print_data(struct api_data *root, char *buf, bool isjson
} }
#ifdef HAVE_AN_ASIC #ifdef HAVE_AN_ASIC
static int numascs() static int numascs(void)
{ {
int count = 0; int count = 0;
int i; int i;
rd_lock(&devices_lock); rd_lock(&devices_lock);
for (i = 0; i < total_devices; i++) { for (i = 0; i < total_devices; i++) {
#ifdef USE_AVALON #define DRIVER_ADD_COMMAND(X) \
if (devices[i]->drv->drv_id == DRIVER_avalon) if (devices[i]->drv->drv_id == DRIVER_##X) \
count++;
#endif
#ifdef USE_BFLSC
if (devices[i]->drv->drv_id == DRIVER_bflsc)
count++;
#endif
#ifdef USE_BITFURY
if (devices[i]->drv->drv_id == DRIVER_bitfury)
count++; count++;
#endif ASIC_PARSE_COMMANDS
#undef DRIVER_ADD_COMMAND
} }
rd_unlock(&devices_lock); rd_unlock(&devices_lock);
return count; return count;
@ -1243,18 +1236,11 @@ static int ascdevice(int ascid)
rd_lock(&devices_lock); rd_lock(&devices_lock);
for (i = 0; i < total_devices; i++) { for (i = 0; i < total_devices; i++) {
#ifdef USE_AVALON #define DRIVER_ADD_COMMAND(X) \
if (devices[i]->drv->drv_id == DRIVER_avalon) if (devices[i]->drv->drv_id == DRIVER_##X) \
count++; count++;
#endif ASIC_PARSE_COMMANDS
#ifdef USE_BFLSC #undef DRIVER_ADD_COMMAND
if (devices[i]->drv->drv_id == DRIVER_bflsc)
count++;
#endif
#ifdef USE_BITFURY
if (devices[i]->drv->drv_id == DRIVER_bitfury)
count++;
#endif
if (count == (ascid + 1)) if (count == (ascid + 1))
goto foundit; goto foundit;
} }
@ -1270,29 +1256,18 @@ foundit:
#endif #endif
#ifdef HAVE_AN_FPGA #ifdef HAVE_AN_FPGA
static int numpgas() static int numpgas(void)
{ {
int count = 0; int count = 0;
int i; int i;
rd_lock(&devices_lock); rd_lock(&devices_lock);
for (i = 0; i < total_devices; i++) { for (i = 0; i < total_devices; i++) {
#ifdef USE_BITFORCE #define DRIVER_ADD_COMMAND(X) \
if (devices[i]->drv->drv_id == DRIVER_bitforce) if (devices[i]->drv->drv_id == DRIVER_##X) \
count++;
#endif
#ifdef USE_ICARUS
if (devices[i]->drv->drv_id == DRIVER_icarus)
count++;
#endif
#ifdef USE_ZTEX
if (devices[i]->drv->drv_id == DRIVER_ztex)
count++;
#endif
#ifdef USE_MODMINER
if (devices[i]->drv->drv_id == DRIVER_modminer)
count++; count++;
#endif FPGA_PARSE_COMMANDS
#undef DRIVER_ADD_COMMAND
} }
rd_unlock(&devices_lock); rd_unlock(&devices_lock);
return count; return count;
@ -1305,22 +1280,11 @@ static int pgadevice(int pgaid)
rd_lock(&devices_lock); rd_lock(&devices_lock);
for (i = 0; i < total_devices; i++) { for (i = 0; i < total_devices; i++) {
#ifdef USE_BITFORCE #define DRIVER_ADD_COMMAND(X) \
if (devices[i]->drv->drv_id == DRIVER_bitforce) if (devices[i]->drv->drv_id == DRIVER_##X) \
count++; count++;
#endif FPGA_PARSE_COMMANDS
#ifdef USE_ICARUS #undef DRIVER_ADD_COMMAND
if (devices[i]->drv->drv_id == DRIVER_icarus)
count++;
#endif
#ifdef USE_ZTEX
if (devices[i]->drv->drv_id == DRIVER_ztex)
count++;
#endif
#ifdef USE_MODMINER
if (devices[i]->drv->drv_id == DRIVER_modminer)
count++;
#endif
if (count == (pgaid + 1)) if (count == (pgaid + 1))
goto foundit; goto foundit;
} }

Write Preview
Loading…
Cancel
Save