summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2022-09-10 15:44:31 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2022-09-10 15:44:31 +0200
commit36a24e9032591da8cc7688f69e7e9f5f41ffe4ab (patch)
treeeec9b06cd7f4498ef4db3e2f7973e08904981c48 /include
parentdce3efdab4ea7314a3e1db3af2cb0aac3f48dcef (diff)
New upstream release
Diffstat (limited to 'include')
-rw-r--r--include/ipmitool/ipmi.h1
-rw-r--r--include/ipmitool/ipmi_channel.h2
-rw-r--r--include/ipmitool/ipmi_hpmfwupg.h17
-rw-r--r--include/ipmitool/ipmi_pef.h2
4 files changed, 20 insertions, 2 deletions
diff --git a/include/ipmitool/ipmi.h b/include/ipmitool/ipmi.h
index 6e42d06..23f9681 100644
--- a/include/ipmitool/ipmi.h
+++ b/include/ipmitool/ipmi.h
@@ -279,6 +279,7 @@ typedef enum IPMI_OEM {
/* 4769 for [IBM Corporation] */
IPMI_OEM_IBM_4769 = 4769,
IPMI_OEM_MAGNUM = 5593,
+ IPMI_OEM_NVIDIA = 5703,
IPMI_OEM_TYAN = 6653,
IPMI_OEM_QUANTA = 7244,
IPMI_OEM_NEWISYS = 9237,
diff --git a/include/ipmitool/ipmi_channel.h b/include/ipmitool/ipmi_channel.h
index b138c26..d7cce5e 100644
--- a/include/ipmitool/ipmi_channel.h
+++ b/include/ipmitool/ipmi_channel.h
@@ -77,6 +77,8 @@ struct channel_access_t {
uint8_t user_level_auth;
};
+#define MAX_CIPHER_SUITE_DATA_LEN 0x10
+
/*
* The Get Authentication Capabilities response structure
* From table 22-15 of the IPMI v2.0 spec
diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h
index de65292..a994b9f 100644
--- a/include/ipmitool/ipmi_hpmfwupg.h
+++ b/include/ipmitool/ipmi_hpmfwupg.h
@@ -30,9 +30,22 @@
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
+
#ifndef IPMI_HPMFWUPG_H
#define IPMI_HPMFWUPG_H
+
+#ifdef IPMI_HPMFWUPG_MOD
+
+ #define EXTERN
+
+#else
+
+ #define EXTERN extern
+
+#endif
+
+
#include <inttypes.h>
#include <ipmitool/ipmi.h>
@@ -800,10 +813,12 @@ typedef struct _VERSIONINFO {
char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
}VERSIONINFO, *PVERSIONINFO;
-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+EXTERN VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
#define TARGET_VER (0x01)
#define ROLLBACK_VER (0x02)
#define IMAGE_VER (0x04)
#endif /* IPMI_KFWUM_H */
+
+#undef EXTERN
diff --git a/include/ipmitool/ipmi_pef.h b/include/ipmitool/ipmi_pef.h
index 14c6e18..42e2ddb 100644
--- a/include/ipmitool/ipmi_pef.h
+++ b/include/ipmitool/ipmi_pef.h
@@ -178,7 +178,7 @@ BIT_DESC_MAP_LIST,
{"Entity presence", 37},
{"Monitor ASIC/IC", 38},
{"LAN", 39},
- {"Management subsytem health",40},
+ {"Management subsystem health",40},
{"Battery", 41},
{NULL}
} };