Browse Source

Merge branch 'api_refactor' into bfgminer

Luke Dashjr 14 years ago
parent
commit
7a70df24a4
2 changed files with 5 additions and 1 deletions
  1. 4 1
      README
  2. 1 0
      api.c

+ 4 - 1
README

@@ -673,7 +673,7 @@ The list of requests - a (*) means it requires privileged access - and replies a
  pools         POOLS          The status of each pool
  pools         POOLS          The status of each pool
                               e.g. Pool=0,URL=http://pool.com:6311,Status=Alive,...|
                               e.g. Pool=0,URL=http://pool.com:6311,Status=Alive,...|
 
 
- devs          DEVS           Each available GPU, PGA and CPU with their details
+ devs          DEVS           Each available GPU, PGA and CPU with their status
                               e.g. GPU=0,Accepted=NN,MHS av=NNN,...,Intensity=D|
                               e.g. GPU=0,Accepted=NN,MHS av=NNN,...,Intensity=D|
                               Last Share Time=NNN, <- standand long time in seconds
                               Last Share Time=NNN, <- standand long time in seconds
                                (or 0 if none) of last accepted share
                                (or 0 if none) of last accepted share
@@ -681,6 +681,9 @@ The list of requests - a (*) means it requires privileged access - and replies a
                               Will not report PGAs if PGA mining is disabled
                               Will not report PGAs if PGA mining is disabled
                               Will not report CPUs if CPU mining is disabled
                               Will not report CPUs if CPU mining is disabled
 
 
+ devdetail     DEVS           Each available device with their fixed details
+                              e.g. GPU=0,Driver=opencl,Kernel=diablo,Model=...|
+
  gpu|N         GPU            The details of a single GPU number N in the same
  gpu|N         GPU            The details of a single GPU number N in the same
                               format and details as for DEVS
                               format and details as for DEVS
 
 

+ 1 - 0
api.c

@@ -881,6 +881,7 @@ static void pgastatus(int pga, bool isjson)
 	devstatus_an(io_buffer, devices[dev], isjson);
 	devstatus_an(io_buffer, devices[dev], isjson);
 }
 }
 
 
+__maybe_unused
 static void cpustatus(int cpu, bool isjson)
 static void cpustatus(int cpu, bool isjson)
 {
 {
 	if (opt_n_threads <= 0 || cpu < 0 || cpu >= num_processors)
 	if (opt_n_threads <= 0 || cpu < 0 || cpu >= num_processors)