Commit c0627c6ac443604ee1714cd1a0a7d4e704cb1146
2014-04-03T20:40:03
Allow an arbitrary number of chips in the BXF driver, showing results from each chip in the API and identify the hexfury, naming it HXF
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 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/driver-bitfury.c b/driver-bitfury.c
index 854a764..a629af7 100644
--- a/driver-bitfury.c
+++ b/driver-bitfury.c
@@ -292,6 +292,16 @@ static bool bxf_detect_one(struct cgpu_info *bitfury, struct bitfury_info *info)
applog(LOG_INFO, "%s %d: Successfully initialised %s",
bitfury->drv->name, bitfury->device_id, bitfury->device_path);
+ /* Sanity check and recognise the hexfury */
+ if (info->chips <= 2 || info->chips > 999)
+ info->chips = 2;
+ else if (info->chips == 6)
+ bitfury->drv->name = "HXF";
+ info->filtered_hw = calloc(sizeof(int), info->chips);
+ info->job = calloc(sizeof(int), info->chips);
+ info->submits = calloc(sizeof(int), info->chips);
+ if (!info->filtered_hw || !info->job || !info->submits)
+ quit(1, "Failed to calloc bxf chip arrays");
info->total_nonces = 1;
info->temp_target = opt_bxf_temp_target * 10;
/* This unsets it to make sure it gets set on the first pass */
@@ -801,7 +811,7 @@ static void parse_bxf_submit(struct cgpu_info *bitfury, struct bitfury_info *inf
bitfury->drv->name, bitfury->device_id);
return;
}
- if (chip > -1 && chip < 2)
+ if (likely(chip > -1 && chip < info->chips))
info->submits[chip]++;
applog(LOG_DEBUG, "%s %d: Parsed nonce %u workid %d timestamp %u",
@@ -947,7 +957,7 @@ static void parse_bxf_job(struct cgpu_info *bitfury, struct bitfury_info *info,
bitfury->drv->name, bitfury->device_id);
return;
}
- if (chip > 1) {
+ if (chip >= info->chips) {
applog(LOG_INFO, "%s %d: Invalid job chip number %d",
bitfury->drv->name, bitfury->device_id, chip);
return;
@@ -964,7 +974,7 @@ static void parse_bxf_hwerror(struct cgpu_info *bitfury, struct bitfury_info *in
bitfury->drv->name, bitfury->device_id);
return;
}
- if (chip > 1) {
+ if (chip >= info->chips) {
applog(LOG_INFO, "%s %d: Invalid hwerror chip number %d",
bitfury->drv->name, bitfury->device_id, chip);
return;
@@ -1408,6 +1418,7 @@ static struct api_data *bxf_api_stats(struct cgpu_info *bitfury, struct bitfury_
struct api_data *root = NULL;
double nonce_rate;
char buf[32];
+ int i;
sprintf(buf, "%d.%d", info->ver_major, info->ver_minor);
root = api_add_string(root, "Version", buf, true);
@@ -1419,12 +1430,14 @@ static struct api_data *bxf_api_stats(struct cgpu_info *bitfury, struct bitfury_
root = api_add_double(root, "Temperature", &bitfury->temp, false);
root = api_add_int(root, "Max DeciTemp", &info->max_decitemp, false);
root = api_add_uint8(root, "Clock", &info->clocks, false);
- root = api_add_int(root, "Core0 hwerror", &info->filtered_hw[0], false);
- root = api_add_int(root, "Core1 hwerror", &info->filtered_hw[1], false);
- root = api_add_int(root, "Core0 jobs", &info->job[0], false);
- root = api_add_int(root, "Core1 jobs", &info->job[1], false);
- root = api_add_int(root, "Core0 submits", &info->submits[0], false);
- root = api_add_int(root, "Core1 submits", &info->submits[1], false);
+ for (i = 0; i < info->chips; i++) {
+ sprintf(buf, "Core%d hwerror", i);
+ root = api_add_int(root, buf, &info->filtered_hw[i], false);
+ sprintf(buf, "Core%d jobs", i);
+ root = api_add_int(root, buf, &info->job[i], false);
+ sprintf(buf, "Core%d submits", i);
+ root = api_add_int(root, buf, &info->submits[i], false);
+ }
return root;
}
diff --git a/driver-bitfury.h b/driver-bitfury.h
index 2b2f75a..028e17b 100644
--- a/driver-bitfury.h
+++ b/driver-bitfury.h
@@ -88,9 +88,9 @@ struct bitfury_info {
int hw_rev;
int chips;
uint8_t clocks; // There are two but we set them equal
- int filtered_hw[2]; // Hardware errors we're told about but are filtered
- int job[2]; // Completed jobs we're told about
- int submits[2]; // Submitted responses
+ int *filtered_hw; // Hardware errors we're told about but are filtered
+ int *job; // Completed jobs we're told about
+ int *submits; // Submitted responses
/* NF1 specific data */
struct mcp_settings mcp;