From a1cd9defbaf2a18c01dc1231532680c0819eaa46 Mon Sep 17 00:00:00 2001 From: Kano Date: Mon, 23 Jan 2012 15:25:59 +1100 Subject: [PATCH 1/2] Return an error if using ADL API commands when it's not available --- api.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/api.c b/api.c index ab1d2177..2b7dde04 100644 --- a/api.c +++ b/api.c @@ -1014,6 +1014,7 @@ static void gpuintensity(SOCKETTYPE c, char *param, bool isjson) static void gpumem(SOCKETTYPE c, char *param, bool isjson) { +#ifdef HAVE_ADL int id; char *value; int clock; @@ -1027,10 +1028,14 @@ static void gpumem(SOCKETTYPE c, char *param, bool isjson) strcpy(io_buffer, message(MSG_GPUMERR, id, value, isjson)); else strcpy(io_buffer, message(MSG_GPUMEM, id, value, isjson)); +#else + strcpy(io_buffer, message(MSG_NOADL, 0, NULL, isjson)); +#endif } static void gpuengine(SOCKETTYPE c, char *param, bool isjson) { +#ifdef HAVE_ADL int id; char *value; int clock; @@ -1044,10 +1049,14 @@ static void gpuengine(SOCKETTYPE c, char *param, bool isjson) strcpy(io_buffer, message(MSG_GPUEERR, id, value, isjson)); else strcpy(io_buffer, message(MSG_GPUENG, id, value, isjson)); +#else + strcpy(io_buffer, message(MSG_NOADL, 0, NULL, isjson)); +#endif } static void gpufan(SOCKETTYPE c, char *param, bool isjson) { +#ifdef HAVE_ADL int id; char *value; int fan; @@ -1061,10 +1070,14 @@ static void gpufan(SOCKETTYPE c, char *param, bool isjson) strcpy(io_buffer, message(MSG_GPUFERR, id, value, isjson)); else strcpy(io_buffer, message(MSG_GPUFAN, id, value, isjson)); +#else + strcpy(io_buffer, message(MSG_NOADL, 0, NULL, isjson)); +#endif } static void gpuvddc(SOCKETTYPE c, char *param, bool isjson) { +#ifdef HAVE_ADL int id; char *value; float vddc; @@ -1078,6 +1091,9 @@ static void gpuvddc(SOCKETTYPE c, char *param, bool isjson) strcpy(io_buffer, message(MSG_GPUVERR, id, value, isjson)); else strcpy(io_buffer, message(MSG_GPUVDDC, id, value, isjson)); +#else + strcpy(io_buffer, message(MSG_NOADL, 0, NULL, isjson)); +#endif } static void send_result(SOCKETTYPE c, bool isjson); From 2e16d5e5439dcb99b589a1ffef7c836b7bde21a1 Mon Sep 17 00:00:00 2001 From: Kano Date: Mon, 23 Jan 2012 15:32:48 +1100 Subject: [PATCH 2/2] Add more explanation of JSON format and the 'save' command --- README | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README b/README index 88f9fb79..5709c2fe 100644 --- a/README +++ b/README @@ -543,6 +543,10 @@ The JSON request format required is '{"command":"CMD","parameter":"PARAM"}' where "CMD" is from the "Request" column below and "PARAM" would be e.g. the CPU/GPU number if required. +An example request in both formats: + gpufan|0,80 + {"command":"gpufan","parameter":"0,80"} + The format of each reply (unless stated otherwise) is a STATUS section followed by an optional detail section @@ -635,7 +639,8 @@ The list of requests and replies are: stating the results of setting GPU N vddc to V save|filename none There is no reply section just the STATUS section - stating success or failure + stating success or failure saving the cgminer config + to filename quit none There is no status section but just a single "BYE|" reply before cgminer quits