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

enhanced PICMG fru control

Browse Source 
- Fix the help message for the picmg fru control command.  The command doesn't
support an hex argument
 - Changed output format to interpret the raw data supplied
 - Prints 'ok' on success
This commit is contained in:
Francois Isabelle 2009-04-20 15:33:51 +00:00
parent ebce6517f5
commit dece10b9d6
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipmitool/include/ipmitool/ipmi_strings.h
View File

@ -53,6 +53,8 @@ extern const struct valstr ipmi_integrity_algorithms[];
extern const struct valstr ipmi_encryption_algorithms[]; extern const struct valstr ipmi_encryption_algorithms[];
extern const struct valstr ipmi_oem_info[]; extern const struct valstr ipmi_oem_info[];
extern const struct valstr picmg_frucontrol_vals[];
/* these are similar, expect that the lookup takes the IANA number /* these are similar, expect that the lookup takes the IANA number
as first parameter */ as first parameter */
extern const struct oemvalstr ipmi_oem_product_info[]; extern const struct oemvalstr ipmi_oem_product_info[];

24
ipmitool/lib/ipmi_picmg.c
View File

@ -34,6 +34,7 @@
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>
#include <ipmitool/ipmi_picmg.h> #include <ipmitool/ipmi_picmg.h>
#include <ipmitool/ipmi_fru.h> /* for access to link descriptor defines */ #include <ipmitool/ipmi_fru.h> /* for access to link descriptor defines */
#include <ipmitool/ipmi_strings.h>
#include <ipmitool/log.h> #include <ipmitool/log.h>
#define PICMG_EXTENSION_ATCA_MAJOR_VERSION 2 #define PICMG_EXTENSION_ATCA_MAJOR_VERSION 2
@ -997,7 +998,8 @@ ipmi_picmg_fru_control(struct ipmi_intf * intf, int argc, char ** argv)
msg_data[1] = atoi(argv[0]); /* FRU-ID */ msg_data[1] = atoi(argv[0]); /* FRU-ID */
msg_data[2] = atoi(argv[1]); /* control option */ msg_data[2] = atoi(argv[1]); /* control option */
printf("0: 0x%02x 1: 0x%02x\n\r", msg_data[1], msg_data[2]); printf("FRU Device Id: %d FRU Control Option: %s\n\r", msg_data[1], \
val2str( msg_data[2], picmg_frucontrol_vals));
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
@ -1009,10 +1011,10 @@ ipmi_picmg_fru_control(struct ipmi_intf * intf, int argc, char ** argv)
if (rsp->ccode) { if (rsp->ccode) {
printf("frucontrol: returned CC code 0x%02x\n", rsp->ccode); printf("frucontrol: returned CC code 0x%02x\n", rsp->ccode);
return -1; return -1;
} else {
printf("frucontrol: ok\n");
} }
return 0; return 0;
} }
@ -1169,17 +1171,15 @@ ipmi_picmg_main (struct ipmi_intf * intf, int argc, char ** argv)
else { else {
printf("usage: frucontrol <FRU-ID> <OPTION>\n"); printf("usage: frucontrol <FRU-ID> <OPTION>\n");
printf(" OPTION:\n"); printf(" OPTION:\n");
printf(" 0x00 - Cold Reset\n"); printf(" 0 - Cold Reset\n");
printf(" 0x01 - Warm Reset\n"); printf(" 1 - Warm Reset\n");
printf(" 0x02 - Graceful Reboot\n"); printf(" 2 - Graceful Reboot\n");
printf(" 0x03 - Issue Diagnostic Interrupt\n"); printf(" 3 - Issue Diagnostic Interrupt\n");
printf(" 0x04 - Quiesce [AMC only]\n"); printf(" 4 - Quiesce [AMC only]\n");
printf(" 0x05-0xFF - Cold Reset\n"); printf(" 5-255 - Reserved\n");
return -1; return -1;
} }
printf("frucontrol\n\r");
} }
/* fru activation command */ /* fru activation command */
@ -1509,7 +1509,7 @@ ipmi_picmg_main (struct ipmi_intf * intf, int argc, char ** argv)
printf(" 0x1-0x14 : Power level\n"); printf(" 0x1-0x14 : Power level\n");
printf(" 0xFF : do not change\n"); printf(" 0xFF : do not change\n");
printf("\n"); printf("\n");
printf(" <present-desired> 0: do not change present levelsßn"); printf(" <present-desired> 0: do not change present levels\n");
printf(" 1: copy desired to present level\n"); printf(" 1: copy desired to present level\n");
return -1; return -1;