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

add minimial support for printing compact sensor records

Browse Source
This commit is contained in:
Duncan Laurie 2003-12-18 01:00:22 +00:00
parent 18a1ff5e60
commit 7d910260e4
1 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ipmitool/lib/ipmi_sdr.c
View File

@ -174,7 +174,9 @@ static void
ipmi_sdr_print_sensor_compact(struct ipmi_intf * intf, ipmi_sdr_print_sensor_compact(struct ipmi_intf * intf,
struct sdr_record_compact_sensor * sensor) struct sdr_record_compact_sensor * sensor)
{ {
struct ipmi_rs * rsp;
char desc[17]; char desc[17];
char state[20];
if (!sensor) if (!sensor)
return; return;
@ -182,26 +184,64 @@ ipmi_sdr_print_sensor_compact(struct ipmi_intf * intf,
memset(desc, 0, sizeof(desc)); memset(desc, 0, sizeof(desc));
memcpy(desc, sensor->id_string, 16); memcpy(desc, sensor->id_string, 16);
rsp = ipmi_sdr_get_sensor_reading(intf, sensor->keys.sensor_num);
if (!rsp || rsp->ccode) {
printf("Unable to get sensor %x reading\n", sensor->keys.sensor_num);
return;
}
if (verbose) { if (verbose) {
printf("Sensor ID : %s (0x%x)\n", printf("Sensor ID : %s (0x%x)\n",
sensor->id_code ? desc : NULL, sensor->keys.sensor_num); sensor->id_code ? desc : NULL, sensor->keys.sensor_num);
printf("Entity ID : %d.%d (%s)\n", printf("Entity ID : %d.%d (%s)\n",
sensor->entity.id, sensor->entity.instance, sensor->entity.id, sensor->entity.instance,
val2str(sensor->entity.id, entity_id_vals)); val2str(sensor->entity.id, entity_id_vals));
if (verbose > 1) { if (verbose > 1) {
printf("sensor unit.pct: 0x%x\n", sensor->unit.pct); printf("Sensor Type Code : 0x%02x\n", sensor->sensor.type);
printf("sensor unit.rate: 0x%x\n", sensor->unit.rate); printf("Event Type Code : 0x%02x\n", sensor->event_type);
printf("sensor unit.analog: 0x%x\n", sensor->unit.analog); printbuf(rsp->data, rsp->data_len, "COMPACT SENSOR READING");
printf("sensor unit.modifier: 0x%x\n", sensor->unit.modifier); }
printf("sensor unit.type.base: 0x%x\n", sensor->unit.type.base); }
printf("sensor unit.type.modifier: 0x%x\n", sensor->unit.type.modifier);
printf("sensor.type: 0x%02x\n", sensor->sensor.type); if (!(rsp->data[1] & 0x80))
printf("event_type: 0x%02x\n", sensor->event_type); return; /* sensor scanning disabled */
/* TODO: handle this using SEL decode functions */
memset(state, 0, sizeof(state));
if (sensor->event_type == 0x6f) {
if (verbose)
printf("State : ");
else {
if (csv_output)
printf("%s,", sensor->id_code ? desc : NULL);
else
printf("%-16s | ", sensor->id_code ? desc : NULL);
} }
switch (sensor->sensor.type) {
case 0x07: /* processor */
if (rsp->data[2] & 0x80)
printf("Present ");
else
printf("Not Present ");
break;
case 0x21: /* slot/connector */
if (rsp->data[2] & 0x04)
printf("Installed ");
else
printf("Not Installed ");
break;
default:
printf("Unknown ");
}
if (!verbose)
printf("| ok");
printf("\n"); printf("\n");
} }
if (verbose)
printf("\n");
} }
static void static void
@ -237,6 +277,8 @@ ipmi_sdr_print_sensor_full(struct ipmi_intf * intf,
return; return;
} }
} else { } else {
if (!(rsp->data[1] & 0x80))
return; /* Sensor Scanning Disabled */
/* convert RAW reading into units */ /* convert RAW reading into units */
val = rsp->data[0] ? sdr_convert_sensor_reading(sensor, rsp->data[0]) : 0; val = rsp->data[0] ? sdr_convert_sensor_reading(sensor, rsp->data[0]) : 0;
} }