Merge branch 'master' of https://github.com/kanoi/cgminer into kanoi-usb

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
 

cgminer.c

@@ -5951,7 +5951,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)) {
@@ -6343,7 +6343,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
@@ -6376,7 +6376,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
@@ -6681,7 +6681,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]);

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,

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,

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,

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,

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,

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;

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