Browse Source

Merge commit '40b747b' into bfgminer

Luke Dashjr 13 years ago
parent
commit
eaf81b79eb
2 changed files with 3 additions and 3 deletions
  1. 1 1
      miner.h
  2. 2 2
      ocl.c

+ 1 - 1
miner.h

@@ -425,7 +425,7 @@ struct cgpu_info {
 
 #ifdef USE_SCRYPT
 	int opt_lg, lookup_gap;
-	int opt_tc, thread_concurrency;
+	size_t opt_tc, thread_concurrency;
 	int shaders;
 #endif
 	struct timeval tv_gpustart;;

+ 2 - 2
ocl.c

@@ -987,8 +987,8 @@ built:
 		/* Use the max alloc value which has been rounded to a power of
 		 * 2 greater >= required amount earlier */
 		if (bufsize > cgpu->max_alloc) {
-			applog(LOG_WARNING, "Maximum buffer memory device %d supports says %u, your scrypt settings come to %u",
-			       gpu, cgpu->max_alloc, bufsize);
+			applog(LOG_WARNING, "Maximum buffer memory device %d supports says %u", gpu, cgpu->max_alloc);
+			applog(LOG_WARNING, "Your scrypt settings come to %u", bufsize);
 		} else
 			bufsize = cgpu->max_alloc;
 		applog(LOG_DEBUG, "Creating scrypt buffer sized %d", bufsize);