From 5a65415b1e8458b9e71c2a4436273ac2426efeb6 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Fri, 13 Jul 2012 14:47:02 +1000 Subject: [PATCH] Enable completely compiling scrypt out. --- driver-opencl.c | 9 +++++++++ miner.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/driver-opencl.c b/driver-opencl.c index b77614d3..e8a901dc 100644 --- a/driver-opencl.c +++ b/driver-opencl.c @@ -137,8 +137,10 @@ static enum cl_kernels select_kernel(char *arg) return KL_POCLBM; if (!strcmp(arg, "phatk")) return KL_PHATK; +#ifdef HAVE_SCRYPT if (!strcmp(arg, "scrypt")) return KL_SCRYPT; +#endif return KL_NONE; } @@ -988,12 +990,15 @@ static cl_int queue_diablo_kernel(_clState *clState, dev_blk_ctx *blk, cl_uint t return status; } +#ifdef HAVE_SCRYPT static cl_int queue_scrypt_kernel(_clState *clState, dev_blk_ctx *blk, cl_uint threads) { cl_int status = 0; return status; } +#endif + static void set_threads_hashes(unsigned int vectors, unsigned int *threads, int64_t *hashes, size_t *globalThreads, unsigned int minthreads, int intensity) @@ -1258,9 +1263,11 @@ static bool opencl_thread_prepare(struct thr_info *thr) case KL_PHATK: cgpu->kname = "phatk"; break; +#ifdef HAVE_SCRYPT case KL_SCRYPT: cgpu->kname = "scrypt"; break; +#endif case KL_POCLBM: cgpu->kname = "poclbm"; break; @@ -1302,9 +1309,11 @@ static bool opencl_thread_init(struct thr_info *thr) case KL_DIAKGCN: thrdata->queue_kernel_parameters = &queue_diakgcn_kernel; break; +#ifdef HAVE_SCRYPT case KL_SCRYPT: thrdata->queue_kernel_parameters = &queue_scrypt_kernel; break; +#endif default: case KL_DIABLO: thrdata->queue_kernel_parameters = &queue_diablo_kernel; diff --git a/miner.h b/miner.h index a9fa29c1..74824730 100644 --- a/miner.h +++ b/miner.h @@ -262,7 +262,9 @@ enum cl_kernels { KL_PHATK, KL_DIAKGCN, KL_DIABLO, +#ifdef HAVE_SCRYPT KL_SCRYPT, +#endif }; enum dev_reason {