Commit d8c093645c6d246b7ffb57910b929a700b8156ec
2014-03-06T19:08:24
Store the hardware and firmware revision in the info struct for easy use in the hfa driver.
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
diff --git a/driver-hashfast.c b/driver-hashfast.c
index 22d98b7..7807152 100644
--- a/driver-hashfast.c
+++ b/driver-hashfast.c
@@ -482,10 +482,12 @@ tryagain:
goto out;
}
db = &info->usb_init_base;
- applog(LOG_INFO, "%s %d: firmware_rev: %d.%d", hashfast->drv->name, hashfast->device_id,
- (db->firmware_rev >> 8) & 0xff, db->firmware_rev & 0xff);
- applog(LOG_INFO, "%s %d: hardware_rev: %d.%d", hashfast->drv->name, hashfast->device_id,
- (db->hardware_rev >> 8) & 0xff, db->hardware_rev & 0xff);
+ info->firmware_version = ((db->firmware_rev >> 8) & 0xff) + (double)(db->firmware_rev & 0xff) / 10.0;
+ info->hardware_version = ((db->hardware_rev >> 8) & 0xff) + (double)(db->hardware_rev & 0xff) / 10.0;
+ applog(LOG_INFO, "%s %d: firmware_rev: %.1f", hashfast->drv->name, hashfast->device_id,
+ info->firmware_version);
+ applog(LOG_INFO, "%s %d: hardware_rev: %.1f", hashfast->drv->name, hashfast->device_id,
+ info->hardware_version);
applog(LOG_INFO, "%s %d: serial number: %08x", hashfast->drv->name, hashfast->device_id,
db->serial_number);
applog(LOG_INFO, "%s %d: hash clockrate: %d Mhz", hashfast->drv->name, hashfast->device_id,
@@ -1694,11 +1696,9 @@ static struct api_data *hfa_api_stats(struct cgpu_info *cgpu)
root = api_add_int(root, "asic count", &info->asic_count, false);
root = api_add_int(root, "core count", &info->core_count, false);
+ root = api_add_double(root, "firmware rev", &info->firmware_version, false);
+ root = api_add_double(root, "hardware rev", &info->hardware_version, false);
db = &info->usb_init_base;
- sprintf(buf, "%d.%d", (db->firmware_rev >> 8) & 0xff, db->firmware_rev & 0xff);
- root = api_add_string(root, "firmware rev", buf, true);
- sprintf(buf, "%d.%d", (db->hardware_rev >> 8) & 0xff, db->hardware_rev & 0xff);
- root = api_add_string(root, "hardware rev", buf, true);
root = api_add_hex32(root, "serial number", &db->serial_number, true);
varint = db->hash_clockrate;
root = api_add_int(root, "base clockrate", &varint, true);
diff --git a/driver-hashfast.h b/driver-hashfast.h
index 0c7b811..1a71f58 100644
--- a/driver-hashfast.h
+++ b/driver-hashfast.h
@@ -109,6 +109,8 @@ struct hashfast_info {
struct hf_long_statistics *die_statistics; // Array of per-die error counters
struct hf_long_usb_stats1 stats1;
struct hf_die_data *die_data;
+ double firmware_version;
+ double hardware_version;
int hash_clock_rate; // Hash clock rate to use, in Mhz
int base_clock; // Clock rate we actually got
struct hf_usb_init_base usb_init_base; // USB Base information from USB_INIT