deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-12 03:27:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed display format (suppressed TAB from formatted output)

Browse Source
This commit is contained in:
Francois Isabelle 2007-12-14 19:30:12 +00:00
parent 0b9f0d6a35
commit c306d08d7e
2 changed files with 221 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipmitool/lib/ipmi_fru.c
View File

@ -40,6 +40,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h>
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
@ -445,6 +446,7 @@ fru_area_print_board(struct ipmi_intf * intf, struct fru_info * fru,
char * fru_area; char * fru_area;
uint8_t * fru_data; uint8_t * fru_data;
uint32_t fru_len, area_len, i; uint32_t fru_len, area_len, i;
time_t tval;
i = offset; i = offset;
fru_len = 0; fru_len = 0;
@ -473,9 +475,12 @@ fru_area_print_board(struct ipmi_intf * intf, struct fru_info * fru,
i++; /* skip fru area version */ i++; /* skip fru area version */
area_len = fru_data[i++] * 8; /* fru area length */ area_len = fru_data[i++] * 8; /* fru area length */
i++; /* skip fru board language */ i++; /* skip fru board language */
tval=((fru_data[i+2] << 16) + (fru_data[i+1] << 8) + (fru_data[i]));
tval=tval * 60;
tval=tval + secs_from_1970_1996;
printf(" Board Mfg Date : %s", asctime(localtime(&tval)));
i += 3; /* skip mfg. date time */ i += 3; /* skip mfg. date time */
fru_area = get_fru_area_str(fru_data, &i); fru_area = get_fru_area_str(fru_data, &i);
if (fru_area != NULL && strlen(fru_area) > 0) { if (fru_area != NULL && strlen(fru_area) > 0) {
printf(" Board Mfg : %s\n", fru_area); printf(" Board Mfg : %s\n", fru_area);
@ -639,13 +644,13 @@ fru_area_print_multirec(struct ipmi_intf * intf, struct fru_info * fru,
uint8_t id, uint32_t offset) uint8_t id, uint32_t offset)
{ {
uint8_t * fru_data; uint8_t * fru_data;
uint32_t fru_len, i; uint32_t fru_len, i, j, toff;
struct fru_multirec_header * h; struct fru_multirec_header * h;
struct fru_multirec_powersupply * ps; struct fru_multirec_powersupply * ps;
struct fru_multirec_dcoutput * dc; struct fru_multirec_dcoutput * dc;
struct fru_multirec_dcload * dl; struct fru_multirec_dcload * dl;
uint16_t peak_capacity; uint16_t peak_capacity;
uint8_t peak_hold_up_time; uint8_t peak_hold_up_time, bn;
uint32_t last_off, len; uint32_t last_off, len;
i = last_off = offset; i = last_off = offset;

18
ipmitool/lib/ipmi_picmg.c
View File

@ -362,12 +362,9 @@ ipmi_picmg_portstate_get(struct ipmi_intf * intf, int interface,int channel,
if (rsp->data_len >= 6) { if (rsp->data_len >= 6) {
int index; int index;
/* add support for more than one link per channel */ /* add support for more than one link per channel */
for(index=0;index<PICMG_MAX_LINK_PER_CHANNEL;index++){ for(index=0;index<PICMG_MAX_LINK_PER_CHANNEL;index++){
if( rsp->data_len > (1+ (index*5))){ if( rsp->data_len > (1+ (index*5))){
d = (struct fru_picmgext_link_desc *) &(rsp->data[1 + (index*5)]); d = (struct fru_picmgext_link_desc *) &(rsp->data[1 + (index*5)]);
if if
@ -450,8 +447,9 @@ ipmi_picmg_portstate_get(struct ipmi_intf * intf, int interface,int channel,
break; break;
} }
printf(" Channel Number: 0x%02x\n", d->desig_channel); printf(" Channel Number: 0x%02x\n", d->desig_channel);
printf(" STATE: %s\n",
( rsp->data[5 +(index*5)] == 0x01) ?"enabled":"disabled");
printf("\n"); printf("\n");
printf(" STATE: %s\n", rsp->data[5 +(index*5)] == 0x01?"enabled":"disabled");
} }
} }
} }
@ -602,7 +600,6 @@ ipmi_picmg_amc_portstate_get(struct ipmi_intf * intf,int device,int channel,
}else{ }else{
printf(" Link device : 0x%02x\n", device ); printf(" Link device : 0x%02x\n", device );
} }
printf(" Link channel: 0x%02x\n", channel);
printf(" Link Grouping ID: 0x%02x\n", grouping); printf(" Link Grouping ID: 0x%02x\n", grouping);
@ -620,16 +617,21 @@ ipmi_picmg_amc_portstate_get(struct ipmi_intf * intf,int device,int channel,
{ {
if (type <= FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE ) if (type <= FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE )
{ {
printf(" Link Type Extension: %s\n",amc_link_type_ext_str[type][ext]); printf(" Link Type Extension: %s\n",
printf(" Link Type: %s\n",amc_link_type_str[type]); amc_link_type_ext_str[type][ext]);
printf(" Link Type: %s\n",
amc_link_type_str[type]);
} }
else{ else{
printf(" Link Type Extension: 0x%02x\n", ext); printf(" Link Type Extension: 0x%02x\n", ext);
printf(" Link Type: undefined\n"); printf(" Link Type: undefined\n");
} }
} }
printf(" Link Designator: \n");
printf(" Channel Number: 0x%02x\n", channel);
printf(" Port Flag: 0x%02x\n", port ); printf(" Port Flag: 0x%02x\n", port );
printf(" STATE: %s\n",( enabled == 0x01 )?"enabled":"disabled"); printf(" STATE: %s\n",
( enabled == 0x01 )?"enabled":"disabled");
printf("\n"); printf("\n");
} }
} }