From 293b94c7ed2aeb3352e454146ff2d3e400c72da2 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sun, 7 Apr 2013 01:39:20 +1100 Subject: [PATCH] Add API support for Avalon. --- api.c | 16 ++++++++++++---- miner.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/api.c b/api.c index a2c70582..24dcb589 100644 --- a/api.c +++ b/api.c @@ -29,7 +29,7 @@ #include "util.h" #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 #endif @@ -179,6 +179,9 @@ static const char *DEVICECODE = "" #ifdef USE_ICARUS "ICA " #endif +#ifdef USE_AVALON + "AVA " +#endif #ifdef USE_ZTEX "ZTX " #endif @@ -605,9 +608,6 @@ struct CODES { static int my_thr_id = 0; 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 static pthread_mutex_t quit_restart_lock; @@ -1178,6 +1178,10 @@ static int numascs() rd_lock(&devices_lock); for (i = 0; i < total_devices; i++) { +#ifdef USE_AVALON + if (devices[i]->drv->drv_id == DRIVER_AVALON) + count++; +#endif #ifdef USE_BFLSC if (devices[i]->drv->drv_id == DRIVER_BFLSC) count++; @@ -1194,6 +1198,10 @@ static int ascdevice(int ascid) rd_lock(&devices_lock); for (i = 0; i < total_devices; i++) { +#ifdef USE_AVALON + if (devices[i]->drv->drv_id == DRIVER_AVALON) + count++; +#endif #ifdef USE_BFLSC if (devices[i]->drv->drv_id == DRIVER_BFLSC) count++; diff --git a/miner.h b/miner.h index 7f565827..9aa87419 100644 --- a/miner.h +++ b/miner.h @@ -805,6 +805,7 @@ extern bool opt_usb_list_all; #ifdef USE_BITFORCE extern bool opt_bfl_noncerange; #endif +extern bool ping; extern int swork_id; extern pthread_rwlock_t netacc_lock;