Commit 6f384c277fc89c4bbdf13d939f66a014d83e64a5
2014-05-21T21:44:24
ants2 - beeper fix, max 4k chip diff, libm test/fail
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
diff --git a/driver-bitmain.c b/driver-bitmain.c
index 54438e8..cb52bc1 100644
--- a/driver-bitmain.c
+++ b/driver-bitmain.c
@@ -48,7 +48,7 @@ bool opt_bitmain_hwerror = false;
#ifdef USE_ANT_S2
bool opt_bitmain_checkall = false;
bool opt_bitmain_checkn2diff = false;
-bool opt_bitmain_beeper = true;
+bool opt_bitmain_beeper = false;
bool opt_bitmain_tempoverctrl = true;
#endif
int opt_bitmain_temp = BITMAIN_TEMP_TARGET;
@@ -494,8 +494,11 @@ static int bitmain_set_txtask(struct bitmain_info *info, uint8_t *sendbuf,
k_add_head(info->wbuild, witem);
diffbits = (int)floor(log2(DATAW(witem)->work->sdiff));
- if (diffbits > 199)
- diffbits = 199;
+ if (diffbits < 0)
+ diffbits = 0;
+ // Limit to 4096 so solo mining has reasonable mining stats
+ if (diffbits > 12)
+ diffbits = 12;
// Must use diffbits <= all work being sent
if (lowestdiffbits == -1 || lowestdiffbits > diffbits)
@@ -1765,6 +1768,13 @@ static int bitmain_initialize(struct cgpu_info *bitmain)
int tempover_ctrl = 1;
struct bitmain_packet_head packethead;
int asicnum = 0;
+
+ int mathtest = (int)floor(log2(42));
+ if (mathtest != 5) {
+ applog(LOG_ERR, "%s%d: %s() floating point math library is deficient",
+ bitmain->drv->name, bitmain->device_id, __func__);
+ return -1;
+ }
#endif
/* Send reset, then check for result */
@@ -2724,6 +2734,7 @@ static struct api_data *bitmain_api_stats(struct cgpu_info *cgpu)
root = api_add_avg(root, "avg_failed", &avg, true);
root = api_add_int(root, "temp_hi", &(info->temp_hi), false);
+#ifdef USE_ANT_S1
root = api_add_bool(root, "overheat", &(info->overheat), true);
root = api_add_int(root, "overheat_temp", &(info->overheat_temp), true);
root = api_add_uint32(root, "overheat_count", &(info->overheat_count), true);
@@ -2732,6 +2743,7 @@ static struct api_data *bitmain_api_stats(struct cgpu_info *cgpu)
root = api_add_uint32(root, "overheat_slept", &(info->overheat_slept), true);
root = api_add_uint64(root, "overheat_total_sleep", &(info->overheat_total_sleep), true);
root = api_add_uint32(root, "overheat_recovers", &(info->overheat_recovers), true);
+#endif
#ifdef USE_ANT_S2
root = api_add_bool(root, "opt_bitmain_beeper", &opt_bitmain_beeper, false);
diff --git a/driver-bitmain.h b/driver-bitmain.h
index 1d31db7..76594fc 100644
--- a/driver-bitmain.h
+++ b/driver-bitmain.h
@@ -338,8 +338,9 @@ struct bitmain_info {
int idle;
bool reset;
- bool overheat;
bool optimal;
+#ifdef USE_ANT_S1
+ bool overheat;
int overheat_temp;
uint32_t overheat_count;
uint32_t overheat_sleep_ms;
@@ -347,6 +348,7 @@ struct bitmain_info {
uint32_t overheat_slept;
uint64_t overheat_total_sleep;
uint32_t overheat_recovers;
+#endif
// Work
K_LIST *work_list;