Merge commit '93555e2' into bfgminer

Conflicts:
	api.c
	miner.php

API-README

@@ -362,6 +362,9 @@ Added API commands:
 
 Modified API commands:
  Change pool field name 'Diff1 Shares' to 'Diff1 Work'
+ 'devs' - add 'Diff1 Work' to all devices
+ 'gpu|N' - add 'Diff1 Work'
+ 'pga|N' - add 'Diff1 Work'
 
 ----------
 

api.c

@@ -1383,6 +1383,7 @@ static void devstatus_an(struct cgpu_info *cgpu, bool isjson)
 	root = api_add_int(root, "Last Share Pool", &last_share_pool, false);
 	root = api_add_time(root, "Last Share Time", &(cgpu->last_share_pool_time), false);
 	root = api_add_mhtotal(root, "Total MH", &(cgpu->total_mhashes), false);
+	root = api_add_int(root, "Diff1 Work", &(cgpu->diff1), false);
 
 	if (cgpu->api->get_api_extra_device_status)
 		root = api_add_extra(root, cgpu->api->get_api_extra_device_status(cgpu));

miner.c

@@ -4695,6 +4695,7 @@ bool test_nonce(struct work *work, uint32_t nonce, bool checktarget)
 bool submit_nonce(struct thr_info *thr, struct work *work, uint32_t nonce)
 {
 	total_diff1++;
+	thr->cgpu->diff1++;
 	work->pool->diff1++;
 
 	/* Do one last check before attempting to submit the work */

miner.h

@@ -433,6 +433,7 @@ struct cgpu_info {
 	int gpu_powertune;
 	float gpu_vddc;
 #endif
+	int diff1;
 	int last_share_pool;
 	time_t last_share_pool_time;