From 49f3c1aa61839a2e6f5b77d37068fa3ddef994f8 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 18 May 2010 21:11:35 +0000
Subject: [PATCH] client: bug fixes

svn path=/trunk/boinc/; revision=21571
---
 client/coproc_detect.cpp | 8 ++++----
 client/cpu_sched.cpp     | 8 ++++----
 lib/coproc.h             | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/coproc_detect.cpp b/client/coproc_detect.cpp
index 8849d01796..9bc22774b9 100644
--- a/client/coproc_detect.cpp
+++ b/client/coproc_detect.cpp
@@ -427,9 +427,9 @@ void COPROC_CUDA::get(
 
 // fake a NVIDIA GPU (for debugging)
 //
-void COPROC_CUDA::fake(double ram, int count) {
+void COPROC_CUDA::fake(double ram, int n) {
    strcpy(type, "CUDA");
-   count = count;
+   count = n;
    for (int i=0; i<count; i++) {
        device_nums[i] = i;
    }
@@ -823,11 +823,11 @@ void COPROC_ATI::get(
     retval = (*__calShutdown)();
 }
 
-void COPROC_ATI::fake(double ram, int count) {
+void COPROC_ATI::fake(double ram, int n) {
     strcpy(type, "ATI");
     strcpy(version, "1.4.3");
     strcpy(name, "foobar");
-    count = count;
+    count = n;
     memset(&attribs, 0, sizeof(attribs));
     memset(&info, 0, sizeof(info));
     attribs.localRAM = (int)(ram/MEGA);
diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp
index 16e3bebdaf..c16bfc5bf2 100644
--- a/client/cpu_sched.cpp
+++ b/client/cpu_sched.cpp
@@ -126,10 +126,10 @@ struct PROC_RESOURCES {
         COPROC* cp2;
         if (av.ncudas) {
             x = av.ncudas;
-            cp2 = &gstate.host_info.coprocs.cuda;
+            cp2 = &coprocs.cuda;
         } else if (av.natis) {
             x = av.natis;
-            cp2 = &gstate.host_info.coprocs.ati;
+            cp2 = &coprocs.ati;
         } else {
             return true;
         }
@@ -158,10 +158,10 @@ struct PROC_RESOURCES {
         COPROC* cp2;
         if (av.ncudas) {
             x = av.ncudas;
-            cp2 = &gstate.host_info.coprocs.cuda;
+            cp2 = &coprocs.cuda;
         } else if (av.natis) {
             x = av.natis;
-            cp2 = &gstate.host_info.coprocs.ati;
+            cp2 = &coprocs.ati;
         } else {
             return;
         }
diff --git a/lib/coproc.h b/lib/coproc.h
index c5f022b58f..1dc6fcb228 100644
--- a/lib/coproc.h
+++ b/lib/coproc.h
@@ -302,11 +302,11 @@ struct COPROCS {
     // to avoid messing w/ master copy
     //
     void clone(COPROCS& c, bool copy_used) {
-        c.cuda = cuda;
-        c.ati = ati;
+        cuda = c.cuda;
+        ati = c.ati;
         if (!copy_used) {
-            c.cuda.used = 0;
-            c.ati.used = 0;
+            cuda.used = 0;
+            ati.used = 0;
         }
     }
     inline void clear() {