From b11ca3650ac986b9fd7aee44363a0287c6dad45c Mon Sep 17 00:00:00 2001 From: Noel Maersk Date: Sat, 11 Jan 2014 20:57:15 +0200 Subject: [PATCH] Remove remaining references to have_opencl. --- cgminer.c | 6 ++---- driver-opencl.c | 3 --- driver-opencl.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cgminer.c b/cgminer.c index a92ab4a6..981185ec 100644 --- a/cgminer.c +++ b/cgminer.c @@ -105,7 +105,6 @@ int total_devices; int zombie_devs; static int most_devices; struct cgpu_info **devices; -bool have_opencl; int mining_threads; int num_processors; #ifdef HAVE_CURSES @@ -2036,8 +2035,7 @@ static void curses_print_status(void) prev_block, block_diff, blocktime, best_share); mvwhline(statuswin, 6, 0, '-', 80); mvwhline(statuswin, statusy - 1, 0, '-', 80); - cg_mvwprintw(statuswin, devcursor - 1, 1, "[P]ool management %s[S]ettings [D]isplay options [Q]uit", - have_opencl ? "[G]PU management " : ""); + cg_mvwprintw(statuswin, devcursor - 1, 1, "[P]ool management [G]PU management [S]ettings [D]isplay options [Q]uit"); } static void adj_width(int var, int *length) @@ -4747,7 +4745,7 @@ static void *input_thread(void __maybe_unused *userdata) display_pools(); else if (!strncasecmp(&input, "s", 1)) set_options(); - else if (have_opencl && !strncasecmp(&input, "g", 1)) + else if (!strncasecmp(&input, "g", 1)) manage_gpu(); if (opt_realquiet) { disable_curses(); diff --git a/driver-opencl.c b/driver-opencl.c index cb856c63..60a995cc 100644 --- a/driver-opencl.c +++ b/driver-opencl.c @@ -48,7 +48,6 @@ extern bool opt_loginput; extern char *opt_kernel_path; extern int gpur_thr_id; extern bool opt_noadl; -extern bool have_opencl; extern void *miner_thread(void *userdata); extern int dev_from_id(int thr_id); @@ -1154,8 +1153,6 @@ static bool opencl_thread_prepare(struct thr_info *thr) cgtime(&now); get_datestamp(cgpu->init, sizeof(cgpu->init), &now); - have_opencl = true; - return true; } diff --git a/driver-opencl.h b/driver-opencl.h index 2120135f..58dcb0ec 100644 --- a/driver-opencl.h +++ b/driver-opencl.h @@ -26,7 +26,6 @@ extern char *set_kernel(char *arg); void manage_gpu(void); extern void pause_dynamic_threads(int gpu); -extern bool have_opencl; extern int opt_platform_id; extern struct device_drv opencl_drv;