Merge branch 'sane_driverapi' into bfgminer

Conflicts:
	api.c
	miner.h

api.c

@@ -1987,14 +1987,14 @@ static int itemstats(int i, char *id, struct cgminer_stats *stats, char *extra,
 			extra = (char *)BLANK;
 
 		sprintf(buf, isjson
-			? "%s{\"STATS\":%d,\"ID\":\"%s\",\"Elapsed\":%.0f,\"Calls\":%d,\"Wait\":%ld.%06ld,\"Max\":%ld.%06ld,\"Min\":%ld.%06ld%s%s}"
-			: "%sSTATS=%d,ID=%s,Elapsed=%.0f,Calls=%d,Wait=%ld.%06ld,Max=%ld.%06ld,Min=%ld.%06ld%s%s" SEPSTR,
+			? "%s{\"STATS\":%d,\"ID\":\"%s\",\"Elapsed\":%.0f,\"Calls\":%d,\"Wait\":%ld.%06ld,\"Max\":%ld.%06ld,\"Min\":%ld.%06ld%s}"
+			: "%sSTATS=%d,ID=%s,Elapsed=%.0f,Calls=%d,Wait=%ld.%06ld,Max=%ld.%06ld,Min=%ld.%06ld%s" SEPSTR,
 			(isjson && (i > 0)) ? COMMA : BLANK,
 			i, id, total_secs, stats->getwork_calls,
 			stats->getwork_wait.tv_sec, stats->getwork_wait.tv_usec,
 			stats->getwork_wait_max.tv_sec, stats->getwork_wait_max.tv_usec,
 			stats->getwork_wait_min.tv_sec, stats->getwork_wait_min.tv_usec,
-			*extra ? COMMA : BLANK, extra);
+			extra);
 
 		strcat(io_buffer, buf);
 
@@ -2020,15 +2020,15 @@ static void minerstats(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
 	for (j = 0; j < total_devices; j++) {
 		struct cgpu_info *cgpu = devices[j];
 
-		if (cgpu && cgpu->api) {
-			if (cgpu->api->get_api_stats)
-				cgpu->api->get_api_stats(extra, cgpu, isjson);
-			else
-				extra[0] = '\0';
-
-			sprintf(id, "%s%d", cgpu->api->name, cgpu->device_id);
-			i = itemstats(i, id, &(cgpu->cgminer_stats), extra, isjson);
+		extra[0] = '\0';
+		if (cgpu->api->get_extra_device_perf_stats) {
+			json_t *info = cgpu->api->get_extra_device_perf_stats(cgpu);
+			append_kv(extra, info, isjson);
+			json_decref(info);
 		}
+
+		sprintf(id, "%s%d", cgpu->api->name, cgpu->device_id);
+		i = itemstats(i, id, &(cgpu->cgminer_stats), extra, isjson);
 	}
 
 	for (j = 0; j < total_pools; j++) {

miner.h

@@ -205,7 +205,7 @@ struct device_api {
 	void (*get_statline)(char*, struct cgpu_info*);
 	json_t* (*get_extra_device_detail)(struct cgpu_info*);
 	json_t* (*get_extra_device_status)(struct cgpu_info*);
-	void (*get_api_stats)(char*, struct cgpu_info*, bool);
+	json_t* (*get_extra_device_perf_stats)(struct cgpu_info*);
 
 	// Thread-specific functions
 	bool (*thread_prepare)(struct thr_info*);