diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-09-10 15:44:42 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-09-10 15:44:42 +0200 |
| commit | d83fb6dd0cdb8d4509fda0c6e77bbeb0fcd018a8 (patch) | |
| tree | 2599d2b8a9e660bff139cbd2a32d777ad30e0c9d /include/ipmitool/ipmi_hpmfwupg.h | |
| parent | 36a24e9032591da8cc7688f69e7e9f5f41ffe4ab (diff) | |
| parent | a9ee361f27e0439530387765924574e5358c8a5c (diff) | |
Update upstream source from tag 'upstream/1.8.19'
Update to upstream version '1.8.19'
with Debian dir 820184ee2ea8eb8c4a7769d0a89d5236e5775134
Diffstat (limited to 'include/ipmitool/ipmi_hpmfwupg.h')
| -rw-r--r-- | include/ipmitool/ipmi_hpmfwupg.h | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h index a994b9f..5ac8299 100644 --- a/include/ipmitool/ipmi_hpmfwupg.h +++ b/include/ipmitool/ipmi_hpmfwupg.h @@ -30,21 +30,7 @@ * 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 - +#pragma once #include <inttypes.h> #include <ipmitool/ipmi.h> @@ -85,23 +71,6 @@ int ipmi_hpmfwupg_main(struct ipmi_intf *, int, char **); #define HPMFWUPG_FW_MISMATCH 0x83 #define HPMFWUPG_ROLLBACK_DENIED 0x83 -/* - * This error code is used as a temporary PATCH to - * the latest Open ipmi driver. This PATCH - * will be removed once a new Open IPMI driver is released. - * (Buggy version = 39) - */ -#define ENABLE_OPENIPMI_V39_PATCH - -#ifdef ENABLE_OPENIPMI_V39_PATCH -# define RETRY_COUNT_MAX 3 -static int errorCount; -# define HPMFWUPG_IS_RETRYABLE(error) \ - ((((error==0x83)||(error==0x82)||(error==0x80)) && (errorCount++<RETRY_COUNT_MAX))?TRUE:FALSE) -#else -# define HPMFWUPG_IS_RETRYABLE(error) FALSE -#endif - /* HPM FIRMWARE UPGRADE GENERAL DEFINITIONS */ #define HPMFWUPG_PICMG_IDENTIFIER 0 #define HPMFWUPG_VERSION_SIZE 6 @@ -813,12 +782,6 @@ typedef struct _VERSIONINFO { char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; }VERSIONINFO, *PVERSIONINFO; -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 |