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

Merge /u/spruckb/ipmitool/ branch master into master

Browse Source 
https://sourceforge.net/p/ipmitool/source/merge-requests/12/
This commit is contained in:
Zdenek Styblik 2016-10-08 08:28:15 +00:00
commit 076ffb5650
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ipmitool/ipmi_picmg.h
View File

@ -12,6 +12,7 @@
#define PICMG_CPCI_MAJOR_VERSION 1 #define PICMG_CPCI_MAJOR_VERSION 1
#define PICMG_ATCA_MAJOR_VERSION 2 #define PICMG_ATCA_MAJOR_VERSION 2
#define PICMG_AMC_MAJOR_VERSION 4 #define PICMG_AMC_MAJOR_VERSION 4
#define PICMG_UTCA_MAJOR_VERSION 5
/* PICMG commands */ /* PICMG commands */
#define PICMG_GET_PICMG_PROPERTIES_CMD 0x00 #define PICMG_GET_PICMG_PROPERTIES_CMD 0x00

2
include/ipmitool/ipmi_sel.h
View File

@ -580,7 +580,7 @@ static const struct ipmi_event_sensor_types sensor_specific_event_types[] = {
{ 0xF1, 0x01, 0xff, "IPMB-A enabled, IPMB-B disabled" }, { 0xF1, 0x01, 0xff, "IPMB-A enabled, IPMB-B disabled" },
{ 0xF1, 0x02, 0xff, "IPMB-A disabled, IPMB-B enabled" }, { 0xF1, 0x02, 0xff, "IPMB-A disabled, IPMB-B enabled" },
{ 0xF1, 0x03, 0xff, "IPMB-A enabled, IPMP-B enabled" }, { 0xF1, 0x03, 0xff, "IPMB-A enabled, IPMP-B enabled" },
/* PICNG Moduke Hot Swap */ /* PICMG Module Hot Swap */
{ 0xF2, 0x00, 0xff, "Module Handle Closed" }, { 0xF2, 0x00, 0xff, "Module Handle Closed" },
{ 0xF2, 0x01, 0xff, "Module Handle Opened" }, { 0xF2, 0x01, 0xff, "Module Handle Opened" },
{ 0xF2, 0x02, 0xff, "Quiesced" }, { 0xF2, 0x02, 0xff, "Quiesced" },

11
lib/ipmi_picmg.c
View File

@ -37,11 +37,6 @@
#include <ipmitool/ipmi_strings.h> #include <ipmitool/ipmi_strings.h>
#include <ipmitool/log.h> #include <ipmitool/log.h>
#define PICMG_EXTENSION_ATCA_MAJOR_VERSION 2
#define PICMG_EXTENSION_AMC0_MAJOR_VERSION 4
#define PICMG_EXTENSION_UTCA_MAJOR_VERSION 5
#define PICMG_EKEY_MODE_QUERY 0 #define PICMG_EKEY_MODE_QUERY 0
#define PICMG_EKEY_MODE_PRINT_ALL 1 #define PICMG_EKEY_MODE_PRINT_ALL 1
#define PICMG_EKEY_MODE_PRINT_ENABLED 2 #define PICMG_EKEY_MODE_PRINT_ENABLED 2
@ -2367,9 +2362,9 @@ picmg_discover(struct ipmi_intf *intf) {
} else if (rsp->data[0] != 0) { } else if (rsp->data[0] != 0) {
lprintf(LOG_INFO,"Invalid Get PICMG Properties group extension %#x", lprintf(LOG_INFO,"Invalid Get PICMG Properties group extension %#x",
rsp->data[0]); rsp->data[0]);
} else if ((rsp->data[1] & 0x0F) != PICMG_EXTENSION_ATCA_MAJOR_VERSION } else if ((rsp->data[1] & 0x0F) != PICMG_ATCA_MAJOR_VERSION
&& (rsp->data[1] & 0x0F) != PICMG_EXTENSION_AMC0_MAJOR_VERSION && (rsp->data[1] & 0x0F) != PICMG_AMC_MAJOR_VERSION
&& (rsp->data[1] & 0x0F) != PICMG_EXTENSION_UTCA_MAJOR_VERSION) { && (rsp->data[1] & 0x0F) != PICMG_UTCA_MAJOR_VERSION) {
lprintf(LOG_INFO,"Unknown PICMG Extension Version %d.%d", lprintf(LOG_INFO,"Unknown PICMG Extension Version %d.%d",
(rsp->data[1] & 0x0F), (rsp->data[1] >> 4)); (rsp->data[1] & 0x0F), (rsp->data[1] >> 4));
} else { } else {