Browse Source

Provide a blank get_statline for drivers that don't support it.

nfactor-troky
Con Kolivas 12 years ago
parent
commit
de48ccca0e
  1. 21
      cgminer.c

21
cgminer.c

@ -1909,8 +1909,7 @@ static void get_statline(char *buf, struct cgpu_info *cgpu)
cgpu->rejected, cgpu->rejected,
cgpu->hw_errors, cgpu->hw_errors,
cgpu->utility); cgpu->utility);
if (cgpu->drv->get_statline) cgpu->drv->get_statline(buf, cgpu);
cgpu->drv->get_statline(buf, cgpu);
} }
static void text_print_status(int thr_id) static void text_print_status(int thr_id)
@ -2027,11 +2026,9 @@ static void curses_print_devstatus(int thr_id)
hwwidth, cgpu->hw_errors, hwwidth, cgpu->hw_errors,
uwidth + 3, cgpu->utility); uwidth + 3, cgpu->utility);
if (cgpu->drv->get_statline) { logline[0] = '\0';
logline[0] = '\0'; cgpu->drv->get_statline(logline, cgpu);
cgpu->drv->get_statline(logline, cgpu); wprintw(statuswin, "%s", logline);
wprintw(statuswin, "%s", logline);
}
wclrtoeol(statuswin); wclrtoeol(statuswin);
} }
@ -6370,15 +6367,19 @@ extern struct device_drv ztex_drv;
static int cgminer_id_count = 0; static int cgminer_id_count = 0;
void noop_reinit_device(struct cgpu_info __maybe_unused *cgpu) static void noop_reinit_device(struct cgpu_info __maybe_unused *cgpu)
{ {
} }
void blank_get_statline_before(char *buf, struct cgpu_info __maybe_unused *cgpu) static void blank_get_statline_before(char *buf, struct cgpu_info __maybe_unused *cgpu)
{ {
tailsprintf(buf, " | "); tailsprintf(buf, " | ");
} }
static void noop_get_statline(char __maybe_unused *buf, struct cgpu_info __maybe_unused *cgpu)
{
}
/* Fill missing driver api functions with noops */ /* Fill missing driver api functions with noops */
void fill_device_api(struct cgpu_info *cgpu) void fill_device_api(struct cgpu_info *cgpu)
{ {
@ -6388,6 +6389,8 @@ void fill_device_api(struct cgpu_info *cgpu)
drv->reinit_device = &noop_reinit_device; drv->reinit_device = &noop_reinit_device;
if (!drv->get_statline_before) if (!drv->get_statline_before)
drv->get_statline_before = &blank_get_statline_before; drv->get_statline_before = &blank_get_statline_before;
if (!drv->get_statline)
drv->get_statline = &noop_get_statline;
} }
void enable_device(struct cgpu_info *cgpu) void enable_device(struct cgpu_info *cgpu)

Loading…
Cancel
Save