From 9b756d731654c244cc101436444a30e22e83fe51 Mon Sep 17 00:00:00 2001 From: Kano Date: Mon, 3 Jun 2013 10:24:02 +1000 Subject: [PATCH 1/2] devs display - show ZOMBIEs after all others --- cgminer.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/cgminer.c b/cgminer.c index 3bf959f5..0714d9cf 100644 --- a/cgminer.c +++ b/cgminer.c @@ -2034,10 +2034,9 @@ static void adj_width(int var, int *length) static int dev_width; -static void curses_print_devstatus(int thr_id) +static void curses_print_devstatus(struct cgpu_info *cgpu, int count) { static int awidth = 1, rwidth = 1, hwwidth = 1, uwidth = 1; - struct cgpu_info *cgpu; char logline[256]; char displayed_hashes[16], displayed_rolling[16]; uint64_t dh64, dr64; @@ -2045,14 +2044,12 @@ static void curses_print_devstatus(int thr_id) if (opt_compact) return; - cgpu = get_thr_cgpu(thr_id); - - if (cgpu->cgminer_id >= start_devices || devcursor + cgpu->cgminer_id > LINES - 2) + if (count >= start_devices || devcursor + count > LINES - 2) return; cgpu->utility = cgpu->accepted / total_secs * 60; - wmove(statuswin,devcursor + cgpu->cgminer_id, 0); + wmove(statuswin,devcursor + count, 0); wprintw(statuswin, " %s %*d: ", cgpu->drv->name, dev_width, cgpu->device_id); logline[0] = '\0'; cgpu->drv->get_statline_before(logline, cgpu); @@ -6385,10 +6382,28 @@ static void *watchdog_thread(void __maybe_unused *userdata) #ifdef HAVE_CURSES if (curses_active_locked()) { + struct cgpu_info *cgpu; + int count; + change_logwinsize(); curses_print_status(); - for (i = 0; i < mining_threads; i++) - curses_print_devstatus(i); + count = 0; + for (i = 0; i < mining_threads; i++) { + cgpu = get_thr_cgpu(i); +#ifndef USE_USBUTILS + if (cgpu) +#else + if (cgpu && !cgpu->usbinfo.nodev) +#endif + curses_print_devstatus(cgpu, count++); + } +#ifdef USE_USBUTILS + for (i = 0; i < mining_threads; i++) { + cgpu = get_thr_cgpu(i); + if (cgpu && cgpu->usbinfo.nodev) + curses_print_devstatus(cgpu, count++); + } +#endif touchwin(statuswin); wrefresh(statuswin); touchwin(logwin); From fe802b62ae76384df3a76147b2836a6e967215a0 Mon Sep 17 00:00:00 2001 From: Kano Date: Mon, 3 Jun 2013 07:39:30 +1000 Subject: [PATCH 2/2] basic copyright statement in API.java --- API.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/API.java b/API.java index 54dcda99..74c57a21 100644 --- a/API.java +++ b/API.java @@ -1,4 +1,6 @@ /* + * + * Copyright (C) Andrew Smith 2012-2013 * * Usage: java API command ip port *