From c6cd49ea37da24d6e0a445845d0e63f2d2256418 Mon Sep 17 00:00:00 2001 From: Bjoern Spruck Date: Thu, 1 Sep 2016 11:26:44 +0200 Subject: [PATCH 1/3] fix typo Signed-off-by: Bjoern Spruck --- include/ipmitool/ipmi_sel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ipmitool/ipmi_sel.h b/include/ipmitool/ipmi_sel.h index 1c325db..ab8eaa9 100644 --- a/include/ipmitool/ipmi_sel.h +++ b/include/ipmitool/ipmi_sel.h @@ -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, 0x02, 0xff, "IPMB-A disabled, IPMB-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, 0x01, 0xff, "Module Handle Opened" }, { 0xF2, 0x02, 0xff, "Quiesced" }, From 3f7e82a6b4883d49d9836978cfc66c6a9ad63cf4 Mon Sep 17 00:00:00 2001 From: Bjoern Spruck Date: Thu, 1 Sep 2016 11:27:10 +0200 Subject: [PATCH 2/3] added microTCA major version Signed-off-by: Bjoern Spruck --- include/ipmitool/ipmi_picmg.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ipmitool/ipmi_picmg.h b/include/ipmitool/ipmi_picmg.h index 3d70454..0bcbd93 100644 --- a/include/ipmitool/ipmi_picmg.h +++ b/include/ipmitool/ipmi_picmg.h @@ -12,6 +12,7 @@ #define PICMG_CPCI_MAJOR_VERSION 1 #define PICMG_ATCA_MAJOR_VERSION 2 #define PICMG_AMC_MAJOR_VERSION 4 +#define PICMG_UTCA_MAJOR_VERSION 5 /* PICMG commands */ #define PICMG_GET_PICMG_PROPERTIES_CMD 0x00 From 89cffb984b4dee8edc1740a9837876a2164f8b73 Mon Sep 17 00:00:00 2001 From: Bjoern Spruck Date: Thu, 1 Sep 2016 11:27:38 +0200 Subject: [PATCH 3/3] replaced/removed defines which are already present in ipmi_picmg.h Signed-off-by: Bjoern Spruck --- lib/ipmi_picmg.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/ipmi_picmg.c b/lib/ipmi_picmg.c index c7d9c8e..2166cbe 100644 --- a/lib/ipmi_picmg.c +++ b/lib/ipmi_picmg.c @@ -37,11 +37,6 @@ #include #include -#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_PRINT_ALL 1 #define PICMG_EKEY_MODE_PRINT_ENABLED 2 @@ -2367,9 +2362,9 @@ picmg_discover(struct ipmi_intf *intf) { } else if (rsp->data[0] != 0) { lprintf(LOG_INFO,"Invalid Get PICMG Properties group extension %#x", rsp->data[0]); - } else if ((rsp->data[1] & 0x0F) != PICMG_EXTENSION_ATCA_MAJOR_VERSION - && (rsp->data[1] & 0x0F) != PICMG_EXTENSION_AMC0_MAJOR_VERSION - && (rsp->data[1] & 0x0F) != PICMG_EXTENSION_UTCA_MAJOR_VERSION) { + } else if ((rsp->data[1] & 0x0F) != PICMG_ATCA_MAJOR_VERSION + && (rsp->data[1] & 0x0F) != PICMG_AMC_MAJOR_VERSION + && (rsp->data[1] & 0x0F) != PICMG_UTCA_MAJOR_VERSION) { lprintf(LOG_INFO,"Unknown PICMG Extension Version %d.%d", (rsp->data[1] & 0x0F), (rsp->data[1] >> 4)); } else {