Undo temporary work-around for RSMI change

Change-Id: I9bf144add951c95e4eebc8647bffb71d13f4f612
This commit is contained in:
Chris Freehill
2018-07-09 08:46:57 -05:00
parent ae0c852074
commit 06759fed5f
+6 -6
View File
@@ -139,7 +139,7 @@ int DumpMonitorInfo() {
int ret = 0;
uint64_t value_u64;
uint32_t value_u32;
// temp work-around int64_t value_i64;
int64_t value_i64;
std::string val_str;
std::vector<std::string> val_vec;
rsmi_status_t rsmi_ret;
@@ -223,17 +223,17 @@ int DumpMonitorInfo() {
char mon_name[32];
rsmi_ret = rsmi_dev_name_get(dindx, mon_name, 32);
print_val_str(mon_name, "Monitor name: ");
#if 0 // Temp work around for rsmi change
rsmi_ret = rsmi_dev_temp_get(dindx, &value_i64);
rsmi_ret = rsmi_dev_temp_metric_get(dindx, 0,
RSMI_TEMP_CURRENT, &value_i64);
print_val_str(IntegerToString(value_i64/1000, false) + "C",
"Temperature: ");
rsmi_ret = rsmi_dev_fan_speed_get(dindx, &value_i64);
rsmi_ret = rsmi_dev_fan_speed_get(dindx, 0, &value_i64);
if (ret != RSMI_STATUS_SUCCESS) {
std::cout << "not available; rsmi call returned" << rsmi_ret;
dump_ret = 1;
}
rsmi_ret = rsmi_dev_fan_speed_max_get(dindx, &value_u64);
rsmi_ret = rsmi_dev_fan_speed_max_get(dindx, 0, &value_u64);
if (ret != RSMI_STATUS_SUCCESS) {
std::cout << "not available; rsmi call returned" << rsmi_ret;
dump_ret = 1;
@@ -242,7 +242,7 @@ int DumpMonitorInfo() {
std::cout << static_cast<float>(value_i64)/value_u64 * 100 << "% (" <<
value_i64 << "/" << value_u64 << ")" << std::endl;
}
#endif
std::cout << "\t=======" << std::endl;
}
std::cout << delim << std::endl;