[Ipmitool-cvs] [SCM] ipmitool branch master updated. 076ffb56503c8eedb03c2a164291d0ccd2185b9e

[Allura u. <al...@ch...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ipmitool".

The branch, master has been updated
       via  076ffb56503c8eedb03c2a164291d0ccd2185b9e (commit)
       via  89cffb984b4dee8edc1740a9837876a2164f8b73 (commit)
       via  3f7e82a6b4883d49d9836978cfc66c6a9ad63cf4 (commit)
       via  c6cd49ea37da24d6e0a445845d0e63f2d2256418 (commit)
      from  b5ce925744851b58193ad3ee18957ce88f6efc26 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 076ffb56503c8eedb03c2a164291d0ccd2185b9e
Merge: b5ce925 89cffb9
Author: Zdenek Styblik <allura@localhost>
Date:   Sat Oct 8 08:28:15 2016 +0000

    Merge /u/spruckb/ipmitool/ branch master into master
    
    https://sourceforge.net/p/ipmitool/source/merge-requests/12/


commit 89cffb984b4dee8edc1740a9837876a2164f8b73
Author: Bjoern Spruck <bs...@un...>
Date:   Thu Sep 1 11:27:38 2016 +0200

    replaced/removed defines which are already present in ipmi_picmg.h
    
    Signed-off-by: Bjoern Spruck <bs...@un...>

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 <ipmitool/ipmi_strings.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_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 {

commit 3f7e82a6b4883d49d9836978cfc66c6a9ad63cf4
Author: Bjoern Spruck <bs...@un...>
Date:   Thu Sep 1 11:27:10 2016 +0200

    added microTCA major version
    
    Signed-off-by: Bjoern Spruck <bs...@un...>

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

commit c6cd49ea37da24d6e0a445845d0e63f2d2256418
Author: Bjoern Spruck <bs...@un...>
Date:   Thu Sep 1 11:26:44 2016 +0200

    fix typo
    
    Signed-off-by: Bjoern Spruck <bs...@un...>

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" },

-----------------------------------------------------------------------

Summary of changes:
 include/ipmitool/ipmi_picmg.h |  1 +
 include/ipmitool/ipmi_sel.h   |  2 +-
 lib/ipmi_picmg.c              | 11 +++--------
 3 files changed, 5 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
ipmitool