Browse Source

Enable completely compiling scrypt out.

nfactor-troky
Con Kolivas 13 years ago
parent
commit
5a65415b1e
  1. 9
      driver-opencl.c
  2. 2
      miner.h

9
driver-opencl.c

@ -137,8 +137,10 @@ static enum cl_kernels select_kernel(char *arg)
return KL_POCLBM; return KL_POCLBM;
if (!strcmp(arg, "phatk")) if (!strcmp(arg, "phatk"))
return KL_PHATK; return KL_PHATK;
#ifdef HAVE_SCRYPT
if (!strcmp(arg, "scrypt")) if (!strcmp(arg, "scrypt"))
return KL_SCRYPT; return KL_SCRYPT;
#endif
return KL_NONE; return KL_NONE;
} }
@ -988,12 +990,15 @@ static cl_int queue_diablo_kernel(_clState *clState, dev_blk_ctx *blk, cl_uint t
return status; return status;
} }
#ifdef HAVE_SCRYPT
static cl_int queue_scrypt_kernel(_clState *clState, dev_blk_ctx *blk, cl_uint threads) static cl_int queue_scrypt_kernel(_clState *clState, dev_blk_ctx *blk, cl_uint threads)
{ {
cl_int status = 0; cl_int status = 0;
return status; return status;
} }
#endif
static void set_threads_hashes(unsigned int vectors, unsigned int *threads, static void set_threads_hashes(unsigned int vectors, unsigned int *threads,
int64_t *hashes, size_t *globalThreads, int64_t *hashes, size_t *globalThreads,
unsigned int minthreads, int intensity) unsigned int minthreads, int intensity)
@ -1258,9 +1263,11 @@ static bool opencl_thread_prepare(struct thr_info *thr)
case KL_PHATK: case KL_PHATK:
cgpu->kname = "phatk"; cgpu->kname = "phatk";
break; break;
#ifdef HAVE_SCRYPT
case KL_SCRYPT: case KL_SCRYPT:
cgpu->kname = "scrypt"; cgpu->kname = "scrypt";
break; break;
#endif
case KL_POCLBM: case KL_POCLBM:
cgpu->kname = "poclbm"; cgpu->kname = "poclbm";
break; break;
@ -1302,9 +1309,11 @@ static bool opencl_thread_init(struct thr_info *thr)
case KL_DIAKGCN: case KL_DIAKGCN:
thrdata->queue_kernel_parameters = &queue_diakgcn_kernel; thrdata->queue_kernel_parameters = &queue_diakgcn_kernel;
break; break;
#ifdef HAVE_SCRYPT
case KL_SCRYPT: case KL_SCRYPT:
thrdata->queue_kernel_parameters = &queue_scrypt_kernel; thrdata->queue_kernel_parameters = &queue_scrypt_kernel;
break; break;
#endif
default: default:
case KL_DIABLO: case KL_DIABLO:
thrdata->queue_kernel_parameters = &queue_diablo_kernel; thrdata->queue_kernel_parameters = &queue_diablo_kernel;

2
miner.h

@ -262,7 +262,9 @@ enum cl_kernels {
KL_PHATK, KL_PHATK,
KL_DIAKGCN, KL_DIAKGCN,
KL_DIABLO, KL_DIABLO,
#ifdef HAVE_SCRYPT
KL_SCRYPT, KL_SCRYPT,
#endif
}; };
enum dev_reason { enum dev_reason {

Loading…
Cancel
Save