diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-10-30 18:12:02 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-10-30 18:12:02 +0100 |
| commit | 1f3c9b4ae26ce1d46d954d509b83b8684ada5625 (patch) | |
| tree | 260b922ec4d5d153cc6db745e27931cfd464472f /include/ipmitool/ipmi_hpmfwupg.h | |
| parent | 8fcf0ba6f182918bd584bb80bf0b8998acad26a8 (diff) | |
| parent | 8b758ee941f4c1ffea0532caa74b1fcd8101d1d8 (diff) | |
Merge branch 'release/debian/1.8.19-1'debian/1.8.19-1
Diffstat (limited to 'include/ipmitool/ipmi_hpmfwupg.h')
| -rw-r--r-- | include/ipmitool/ipmi_hpmfwupg.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h index de65292..5ac8299 100644 --- a/include/ipmitool/ipmi_hpmfwupg.h +++ b/include/ipmitool/ipmi_hpmfwupg.h @@ -30,8 +30,7 @@ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -#ifndef IPMI_HPMFWUPG_H -#define IPMI_HPMFWUPG_H +#pragma once #include <inttypes.h> #include <ipmitool/ipmi.h> @@ -72,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 @@ -800,10 +782,6 @@ typedef struct _VERSIONINFO { char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; }VERSIONINFO, *PVERSIONINFO; -VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; - #define TARGET_VER (0x01) #define ROLLBACK_VER (0x02) #define IMAGE_VER (0x04) - -#endif /* IPMI_KFWUM_H */ |