deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-11 19:17:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make sdr elist reporting consistent

Browse Source
This commit is contained in:
Duncan Laurie 2005-05-14 04:17:56 +00:00
parent 1a4399a9eb
commit 2d0c486541
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ipmitool/lib/ipmi_sdr.c
View File

@ -1050,10 +1050,9 @@ ipmi_sdr_print_sensor_full(struct ipmi_intf * intf,
(val==(int)val) ? 0 : 2, val, (val==(int)val) ? 0 : 2, val,
do_unit ? unitstr : ""); do_unit ? unitstr : "");
else if (IS_SCANNING_DISABLED(rsp->data[1])) else if (IS_SCANNING_DISABLED(rsp->data[1]))
i += snprintf(sval, sizeof(sval), "disabled "); i += snprintf(sval, sizeof(sval), "Disabled");
else else
i += snprintf(sval, sizeof(sval), i += snprintf(sval, sizeof(sval), "No Reading");
"No Reading ");
printf("%s\n", sval); printf("%s\n", sval);
return 0; /* done */ return 0; /* done */
@ -1077,8 +1076,10 @@ ipmi_sdr_print_sensor_full(struct ipmi_intf * intf,
printf(" Sensor Reading : "); printf(" Sensor Reading : ");
if (validread) if (validread)
printf("%xh\n", (uint32_t)val); printf("%xh\n", (uint32_t)val);
else if (IS_SCANNING_DISABLED(rsp->data[1]))
printf("Disabled\n");
else else
printf("Not Present\n"); printf("Not Reading\n");
printf(" Event Message Control : "); printf(" Event Message Control : ");
switch (sensor->sensor.capabilities.event_msg) { switch (sensor->sensor.capabilities.event_msg) {
@ -1134,7 +1135,7 @@ ipmi_sdr_print_sensor_full(struct ipmi_intf * intf,
} else if (IS_SCANNING_DISABLED(rsp->data[1])) } else if (IS_SCANNING_DISABLED(rsp->data[1]))
printf("Disabled\n"); printf("Disabled\n");
else else
printf("Not Present\n"); printf("No Reading\n");
printf(" Status : %s\n", printf(" Status : %s\n",
validread ? ipmi_sdr_get_status(sensor, rsp->data[2]) : "Disabled"); validread ? ipmi_sdr_get_status(sensor, rsp->data[2]) : "Disabled");
@ -1502,8 +1503,12 @@ ipmi_sdr_print_sensor_compact(struct ipmi_intf * intf,
sensor->id_code ? desc : "", sensor->id_code ? desc : "",
sensor->keys.sensor_num); sensor->keys.sensor_num);
if (validread == 0 || rsp->ccode != 0) { if (validread == 0 || rsp->ccode != 0) {
printf("ns | %2d.%1d | No Reading", printf("ns | %2d.%1d | ",
sensor->entity.id, sensor->entity.instance); sensor->entity.id, sensor->entity.instance);
if (IS_SCANNING_DISABLED(rsp->data[1]))
printf("Disabled");
else
printf("No Reading");
dostate = 0; dostate = 0;
} }
else { else {