From 7abf30b2c035b833f507200ce90d0651b0518be1 Mon Sep 17 00:00:00 2001 From: Kano Date: Sun, 3 Feb 2013 22:51:05 +1100 Subject: [PATCH] distinguish between drv and it's id enum now called drv_id --- api.c | 20 ++++++++++---------- cgminer.c | 8 ++++---- driver-bitforce.c | 2 +- driver-cpu.c | 2 +- driver-icarus.c | 2 +- driver-modminer.c | 2 +- driver-opencl.c | 10 +++++----- miner.h | 2 +- usbutils.c | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/api.c b/api.c index 4998d97b..1a2f312e 100644 --- a/api.c +++ b/api.c @@ -1150,19 +1150,19 @@ static int numpgas() for (i = 0; i < total_devices; i++) { #ifdef USE_BITFORCE - if (devices[i]->drv->drv == DRIVER_BITFORCE) + if (devices[i]->drv->drv_id == DRIVER_BITFORCE) count++; #endif #ifdef USE_ICARUS - if (devices[i]->drv->drv == DRIVER_ICARUS) + if (devices[i]->drv->drv_id == DRIVER_ICARUS) count++; #endif #ifdef USE_ZTEX - if (devices[i]->drv->drv == DRIVER_ZTEX) + if (devices[i]->drv->drv_id == DRIVER_ZTEX) count++; #endif #ifdef USE_MODMINER - if (devices[i]->drv->drv == DRIVER_MODMINER) + if (devices[i]->drv->drv_id == DRIVER_MODMINER) count++; #endif } @@ -1176,19 +1176,19 @@ static int pgadevice(int pgaid) for (i = 0; i < total_devices; i++) { #ifdef USE_BITFORCE - if (devices[i]->drv->drv == DRIVER_BITFORCE) + if (devices[i]->drv->drv_id == DRIVER_BITFORCE) count++; #endif #ifdef USE_ICARUS - if (devices[i]->drv->drv == DRIVER_ICARUS) + if (devices[i]->drv->drv_id == DRIVER_ICARUS) count++; #endif #ifdef USE_ZTEX - if (devices[i]->drv->drv == DRIVER_ZTEX) + if (devices[i]->drv->drv_id == DRIVER_ZTEX) count++; #endif #ifdef USE_MODMINER - if (devices[i]->drv->drv == DRIVER_MODMINER) + if (devices[i]->drv->drv_id == DRIVER_MODMINER) count++; #endif if (count == (pgaid + 1)) @@ -1532,11 +1532,11 @@ static void pgastatus(struct io_data *io_data, int pga, bool isjson, bool precom float temp = cgpu->temp; #ifdef USE_ZTEX - if (cgpu->drv->drv == DRIVER_ZTEX && cgpu->device_ztex) + if (cgpu->drv->drv_id == DRIVER_ZTEX && cgpu->device_ztex) frequency = cgpu->device_ztex->freqM1 * (cgpu->device_ztex->freqM + 1); #endif #ifdef USE_MODMINER - if (cgpu->drv->drv == DRIVER_MODMINER) + if (cgpu->drv->drv_id == DRIVER_MODMINER) frequency = cgpu->clock; #endif diff --git a/cgminer.c b/cgminer.c index 1a43e77b..7a95d1fc 100644 --- a/cgminer.c +++ b/cgminer.c @@ -5950,7 +5950,7 @@ static void *watchdog_thread(void __maybe_unused *userdata) continue; #ifdef WANT_CPUMINE - if (cgpu->drv->drv == DRIVER_CPU) + if (cgpu->drv->drv_id == DRIVER_CPU) continue; #endif if (cgpu->status != LIFE_WELL && (now.tv_sec - thr->last.tv_sec < WATCHDOG_SICK_TIME)) { @@ -6342,7 +6342,7 @@ void enable_curses(void) { #ifndef WANT_CPUMINE struct device_drv cpu_drv; struct device_drv cpu_drv = { - .drv = DRIVER_CPU, + .drv_id = DRIVER_CPU, .name = "CPU", }; #endif @@ -6375,7 +6375,7 @@ void enable_device(struct cgpu_info *cgpu) adj_width(mining_threads, &dev_width); #endif #ifdef HAVE_OPENCL - if (cgpu->drv->drv == DRIVER_OPENCL) { + if (cgpu->drv->drv_id == DRIVER_OPENCL) { gpu_threads += cgpu->threads; } #endif @@ -6680,7 +6680,7 @@ int main(int argc, char *argv[]) enable_device(devices[i]); } else if (i < total_devices) { if (opt_removedisabled) { - if (devices[i]->drv->drv == DRIVER_CPU) + if (devices[i]->drv->drv_id == DRIVER_CPU) --opt_n_threads; } else { enable_device(devices[i]); diff --git a/driver-bitforce.c b/driver-bitforce.c index 69da9a5e..de1a8e6d 100644 --- a/driver-bitforce.c +++ b/driver-bitforce.c @@ -751,7 +751,7 @@ static struct api_data *bitforce_api_stats(struct cgpu_info *cgpu) } struct device_drv bitforce_drv = { - .drv = DRIVER_BITFORCE, + .drv_id = DRIVER_BITFORCE, .dname = "BitForce", .name = "BFL", .drv_detect = bitforce_detect, diff --git a/driver-cpu.c b/driver-cpu.c index 4b0c0865..a8b7a56a 100644 --- a/driver-cpu.c +++ b/driver-cpu.c @@ -844,7 +844,7 @@ CPUSearch: } struct device_drv cpu_drv = { - .drv = DRIVER_CPU, + .drv_id = DRIVER_CPU, .dname = "cpu", .name = "CPU", .drv_detect = cpu_detect, diff --git a/driver-icarus.c b/driver-icarus.c index 49300319..9a99e866 100644 --- a/driver-icarus.c +++ b/driver-icarus.c @@ -901,7 +901,7 @@ static void icarus_shutdown(struct thr_info *thr) } struct device_drv icarus_drv = { - .drv = DRIVER_ICARUS, + .drv_id = DRIVER_ICARUS, .dname = "Icarus", .name = "ICA", .drv_detect = icarus_detect, diff --git a/driver-modminer.c b/driver-modminer.c index 02ad85dc..22812aa5 100644 --- a/driver-modminer.c +++ b/driver-modminer.c @@ -1185,7 +1185,7 @@ static char *modminer_set_device(struct cgpu_info *modminer, char *option, char } struct device_drv modminer_drv = { - .drv = DRIVER_MODMINER, + .drv_id = DRIVER_MODMINER, .dname = "ModMiner", .name = "MMQ", .drv_detect = modminer_detect, diff --git a/driver-opencl.c b/driver-opencl.c index 299d8c40..0521ac1e 100644 --- a/driver-opencl.c +++ b/driver-opencl.c @@ -770,7 +770,7 @@ retry: thr = mining_thr[i]; mutex_unlock(&mining_thr_lock); cgpu = thr->cgpu; - if (cgpu->drv->drv != DRIVER_OPENCL) + if (cgpu->drv->drv_id != DRIVER_OPENCL) continue; if (dev_from_id(i) != selected) continue; @@ -1159,7 +1159,7 @@ select_cgpu: thr = mining_thr[thr_id]; mutex_unlock(&mining_thr_lock); cgpu = thr->cgpu; - if (cgpu->drv->drv != DRIVER_OPENCL) + if (cgpu->drv->drv_id != DRIVER_OPENCL) continue; if (dev_from_id(thr_id) != gpu) continue; @@ -1188,7 +1188,7 @@ select_cgpu: thr = mining_thr[thr_id]; mutex_unlock(&mining_thr_lock); cgpu = thr->cgpu; - if (cgpu->drv->drv != DRIVER_OPENCL) + if (cgpu->drv->drv_id != DRIVER_OPENCL) continue; if (dev_from_id(thr_id) != gpu) continue; @@ -1227,7 +1227,7 @@ select_cgpu: thr = mining_thr[thr_id]; mutex_unlock(&mining_thr_lock); cgpu = thr->cgpu; - if (cgpu->drv->drv != DRIVER_OPENCL) + if (cgpu->drv->drv_id != DRIVER_OPENCL) continue; if (dev_from_id(thr_id) != gpu) continue; @@ -1574,7 +1574,7 @@ static void opencl_thread_shutdown(struct thr_info *thr) } struct device_drv opencl_drv = { - .drv = DRIVER_OPENCL, + .drv_id = DRIVER_OPENCL, .dname = "opencl", .name = "GPU", .drv_detect = opencl_detect, diff --git a/miner.h b/miner.h index f25b6263..87d58fe6 100644 --- a/miner.h +++ b/miner.h @@ -273,7 +273,7 @@ struct thr_info; struct work; struct device_drv { - enum drv_driver drv; + enum drv_driver drv_id; char *dname; char *name; diff --git a/usbutils.c b/usbutils.c index a34028e3..ba4db390 100644 --- a/usbutils.c +++ b/usbutils.c @@ -1117,17 +1117,17 @@ static struct usb_find_devices *usb_check_each(int drvnum, struct device_drv *dr static struct usb_find_devices *usb_check(__maybe_unused struct device_drv *drv, __maybe_unused struct libusb_device *dev) { #ifdef USE_BITFORCE - if (drv->drv == DRIVER_BITFORCE) + if (drv->drv_id == DRIVER_BITFORCE) return usb_check_each(DRV_BITFORCE, drv, dev); #endif #ifdef USE_ICARUS - if (drv->drv == DRIVER_ICARUS) + if (drv->drv_id == DRIVER_ICARUS) return usb_check_each(DRV_ICARUS, drv, dev); #endif #ifdef USE_MODMINER - if (drv->drv == DRIVER_MODMINER) + if (drv->drv_id == DRIVER_MODMINER) return usb_check_each(DRV_MODMINER, drv, dev); #endif