1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 12:34:27 +00:00

Add API support for Avalon.

This commit is contained in:
Con Kolivas 2013-04-07 01:39:20 +11:00
parent 809fec91a6
commit 293b94c7ed
2 changed files with 13 additions and 4 deletions

16
api.c
View File

@ -29,7 +29,7 @@
#include "util.h" #include "util.h"
#include "driver-cpu.h" /* for algo_names[], TODO: re-factor dependency */ #include "driver-cpu.h" /* for algo_names[], TODO: re-factor dependency */
#if defined(USE_BFLSC) #if defined(USE_BFLSC) || defined(USE_AVALON)
#define HAVE_AN_ASIC 1 #define HAVE_AN_ASIC 1
#endif #endif
@ -179,6 +179,9 @@ static const char *DEVICECODE = ""
#ifdef USE_ICARUS #ifdef USE_ICARUS
"ICA " "ICA "
#endif #endif
#ifdef USE_AVALON
"AVA "
#endif
#ifdef USE_ZTEX #ifdef USE_ZTEX
"ZTX " "ZTX "
#endif #endif
@ -605,9 +608,6 @@ struct CODES {
static int my_thr_id = 0; static int my_thr_id = 0;
static bool bye; static bool bye;
#if defined(HAVE_OPENCL) || defined (HAVE_AN_ASIC) || defined(HAVE_AN_FPGA)
static bool ping = true;
#endif
// Used to control quit restart access to shutdown variables // Used to control quit restart access to shutdown variables
static pthread_mutex_t quit_restart_lock; static pthread_mutex_t quit_restart_lock;
@ -1178,6 +1178,10 @@ static int numascs()
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
if (devices[i]->drv->drv_id == DRIVER_AVALON)
count++;
#endif
#ifdef USE_BFLSC #ifdef USE_BFLSC
if (devices[i]->drv->drv_id == DRIVER_BFLSC) if (devices[i]->drv->drv_id == DRIVER_BFLSC)
count++; count++;
@ -1194,6 +1198,10 @@ 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
if (devices[i]->drv->drv_id == DRIVER_AVALON)
count++;
#endif
#ifdef USE_BFLSC #ifdef USE_BFLSC
if (devices[i]->drv->drv_id == DRIVER_BFLSC) if (devices[i]->drv->drv_id == DRIVER_BFLSC)
count++; count++;

View File

@ -805,6 +805,7 @@ extern bool opt_usb_list_all;
#ifdef USE_BITFORCE #ifdef USE_BITFORCE
extern bool opt_bfl_noncerange; extern bool opt_bfl_noncerange;
#endif #endif
extern bool ping;
extern int swork_id; extern int swork_id;
extern pthread_rwlock_t netacc_lock; extern pthread_rwlock_t netacc_lock;