From a94b7be3bce294b5dd426736ded6fac69530702f Mon Sep 17 00:00:00 2001
From: Kano <root@mutsumi.paige>
Date: Sat, 29 Jun 2013 08:41:22 +1000
Subject: [PATCH] correct device DR: and remove global U:

---
 README    |  3 +--
 cgminer.c | 11 ++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/README b/README
index adcab8f2..0866703d 100644
--- a/README
+++ b/README
@@ -420,7 +420,7 @@ dedicated to this program,
 	http://forum.bitcoin.org/index.php?topic=28402.0
 
 The output line shows the following:
-(5s):1713.6 (avg):1707.8 Mh/s | DA:729  DR:8  HW:0  U:22.53/m  WU:22.53/m
+(5s):1713.6 (avg):1707.8 Mh/s | DA:729  DR:8  HW:0  WU:22.53/m
 
 Each column is as follows:
 5s:  A 5 second exponentially decaying average hash rate
@@ -428,7 +428,6 @@ avg: An all time average hash rate
 DA:  The total difficulty of Accepted shares
 DR:  The total difficulty of Rejected shares
 HW:  The number of HardWare errors
-U:   The Utility defined as the number of shares / minute
 WU:  The Work Utility defined as the number of diff1 shares work / minute
      (accepted or rejected).
 
diff --git a/cgminer.c b/cgminer.c
index 4abba257..c9e10255 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2174,10 +2174,10 @@ static void curses_print_devstatus(struct cgpu_info *cgpu, int count)
 	adj_width(cgpu->hw_errors, &hwwidth);
 	adj_width(wu, &wuwidth);
 
-	wprintw(statuswin, "/%6sh/s | DA:%*.0f DR:%*d HW:%*d WU:%*.2f/m",
+	wprintw(statuswin, "/%6sh/s | DA:%*.0f DR:%*.0f HW:%*d WU:%*.2f/m",
 			displayed_hashes,
 			dawidth, cgpu->diff_accepted,
-			drwidth, cgpu->rejected,
+			drwidth, cgpu->diff_rejected,
 			hwwidth, cgpu->hw_errors,
 			wuwidth + 3, wu);
 
@@ -4646,7 +4646,6 @@ static void hashmeter(int thr_id, struct timeval *diff,
 	struct timeval temp_tv_end, total_diff;
 	double secs;
 	double local_secs;
-	double utility;
 	static double local_mhashes_done = 0;
 	static double rolling = 0;
 	double local_mhashes;
@@ -4728,17 +4727,15 @@ static void hashmeter(int thr_id, struct timeval *diff,
 	total_secs = (double)total_diff.tv_sec +
 		((double)total_diff.tv_usec / 1000000.0);
 
-	utility = total_accepted / total_secs * 60;
-
 	dh64 = (double)total_mhashes_done / total_secs * 1000000ull;
 	dr64 = (double)rolling * 1000000ull;
 	suffix_string(dh64, displayed_hashes, 4);
 	suffix_string(dr64, displayed_rolling, 4);
 
-	sprintf(statusline, "%s(%ds):%s (avg):%sh/s | DA:%.0f  DR:%.0f  HW:%d  U:%.1f/m  WU:%.1f/m",
+	sprintf(statusline, "%s(%ds):%s (avg):%sh/s | DA:%.0f  DR:%.0f  HW:%d  WU:%.1f/m",
 		want_per_device_stats ? "ALL " : "",
 		opt_log_interval, displayed_rolling, displayed_hashes,
-		total_diff_accepted, total_diff_rejected, hw_errors, utility,
+		total_diff_accepted, total_diff_rejected, hw_errors,
 		total_diff1 / total_secs * 60);
 
 	local_mhashes_done = 0;