sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdePkg: Apply uncrustify changes

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the MdePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:05 -08:00
committed by mergify[bot]
parent 1436aea4d5
commit 2f88bd3a12
975 changed files with 55681 additions and 57790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
MdePkg/Include/AArch64/ProcessorBind.h
View File

@ -20,11 +20,11 @@
//
// Make sure we are using the correct packing rules per EFI specification
//
#if !defined(__GNUC__) && !defined(__ASSEMBLER__)
#pragma pack()
#if !defined (__GNUC__) && !defined (__ASSEMBLER__)
#pragma pack()
#endif
#if defined(_MSC_EXTENSIONS)
#if defined (_MSC_EXTENSIONS)
//
// Disable some level 4 compilation warnings (same as IA32 and X64)
@ -33,75 +33,75 @@
//
// Disabling bitfield type checking warnings.
//
#pragma warning ( disable : 4214 )
#pragma warning ( disable : 4214 )
//
// Disabling the unreferenced formal parameter warnings.
//
#pragma warning ( disable : 4100 )
#pragma warning ( disable : 4100 )
//
// Disable slightly different base types warning as CHAR8 * can not be set
// to a constant string.
//
#pragma warning ( disable : 4057 )
#pragma warning ( disable : 4057 )
//
// ASSERT(FALSE) or while (TRUE) are legal constructs so suppress this warning
//
#pragma warning ( disable : 4127 )
#pragma warning ( disable : 4127 )
//
// This warning is caused by functions defined but not used. For precompiled header only.
//
#pragma warning ( disable : 4505 )
#pragma warning ( disable : 4505 )
//
// This warning is caused by empty (after preprocessing) source file. For precompiled header only.
//
#pragma warning ( disable : 4206 )
#pragma warning ( disable : 4206 )
//
// Disable 'potentially uninitialized local variable X used' warnings
//
#pragma warning ( disable : 4701 )
#pragma warning ( disable : 4701 )
//
// Disable 'potentially uninitialized local pointer variable X used' warnings
//
#pragma warning ( disable : 4703 )
#pragma warning ( disable : 4703 )
//
// use Microsoft* C compiler dependent integer width types
//
typedef unsigned __int64 UINT64;
typedef __int64 INT64;
typedef unsigned __int32 UINT32;
typedef __int32 INT32;
typedef unsigned short UINT16;
typedef unsigned short CHAR16;
typedef short INT16;
typedef unsigned char BOOLEAN;
typedef unsigned char UINT8;
typedef char CHAR8;
typedef signed char INT8;
//
// use Microsoft* C compiler dependent integer width types
//
typedef unsigned __int64 UINT64;
typedef __int64 INT64;
typedef unsigned __int32 UINT32;
typedef __int32 INT32;
typedef unsigned short UINT16;
typedef unsigned short CHAR16;
typedef short INT16;
typedef unsigned char BOOLEAN;
typedef unsigned char UINT8;
typedef char CHAR8;
typedef signed char INT8;
#else
//
// Assume standard AARCH64 alignment.
//
typedef unsigned long long UINT64;
typedef long long INT64;
typedef unsigned int UINT32;
typedef int INT32;
typedef unsigned short UINT16;
typedef unsigned short CHAR16;
typedef short INT16;
typedef unsigned char BOOLEAN;
typedef unsigned char UINT8;
typedef char CHAR8;
typedef signed char INT8;
//
// Assume standard AARCH64 alignment.
//
typedef unsigned long long UINT64;
typedef long long INT64;
typedef unsigned int UINT32;
typedef int INT32;
typedef unsigned short UINT16;
typedef unsigned short CHAR16;
typedef short INT16;
typedef unsigned char BOOLEAN;
typedef unsigned char UINT8;
typedef char CHAR8;
typedef signed char INT8;
#endif
@ -172,18 +172,18 @@ typedef INT64 INTN;
// When compiling with Clang, we still use GNU as for the assembler, so we still
// need to define the GCC_ASM* macros.
#if defined(__GNUC__) || defined(__clang__)
///
/// For GNU assembly code, .global or .globl can declare global symbols.
/// Define this macro to unify the usage.
///
#define ASM_GLOBAL .globl
#if defined (__GNUC__) || defined (__clang__)
///
/// For GNU assembly code, .global or .globl can declare global symbols.
/// Define this macro to unify the usage.
///
#define ASM_GLOBAL .globl
#define GCC_ASM_EXPORT(func__) \
#define GCC_ASM_EXPORT(func__) \
.global _CONCATENATE (__USER_LABEL_PREFIX__, func__) ;\
.type ASM_PFX(func__), %function
#define GCC_ASM_IMPORT(func__) \
#define GCC_ASM_IMPORT(func__) \
.extern _CONCATENATE (__USER_LABEL_PREFIX__, func__)
#endif

138
MdePkg/Include/Arm/ProcessorBind.h
View File

@ -18,11 +18,11 @@
//
// Make sure we are using the correct packing rules per EFI specification
//
#if !defined(__GNUC__) && !defined(__ASSEMBLER__)
#pragma pack()
#if !defined (__GNUC__) && !defined (__ASSEMBLER__)
#pragma pack()
#endif
#if defined(_MSC_EXTENSIONS)
#if defined (_MSC_EXTENSIONS)
//
// Disable some level 4 compilation warnings (same as IA32 and X64)
@ -31,84 +31,84 @@
//
// Disabling bitfield type checking warnings.
//
#pragma warning ( disable : 4214 )
#pragma warning ( disable : 4214 )
//
// Disabling the unreferenced formal parameter warnings.
//
#pragma warning ( disable : 4100 )
#pragma warning ( disable : 4100 )
//
// Disable slightly different base types warning as CHAR8 * can not be set
// to a constant string.
//
#pragma warning ( disable : 4057 )
#pragma warning ( disable : 4057 )
//
// ASSERT(FALSE) or while (TRUE) are legal constructs so suppress this warning
//
#pragma warning ( disable : 4127 )
#pragma warning ( disable : 4127 )
//
// This warning is caused by functions defined but not used. For precompiled header only.
//
#pragma warning ( disable : 4505 )
#pragma warning ( disable : 4505 )
//
// This warning is caused by empty (after preprocessing) source file. For precompiled header only.
//
#pragma warning ( disable : 4206 )
#pragma warning ( disable : 4206 )
//
// Disable 'potentially uninitialized local variable X used' warnings
//
#pragma warning ( disable : 4701 )
#pragma warning ( disable : 4701 )
//
// Disable 'potentially uninitialized local pointer variable X used' warnings
//
#pragma warning ( disable : 4703 )
#pragma warning ( disable : 4703 )
#endif
//
// RVCT and MSFT don't support the __builtin_unreachable() macro
//
#if defined(__ARMCC_VERSION) || defined(_MSC_EXTENSIONS)
#if defined (__ARMCC_VERSION) || defined (_MSC_EXTENSIONS)
#define UNREACHABLE()
#endif
#if defined(_MSC_EXTENSIONS)
//
// use Microsoft* C compiler dependent integer width types
//
typedef unsigned __int64 UINT64;
typedef __int64 INT64;
typedef unsigned __int32 UINT32;
typedef __int32 INT32;
typedef unsigned short UINT16;
typedef unsigned short CHAR16;
typedef short INT16;
typedef unsigned char BOOLEAN;
typedef unsigned char UINT8;
typedef char CHAR8;
typedef signed char INT8;
#if defined (_MSC_EXTENSIONS)
//
// use Microsoft* C compiler dependent integer width types
//
typedef unsigned __int64 UINT64;
typedef __int64 INT64;
typedef unsigned __int32 UINT32;
typedef __int32 INT32;
typedef unsigned short UINT16;
typedef unsigned short CHAR16;
typedef short INT16;
typedef unsigned char BOOLEAN;
typedef unsigned char UINT8;
typedef char CHAR8;
typedef signed char INT8;
#else
//
// Assume standard ARM alignment.
// Need to check portability of long long
//
typedef unsigned long long UINT64;
typedef long long INT64;
typedef unsigned int UINT32;
typedef int INT32;
typedef unsigned short UINT16;
typedef unsigned short CHAR16;
typedef short INT16;
typedef unsigned char BOOLEAN;
typedef unsigned char UINT8;
typedef char CHAR8;
typedef signed char INT8;
//
// Assume standard ARM alignment.
// Need to check portability of long long
//
typedef unsigned long long UINT64;
typedef long long INT64;
typedef unsigned int UINT32;
typedef int INT32;
typedef unsigned short UINT16;
typedef unsigned short CHAR16;
typedef short INT16;
typedef unsigned char BOOLEAN;
typedef unsigned char UINT8;
typedef char CHAR8;
typedef signed char INT8;
#endif
///
@ -178,45 +178,45 @@ typedef INT32 INTN;
// When compiling with Clang, we still use GNU as for the assembler, so we still
// need to define the GCC_ASM* macros.
#if defined(__GNUC__) || defined(__clang__)
///
/// For GNU assembly code, .global or .globl can declare global symbols.
/// Define this macro to unify the usage.
///
#define ASM_GLOBAL .globl
#if defined (__GNUC__) || defined (__clang__)
///
/// For GNU assembly code, .global or .globl can declare global symbols.
/// Define this macro to unify the usage.
///
#define ASM_GLOBAL .globl
#if !defined(__APPLE__)
///
/// ARM EABI defines that the linker should not manipulate call relocations
/// (do bl/blx conversion) unless the target symbol has function type.
/// CodeSourcery 2010.09 started requiring the .type to function properly
///
#define INTERWORK_FUNC(func__) .type ASM_PFX(func__), %function
#if !defined (__APPLE__)
///
/// ARM EABI defines that the linker should not manipulate call relocations
/// (do bl/blx conversion) unless the target symbol has function type.
/// CodeSourcery 2010.09 started requiring the .type to function properly
///
#define INTERWORK_FUNC(func__) .type ASM_PFX(func__), %function
#define GCC_ASM_EXPORT(func__) \
#define GCC_ASM_EXPORT(func__) \
.global _CONCATENATE (__USER_LABEL_PREFIX__, func__) ;\
.type ASM_PFX(func__), %function
#define GCC_ASM_IMPORT(func__) \
#define GCC_ASM_IMPORT(func__) \
.extern _CONCATENATE (__USER_LABEL_PREFIX__, func__)
#else
//
// .type not supported by Apple Xcode tools
//
#define INTERWORK_FUNC(func__)
//
// .type not supported by Apple Xcode tools
//
#define INTERWORK_FUNC(func__)
#define GCC_ASM_EXPORT(func__) \
#define GCC_ASM_EXPORT(func__) \
.globl _CONCATENATE (__USER_LABEL_PREFIX__, func__) \
#define GCC_ASM_IMPORT(name)
#define GCC_ASM_IMPORT(name)
#endif
#elif defined(_MSC_EXTENSIONS)
//
// PRESERVE8 is not supported by the MSFT assembler.
//
#define PRESERVE8
#elif defined (_MSC_EXTENSIONS)
//
// PRESERVE8 is not supported by the MSFT assembler.
//
#define PRESERVE8
#endif
/**
@ -236,5 +236,3 @@ typedef INT32 INTN;
#endif
#endif

261
MdePkg/Include/Base.h
View File

@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __BASE_H__
#define __BASE_H__
@ -21,11 +20,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
#include <ProcessorBind.h>
#if defined(_MSC_EXTENSIONS)
#if defined (_MSC_EXTENSIONS)
//
// Disable warning when last field of data structure is a zero sized array.
//
#pragma warning ( disable : 4200 )
#pragma warning ( disable : 4200 )
#endif
//
@ -33,20 +32,20 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// if the /OPT:REF linker option is used. We defined a macro as this is a
// a non standard extension
//
#if defined(_MSC_VER) && _MSC_VER < 1800 && !defined (MDE_CPU_EBC)
///
/// Remove global variable from the linked image if there are no references to
/// it after all compiler and linker optimizations have been performed.
///
///
#define GLOBAL_REMOVE_IF_UNREFERENCED __declspec(selectany)
#if defined (_MSC_VER) && _MSC_VER < 1800 && !defined (MDE_CPU_EBC)
///
/// Remove global variable from the linked image if there are no references to
/// it after all compiler and linker optimizations have been performed.
///
///
#define GLOBAL_REMOVE_IF_UNREFERENCED __declspec(selectany)
#else
///
/// Remove the global variable from the linked image if there are no references
/// to it after all compiler and linker optimizations have been performed.
///
///
#define GLOBAL_REMOVE_IF_UNREFERENCED
///
/// Remove the global variable from the linked image if there are no references
/// to it after all compiler and linker optimizations have been performed.
///
///
#define GLOBAL_REMOVE_IF_UNREFERENCED
#endif
//
@ -55,27 +54,27 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
#ifndef UNREACHABLE
#ifdef __GNUC__
///
/// Signal compilers and analyzers that this call is not reachable. It is
/// up to the compiler to remove any code past that point.
///
#define UNREACHABLE() __builtin_unreachable ()
///
/// Signal compilers and analyzers that this call is not reachable. It is
/// up to the compiler to remove any code past that point.
///
#define UNREACHABLE() __builtin_unreachable ()
#elif defined (__has_feature)
#if __has_builtin (__builtin_unreachable)
///
/// Signal compilers and analyzers that this call is not reachable. It is
/// up to the compiler to remove any code past that point.
///
#define UNREACHABLE() __builtin_unreachable ()
///
/// Signal compilers and analyzers that this call is not reachable. It is
/// up to the compiler to remove any code past that point.
///
#define UNREACHABLE() __builtin_unreachable ()
#endif
#endif
#ifndef UNREACHABLE
///
/// Signal compilers and analyzers that this call is not reachable. It is
/// up to the compiler to remove any code past that point.
///
#define UNREACHABLE()
///
/// Signal compilers and analyzers that this call is not reachable. It is
/// up to the compiler to remove any code past that point.
///
#define UNREACHABLE()
#endif
#endif
@ -86,26 +85,26 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
#ifndef NORETURN
#if defined (__GNUC__) || defined (__clang__)
///
/// Signal compilers and analyzers that the function cannot return.
/// It is up to the compiler to remove any code past a call to functions
/// flagged with this attribute.
///
#define NORETURN __attribute__((noreturn))
#elif defined(_MSC_EXTENSIONS) && !defined(MDE_CPU_EBC)
///
/// Signal compilers and analyzers that the function cannot return.
/// It is up to the compiler to remove any code past a call to functions
/// flagged with this attribute.
///
#define NORETURN __declspec(noreturn)
///
/// Signal compilers and analyzers that the function cannot return.
/// It is up to the compiler to remove any code past a call to functions
/// flagged with this attribute.
///
#define NORETURN __attribute__((noreturn))
#elif defined (_MSC_EXTENSIONS) && !defined (MDE_CPU_EBC)
///
/// Signal compilers and analyzers that the function cannot return.
/// It is up to the compiler to remove any code past a call to functions
/// flagged with this attribute.
///
#define NORETURN __declspec(noreturn)
#else
///
/// Signal compilers and analyzers that the function cannot return.
/// It is up to the compiler to remove any code past a call to functions
/// flagged with this attribute.
///
#define NORETURN
///
/// Signal compilers and analyzers that the function cannot return.
/// It is up to the compiler to remove any code past a call to functions
/// flagged with this attribute.
///
#define NORETURN
#endif
#endif
@ -116,20 +115,20 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#ifndef ANALYZER_UNREACHABLE
#ifdef __clang_analyzer__
#if __has_builtin (__builtin_unreachable)
///
/// Signal the analyzer that this call is not reachable.
/// This excludes compilers.
///
#define ANALYZER_UNREACHABLE() __builtin_unreachable ()
///
/// Signal the analyzer that this call is not reachable.
/// This excludes compilers.
///
#define ANALYZER_UNREACHABLE() __builtin_unreachable ()
#endif
#endif
#ifndef ANALYZER_UNREACHABLE
///
/// Signal the analyzer that this call is not reachable.
/// This excludes compilers.
///
#define ANALYZER_UNREACHABLE()
///
/// Signal the analyzer that this call is not reachable.
/// This excludes compilers.
///
#define ANALYZER_UNREACHABLE()
#endif
#endif
@ -142,20 +141,20 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#ifndef ANALYZER_NORETURN
#ifdef __has_feature
#if __has_feature (attribute_analyzer_noreturn)
///
/// Signal analyzers that the function cannot return.
/// This excludes compilers.
///
#define ANALYZER_NORETURN __attribute__((analyzer_noreturn))
///
/// Signal analyzers that the function cannot return.
/// This excludes compilers.
///
#define ANALYZER_NORETURN __attribute__((analyzer_noreturn))
#endif
#endif
#ifndef ANALYZER_NORETURN
///
/// Signal the analyzer that the function cannot return.
/// This excludes compilers.
///
#define ANALYZER_NORETURN
///
/// Signal the analyzer that the function cannot return.
/// This excludes compilers.
///
#define ANALYZER_NORETURN
#endif
#endif
@ -165,17 +164,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
///
#ifndef RETURNS_TWICE
#if defined (__GNUC__) || defined (__clang__)
///
/// Tell the code optimizer that the function will return twice.
/// This prevents wrong optimizations which can cause bugs.
///
#define RETURNS_TWICE __attribute__((returns_twice))
///
/// Tell the code optimizer that the function will return twice.
/// This prevents wrong optimizations which can cause bugs.
///
#define RETURNS_TWICE __attribute__((returns_twice))
#else
///
/// Tell the code optimizer that the function will return twice.
/// This prevents wrong optimizations which can cause bugs.
///
#define RETURNS_TWICE
///
/// Tell the code optimizer that the function will return twice.
/// This prevents wrong optimizations which can cause bugs.
///
#define RETURNS_TWICE
#endif
#endif
@ -196,23 +195,23 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)
#ifdef __APPLE__
//
// Apple extension that is used by the linker to optimize code size
// with assembly functions. Put at the end of your .S files
//
#define ASM_FUNCTION_REMOVE_IF_UNREFERENCED .subsections_via_symbols
//
// Apple extension that is used by the linker to optimize code size
// with assembly functions. Put at the end of your .S files
//
#define ASM_FUNCTION_REMOVE_IF_UNREFERENCED .subsections_via_symbols
#else
#define ASM_FUNCTION_REMOVE_IF_UNREFERENCED
#define ASM_FUNCTION_REMOVE_IF_UNREFERENCED
#endif
#ifdef __CC_ARM
//
// Older RVCT ARM compilers don't fully support #pragma pack and require __packed
// as a prefix for the structure.
//
#define PACKED __packed
//
// Older RVCT ARM compilers don't fully support #pragma pack and require __packed
// as a prefix for the structure.
//
#define PACKED __packed
#else
#define PACKED
#define PACKED
#endif
///
@ -579,7 +578,7 @@ struct _LIST_ENTRY {
**/
#define _INT_SIZE_OF(n) ((sizeof (n) + sizeof (UINTN) - 1) &~(sizeof (UINTN) - 1))
#if defined(__CC_ARM)
#if defined (__CC_ARM)
//
// RVCT ARM variable argument list support.
//
@ -588,13 +587,15 @@ struct _LIST_ENTRY {
/// Variable used to traverse the list of arguments. This type can vary by
/// implementation and could be an array or structure.
///
#ifdef __APCS_ADSABI
typedef int *va_list[1];
#define VA_LIST va_list
#else
typedef struct __va_list { void *__ap; } va_list;
#define VA_LIST va_list
#endif
#ifdef __APCS_ADSABI
typedef int *va_list[1];
#define VA_LIST va_list
#else
typedef struct __va_list {
void *__ap;
} va_list;
#define VA_LIST va_list
#endif
#define VA_START(Marker, Parameter) __va_start(Marker, Parameter)
@ -603,27 +604,27 @@ struct _LIST_ENTRY {
#define VA_END(Marker) ((void)0)
// For some ARM RVCT compilers, __va_copy is not defined
#ifndef __va_copy
#define __va_copy(dest, src) ((void)((dest) = (src)))
#endif
#ifndef __va_copy
#define __va_copy(dest, src) ((void)((dest) = (src)))
#endif
#define VA_COPY(Dest, Start) __va_copy (Dest, Start)
#elif defined(_M_ARM) || defined(_M_ARM64)
#elif defined (_M_ARM) || defined (_M_ARM64)
//
// MSFT ARM variable argument list support.
//
typedef char* VA_LIST;
typedef char *VA_LIST;
#define VA_START(Marker, Parameter) __va_start (&Marker, &Parameter, _INT_SIZE_OF (Parameter), __alignof(Parameter), &Parameter)
#define VA_ARG(Marker, TYPE) (*(TYPE *) ((Marker += _INT_SIZE_OF (TYPE) + ((-(INTN)Marker) & (sizeof(TYPE) - 1))) - _INT_SIZE_OF (TYPE)))
#define VA_END(Marker) (Marker = (VA_LIST) 0)
#define VA_COPY(Dest, Start) ((void)((Dest) = (Start)))
#elif defined(__GNUC__) || defined(__clang__)
#elif defined (__GNUC__) || defined (__clang__)
#if defined(MDE_CPU_X64) && !defined(NO_MSABI_VA_FUNCS)
#if defined (MDE_CPU_X64) && !defined (NO_MSABI_VA_FUNCS)
//
// X64 only. Use MS ABI version of GCC built-in macros for variable argument lists.
//
@ -645,7 +646,7 @@ typedef __builtin_ms_va_list VA_LIST;
#define VA_COPY(Dest, Start) __builtin_ms_va_copy (Dest, Start)
#else
#else
//
// Use GCC built-in macros for variable argument lists.
//
@ -664,7 +665,7 @@ typedef __builtin_va_list VA_LIST;
#define VA_COPY(Dest, Start) __builtin_va_copy (Dest, Start)
#endif
#endif
#else
///
@ -781,7 +782,7 @@ typedef UINTN *BASE_LIST;
@return Offset, in bytes, of field.
**/
#if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__)
#if (defined (__GNUC__) && __GNUC__ >= 4) || defined (__clang__)
#define OFFSET_OF(TYPE, Field) ((UINTN) __builtin_offsetof(TYPE, Field))
#endif
@ -798,11 +799,11 @@ typedef UINTN *BASE_LIST;
**/
#ifdef MDE_CPU_EBC
#define STATIC_ASSERT(Expression, Message)
#elif defined(_MSC_EXTENSIONS)
#define STATIC_ASSERT static_assert
#define STATIC_ASSERT(Expression, Message)
#elif defined (_MSC_EXTENSIONS)
#define STATIC_ASSERT static_assert
#else
#define STATIC_ASSERT _Static_assert
#define STATIC_ASSERT _Static_assert
#endif
//
@ -911,7 +912,6 @@ STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not m
**/
#define ALIGN_VARIABLE(Value) ALIGN_VALUE ((Value), sizeof (UINTN))
/**
Return the maximum of two operands.
@ -1204,7 +1204,6 @@ typedef UINTN RETURN_STATUS;
///
#define RETURN_WARN_FILE_SYSTEM ENCODE_WARNING (6)
/**
Returns a 16-bit signature built from 2 ASCII characters.
@ -1258,10 +1257,15 @@ typedef UINTN RETURN_STATUS;
#define SIGNATURE_64(A, B, C, D, E, F, G, H) \
(SIGNATURE_32 (A, B, C, D) | ((UINT64) (SIGNATURE_32 (E, F, G, H)) << 32))
#if defined(_MSC_EXTENSIONS) && !defined (__INTEL_COMPILER) && !defined (MDE_CPU_EBC)
void * _ReturnAddress(void);
#if defined (_MSC_EXTENSIONS) && !defined (__INTEL_COMPILER) && !defined (MDE_CPU_EBC)
void *
_ReturnAddress (
void
);
#pragma intrinsic(_ReturnAddress)
/**
/**
Get the return address of the calling function.
Based on intrinsic function _ReturnAddress that provides the address of
@ -1272,10 +1276,11 @@ typedef UINTN RETURN_STATUS;
@return The return address of the calling function or 0 if L != 0.
**/
#define RETURN_ADDRESS(L) ((L == 0) ? _ReturnAddress() : (VOID *) 0)
**/
#define RETURN_ADDRESS(L) ((L == 0) ? _ReturnAddress() : (VOID *) 0)
#elif defined (__GNUC__) || defined (__clang__)
/**
/**
Get the return address of the calling function.
Based on built-in Function __builtin_return_address that returns
@ -1285,18 +1290,19 @@ typedef UINTN RETURN_STATUS;
@return The return address of the calling function.
**/
#define RETURN_ADDRESS(L) __builtin_return_address (L)
**/
#define RETURN_ADDRESS(L) __builtin_return_address (L)
#else
/**
/**
Get the return address of the calling function.
@param L Return Level.
@return 0 as compilers don't support this feature.
**/
#define RETURN_ADDRESS(L) ((VOID *) 0)
**/
#define RETURN_ADDRESS(L) ((VOID *) 0)
#endif
/**
@ -1313,4 +1319,3 @@ typedef UINTN RETURN_STATUS;
#define ARRAY_SIZE(Array) (sizeof (Array) / sizeof ((Array)[0]))
#endif

7
MdePkg/Include/Ebc/ProcessorBind.h
View File

@ -130,9 +130,9 @@ typedef unsigned long UINTN;
/// EFI intrinsics are required to modify their member functions with EFIAPI.
///
#ifdef EFIAPI
///
/// If EFIAPI is already defined, then we use that definition.
///
///
/// If EFIAPI is already defined, then we use that definition.
///
#else
#define EFIAPI
#endif
@ -153,4 +153,3 @@ typedef unsigned long UINTN;
#endif
#endif

2
MdePkg/Include/Guid/AprioriFileName.h
View File

@ -17,7 +17,6 @@
#define PEI_APRIORI_FILE_NAME_GUID \
{ 0x1b45cc0a, 0x156a, 0x428a, { 0x62, 0XAF, 0x49, 0x86, 0x4d, 0xa0, 0xe6, 0xe6 } }
///
/// This file must be of type EFI_FV_FILETYPE_FREEFORM and must
/// contain a single section of type EFI_SECTION_RAW. For details on
@ -35,4 +34,3 @@ typedef struct {
extern EFI_GUID gPeiAprioriFileNameGuid;
#endif

8
MdePkg/Include/Guid/CapsuleReport.h
View File

@ -9,7 +9,6 @@
**/
#ifndef _CAPSULE_REPORT_GUID_H__
#define _CAPSULE_REPORT_GUID_H__
@ -21,9 +20,7 @@
0x39b68c46, 0xf7fb, 0x441b, {0xb6, 0xec, 0x16, 0xb0, 0xf6, 0x98, 0x21, 0xf3 } \
}
typedef struct {
///
/// Size in bytes of the variable including any data beyond header as specified by CapsuleGuid
///
@ -51,9 +48,7 @@ typedef struct {
EFI_STATUS CapsuleStatus;
} EFI_CAPSULE_RESULT_VARIABLE_HEADER;
typedef struct {
///
/// Version of this structure, currently 0x00000001
///
@ -94,7 +89,6 @@ typedef struct {
} EFI_CAPSULE_RESULT_VARIABLE_FMP;
typedef struct {
///
/// Version of this structure, currently 0x00000001
///
@ -121,7 +115,7 @@ typedef struct {
/// the scope of this specification.
///
UINT8 Resp[];
} EFI_CAPSULE_RESULT_VARIABLE_JSON;
} EFI_CAPSULE_RESULT_VARIABLE_JSON;
extern EFI_GUID gEfiCapsuleReportGuid;

121
MdePkg/Include/Guid/Cper.h
View File

@ -327,7 +327,6 @@ typedef struct {
UINT64 InstructionIP;
} EFI_PROCESSOR_GENERIC_ERROR_DATA;
#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)
///
/// IA32 and x64 Specific definitions.
@ -413,16 +412,16 @@ typedef struct {
/// IA32/X64 Cache Check Structure
///
typedef struct {
UINT64 ValidFields:16;
UINT64 TransactionType:2;
UINT64 Operation:4;
UINT64 Level:3;
UINT64 ContextCorrupt:1;
UINT64 ErrorUncorrected:1;
UINT64 PreciseIp:1;
UINT64 RestartableIp:1;
UINT64 Overflow:1;
UINT64 Resv1:34;
UINT64 ValidFields : 16;
UINT64 TransactionType : 2;
UINT64 Operation : 4;
UINT64 Level : 3;
UINT64 ContextCorrupt : 1;
UINT64 ErrorUncorrected : 1;
UINT64 PreciseIp : 1;
UINT64 RestartableIp : 1;
UINT64 Overflow : 1;
UINT64 Resv1 : 34;
} EFI_IA32_X64_CACHE_CHECK_INFO;
///
@ -464,16 +463,16 @@ typedef struct {
/// IA32/X64 TLB Check Structure
///
typedef struct {
UINT64 ValidFields:16;
UINT64 TransactionType:2;
UINT64 Operation:4;
UINT64 Level:3;
UINT64 ContextCorrupt:1;
UINT64 ErrorUncorrected:1;
UINT64 PreciseIp:1;
UINT64 RestartableIp:1;
UINT64 Overflow:1;
UINT64 Resv1:34;
UINT64 ValidFields : 16;
UINT64 TransactionType : 2;
UINT64 Operation : 4;
UINT64 Level : 3;
UINT64 ContextCorrupt : 1;
UINT64 ErrorUncorrected : 1;
UINT64 PreciseIp : 1;
UINT64 RestartableIp : 1;
UINT64 Overflow : 1;
UINT64 Resv1 : 34;
} EFI_IA32_X64_TLB_CHECK_INFO;
///
@ -536,19 +535,19 @@ typedef struct {
/// IA32/X64 Bus Check Structure
///
typedef struct {
UINT64 ValidFields:16;
UINT64 TransactionType:2;
UINT64 Operation:4;
UINT64 Level:3;
UINT64 ContextCorrupt:1;
UINT64 ErrorUncorrected:1;
UINT64 PreciseIp:1;
UINT64 RestartableIp:1;
UINT64 Overflow:1;
UINT64 ParticipationType:2;
UINT64 TimeOut:1;
UINT64 AddressSpace:2;
UINT64 Resv1:29;
UINT64 ValidFields : 16;
UINT64 TransactionType : 2;
UINT64 Operation : 4;
UINT64 Level : 3;
UINT64 ContextCorrupt : 1;
UINT64 ErrorUncorrected : 1;
UINT64 PreciseIp : 1;
UINT64 RestartableIp : 1;
UINT64 Overflow : 1;
UINT64 ParticipationType : 2;
UINT64 TimeOut : 1;
UINT64 AddressSpace : 2;
UINT64 Resv1 : 29;
} EFI_IA32_X64_BUS_CHECK_INFO;
///
@ -578,14 +577,14 @@ typedef struct {
/// IA32/X64 MS Check Field Description
///
typedef struct {
UINT64 ValidFields:16;
UINT64 ErrorType:3;
UINT64 ContextCorrupt:1;
UINT64 ErrorUncorrected:1;
UINT64 PreciseIp:1;
UINT64 RestartableIp:1;
UINT64 Overflow:1;
UINT64 Resv1:40;
UINT64 ValidFields : 16;
UINT64 ErrorType : 3;
UINT64 ContextCorrupt : 1;
UINT64 ErrorUncorrected : 1;
UINT64 PreciseIp : 1;
UINT64 RestartableIp : 1;
UINT64 Overflow : 1;
UINT64 Resv1 : 40;
} EFI_IA32_X64_MS_CHECK_INFO;
///
@ -728,11 +727,11 @@ typedef struct {
/// Processor Error Section.
///
typedef struct {
UINT64 ApicIdValid:1;
UINT64 CpuIdInforValid:1;
UINT64 ErrorInfoNum:6;
UINT64 ContextNum:6;
UINT64 Resv1:50;
UINT64 ApicIdValid : 1;
UINT64 CpuIdInforValid : 1;
UINT64 ErrorInfoNum : 6;
UINT64 ContextNum : 6;
UINT64 Resv1 : 50;
} EFI_IA32_X64_VALID_BITS;
#endif
@ -741,16 +740,16 @@ typedef struct {
/// Error Status Fields
///
typedef struct {
UINT64 Resv1:8;
UINT64 Type:8;
UINT64 AddressSignal:1; ///< Error in Address signals or in Address portion of transaction
UINT64 ControlSignal:1; ///< Error in Control signals or in Control portion of transaction
UINT64 DataSignal:1; ///< Error in Data signals or in Data portion of transaction
UINT64 DetectedByResponder:1; ///< Error detected by responder
UINT64 DetectedByRequester:1; ///< Error detected by requestor
UINT64 FirstError:1; ///< First Error in the sequence - option field
UINT64 OverflowNotLogged:1; ///< Additional errors were not logged due to lack of resources
UINT64 Resv2:41;
UINT64 Resv1 : 8;
UINT64 Type : 8;
UINT64 AddressSignal : 1; ///< Error in Address signals or in Address portion of transaction
UINT64 ControlSignal : 1; ///< Error in Control signals or in Control portion of transaction
UINT64 DataSignal : 1; ///< Error in Data signals or in Data portion of transaction
UINT64 DetectedByResponder : 1; ///< Error detected by responder
UINT64 DetectedByRequester : 1; ///< Error detected by requestor
UINT64 FirstError : 1; ///< First Error in the sequence - option field
UINT64 OverflowNotLogged : 1; ///< Additional errors were not logged due to lack of resources
UINT64 Resv2 : 41;
} EFI_GENERIC_ERROR_STATUS;
///
@ -778,7 +777,7 @@ typedef enum {
ErrorAccessInvalid = 18, // Improper access
ErrorUnimplAccess = 19, // Unimplemented memory access
ErrorLossOfLockstep = 20,
ErrorResponseInvalid= 21, // Response not associated with request
ErrorResponseInvalid = 21, // Response not associated with request
ErrorParity = 22,
ErrorProtocol = 23,
ErrorPath = 24, // Detected path error
@ -972,8 +971,8 @@ typedef struct {
/// PCI Slot number
///
typedef struct {
UINT16 Resv1:3;
UINT16 Number:13;
UINT16 Resv1 : 3;
UINT16 Number : 13;
} EFI_GENERIC_ERROR_PCI_SLOT;
///
@ -1226,7 +1225,7 @@ extern EFI_GUID gEfiEventNotificationTypePeiGuid;
extern EFI_GUID gEfiProcessorGenericErrorSectionGuid;
extern EFI_GUID gEfiProcessorSpecificErrorSectionGuid;
extern EFI_GUID gEfiIa32X64ProcessorErrorSectionGuid;
extern EFI_GUID gEfiArmProcessorErrorSectionGuid ;
extern EFI_GUID gEfiArmProcessorErrorSectionGuid;
extern EFI_GUID gEfiPlatformMemoryErrorSectionGuid;
extern EFI_GUID gEfiPlatformMemory2ErrorSectionGuid;
extern EFI_GUID gEfiPcieErrorSectionGuid;

4
MdePkg/Include/Guid/EventGroup.h
View File

@ -9,25 +9,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#ifndef __EVENT_GROUP_GUID__
#define __EVENT_GROUP_GUID__
#define EFI_EVENT_GROUP_EXIT_BOOT_SERVICES \
{ 0x27abf055, 0xb1b8, 0x4c26, { 0x80, 0x48, 0x74, 0x8f, 0x37, 0xba, 0xa2, 0xdf } }
extern EFI_GUID gEfiEventExitBootServicesGuid;
#define EFI_EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE \
{ 0x13fa7698, 0xc831, 0x49c7, { 0x87, 0xea, 0x8f, 0x43, 0xfc, 0xc2, 0x51, 0x96 } }
extern EFI_GUID gEfiEventVirtualAddressChangeGuid;
#define EFI_EVENT_GROUP_MEMORY_MAP_CHANGE \
{ 0x78bee926, 0x692f, 0x48fd, { 0x9e, 0xdb, 0x1, 0x42, 0x2e, 0xf0, 0xd7, 0xab } }
extern EFI_GUID gEfiEventMemoryMapChangeGuid;
#define EFI_EVENT_GROUP_READY_TO_BOOT \
{ 0x7ce88fb3, 0x4bd7, 0x4679, { 0x87, 0xa8, 0xa8, 0xd8, 0xde, 0xe5, 0x0d, 0x2b } }

1
MdePkg/Include/Guid/FirmwareFileSystem2.h
View File

@ -27,7 +27,6 @@
#define EFI_FFS_VOLUME_TOP_FILE_GUID \
{ 0x1BA0062E, 0xC779, 0x4582, { 0x85, 0x66, 0x33, 0x6A, 0xE8, 0xF7, 0x8F, 0x9 } }
extern EFI_GUID gEfiFirmwareFileSystem2Guid;
extern EFI_GUID gEfiFirmwareVolumeTopFileGuid;

2
MdePkg/Include/Guid/FmpCapsule.h
View File

@ -10,7 +10,6 @@
**/
#ifndef _FMP_CAPSULE_GUID_H__
#define _FMP_CAPSULE_GUID_H__
@ -90,7 +89,6 @@ typedef struct {
#pragma pack()
#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER_INIT_VERSION 0x00000001
#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION 0x00000003
#define CAPSULE_SUPPORT_AUTHENTICATION 0x0000000000000001

9
MdePkg/Include/Guid/ImageAuthentication.h
View File

@ -41,9 +41,9 @@
#define SETUP_MODE 1
#define USER_MODE 0
//***********************************************************************
// ***********************************************************************
// Signature Database
//***********************************************************************
// ***********************************************************************
///
/// The format of a signature database.
///
@ -265,9 +265,9 @@ typedef struct {
0x4aafd29d, 0x68df, 0x49ee, {0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7} \
}
//***********************************************************************
// ***********************************************************************
// Image Execution Information Table Definition
//***********************************************************************
// ***********************************************************************
typedef UINT32 EFI_IMAGE_EXECUTION_ACTION;
#define EFI_IMAGE_EXECUTION_AUTHENTICATION 0x00000007
@ -316,7 +316,6 @@ typedef struct {
///
} EFI_IMAGE_EXECUTION_INFO;
typedef struct {
///
/// Number of EFI_IMAGE_EXECUTION_INFO structures.

2
MdePkg/Include/Guid/JsonCapsule.h
View File

@ -31,7 +31,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
{0x67d6f4cd, 0xd6b8, 0x4573, \
{0xbf, 0x4a, 0xde, 0x5e, 0x25, 0x2d, 0x61, 0xae }}
#pragma pack(1)
typedef struct {
@ -94,5 +93,4 @@ extern EFI_GUID gEfiJsonCapsuleDataTableGuid;
extern EFI_GUID gEfiJsonCapsuleResultTableGuid;
extern EFI_GUID gEfiJsonCapsuleIdGuid;
#endif

2
MdePkg/Include/Guid/MemoryAttributesTable.h
View File

@ -18,7 +18,7 @@ typedef struct {
UINT32 NumberOfEntries;
UINT32 DescriptorSize;
UINT32 Reserved;
//EFI_MEMORY_DESCRIPTOR Entry[1];
// EFI_MEMORY_DESCRIPTOR Entry[1];
} EFI_MEMORY_ATTRIBUTES_TABLE;
#define EFI_MEMORY_ATTRIBUTES_TABLE_VERSION 0x00000001

3
MdePkg/Include/Guid/RtPropertiesTable.h
View File

@ -22,9 +22,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
{ 0xeb66918a, 0x7eef, 0x402a, \
{ 0x84, 0x2e, 0x93, 0x1d, 0x21, 0xc3, 0x8a, 0xe9 }}
#pragma pack(1)
typedef struct {

1
MdePkg/Include/Guid/SmramMemoryReserve.h
View File

@ -42,4 +42,3 @@ typedef struct {
extern EFI_GUID gEfiSmmSmramMemoryGuid;
#endif

3
MdePkg/Include/Guid/SystemResourceTable.h
View File

@ -10,7 +10,6 @@
**/
#ifndef _SYSTEM_RESOURCE_TABLE_H__
#define _SYSTEM_RESOURCE_TABLE_H__
@ -125,7 +124,7 @@ typedef struct {
///
/// Array of EFI_SYSTEM_RESOURCE_ENTRY
///
//EFI_SYSTEM_RESOURCE_ENTRY Entries[];
// EFI_SYSTEM_RESOURCE_ENTRY Entries[];
} EFI_SYSTEM_RESOURCE_TABLE;
extern EFI_GUID gEfiSystemResourceTableGuid;

2
MdePkg/Include/Guid/WinCertificate.h
View File

@ -61,7 +61,6 @@ typedef struct {
UINT8 Signature[256];
} EFI_CERT_BLOCK_RSA_2048_SHA256;
///
/// Certificate which encapsulates a GUID-specific digital signature
///
@ -85,7 +84,6 @@ typedef struct {
UINT8 CertData[1];
} WIN_CERTIFICATE_UEFI_GUID;
///
/// Certificate which encapsulates the RSASSA_PKCS1-v1_5 digital signature.
///

281
MdePkg/Include/Ia32/ProcessorBind.h
View File

@ -17,39 +17,38 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Make sure we are using the correct packing rules per EFI specification
//
#if !defined(__GNUC__)
#pragma pack()
#if !defined (__GNUC__)
#pragma pack()
#endif
#if defined(__INTEL_COMPILER)
#if defined (__INTEL_COMPILER)
//
// Disable ICC's remark #869: "Parameter" was never referenced warning.
// This is legal ANSI C code so we disable the remark that is turned on with -Wall
//
#pragma warning ( disable : 869 )
#pragma warning ( disable : 869 )
//
// Disable ICC's remark #1418: external function definition with no prior declaration.
// This is legal ANSI C code so we disable the remark that is turned on with /W4
//
#pragma warning ( disable : 1418 )
#pragma warning ( disable : 1418 )
//
// Disable ICC's remark #1419: external declaration in primary source file
// This is legal ANSI C code so we disable the remark that is turned on with /W4
//
#pragma warning ( disable : 1419 )
#pragma warning ( disable : 1419 )
//
// Disable ICC's remark #593: "Variable" was set but never used.
// This is legal ANSI C code so we disable the remark that is turned on with /W4
//
#pragma warning ( disable : 593 )
#pragma warning ( disable : 593 )
#endif
#if defined(_MSC_EXTENSIONS)
#if defined (_MSC_EXTENSIONS)
//
// Disable warning that make it impossible to compile at /W4
@ -59,35 +58,35 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Disabling bitfield type checking warnings.
//
#pragma warning ( disable : 4214 )
#pragma warning ( disable : 4214 )
//
// Disabling the unreferenced formal parameter warnings.
//
#pragma warning ( disable : 4100 )
#pragma warning ( disable : 4100 )
//
// Disable slightly different base types warning as CHAR8 * can not be set
// to a constant string.
//
#pragma warning ( disable : 4057 )
#pragma warning ( disable : 4057 )
//
// ASSERT(FALSE) or while (TRUE) are legal constructs so suppress this warning
//
#pragma warning ( disable : 4127 )
#pragma warning ( disable : 4127 )
//
// This warning is caused by functions defined but not used. For precompiled header only.
//
#pragma warning ( disable : 4505 )
#pragma warning ( disable : 4505 )
//
// This warning is caused by empty (after preprocessing) source file. For precompiled header only.
//
#pragma warning ( disable : 4206 )
#pragma warning ( disable : 4206 )
#if defined(_MSC_VER) && _MSC_VER >= 1800
#if defined (_MSC_VER) && _MSC_VER >= 1800
//
// Disable these warnings for VS2013.
@ -97,118 +96,117 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// This warning is for potentially uninitialized local variable, and it may cause false
// positive issues in VS2013 and VS2015 build
//
#pragma warning ( disable : 4701 )
#pragma warning ( disable : 4701 )
//
// This warning is for potentially uninitialized local pointer variable, and it may cause
// false positive issues in VS2013 and VS2015 build
//
#pragma warning ( disable : 4703 )
#pragma warning ( disable : 4703 )
#endif
#endif
#endif
#if defined (_MSC_EXTENSIONS)
//
// use Microsoft C compiler dependent integer width types
//
#if defined(_MSC_EXTENSIONS)
//
// use Microsoft C compiler dependent integer width types
//
///
/// 8-byte unsigned value.
///
typedef unsigned __int64 UINT64;
///
/// 8-byte signed value.
///
typedef __int64 INT64;
///
/// 4-byte unsigned value.
///
typedef unsigned __int32 UINT32;
///
/// 4-byte signed value.
///
typedef __int32 INT32;
///
/// 2-byte unsigned value.
///
typedef unsigned short UINT16;
///
/// 2-byte Character. Unless otherwise specified all strings are stored in the
/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
///
typedef unsigned short CHAR16;
///
/// 2-byte signed value.
///
typedef short INT16;
///
/// Logical Boolean. 1-byte value containing 0 for FALSE or a 1 for TRUE. Other
/// values are undefined.
///
typedef unsigned char BOOLEAN;
///
/// 1-byte unsigned value.
///
typedef unsigned char UINT8;
///
/// 1-byte Character.
///
typedef char CHAR8;
///
/// 1-byte signed value.
///
typedef signed char INT8;
///
/// 8-byte unsigned value.
///
typedef unsigned __int64 UINT64;
///
/// 8-byte signed value.
///
typedef __int64 INT64;
///
/// 4-byte unsigned value.
///
typedef unsigned __int32 UINT32;
///
/// 4-byte signed value.
///
typedef __int32 INT32;
///
/// 2-byte unsigned value.
///
typedef unsigned short UINT16;
///
/// 2-byte Character. Unless otherwise specified all strings are stored in the
/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
///
typedef unsigned short CHAR16;
///
/// 2-byte signed value.
///
typedef short INT16;
///
/// Logical Boolean. 1-byte value containing 0 for FALSE or a 1 for TRUE. Other
/// values are undefined.
///
typedef unsigned char BOOLEAN;
///
/// 1-byte unsigned value.
///
typedef unsigned char UINT8;
///
/// 1-byte Character.
///
typedef char CHAR8;
///
/// 1-byte signed value.
///
typedef signed char INT8;
#else
///
/// 8-byte unsigned value.
///
typedef unsigned long long UINT64;
///
/// 8-byte signed value.
///
typedef long long INT64;
///
/// 4-byte unsigned value.
///
typedef unsigned int UINT32;
///
/// 4-byte signed value.
///
typedef int INT32;
///
/// 2-byte unsigned value.
///
typedef unsigned short UINT16;
///
/// 2-byte Character. Unless otherwise specified all strings are stored in the
/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
///
typedef unsigned short CHAR16;
///
/// 2-byte signed value.
///
typedef short INT16;
///
/// Logical Boolean. 1-byte value containing 0 for FALSE or a 1 for TRUE. Other
/// values are undefined.
///
typedef unsigned char BOOLEAN;
///
/// 1-byte unsigned value.
///
typedef unsigned char UINT8;
///
/// 1-byte Character
///
typedef char CHAR8;
///
/// 1-byte signed value
///
typedef signed char INT8;
///
/// 8-byte unsigned value.
///
typedef unsigned long long UINT64;
///
/// 8-byte signed value.
///
typedef long long INT64;
///
/// 4-byte unsigned value.
///
typedef unsigned int UINT32;
///
/// 4-byte signed value.
///
typedef int INT32;
///
/// 2-byte unsigned value.
///
typedef unsigned short UINT16;
///
/// 2-byte Character. Unless otherwise specified all strings are stored in the
/// UTF-16 encoding format as defined by Unicode 2.1 and ISO/IEC 10646 standards.
///
typedef unsigned short CHAR16;
///
/// 2-byte signed value.
///
typedef short INT16;
///
/// Logical Boolean. 1-byte value containing 0 for FALSE or a 1 for TRUE. Other
/// values are undefined.
///
typedef unsigned char BOOLEAN;
///
/// 1-byte unsigned value.
///
typedef unsigned char UINT8;
///
/// 1-byte Character
///
typedef char CHAR8;
///
/// 1-byte signed value
///
typedef signed char INT8;
#endif
///
@ -273,33 +271,33 @@ typedef INT32 INTN;
// EFI intrinsics are required to modify their member functions with EFIAPI.
//
#ifdef EFIAPI
///
/// If EFIAPI is already defined, then we use that definition.
///
#elif defined(_MSC_EXTENSIONS)
///
/// Microsoft* compiler specific method for EFIAPI calling convention.
///
#define EFIAPI __cdecl
#elif defined(__GNUC__) || defined(__clang__)
///
/// GCC specific method for EFIAPI calling convention.
///
#define EFIAPI __attribute__((cdecl))
///
/// If EFIAPI is already defined, then we use that definition.
///
#elif defined (_MSC_EXTENSIONS)
///
/// Microsoft* compiler specific method for EFIAPI calling convention.
///
#define EFIAPI __cdecl
#elif defined (__GNUC__) || defined (__clang__)
///
/// GCC specific method for EFIAPI calling convention.
///
#define EFIAPI __attribute__((cdecl))
#else
///
/// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI
/// is the standard.
///
#define EFIAPI
///
/// The default for a non Microsoft* or GCC compiler is to assume the EFI ABI
/// is the standard.
///
#define EFIAPI
#endif
#if defined(__GNUC__) || defined(__clang__)
///
/// For GNU assembly code, .global or .globl can declare global symbols.
/// Define this macro to unify the usage.
///
#define ASM_GLOBAL .globl
#if defined (__GNUC__) || defined (__clang__)
///
/// For GNU assembly code, .global or .globl can declare global symbols.
/// Define this macro to unify the usage.
///
#define ASM_GLOBAL .globl
#endif
/**
@ -319,4 +317,3 @@ typedef INT32 INTN;
#endif
#endif

2
MdePkg/Include/IndustryStandard/Acpi10.h
View File

@ -141,7 +141,7 @@ typedef PACKED struct {
PACKED struct {
UINT8 Name : 7;
UINT8 Type : 1;
}Bits;
} Bits;
} Header;
UINT16 Length;
} ACPI_LARGE_RESOURCE_HEADER;

26
MdePkg/Include/IndustryStandard/Acpi40.h
View File

@ -667,12 +667,12 @@ typedef struct {
/// Boot Error Region Block Status Definition
///
typedef struct {
UINT32 UncorrectableErrorValid:1;
UINT32 CorrectableErrorValid:1;
UINT32 MultipleUncorrectableErrors:1;
UINT32 MultipleCorrectableErrors:1;
UINT32 ErrorDataEntryCount:10;
UINT32 Reserved:18;
UINT32 UncorrectableErrorValid : 1;
UINT32 CorrectableErrorValid : 1;
UINT32 MultipleUncorrectableErrors : 1;
UINT32 MultipleCorrectableErrors : 1;
UINT32 ErrorDataEntryCount : 10;
UINT32 Reserved : 18;
} EFI_ACPI_4_0_ERROR_BLOCK_STATUS;
///
@ -795,13 +795,13 @@ typedef struct {
/// Hardware Error Notification Configuration Write Enable Structure Definition
///
typedef struct {
UINT16 Type:1;
UINT16 PollInterval:1;
UINT16 SwitchToPollingThresholdValue:1;
UINT16 SwitchToPollingThresholdWindow:1;
UINT16 ErrorThresholdValue:1;
UINT16 ErrorThresholdWindow:1;
UINT16 Reserved:10;
UINT16 Type : 1;
UINT16 PollInterval : 1;
UINT16 SwitchToPollingThresholdValue : 1;
UINT16 SwitchToPollingThresholdWindow : 1;
UINT16 ErrorThresholdValue : 1;
UINT16 ErrorThresholdWindow : 1;
UINT16 Reserved : 10;
} EFI_ACPI_4_0_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE;
///

56
MdePkg/Include/IndustryStandard/Acpi50.h
View File

@ -69,7 +69,7 @@ typedef PACKED struct {
UINT16 TypeSpecificFlags;
UINT8 TypeSpecificRevisionId;
UINT16 TypeDataLength;
// Type specific data
// Type specific data
} EFI_ACPI_SERIAL_BUS_RESOURCE_DESCRIPTOR;
#define EFI_ACPI_SERIAL_BUS_RESOURCE_TYPE_I2C 0x1
@ -881,8 +881,8 @@ typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
UINT8 PlatformCommunicationChannelIdentifier;
UINT8 Reserved[3];
// Memory Power Node Structure
// Memory Power State Characteristics
// Memory Power Node Structure
// Memory Power State Characteristics
} EFI_ACPI_5_0_MEMORY_POWER_STATUS_TABLE;
///
@ -935,8 +935,8 @@ typedef struct {
UINT64 AddressLength;
UINT32 NumberOfPowerStates;
UINT32 NumberOfPhysicalComponents;
//EFI_ACPI_5_0_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
//UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
// EFI_ACPI_5_0_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
// UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
} EFI_ACPI_5_0_MPST_MEMORY_POWER_STRUCTURE;
#define EFI_ACPI_5_0_MPST_MEMORY_POWER_STRUCTURE_FLAG_ENABLE 0x01
@ -1007,7 +1007,7 @@ typedef struct {
EFI_ACPI_5_0_PMMT_COMMON_MEMORY_AGGREGATOR_DEVICE_STRUCTURE Header;
UINT16 SocketIdentifier;
UINT16 Reserved;
//EFI_ACPI_5_0_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
// EFI_ACPI_5_0_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
} EFI_ACPI_5_0_PMMT_SOCKET_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -1023,8 +1023,8 @@ typedef struct {
UINT16 OptimalAccessAlignment;
UINT16 Reserved;
UINT16 NumberOfProximityDomains;
//UINT32 ProximityDomain[NumberOfProximityDomains];
//EFI_ACPI_5_0_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
// UINT32 ProximityDomain[NumberOfProximityDomains];
// EFI_ACPI_5_0_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
} EFI_ACPI_5_0_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -1338,12 +1338,12 @@ typedef struct {
/// Boot Error Region Block Status Definition
///
typedef struct {
UINT32 UncorrectableErrorValid:1;
UINT32 CorrectableErrorValid:1;
UINT32 MultipleUncorrectableErrors:1;
UINT32 MultipleCorrectableErrors:1;
UINT32 ErrorDataEntryCount:10;
UINT32 Reserved:18;
UINT32 UncorrectableErrorValid : 1;
UINT32 CorrectableErrorValid : 1;
UINT32 MultipleUncorrectableErrors : 1;
UINT32 MultipleCorrectableErrors : 1;
UINT32 ErrorDataEntryCount : 10;
UINT32 Reserved : 18;
} EFI_ACPI_5_0_ERROR_BLOCK_STATUS;
///
@ -1466,13 +1466,13 @@ typedef struct {
/// Hardware Error Notification Configuration Write Enable Structure Definition
///
typedef struct {
UINT16 Type:1;
UINT16 PollInterval:1;
UINT16 SwitchToPollingThresholdValue:1;
UINT16 SwitchToPollingThresholdWindow:1;
UINT16 ErrorThresholdValue:1;
UINT16 ErrorThresholdWindow:1;
UINT16 Reserved:10;
UINT16 Type : 1;
UINT16 PollInterval : 1;
UINT16 SwitchToPollingThresholdValue : 1;
UINT16 SwitchToPollingThresholdWindow : 1;
UINT16 ErrorThresholdValue : 1;
UINT16 ErrorThresholdWindow : 1;
UINT16 Reserved : 10;
} EFI_ACPI_5_0_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE;
///
@ -1845,16 +1845,16 @@ typedef struct {
typedef struct {
UINT8 Command;
UINT8 Reserved:7;
UINT8 GenerateSci:1;
UINT8 Reserved : 7;
UINT8 GenerateSci : 1;
} EFI_ACPI_5_0_PCCT_GENERIC_SHARED_MEMORY_REGION_COMMAND;
typedef struct {
UINT8 CommandComplete:1;
UINT8 SciDoorbell:1;
UINT8 Error:1;
UINT8 PlatformNotification:1;
UINT8 Reserved:4;
UINT8 CommandComplete : 1;
UINT8 SciDoorbell : 1;
UINT8 Error : 1;
UINT8 PlatformNotification : 1;
UINT8 Reserved : 4;
UINT8 Reserved1;
} EFI_ACPI_5_0_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;

54
MdePkg/Include/IndustryStandard/Acpi51.h
View File

@ -836,8 +836,8 @@ typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
UINT8 PlatformCommunicationChannelIdentifier;
UINT8 Reserved[3];
// Memory Power Node Structure
// Memory Power State Characteristics
// Memory Power Node Structure
// Memory Power State Characteristics
} EFI_ACPI_5_1_MEMORY_POWER_STATUS_TABLE;
///
@ -890,8 +890,8 @@ typedef struct {
UINT64 AddressLength;
UINT32 NumberOfPowerStates;
UINT32 NumberOfPhysicalComponents;
//EFI_ACPI_5_1_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
//UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
// EFI_ACPI_5_1_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
// UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
} EFI_ACPI_5_1_MPST_MEMORY_POWER_STRUCTURE;
#define EFI_ACPI_5_1_MPST_MEMORY_POWER_STRUCTURE_FLAG_ENABLE 0x01
@ -962,7 +962,7 @@ typedef struct {
EFI_ACPI_5_1_PMMT_COMMON_MEMORY_AGGREGATOR_DEVICE_STRUCTURE Header;
UINT16 SocketIdentifier;
UINT16 Reserved;
//EFI_ACPI_5_1_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
// EFI_ACPI_5_1_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
} EFI_ACPI_5_1_PMMT_SOCKET_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -978,8 +978,8 @@ typedef struct {
UINT16 OptimalAccessAlignment;
UINT16 Reserved;
UINT16 NumberOfProximityDomains;
//UINT32 ProximityDomain[NumberOfProximityDomains];
//EFI_ACPI_5_1_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
// UINT32 ProximityDomain[NumberOfProximityDomains];
// EFI_ACPI_5_1_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
} EFI_ACPI_5_1_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -1354,12 +1354,12 @@ typedef struct {
/// Boot Error Region Block Status Definition
///
typedef struct {
UINT32 UncorrectableErrorValid:1;
UINT32 CorrectableErrorValid:1;
UINT32 MultipleUncorrectableErrors:1;
UINT32 MultipleCorrectableErrors:1;
UINT32 ErrorDataEntryCount:10;
UINT32 Reserved:18;
UINT32 UncorrectableErrorValid : 1;
UINT32 CorrectableErrorValid : 1;
UINT32 MultipleUncorrectableErrors : 1;
UINT32 MultipleCorrectableErrors : 1;
UINT32 ErrorDataEntryCount : 10;
UINT32 Reserved : 18;
} EFI_ACPI_5_1_ERROR_BLOCK_STATUS;
///
@ -1482,13 +1482,13 @@ typedef struct {
/// Hardware Error Notification Configuration Write Enable Structure Definition
///
typedef struct {
UINT16 Type:1;
UINT16 PollInterval:1;
UINT16 SwitchToPollingThresholdValue:1;
UINT16 SwitchToPollingThresholdWindow:1;
UINT16 ErrorThresholdValue:1;
UINT16 ErrorThresholdWindow:1;
UINT16 Reserved:10;
UINT16 Type : 1;
UINT16 PollInterval : 1;
UINT16 SwitchToPollingThresholdValue : 1;
UINT16 SwitchToPollingThresholdWindow : 1;
UINT16 ErrorThresholdValue : 1;
UINT16 ErrorThresholdWindow : 1;
UINT16 Reserved : 10;
} EFI_ACPI_5_1_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE;
///
@ -1861,16 +1861,16 @@ typedef struct {
typedef struct {
UINT8 Command;
UINT8 Reserved:7;
UINT8 GenerateSci:1;
UINT8 Reserved : 7;
UINT8 GenerateSci : 1;
} EFI_ACPI_5_1_PCCT_GENERIC_SHARED_MEMORY_REGION_COMMAND;
typedef struct {
UINT8 CommandComplete:1;
UINT8 SciDoorbell:1;
UINT8 Error:1;
UINT8 PlatformNotification:1;
UINT8 Reserved:4;
UINT8 CommandComplete : 1;
UINT8 SciDoorbell : 1;
UINT8 Error : 1;
UINT8 PlatformNotification : 1;
UINT8 Reserved : 4;
UINT8 Reserved1;
} EFI_ACPI_5_1_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;

74
MdePkg/Include/IndustryStandard/Acpi60.h
View File

@ -851,8 +851,8 @@ typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
UINT8 PlatformCommunicationChannelIdentifier;
UINT8 Reserved[3];
// Memory Power Node Structure
// Memory Power State Characteristics
// Memory Power Node Structure
// Memory Power State Characteristics
} EFI_ACPI_6_0_MEMORY_POWER_STATUS_TABLE;
///
@ -905,8 +905,8 @@ typedef struct {
UINT64 AddressLength;
UINT32 NumberOfPowerStates;
UINT32 NumberOfPhysicalComponents;
//EFI_ACPI_6_0_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
//UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
// EFI_ACPI_6_0_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
// UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
} EFI_ACPI_6_0_MPST_MEMORY_POWER_STRUCTURE;
#define EFI_ACPI_6_0_MPST_MEMORY_POWER_STRUCTURE_FLAG_ENABLE 0x01
@ -977,7 +977,7 @@ typedef struct {
EFI_ACPI_6_0_PMMT_COMMON_MEMORY_AGGREGATOR_DEVICE_STRUCTURE Header;
UINT16 SocketIdentifier;
UINT16 Reserved;
//EFI_ACPI_6_0_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
// EFI_ACPI_6_0_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
} EFI_ACPI_6_0_PMMT_SOCKET_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -993,8 +993,8 @@ typedef struct {
UINT16 OptimalAccessAlignment;
UINT16 Reserved;
UINT16 NumberOfProximityDomains;
//UINT32 ProximityDomain[NumberOfProximityDomains];
//EFI_ACPI_6_0_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
// UINT32 ProximityDomain[NumberOfProximityDomains];
// EFI_ACPI_6_0_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
} EFI_ACPI_6_0_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -1413,12 +1413,12 @@ typedef struct {
// Definition for Memory Device to System Physical Address Range Mapping Structure
//
typedef struct {
UINT32 DIMMNumber:4;
UINT32 MemoryChannelNumber:4;
UINT32 MemoryControllerID:4;
UINT32 SocketID:4;
UINT32 NodeControllerID:12;
UINT32 Reserved_28:4;
UINT32 DIMMNumber : 4;
UINT32 MemoryChannelNumber : 4;
UINT32 MemoryControllerID : 4;
UINT32 SocketID : 4;
UINT32 NodeControllerID : 12;
UINT32 Reserved_28 : 4;
} EFI_ACPI_6_0_NFIT_DEVICE_HANDLE;
#define EFI_ACPI_6_0_NFIT_MEMORY_DEVICE_STATE_FLAGS_PREVIOUS_SAVE_FAIL BIT0
@ -1433,7 +1433,7 @@ typedef struct {
EFI_ACPI_6_0_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 MemoryDevicePhysicalID;
UINT16 MemoryDeviceRegionID;
UINT16 SPARangeStructureIndex ;
UINT16 SPARangeStructureIndex;
UINT16 NVDIMMControlRegionStructureIndex;
UINT64 MemoryDeviceRegionSize;
UINT64 RegionOffset;
@ -1454,7 +1454,7 @@ typedef struct {
UINT16 Reserved_6;
UINT32 NumberOfLines;
UINT32 LineSize;
//UINT32 LineOffset[NumberOfLines];
// UINT32 LineOffset[NumberOfLines];
} EFI_ACPI_6_0_NFIT_INTERLEAVE_STRUCTURE;
//
@ -1464,7 +1464,7 @@ typedef struct {
UINT16 Type;
UINT16 Length;
UINT32 Reserved_4;
//UINT8 Data[];
// UINT8 Data[];
} EFI_ACPI_6_0_NFIT_SMBIOS_MANAGEMENT_INFORMATION_STRUCTURE;
//
@ -1517,7 +1517,7 @@ typedef struct {
EFI_ACPI_6_0_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 NumberOfFlushHintAddresses;
UINT8 Reserved_10[6];
//UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
// UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
} EFI_ACPI_6_0_NFIT_FLUSH_HINT_ADDRESS_STRUCTURE;
///
@ -1538,12 +1538,12 @@ typedef struct {
/// Boot Error Region Block Status Definition
///
typedef struct {
UINT32 UncorrectableErrorValid:1;
UINT32 CorrectableErrorValid:1;
UINT32 MultipleUncorrectableErrors:1;
UINT32 MultipleCorrectableErrors:1;
UINT32 ErrorDataEntryCount:10;
UINT32 Reserved:18;
UINT32 UncorrectableErrorValid : 1;
UINT32 CorrectableErrorValid : 1;
UINT32 MultipleUncorrectableErrors : 1;
UINT32 MultipleCorrectableErrors : 1;
UINT32 ErrorDataEntryCount : 10;
UINT32 Reserved : 18;
} EFI_ACPI_6_0_ERROR_BLOCK_STATUS;
///
@ -1669,13 +1669,13 @@ typedef struct {
/// Hardware Error Notification Configuration Write Enable Structure Definition
///
typedef struct {
UINT16 Type:1;
UINT16 PollInterval:1;
UINT16 SwitchToPollingThresholdValue:1;
UINT16 SwitchToPollingThresholdWindow:1;
UINT16 ErrorThresholdValue:1;
UINT16 ErrorThresholdWindow:1;
UINT16 Reserved:10;
UINT16 Type : 1;
UINT16 PollInterval : 1;
UINT16 SwitchToPollingThresholdValue : 1;
UINT16 SwitchToPollingThresholdWindow : 1;
UINT16 ErrorThresholdValue : 1;
UINT16 ErrorThresholdWindow : 1;
UINT16 Reserved : 10;
} EFI_ACPI_6_0_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE;
///
@ -2050,16 +2050,16 @@ typedef struct {
typedef struct {
UINT8 Command;
UINT8 Reserved:7;
UINT8 GenerateSci:1;
UINT8 Reserved : 7;
UINT8 GenerateSci : 1;
} EFI_ACPI_6_0_PCCT_GENERIC_SHARED_MEMORY_REGION_COMMAND;
typedef struct {
UINT8 CommandComplete:1;
UINT8 SciDoorbell:1;
UINT8 Error:1;
UINT8 PlatformNotification:1;
UINT8 Reserved:4;
UINT8 CommandComplete : 1;
UINT8 SciDoorbell : 1;
UINT8 Error : 1;
UINT8 PlatformNotification : 1;
UINT8 Reserved : 4;
UINT8 Reserved1;
} EFI_ACPI_6_0_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;

74
MdePkg/Include/IndustryStandard/Acpi61.h
View File

@ -851,8 +851,8 @@ typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
UINT8 PlatformCommunicationChannelIdentifier;
UINT8 Reserved[3];
// Memory Power Node Structure
// Memory Power State Characteristics
// Memory Power Node Structure
// Memory Power State Characteristics
} EFI_ACPI_6_1_MEMORY_POWER_STATUS_TABLE;
///
@ -905,8 +905,8 @@ typedef struct {
UINT64 AddressLength;
UINT32 NumberOfPowerStates;
UINT32 NumberOfPhysicalComponents;
//EFI_ACPI_6_1_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
//UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
// EFI_ACPI_6_1_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
// UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
} EFI_ACPI_6_1_MPST_MEMORY_POWER_STRUCTURE;
#define EFI_ACPI_6_1_MPST_MEMORY_POWER_STRUCTURE_FLAG_ENABLE 0x01
@ -977,7 +977,7 @@ typedef struct {
EFI_ACPI_6_1_PMMT_COMMON_MEMORY_AGGREGATOR_DEVICE_STRUCTURE Header;
UINT16 SocketIdentifier;
UINT16 Reserved;
//EFI_ACPI_6_1_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
// EFI_ACPI_6_1_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
} EFI_ACPI_6_1_PMMT_SOCKET_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -993,8 +993,8 @@ typedef struct {
UINT16 OptimalAccessAlignment;
UINT16 Reserved;
UINT16 NumberOfProximityDomains;
//UINT32 ProximityDomain[NumberOfProximityDomains];
//EFI_ACPI_6_1_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
// UINT32 ProximityDomain[NumberOfProximityDomains];
// EFI_ACPI_6_1_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
} EFI_ACPI_6_1_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -1413,12 +1413,12 @@ typedef struct {
// Definition for Memory Device to System Physical Address Range Mapping Structure
//
typedef struct {
UINT32 DIMMNumber:4;
UINT32 MemoryChannelNumber:4;
UINT32 MemoryControllerID:4;
UINT32 SocketID:4;
UINT32 NodeControllerID:12;
UINT32 Reserved_28:4;
UINT32 DIMMNumber : 4;
UINT32 MemoryChannelNumber : 4;
UINT32 MemoryControllerID : 4;
UINT32 SocketID : 4;
UINT32 NodeControllerID : 12;
UINT32 Reserved_28 : 4;
} EFI_ACPI_6_1_NFIT_DEVICE_HANDLE;
#define EFI_ACPI_6_1_NFIT_MEMORY_DEVICE_STATE_FLAGS_PREVIOUS_SAVE_FAIL BIT0
@ -1434,7 +1434,7 @@ typedef struct {
EFI_ACPI_6_1_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 NVDIMMPhysicalID;
UINT16 NVDIMMRegionID;
UINT16 SPARangeStructureIndex ;
UINT16 SPARangeStructureIndex;
UINT16 NVDIMMControlRegionStructureIndex;
UINT64 NVDIMMRegionSize;
UINT64 RegionOffset;
@ -1455,7 +1455,7 @@ typedef struct {
UINT16 Reserved_6;
UINT32 NumberOfLines;
UINT32 LineSize;
//UINT32 LineOffset[NumberOfLines];
// UINT32 LineOffset[NumberOfLines];
} EFI_ACPI_6_1_NFIT_INTERLEAVE_STRUCTURE;
//
@ -1465,7 +1465,7 @@ typedef struct {
UINT16 Type;
UINT16 Length;
UINT32 Reserved_4;
//UINT8 Data[];
// UINT8 Data[];
} EFI_ACPI_6_1_NFIT_SMBIOS_MANAGEMENT_INFORMATION_STRUCTURE;
//
@ -1523,7 +1523,7 @@ typedef struct {
EFI_ACPI_6_1_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 NumberOfFlushHintAddresses;
UINT8 Reserved_10[6];
//UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
// UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
} EFI_ACPI_6_1_NFIT_FLUSH_HINT_ADDRESS_STRUCTURE;
///
@ -1544,12 +1544,12 @@ typedef struct {
/// Boot Error Region Block Status Definition
///
typedef struct {
UINT32 UncorrectableErrorValid:1;
UINT32 CorrectableErrorValid:1;
UINT32 MultipleUncorrectableErrors:1;
UINT32 MultipleCorrectableErrors:1;
UINT32 ErrorDataEntryCount:10;
UINT32 Reserved:18;
UINT32 UncorrectableErrorValid : 1;
UINT32 CorrectableErrorValid : 1;
UINT32 MultipleUncorrectableErrors : 1;
UINT32 MultipleCorrectableErrors : 1;
UINT32 ErrorDataEntryCount : 10;
UINT32 Reserved : 18;
} EFI_ACPI_6_1_ERROR_BLOCK_STATUS;
///
@ -1680,13 +1680,13 @@ typedef struct {
/// Hardware Error Notification Configuration Write Enable Structure Definition
///
typedef struct {
UINT16 Type:1;
UINT16 PollInterval:1;
UINT16 SwitchToPollingThresholdValue:1;
UINT16 SwitchToPollingThresholdWindow:1;
UINT16 ErrorThresholdValue:1;
UINT16 ErrorThresholdWindow:1;
UINT16 Reserved:10;
UINT16 Type : 1;
UINT16 PollInterval : 1;
UINT16 SwitchToPollingThresholdValue : 1;
UINT16 SwitchToPollingThresholdWindow : 1;
UINT16 ErrorThresholdValue : 1;
UINT16 ErrorThresholdWindow : 1;
UINT16 Reserved : 10;
} EFI_ACPI_6_1_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE;
///
@ -2082,16 +2082,16 @@ typedef struct {
typedef struct {
UINT8 Command;
UINT8 Reserved:7;
UINT8 GenerateSci:1;
UINT8 Reserved : 7;
UINT8 GenerateSci : 1;
} EFI_ACPI_6_1_PCCT_GENERIC_SHARED_MEMORY_REGION_COMMAND;
typedef struct {
UINT8 CommandComplete:1;
UINT8 SciDoorbell:1;
UINT8 Error:1;
UINT8 PlatformNotification:1;
UINT8 Reserved:4;
UINT8 CommandComplete : 1;
UINT8 SciDoorbell : 1;
UINT8 Error : 1;
UINT8 PlatformNotification : 1;
UINT8 Reserved : 4;
UINT8 Reserved1;
} EFI_ACPI_6_1_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;

136
MdePkg/Include/IndustryStandard/Acpi62.h
View File

@ -963,8 +963,8 @@ typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
UINT8 PlatformCommunicationChannelIdentifier;
UINT8 Reserved[3];
// Memory Power Node Structure
// Memory Power State Characteristics
// Memory Power Node Structure
// Memory Power State Characteristics
} EFI_ACPI_6_2_MEMORY_POWER_STATUS_TABLE;
///
@ -1017,8 +1017,8 @@ typedef struct {
UINT64 AddressLength;
UINT32 NumberOfPowerStates;
UINT32 NumberOfPhysicalComponents;
//EFI_ACPI_6_2_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
//UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
// EFI_ACPI_6_2_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
// UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
} EFI_ACPI_6_2_MPST_MEMORY_POWER_STRUCTURE;
#define EFI_ACPI_6_2_MPST_MEMORY_POWER_STRUCTURE_FLAG_ENABLE 0x01
@ -1089,7 +1089,7 @@ typedef struct {
EFI_ACPI_6_2_PMMT_COMMON_MEMORY_AGGREGATOR_DEVICE_STRUCTURE Header;
UINT16 SocketIdentifier;
UINT16 Reserved;
//EFI_ACPI_6_2_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
// EFI_ACPI_6_2_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
} EFI_ACPI_6_2_PMMT_SOCKET_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -1105,8 +1105,8 @@ typedef struct {
UINT16 OptimalAccessAlignment;
UINT16 Reserved;
UINT16 NumberOfProximityDomains;
//UINT32 ProximityDomain[NumberOfProximityDomains];
//EFI_ACPI_6_2_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
// UINT32 ProximityDomain[NumberOfProximityDomains];
// EFI_ACPI_6_2_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
} EFI_ACPI_6_2_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -1525,12 +1525,12 @@ typedef struct {
// Definition for Memory Device to System Physical Address Range Mapping Structure
//
typedef struct {
UINT32 DIMMNumber:4;
UINT32 MemoryChannelNumber:4;
UINT32 MemoryControllerID:4;
UINT32 SocketID:4;
UINT32 NodeControllerID:12;
UINT32 Reserved_28:4;
UINT32 DIMMNumber : 4;
UINT32 MemoryChannelNumber : 4;
UINT32 MemoryControllerID : 4;
UINT32 SocketID : 4;
UINT32 NodeControllerID : 12;
UINT32 Reserved_28 : 4;
} EFI_ACPI_6_2_NFIT_DEVICE_HANDLE;
#define EFI_ACPI_6_2_NFIT_MEMORY_DEVICE_STATE_FLAGS_PREVIOUS_SAVE_FAIL BIT0
@ -1546,7 +1546,7 @@ typedef struct {
EFI_ACPI_6_2_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 NVDIMMPhysicalID;
UINT16 NVDIMMRegionID;
UINT16 SPARangeStructureIndex ;
UINT16 SPARangeStructureIndex;
UINT16 NVDIMMControlRegionStructureIndex;
UINT64 NVDIMMRegionSize;
UINT64 RegionOffset;
@ -1567,7 +1567,7 @@ typedef struct {
UINT16 Reserved_6;
UINT32 NumberOfLines;
UINT32 LineSize;
//UINT32 LineOffset[NumberOfLines];
// UINT32 LineOffset[NumberOfLines];
} EFI_ACPI_6_2_NFIT_INTERLEAVE_STRUCTURE;
//
@ -1577,7 +1577,7 @@ typedef struct {
UINT16 Type;
UINT16 Length;
UINT32 Reserved_4;
//UINT8 Data[];
// UINT8 Data[];
} EFI_ACPI_6_2_NFIT_SMBIOS_MANAGEMENT_INFORMATION_STRUCTURE;
//
@ -1635,7 +1635,7 @@ typedef struct {
EFI_ACPI_6_2_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 NumberOfFlushHintAddresses;
UINT8 Reserved_10[6];
//UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
// UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
} EFI_ACPI_6_2_NFIT_FLUSH_HINT_ADDRESS_STRUCTURE;
///
@ -1716,12 +1716,12 @@ typedef struct {
/// Boot Error Region Block Status Definition
///
typedef struct {
UINT32 UncorrectableErrorValid:1;
UINT32 CorrectableErrorValid:1;
UINT32 MultipleUncorrectableErrors:1;
UINT32 MultipleCorrectableErrors:1;
UINT32 ErrorDataEntryCount:10;
UINT32 Reserved:18;
UINT32 UncorrectableErrorValid : 1;
UINT32 CorrectableErrorValid : 1;
UINT32 MultipleUncorrectableErrors : 1;
UINT32 MultipleCorrectableErrors : 1;
UINT32 ErrorDataEntryCount : 10;
UINT32 Reserved : 18;
} EFI_ACPI_6_2_ERROR_BLOCK_STATUS;
///
@ -1855,13 +1855,13 @@ typedef struct {
/// Hardware Error Notification Configuration Write Enable Structure Definition
///
typedef struct {
UINT16 Type:1;
UINT16 PollInterval:1;
UINT16 SwitchToPollingThresholdValue:1;
UINT16 SwitchToPollingThresholdWindow:1;
UINT16 ErrorThresholdValue:1;
UINT16 ErrorThresholdWindow:1;
UINT16 Reserved:10;
UINT16 Type : 1;
UINT16 PollInterval : 1;
UINT16 SwitchToPollingThresholdValue : 1;
UINT16 SwitchToPollingThresholdWindow : 1;
UINT16 ErrorThresholdValue : 1;
UINT16 ErrorThresholdWindow : 1;
UINT16 Reserved : 10;
} EFI_ACPI_6_2_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE;
///
@ -2039,7 +2039,7 @@ typedef struct {
EFI_ACPI_6_2_HARDWARE_ERROR_NOTIFICATION_STRUCTURE NotificationStructure;
UINT8 NumberOfHardwareBanks;
UINT8 Reserved1[3];
} EFI_ACPI_6_2_IA32_ARCHITECTURE_DEFERRED_MACHINE_CHECK_STRUCTURE;;
} EFI_ACPI_6_2_IA32_ARCHITECTURE_DEFERRED_MACHINE_CHECK_STRUCTURE;
///
/// HMAT - Heterogeneous Memory Attribute Table
@ -2074,10 +2074,10 @@ typedef struct {
/// Memory Subsystem Address Range Structure flags
///
typedef struct {
UINT16 ProcessorProximityDomainValid:1;
UINT16 MemoryProximityDomainValid:1;
UINT16 ReservationHint:1;
UINT16 Reserved:13;
UINT16 ProcessorProximityDomainValid : 1;
UINT16 MemoryProximityDomainValid : 1;
UINT16 ReservationHint : 1;
UINT16 Reserved : 13;
} EFI_ACPI_6_2_HMAT_STRUCTURE_MEMORY_SUBSYSTEM_ADDRESS_RANGE_FLAGS;
///
@ -2100,8 +2100,8 @@ typedef struct {
/// System Locality Latency and Bandwidth Information Structure flags
///
typedef struct {
UINT8 MemoryHierarchy:5;
UINT8 Reserved:3;
UINT8 MemoryHierarchy : 5;
UINT8 Reserved : 3;
} EFI_ACPI_6_2_HMAT_STRUCTURE_SYSTEM_LOCALITY_LATENCY_AND_BANDWIDTH_INFO_FLAGS;
///
@ -2124,11 +2124,11 @@ typedef struct {
/// Memory Side Cache Information Structure cache attributes
///
typedef struct {
UINT32 TotalCacheLevels:4;
UINT32 CacheLevel:4;
UINT32 CacheAssociativity:4;
UINT32 WritePolicy:4;
UINT32 CacheLineSize:16;
UINT32 TotalCacheLevels : 4;
UINT32 CacheLevel : 4;
UINT32 CacheAssociativity : 4;
UINT32 WritePolicy : 4;
UINT32 CacheLineSize : 16;
} EFI_ACPI_6_2_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES;
///
@ -2380,16 +2380,16 @@ typedef struct {
typedef struct {
UINT8 Command;
UINT8 Reserved:7;
UINT8 NotifyOnCompletion:1;
UINT8 Reserved : 7;
UINT8 NotifyOnCompletion : 1;
} EFI_ACPI_6_2_PCCT_GENERIC_SHARED_MEMORY_REGION_COMMAND;
typedef struct {
UINT8 CommandComplete:1;
UINT8 PlatformInterrupt:1;
UINT8 Error:1;
UINT8 PlatformNotification:1;
UINT8 Reserved:4;
UINT8 CommandComplete : 1;
UINT8 PlatformInterrupt : 1;
UINT8 Error : 1;
UINT8 PlatformNotification : 1;
UINT8 Reserved : 4;
UINT8 Reserved1;
} EFI_ACPI_6_2_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;
@ -2506,10 +2506,10 @@ typedef struct {
/// PDTT Platform Communication Channel Identifier Structure
///
typedef struct {
UINT16 SubChannelIdentifer:8;
UINT16 Runtime:1;
UINT16 WaitForCompletion:1;
UINT16 Reserved:6;
UINT16 SubChannelIdentifer : 8;
UINT16 Runtime : 1;
UINT16 WaitForCompletion : 1;
UINT16 Reserved : 6;
} EFI_ACPI_6_2_PDTT_PCC_IDENTIFIER;
///
@ -2561,9 +2561,9 @@ typedef struct {
/// Processor hierarchy node structure flags
///
typedef struct {
UINT32 PhysicalPackage:1;
UINT32 AcpiProcessorIdValid:1;
UINT32 Reserved:30;
UINT32 PhysicalPackage : 1;
UINT32 AcpiProcessorIdValid : 1;
UINT32 Reserved : 30;
} EFI_ACPI_6_2_PPTT_STRUCTURE_PROCESSOR_FLAGS;
///
@ -2583,14 +2583,14 @@ typedef struct {
/// Cache Type Structure flags
///
typedef struct {
UINT32 SizePropertyValid:1;
UINT32 NumberOfSetsValid:1;
UINT32 AssociativityValid:1;
UINT32 AllocationTypeValid:1;
UINT32 CacheTypeValid:1;
UINT32 WritePolicyValid:1;
UINT32 LineSizeValid:1;
UINT32 Reserved:25;
UINT32 SizePropertyValid : 1;
UINT32 NumberOfSetsValid : 1;
UINT32 AssociativityValid : 1;
UINT32 AllocationTypeValid : 1;
UINT32 CacheTypeValid : 1;
UINT32 WritePolicyValid : 1;
UINT32 LineSizeValid : 1;
UINT32 Reserved : 25;
} EFI_ACPI_6_2_PPTT_STRUCTURE_CACHE_FLAGS;
///
@ -2609,10 +2609,10 @@ typedef struct {
/// Cache Type Structure cache attributes
///
typedef struct {
UINT8 AllocationType:2;
UINT8 CacheType:2;
UINT8 WritePolicy:1;
UINT8 Reserved:3;
UINT8 AllocationType : 2;
UINT8 CacheType : 2;
UINT8 WritePolicy : 1;
UINT8 Reserved : 3;
} EFI_ACPI_6_2_PPTT_STRUCTURE_CACHE_ATTRIBUTES;
///

140
MdePkg/Include/IndustryStandard/Acpi63.h
View File

@ -925,8 +925,8 @@ typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
UINT8 PlatformCommunicationChannelIdentifier;
UINT8 Reserved[3];
// Memory Power Node Structure
// Memory Power State Characteristics
// Memory Power Node Structure
// Memory Power State Characteristics
} EFI_ACPI_6_3_MEMORY_POWER_STATUS_TABLE;
///
@ -979,8 +979,8 @@ typedef struct {
UINT64 AddressLength;
UINT32 NumberOfPowerStates;
UINT32 NumberOfPhysicalComponents;
//EFI_ACPI_6_3_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
//UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
// EFI_ACPI_6_3_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
// UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
} EFI_ACPI_6_3_MPST_MEMORY_POWER_STRUCTURE;
#define EFI_ACPI_6_3_MPST_MEMORY_POWER_STRUCTURE_FLAG_ENABLE 0x01
@ -1051,7 +1051,7 @@ typedef struct {
EFI_ACPI_6_3_PMMT_COMMON_MEMORY_AGGREGATOR_DEVICE_STRUCTURE Header;
UINT16 SocketIdentifier;
UINT16 Reserved;
//EFI_ACPI_6_3_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
// EFI_ACPI_6_3_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE MemoryController[];
} EFI_ACPI_6_3_PMMT_SOCKET_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -1067,8 +1067,8 @@ typedef struct {
UINT16 OptimalAccessAlignment;
UINT16 Reserved;
UINT16 NumberOfProximityDomains;
//UINT32 ProximityDomain[NumberOfProximityDomains];
//EFI_ACPI_6_3_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
// UINT32 ProximityDomain[NumberOfProximityDomains];
// EFI_ACPI_6_3_PMMT_DIMM_MEMORY_AGGREGATOR_DEVICE_STRUCTURE PhysicalComponent[];
} EFI_ACPI_6_3_PMMT_MEMORY_CONTROLLER_MEMORY_AGGREGATOR_DEVICE_STRUCTURE;
///
@ -1489,12 +1489,12 @@ typedef struct {
// Definition for Memory Device to System Physical Address Range Mapping Structure
//
typedef struct {
UINT32 DIMMNumber:4;
UINT32 MemoryChannelNumber:4;
UINT32 MemoryControllerID:4;
UINT32 SocketID:4;
UINT32 NodeControllerID:12;
UINT32 Reserved_28:4;
UINT32 DIMMNumber : 4;
UINT32 MemoryChannelNumber : 4;
UINT32 MemoryControllerID : 4;
UINT32 SocketID : 4;
UINT32 NodeControllerID : 12;
UINT32 Reserved_28 : 4;
} EFI_ACPI_6_3_NFIT_DEVICE_HANDLE;
#define EFI_ACPI_6_3_NFIT_MEMORY_DEVICE_STATE_FLAGS_PREVIOUS_SAVE_FAIL BIT0
@ -1510,7 +1510,7 @@ typedef struct {
EFI_ACPI_6_3_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 NVDIMMPhysicalID;
UINT16 NVDIMMRegionID;
UINT16 SPARangeStructureIndex ;
UINT16 SPARangeStructureIndex;
UINT16 NVDIMMControlRegionStructureIndex;
UINT64 NVDIMMRegionSize;
UINT64 RegionOffset;
@ -1531,7 +1531,7 @@ typedef struct {
UINT16 Reserved_6;
UINT32 NumberOfLines;
UINT32 LineSize;
//UINT32 LineOffset[NumberOfLines];
// UINT32 LineOffset[NumberOfLines];
} EFI_ACPI_6_3_NFIT_INTERLEAVE_STRUCTURE;
//
@ -1541,7 +1541,7 @@ typedef struct {
UINT16 Type;
UINT16 Length;
UINT32 Reserved_4;
//UINT8 Data[];
// UINT8 Data[];
} EFI_ACPI_6_3_NFIT_SMBIOS_MANAGEMENT_INFORMATION_STRUCTURE;
//
@ -1599,7 +1599,7 @@ typedef struct {
EFI_ACPI_6_3_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 NumberOfFlushHintAddresses;
UINT8 Reserved_10[6];
//UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
// UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
} EFI_ACPI_6_3_NFIT_FLUSH_HINT_ADDRESS_STRUCTURE;
///
@ -1680,12 +1680,12 @@ typedef struct {
/// Boot Error Region Block Status Definition
///
typedef struct {
UINT32 UncorrectableErrorValid:1;
UINT32 CorrectableErrorValid:1;
UINT32 MultipleUncorrectableErrors:1;
UINT32 MultipleCorrectableErrors:1;
UINT32 ErrorDataEntryCount:10;
UINT32 Reserved:18;
UINT32 UncorrectableErrorValid : 1;
UINT32 CorrectableErrorValid : 1;
UINT32 MultipleUncorrectableErrors : 1;
UINT32 MultipleCorrectableErrors : 1;
UINT32 ErrorDataEntryCount : 10;
UINT32 Reserved : 18;
} EFI_ACPI_6_3_ERROR_BLOCK_STATUS;
///
@ -1819,13 +1819,13 @@ typedef struct {
/// Hardware Error Notification Configuration Write Enable Structure Definition
///
typedef struct {
UINT16 Type:1;
UINT16 PollInterval:1;
UINT16 SwitchToPollingThresholdValue:1;
UINT16 SwitchToPollingThresholdWindow:1;
UINT16 ErrorThresholdValue:1;
UINT16 ErrorThresholdWindow:1;
UINT16 Reserved:10;
UINT16 Type : 1;
UINT16 PollInterval : 1;
UINT16 SwitchToPollingThresholdValue : 1;
UINT16 SwitchToPollingThresholdWindow : 1;
UINT16 ErrorThresholdValue : 1;
UINT16 ErrorThresholdWindow : 1;
UINT16 Reserved : 10;
} EFI_ACPI_6_3_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE;
///
@ -2003,7 +2003,7 @@ typedef struct {
EFI_ACPI_6_3_HARDWARE_ERROR_NOTIFICATION_STRUCTURE NotificationStructure;
UINT8 NumberOfHardwareBanks;
UINT8 Reserved1[3];
} EFI_ACPI_6_3_IA32_ARCHITECTURE_DEFERRED_MACHINE_CHECK_STRUCTURE;;
} EFI_ACPI_6_3_IA32_ARCHITECTURE_DEFERRED_MACHINE_CHECK_STRUCTURE;
///
/// HMAT - Heterogeneous Memory Attribute Table
@ -2038,8 +2038,8 @@ typedef struct {
/// Memory Proximity Domain Attributes Structure flags
///
typedef struct {
UINT16 InitiatorProximityDomainValid:1;
UINT16 Reserved:15;
UINT16 InitiatorProximityDomainValid : 1;
UINT16 Reserved : 15;
} EFI_ACPI_6_3_HMAT_STRUCTURE_MEMORY_PROXIMITY_DOMAIN_ATTRIBUTES_FLAGS;
///
@ -2060,8 +2060,8 @@ typedef struct {
/// System Locality Latency and Bandwidth Information Structure flags
///
typedef struct {
UINT8 MemoryHierarchy:4;
UINT8 Reserved:4;
UINT8 MemoryHierarchy : 4;
UINT8 Reserved : 4;
} EFI_ACPI_6_3_HMAT_STRUCTURE_SYSTEM_LOCALITY_LATENCY_AND_BANDWIDTH_INFO_FLAGS;
///
@ -2084,11 +2084,11 @@ typedef struct {
/// Memory Side Cache Information Structure cache attributes
///
typedef struct {
UINT32 TotalCacheLevels:4;
UINT32 CacheLevel:4;
UINT32 CacheAssociativity:4;
UINT32 WritePolicy:4;
UINT32 CacheLineSize:16;
UINT32 TotalCacheLevels : 4;
UINT32 CacheLevel : 4;
UINT32 CacheAssociativity : 4;
UINT32 WritePolicy : 4;
UINT32 CacheLineSize : 16;
} EFI_ACPI_6_3_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES;
///
@ -2340,16 +2340,16 @@ typedef struct {
typedef struct {
UINT8 Command;
UINT8 Reserved:7;
UINT8 NotifyOnCompletion:1;
UINT8 Reserved : 7;
UINT8 NotifyOnCompletion : 1;
} EFI_ACPI_6_3_PCCT_GENERIC_SHARED_MEMORY_REGION_COMMAND;
typedef struct {
UINT8 CommandComplete:1;
UINT8 PlatformInterrupt:1;
UINT8 Error:1;
UINT8 PlatformNotification:1;
UINT8 Reserved:4;
UINT8 CommandComplete : 1;
UINT8 PlatformInterrupt : 1;
UINT8 Error : 1;
UINT8 PlatformNotification : 1;
UINT8 Reserved : 4;
UINT8 Reserved1;
} EFI_ACPI_6_3_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;
@ -2466,11 +2466,11 @@ typedef struct {
/// PDTT Platform Communication Channel Identifier Structure
///
typedef struct {
UINT16 SubChannelIdentifer:8;
UINT16 Runtime:1;
UINT16 WaitForCompletion:1;
UINT16 TriggerOrder:1;
UINT16 Reserved:5;
UINT16 SubChannelIdentifer : 8;
UINT16 Runtime : 1;
UINT16 WaitForCompletion : 1;
UINT16 TriggerOrder : 1;
UINT16 Reserved : 5;
} EFI_ACPI_6_3_PDTT_PCC_IDENTIFIER;
///
@ -2530,12 +2530,12 @@ typedef struct {
/// Processor hierarchy node structure flags
///
typedef struct {
UINT32 PhysicalPackage:1;
UINT32 AcpiProcessorIdValid:1;
UINT32 ProcessorIsAThread:1;
UINT32 NodeIsALeaf:1;
UINT32 IdenticalImplementation:1;
UINT32 Reserved:27;
UINT32 PhysicalPackage : 1;
UINT32 AcpiProcessorIdValid : 1;
UINT32 ProcessorIsAThread : 1;
UINT32 NodeIsALeaf : 1;
UINT32 IdenticalImplementation : 1;
UINT32 Reserved : 27;
} EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR_FLAGS;
///
@ -2573,14 +2573,14 @@ typedef struct {
/// Cache Type Structure flags
///
typedef struct {
UINT32 SizePropertyValid:1;
UINT32 NumberOfSetsValid:1;
UINT32 AssociativityValid:1;
UINT32 AllocationTypeValid:1;
UINT32 CacheTypeValid:1;
UINT32 WritePolicyValid:1;
UINT32 LineSizeValid:1;
UINT32 Reserved:25;
UINT32 SizePropertyValid : 1;
UINT32 NumberOfSetsValid : 1;
UINT32 AssociativityValid : 1;
UINT32 AllocationTypeValid : 1;
UINT32 CacheTypeValid : 1;
UINT32 WritePolicyValid : 1;
UINT32 LineSizeValid : 1;
UINT32 Reserved : 25;
} EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE_FLAGS;
///
@ -2599,10 +2599,10 @@ typedef struct {
/// Cache Type Structure cache attributes
///
typedef struct {
UINT8 AllocationType:2;
UINT8 CacheType:2;
UINT8 WritePolicy:1;
UINT8 Reserved:3;
UINT8 AllocationType : 2;
UINT8 CacheType : 2;
UINT8 WritePolicy : 1;
UINT8 Reserved : 3;
} EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE_ATTRIBUTES;
///

164
MdePkg/Include/IndustryStandard/Acpi64.h
View File

@ -956,8 +956,8 @@ typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
UINT8 PlatformCommunicationChannelIdentifier;
UINT8 Reserved[3];
// Memory Power Node Structure
// Memory Power State Characteristics
// Memory Power Node Structure
// Memory Power State Characteristics
} EFI_ACPI_6_4_MEMORY_POWER_STATUS_TABLE;
///
@ -1010,8 +1010,8 @@ typedef struct {
UINT64 AddressLength;
UINT32 NumberOfPowerStates;
UINT32 NumberOfPhysicalComponents;
//EFI_ACPI_6_4_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
//UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
// EFI_ACPI_6_4_MPST_MEMORY_POWER_STATE MemoryPowerState[NumberOfPowerStates];
// UINT16 PhysicalComponentIdentifier[NumberOfPhysicalComponents];
} EFI_ACPI_6_4_MPST_MEMORY_POWER_STRUCTURE;
#define EFI_ACPI_6_4_MPST_MEMORY_POWER_STRUCTURE_FLAG_ENABLE 0x01
@ -1050,7 +1050,7 @@ typedef struct {
typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
UINT32 NumberOfMemoryDevices;
//EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[NumberOfMemoryDevices];
// EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[NumberOfMemoryDevices];
} EFI_ACPI_6_4_PLATFORM_MEMORY_TOPOLOGY_TABLE;
///
@ -1068,8 +1068,8 @@ typedef struct {
UINT16 Flags;
UINT16 Reserved1;
UINT32 NumberOfMemoryDevices;
//UINT8 TypeSpecificData[];
//EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[NumberOfMemoryDevices];
// UINT8 TypeSpecificData[];
// EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[NumberOfMemoryDevices];
} EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE;
///
@ -1087,7 +1087,7 @@ typedef struct {
EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE CommonMemoryDeviceHeader;
UINT16 SocketIdentifier;
UINT16 Reserved;
//EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[];
// EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[];
} EFI_ACPI_6_4_PMTT_SOCKET_TYPE_DATA;
///
@ -1097,7 +1097,7 @@ typedef struct {
EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE CommonMemoryDeviceHeader;
UINT16 MemoryControllerIdentifier;
UINT16 Reserved;
//EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[];
// EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[];
} EFI_ACPI_6_4_PMTT_MEMORY_CONTROLLER_TYPE_DATA;
///
@ -1114,8 +1114,8 @@ typedef struct {
typedef struct {
EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE CommonMemoryDeviceHeader;
UINT8 TypeUuid[16];
//EFI_ACPI_6_4_PMTT_VENDOR_SPECIFIC_TYPE_DATA VendorSpecificData[];
//EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[];
// EFI_ACPI_6_4_PMTT_VENDOR_SPECIFIC_TYPE_DATA VendorSpecificData[];
// EFI_ACPI_6_4_PMTT_COMMON_MEMORY_DEVICE MemoryDeviceStructure[];
} EFI_ACPI_6_4_PMTT_VENDOR_SPECIFIC_TYPE_DATA;
///
@ -1536,12 +1536,12 @@ typedef struct {
// Definition for Memory Device to System Physical Address Range Mapping Structure
//
typedef struct {
UINT32 DIMMNumber:4;
UINT32 MemoryChannelNumber:4;
UINT32 MemoryControllerID:4;
UINT32 SocketID:4;
UINT32 NodeControllerID:12;
UINT32 Reserved_28:4;
UINT32 DIMMNumber : 4;
UINT32 MemoryChannelNumber : 4;
UINT32 MemoryControllerID : 4;
UINT32 SocketID : 4;
UINT32 NodeControllerID : 12;
UINT32 Reserved_28 : 4;
} EFI_ACPI_6_4_NFIT_DEVICE_HANDLE;
#define EFI_ACPI_6_4_NFIT_MEMORY_DEVICE_STATE_FLAGS_PREVIOUS_SAVE_FAIL BIT0
@ -1558,7 +1558,7 @@ typedef struct {
EFI_ACPI_6_4_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 NVDIMMPhysicalID;
UINT16 NVDIMMRegionID;
UINT16 SPARangeStructureIndex ;
UINT16 SPARangeStructureIndex;
UINT16 NVDIMMControlRegionStructureIndex;
UINT64 NVDIMMRegionSize;
UINT64 RegionOffset;
@ -1579,7 +1579,7 @@ typedef struct {
UINT16 Reserved_6;
UINT32 NumberOfLines;
UINT32 LineSize;
//UINT32 LineOffset[NumberOfLines];
// UINT32 LineOffset[NumberOfLines];
} EFI_ACPI_6_4_NFIT_INTERLEAVE_STRUCTURE;
//
@ -1589,7 +1589,7 @@ typedef struct {
UINT16 Type;
UINT16 Length;
UINT32 Reserved_4;
//UINT8 Data[];
// UINT8 Data[];
} EFI_ACPI_6_4_NFIT_SMBIOS_MANAGEMENT_INFORMATION_STRUCTURE;
//
@ -1648,7 +1648,7 @@ typedef struct {
EFI_ACPI_6_4_NFIT_DEVICE_HANDLE NFITDeviceHandle;
UINT16 NumberOfFlushHintAddresses;
UINT8 Reserved_10[6];
//UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
// UINT64 FlushHintAddress[NumberOfFlushHintAddresses];
} EFI_ACPI_6_4_NFIT_FLUSH_HINT_ADDRESS_STRUCTURE;
///
@ -1761,12 +1761,12 @@ typedef struct {
/// Boot Error Region Block Status Definition
///
typedef struct {
UINT32 UncorrectableErrorValid:1;
UINT32 CorrectableErrorValid:1;
UINT32 MultipleUncorrectableErrors:1;
UINT32 MultipleCorrectableErrors:1;
UINT32 ErrorDataEntryCount:10;
UINT32 Reserved:18;
UINT32 UncorrectableErrorValid : 1;
UINT32 CorrectableErrorValid : 1;
UINT32 MultipleUncorrectableErrors : 1;
UINT32 MultipleCorrectableErrors : 1;
UINT32 ErrorDataEntryCount : 10;
UINT32 Reserved : 18;
} EFI_ACPI_6_4_ERROR_BLOCK_STATUS;
///
@ -1900,13 +1900,13 @@ typedef struct {
/// Hardware Error Notification Configuration Write Enable Structure Definition
///
typedef struct {
UINT16 Type:1;
UINT16 PollInterval:1;
UINT16 SwitchToPollingThresholdValue:1;
UINT16 SwitchToPollingThresholdWindow:1;
UINT16 ErrorThresholdValue:1;
UINT16 ErrorThresholdWindow:1;
UINT16 Reserved:10;
UINT16 Type : 1;
UINT16 PollInterval : 1;
UINT16 SwitchToPollingThresholdValue : 1;
UINT16 SwitchToPollingThresholdWindow : 1;
UINT16 ErrorThresholdValue : 1;
UINT16 ErrorThresholdWindow : 1;
UINT16 Reserved : 10;
} EFI_ACPI_6_4_HARDWARE_ERROR_NOTIFICATION_CONFIGURATION_WRITE_ENABLE_STRUCTURE;
///
@ -2084,7 +2084,7 @@ typedef struct {
EFI_ACPI_6_4_HARDWARE_ERROR_NOTIFICATION_STRUCTURE NotificationStructure;
UINT8 NumberOfHardwareBanks;
UINT8 Reserved1[3];
} EFI_ACPI_6_4_IA32_ARCHITECTURE_DEFERRED_MACHINE_CHECK_STRUCTURE;;
} EFI_ACPI_6_4_IA32_ARCHITECTURE_DEFERRED_MACHINE_CHECK_STRUCTURE;
///
/// HMAT - Heterogeneous Memory Attribute Table
@ -2119,8 +2119,8 @@ typedef struct {
/// Memory Proximity Domain Attributes Structure flags
///
typedef struct {
UINT16 InitiatorProximityDomainValid:1;
UINT16 Reserved:15;
UINT16 InitiatorProximityDomainValid : 1;
UINT16 Reserved : 15;
} EFI_ACPI_6_4_HMAT_STRUCTURE_MEMORY_PROXIMITY_DOMAIN_ATTRIBUTES_FLAGS;
///
@ -2141,9 +2141,9 @@ typedef struct {
/// System Locality Latency and Bandwidth Information Structure flags
///
typedef struct {
UINT8 MemoryHierarchy:4;
UINT8 AccessAttributes:2;
UINT8 Reserved:2;
UINT8 MemoryHierarchy : 4;
UINT8 AccessAttributes : 2;
UINT8 Reserved : 2;
} EFI_ACPI_6_4_HMAT_STRUCTURE_SYSTEM_LOCALITY_LATENCY_AND_BANDWIDTH_INFO_FLAGS;
///
@ -2167,11 +2167,11 @@ typedef struct {
/// Memory Side Cache Information Structure cache attributes
///
typedef struct {
UINT32 TotalCacheLevels:4;
UINT32 CacheLevel:4;
UINT32 CacheAssociativity:4;
UINT32 WritePolicy:4;
UINT32 CacheLineSize:16;
UINT32 TotalCacheLevels : 4;
UINT32 CacheLevel : 4;
UINT32 CacheAssociativity : 4;
UINT32 WritePolicy : 4;
UINT32 CacheLineSize : 16;
} EFI_ACPI_6_4_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES;
///
@ -2424,16 +2424,16 @@ typedef struct {
typedef struct {
UINT8 Command;
UINT8 Reserved:7;
UINT8 NotifyOnCompletion:1;
UINT8 Reserved : 7;
UINT8 NotifyOnCompletion : 1;
} EFI_ACPI_6_4_PCCT_GENERIC_SHARED_MEMORY_REGION_COMMAND;
typedef struct {
UINT8 CommandComplete:1;
UINT8 PlatformInterrupt:1;
UINT8 Error:1;
UINT8 PlatformNotification:1;
UINT8 Reserved:4;
UINT8 CommandComplete : 1;
UINT8 PlatformInterrupt : 1;
UINT8 Error : 1;
UINT8 PlatformNotification : 1;
UINT8 Reserved : 4;
UINT8 Reserved1;
} EFI_ACPI_6_4_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;
@ -2556,7 +2556,7 @@ typedef struct {
///
typedef struct {
UINT32 Signature;
//UINT8 CommunicationSubspace[];
// UINT8 CommunicationSubspace[];
} EFI_6_4_PCCT_REDUCED_PCC_SUBSPACE_SHARED_MEMORY_REGION;
///
@ -2578,11 +2578,11 @@ typedef struct {
/// PDTT Platform Communication Channel Identifier Structure
///
typedef struct {
UINT16 SubChannelIdentifer:8;
UINT16 Runtime:1;
UINT16 WaitForCompletion:1;
UINT16 TriggerOrder:1;
UINT16 Reserved:5;
UINT16 SubChannelIdentifer : 8;
UINT16 Runtime : 1;
UINT16 WaitForCompletion : 1;
UINT16 TriggerOrder : 1;
UINT16 Reserved : 5;
} EFI_ACPI_6_4_PDTT_PCC_IDENTIFIER;
///
@ -2642,12 +2642,12 @@ typedef struct {
/// Processor hierarchy node structure flags
///
typedef struct {
UINT32 PhysicalPackage:1;
UINT32 AcpiProcessorIdValid:1;
UINT32 ProcessorIsAThread:1;
UINT32 NodeIsALeaf:1;
UINT32 IdenticalImplementation:1;
UINT32 Reserved:27;
UINT32 PhysicalPackage : 1;
UINT32 AcpiProcessorIdValid : 1;
UINT32 ProcessorIsAThread : 1;
UINT32 NodeIsALeaf : 1;
UINT32 IdenticalImplementation : 1;
UINT32 Reserved : 27;
} EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR_FLAGS;
///
@ -2685,15 +2685,15 @@ typedef struct {
/// Cache Type Structure flags
///
typedef struct {
UINT32 SizePropertyValid:1;
UINT32 NumberOfSetsValid:1;
UINT32 AssociativityValid:1;
UINT32 AllocationTypeValid:1;
UINT32 CacheTypeValid:1;
UINT32 WritePolicyValid:1;
UINT32 LineSizeValid:1;
UINT32 CacheIdValid:1;
UINT32 Reserved:24;
UINT32 SizePropertyValid : 1;
UINT32 NumberOfSetsValid : 1;
UINT32 AssociativityValid : 1;
UINT32 AllocationTypeValid : 1;
UINT32 CacheTypeValid : 1;
UINT32 WritePolicyValid : 1;
UINT32 LineSizeValid : 1;
UINT32 CacheIdValid : 1;
UINT32 Reserved : 24;
} EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS;
///
@ -2712,10 +2712,10 @@ typedef struct {
/// Cache Type Structure cache attributes
///
typedef struct {
UINT8 AllocationType:2;
UINT8 CacheType:2;
UINT8 WritePolicy:1;
UINT8 Reserved:3;
UINT8 AllocationType : 2;
UINT8 CacheType : 2;
UINT8 WritePolicy : 1;
UINT8 Reserved : 3;
} EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_ATTRIBUTES;
///
@ -2755,7 +2755,7 @@ typedef struct {
///
typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
//UINT8 PlatformTelemetryRecords[];
// UINT8 PlatformTelemetryRecords[];
} EFI_ACPI_6_4_PLATFORM_HEALTH_ASSESSMENT_TABLE;
#define EFI_ACPI_6_4_PLATFORM_HEALTH_ASSESSMENT_TABLE_REVISION 0x01
@ -2767,7 +2767,7 @@ typedef struct {
UINT16 PlatformHealthAssessmentRecordType;
UINT16 RecordLength;
UINT8 Revision;
//UINT8 Data[];
// UINT8 Data[];
} EFI_ACPI_6_4_PHAT_RECORD;
///
@ -2794,7 +2794,7 @@ typedef struct {
UINT8 Revision;
UINT8 Reserved[3];
UINT32 RecordCount;
//UINT8 PhatVersionElement[];
// UINT8 PhatVersionElement[];
} EFI_ACPI_6_4_PHAT_FIRMWARE_VERISON_DATA_RECORD;
#define EFI_ACPI_6_4_PHAT_FIRMWARE_VERSION_DATA_RECORD_REVISION 0x01
@ -2810,8 +2810,8 @@ typedef struct {
UINT8 AmHealthy;
GUID DeviceSignature;
UINT32 DeviceSpecificDataOffset;
//UINT8 DevicePath[];
//UINT8 DeviceSpecificData[];
// UINT8 DevicePath[];
// UINT8 DeviceSpecificData[];
} EFI_ACPI_6_4_PHAT_FIRMWARE_HEALTH_DATA_RECORD_STRUCTURE;
#define EFI_ACPI_6_4_PHAT_FIRMWARE_HEALTH_DATA_RECORD_REVISION 0x01

1
MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
View File

@ -93,7 +93,6 @@ typedef struct {
///
} EFI_ACPI_ASF_RCTL;
///
/// Remote Control Capabilities
///

78
MdePkg/Include/IndustryStandard/Atapi.h
View File

@ -249,7 +249,6 @@ typedef struct {
UINT16 integrity_word;
} ATAPI_IDENTIFY_DATA;
///
/// Standard Quiry Data format, defined in SFF-8070i(ATAPI Removable Rewritable Specification).
///
@ -466,7 +465,6 @@ typedef union {
#pragma pack()
#define ATAPI_MAX_DMA_EXT_CMD_SECTORS 0x10000
#define ATAPI_MAX_DMA_CMD_SECTORS 0x100
@ -506,23 +504,23 @@ typedef union {
#define ATA_CMD_MODE_SELECT 0x55 ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_CMD_MODE_SENSE 0x5A ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_READ_WRITE_ERROR 0x01 ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_CACHING_PAGE 0x08 ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_REMOVABLE_BLOCK_CAPABILITIES 0x1B ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_TIMER_PROTECT_PAGE 0x1C ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_RETURN_ALL_PAGES 0x3F ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_READ_WRITE_ERROR 0x01 ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_CACHING_PAGE 0x08 ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_REMOVABLE_BLOCK_CAPABILITIES 0x1B ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_TIMER_PROTECT_PAGE 0x1C ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_PAGE_CODE_RETURN_ALL_PAGES 0x3F ///< defined in ATAPI Removable Rewritable Media Devices
#define ATA_CMD_GET_CONFIGURATION 0x46 ///< defined in ATAPI Multimedia Devices
#define ATA_GCCD_RT_FIELD_VALUE_ALL 0x00 ///< defined in ATAPI Multimedia Devices
#define ATA_GCCD_RT_FIELD_VALUE_CURRENT 0x01 ///< defined in ATAPI Multimedia Devices
#define ATA_GCCD_RT_FIELD_VALUE_SINGLE 0x02 ///< defined in ATAPI Multimedia Devices
#define ATA_GCCD_RT_FIELD_VALUE_RESERVED 0x03 ///< defined in ATAPI Multimedia Devices
#define ATA_GCCD_RT_FIELD_VALUE_ALL 0x00 ///< defined in ATAPI Multimedia Devices
#define ATA_GCCD_RT_FIELD_VALUE_CURRENT 0x01 ///< defined in ATAPI Multimedia Devices
#define ATA_GCCD_RT_FIELD_VALUE_SINGLE 0x02 ///< defined in ATAPI Multimedia Devices
#define ATA_GCCD_RT_FIELD_VALUE_RESERVED 0x03 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_PROFILE_LIST 0x0000 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_CORE 0x0001 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_MORPHING 0x0002 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_REMOVEABLE_MEDIUM 0x0003 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_WRITE_PROTECT 0x0004 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_PROFILE_LIST 0x0000 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_CORE 0x0001 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_MORPHING 0x0002 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_REMOVEABLE_MEDIUM 0x0003 ///< defined in ATAPI Multimedia Devices
#define ATA_FEATURE_LIST_WRITE_PROTECT 0x0004 ///< defined in ATAPI Multimedia Devices
///
/// Start/Stop and Eject Operations
@ -637,20 +635,20 @@ typedef union {
#define ATA_SMART_READ_DATA 0xd0 ///< defined in ACS-3
#define ATA_SMART_AUTOSAVE 0xd2 ///< defined in ACS-3
#define ATA_AUTOSAVE_DISABLE_ATTR 0x00
#define ATA_AUTOSAVE_ENABLE_ATTR 0xf1
#define ATA_AUTOSAVE_DISABLE_ATTR 0x00
#define ATA_AUTOSAVE_ENABLE_ATTR 0xf1
#define ATA_SMART_EXECUTE_OFFLINE_IMMEDIATE 0xd4 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_ROUTINE 0x00 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_SHORT_SELFTEST 0x01 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_EXTENDED_SELFTEST 0x02 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_CONVEYANCE_SELFTEST 0x03 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_SELECTIVE_SELFTEST 0x04 ///< defined in ACS-3
#define ATA_SMART_ABORT_SELF_TEST_SUBROUTINE 0x7f ///< defined in ACS-3
#define ATA_EXECUTE_SMART_CAPTIVE_SHORT_SELFTEST 0x81 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_CAPTIVE_EXTENDED_SELFTEST 0x82 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_CAPTIVE_CONVEYANCE_SELFTEST 0x83 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_CAPTIVE_SELECTIVE_SELFTEST 0x84 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_ROUTINE 0x00 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_SHORT_SELFTEST 0x01 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_EXTENDED_SELFTEST 0x02 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_CONVEYANCE_SELFTEST 0x03 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_OFFLINE_SELECTIVE_SELFTEST 0x04 ///< defined in ACS-3
#define ATA_SMART_ABORT_SELF_TEST_SUBROUTINE 0x7f ///< defined in ACS-3
#define ATA_EXECUTE_SMART_CAPTIVE_SHORT_SELFTEST 0x81 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_CAPTIVE_EXTENDED_SELFTEST 0x82 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_CAPTIVE_CONVEYANCE_SELFTEST 0x83 ///< defined in ACS-3
#define ATA_EXECUTE_SMART_CAPTIVE_SELECTIVE_SELFTEST 0x84 ///< defined in ACS-3
#define ATA_SMART_READLOG 0xd5 ///< defined in ACS-3
#define ATA_SMART_WRITELOG 0xd6 ///< defined in ACS-3
@ -698,10 +696,10 @@ typedef union {
// ATA Device Config Overlay
//
#define ATA_CMD_DEV_CONFIG_OVERLAY 0xb1 ///< defined from ATA-6
#define ATA_CMD_DEV_CONFIG_RESTORE_FEATURE 0xc0 ///< defined from ATA-6
#define ATA_CMD_DEV_CONFIG_FREEZELOCK_FEATURE 0xc1 ///< defined from ATA-6
#define ATA_CMD_DEV_CONFIG_IDENTIFY_FEATURE 0xc2 ///< defined from ATA-6
#define ATA_CMD_DEV_CONFIG_SET_FEATURE 0xc3 ///< defined from ATA-6
#define ATA_CMD_DEV_CONFIG_RESTORE_FEATURE 0xc0 ///< defined from ATA-6
#define ATA_CMD_DEV_CONFIG_FREEZELOCK_FEATURE 0xc1 ///< defined from ATA-6
#define ATA_CMD_DEV_CONFIG_IDENTIFY_FEATURE 0xc2 ///< defined from ATA-6
#define ATA_CMD_DEV_CONFIG_SET_FEATURE 0xc3 ///< defined from ATA-6
//
// ATA Trusted Computing Feature Set Commands
@ -731,15 +729,15 @@ typedef union {
// Equates used for DiPM Support
//
#define ATA_CMD_DIPM_SUB 0x03 // defined in ACS-3 : Count value in SetFeature identification : 03h Device-initiated interface power state transitions
#define ATA_DIPM_ENABLE 0x10 // defined in ACS-3
#define ATA_DIPM_DISABLE 0x90 // defined in ACS-3
#define ATA_DIPM_ENABLE 0x10 // defined in ACS-3
#define ATA_DIPM_DISABLE 0x90 // defined in ACS-3
//
// Equates used for DevSleep Support
//
#define ATA_CMD_DEVSLEEP_SUB 0x09 // defined in SATA 3.2 Gold Spec : Count value in SetFeature identification : 09h Device Sleep
#define ATA_DEVSLEEP_ENABLE 0x10 // defined in SATA 3.2 Gold Spec
#define ATA_DEVSLEEP_DISABLE 0x90 // defined in SATA 3.2 Gold Spec
#define ATA_DEVSLEEP_ENABLE 0x10 // defined in SATA 3.2 Gold Spec
#define ATA_DEVSLEEP_DISABLE 0x90 // defined in SATA 3.2 Gold Spec
#define ATA_DEVSLP_EXIT_TIMEOUT 20 // MDAT - 20 ms
#define ATA_DEVSLP_MINIMUM_DETECTION_TIME 10 // DMDT - 10 us
@ -750,10 +748,10 @@ typedef union {
//
#define ATA_CMD_SET_MAX_ADDRESS_EXT 0x37 ///< defined from ATA-6
#define ATA_CMD_SET_MAX_ADDRESS 0xf9 ///< defined from ATA-6
#define ATA_SET_MAX_SET_PASSWORD 0x01 ///< defined from ATA-6
#define ATA_SET_MAX_LOCK 0x02 ///< defined from ATA-6
#define ATA_SET_MAX_UNLOCK 0x03 ///< defined from ATA-6
#define ATA_SET_MAX_FREEZE_LOCK 0x04 ///< defined from ATA-6
#define ATA_SET_MAX_SET_PASSWORD 0x01 ///< defined from ATA-6
#define ATA_SET_MAX_LOCK 0x02 ///< defined from ATA-6
#define ATA_SET_MAX_UNLOCK 0x03 ///< defined from ATA-6
#define ATA_SET_MAX_FREEZE_LOCK 0x04 ///< defined from ATA-6
///
/// Default content of device control register, disable INT,

8
MdePkg/Include/IndustryStandard/Bluetooth.h
View File

@ -26,10 +26,10 @@ typedef struct {
/// BLUETOOTH_CLASS_OF_DEVICE. See Bluetooth specification for detail.
///
typedef struct {
UINT8 FormatType:2;
UINT8 MinorDeviceClass: 6;
UINT16 MajorDeviceClass: 5;
UINT16 MajorServiceClass:11;
UINT8 FormatType : 2;
UINT8 MinorDeviceClass : 6;
UINT16 MajorDeviceClass : 5;
UINT16 MajorServiceClass : 11;
} BLUETOOTH_CLASS_OF_DEVICE;
///

1
MdePkg/Include/IndustryStandard/Cxl.h
View File

@ -19,4 +19,3 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define CXL_DVSEC_VENDOR_ID 0x1E98
#endif

71
MdePkg/Include/IndustryStandard/Cxl11.h
View File

@ -169,7 +169,6 @@ typedef union {
UINT32 Uint32;
} CXL_DVSEC_FLEX_BUS_DEVICE_RANGE1_BASE_LOW;
typedef union {
struct {
UINT32 MemorySizeHigh : 32; // bit 0..31
@ -236,24 +235,24 @@ typedef struct {
CXL_DVSEC_FLEX_BUS_DEVICE_RANGE2_BASE_LOW DeviceRange2BaseLow; // offset 52
} CXL_1_1_DVSEC_FLEX_BUS_DEVICE;
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, Header , 0x00);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, Header, 0x00);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DesignatedVendorSpecificHeader1, 0x04);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DesignatedVendorSpecificHeader2, 0x08);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceCapability , 0x0A);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceControl , 0x0C);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceStatus , 0x0E);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceControl2 , 0x10);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceStatus2 , 0x12);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceLock , 0x14);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange1SizeHigh , 0x18);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange1SizeLow , 0x1C);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange1BaseHigh , 0x20);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange1BaseLow , 0x24);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange2SizeHigh , 0x28);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange2SizeLow , 0x2C);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange2BaseHigh , 0x30);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange2BaseLow , 0x34);
CXL_11_SIZE_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE , 0x38);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceCapability, 0x0A);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceControl, 0x0C);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceStatus, 0x0E);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceControl2, 0x10);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceStatus2, 0x12);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceLock, 0x14);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange1SizeHigh, 0x18);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange1SizeLow, 0x1C);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange1BaseHigh, 0x20);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange1BaseLow, 0x24);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange2SizeHigh, 0x28);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange2SizeLow, 0x2C);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange2BaseHigh, 0x30);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, DeviceRange2BaseLow, 0x34);
CXL_11_SIZE_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_DEVICE, 0x38);
///@}
///
@ -319,13 +318,13 @@ typedef struct {
CXL_1_1_DVSEC_FLEX_BUS_PORT_STATUS PortStatus; // offset 14
} CXL_1_1_DVSEC_FLEX_BUS_PORT;
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, Header , 0x00);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, Header, 0x00);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, DesignatedVendorSpecificHeader1, 0x04);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, DesignatedVendorSpecificHeader2, 0x08);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, PortCapability , 0x0A);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, PortControl , 0x0C);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, PortStatus , 0x0E);
CXL_11_SIZE_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT , 0x10);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, PortCapability, 0x0A);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, PortControl, 0x0C);
CXL_11_OFFSET_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, PortStatus, 0x0E);
CXL_11_SIZE_ASSERT (CXL_1_1_DVSEC_FLEX_BUS_PORT, 0x10);
///@}
///
@ -484,14 +483,14 @@ typedef struct {
UINT32 HeaderLog[16];
} CXL_1_1_RAS_CAPABILITY_STRUCTURE;
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, UncorrectableErrorStatus , 0x00);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, UncorrectableErrorMask , 0x04);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, UncorrectableErrorSeverity , 0x08);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, CorrectableErrorStatus , 0x0C);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, CorrectableErrorMask , 0x10);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, UncorrectableErrorStatus, 0x00);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, UncorrectableErrorMask, 0x04);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, UncorrectableErrorSeverity, 0x08);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, CorrectableErrorStatus, 0x0C);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, CorrectableErrorMask, 0x10);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, ErrorCapabilitiesAndControl, 0x14);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, HeaderLog , 0x18);
CXL_11_SIZE_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE , 0x58);
CXL_11_OFFSET_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, HeaderLog, 0x18);
CXL_11_SIZE_ASSERT (CXL_1_1_RAS_CAPABILITY_STRUCTURE, 0x58);
typedef union {
struct {
@ -595,14 +594,14 @@ typedef struct {
CXL_LINK_LAYER_DEFEATURE LinkLayerDefeature;
} CXL_1_1_LINK_CAPABILITY_STRUCTURE;
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerCapability , 0x00);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerControlStatus , 0x08);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerRxCreditControl , 0x10);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerCapability, 0x00);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerControlStatus, 0x08);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerRxCreditControl, 0x10);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerRxCreditReturnStatus, 0x18);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerTxCreditStatus , 0x20);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerAckTimerControl , 0x28);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerDefeature , 0x30);
CXL_11_SIZE_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE , 0x38);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerTxCreditStatus, 0x20);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerAckTimerControl, 0x28);
CXL_11_OFFSET_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, LinkLayerDefeature, 0x30);
CXL_11_SIZE_ASSERT (CXL_1_1_LINK_CAPABILITY_STRUCTURE, 0x38);
#define CXL_IO_ARBITRATION_CONTROL_OFFSET 0x180
typedef union {

1
MdePkg/Include/IndustryStandard/DebugPort2Table.h
View File

@ -8,7 +8,6 @@
**/
#ifndef _DEBUG_PORT_2_TABLE_H_
#define _DEBUG_PORT_2_TABLE_H_

1
MdePkg/Include/IndustryStandard/DebugPortTable.h
View File

@ -7,7 +7,6 @@
**/
#ifndef _DEBUG_PORT_TABLE_H_
#define _DEBUG_PORT_TABLE_H_

1
MdePkg/Include/IndustryStandard/Dhcp.h
View File

@ -97,7 +97,6 @@
#define DHCP4_TAG_UUID 97 /// Client Machine Identifier, RFC 4578
#define DHCP4_TAG_CLASSLESS_ROUTE 121 /// Classless Route
///
/// Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
///

8
MdePkg/Include/IndustryStandard/DmaRemappingReportingTable.h
View File

@ -14,6 +14,7 @@
- HPET - High Precision Event Timer
- NUMA - Non-uniform Memory Access
**/
#ifndef _DMA_REMAPPING_REPORTING_TABLE_H_
#define _DMA_REMAPPING_REPORTING_TABLE_H_
@ -97,6 +98,7 @@ typedef struct {
**/
typedef struct {
EFI_ACPI_DMAR_STRUCTURE_HEADER Header;
/**
- Bit[0]: INCLUDE_PCI_ALL
- If Set, this remapping hardware unit has under its scope all
@ -138,6 +140,7 @@ typedef struct {
/// Base address of 4KB-aligned reserved memory region
///
UINT64 ReservedMemoryRegionBaseAddress;
/**
Last address of the reserved memory region. Value in this field must be
greater than the value in Reserved Memory Region Base Address field.
@ -159,6 +162,7 @@ typedef struct {
**/
typedef struct {
EFI_ACPI_DMAR_STRUCTURE_HEADER Header;
/**
- Bit[0]: ALL_PORTS:
- If Set, indicates all PCI Express Root Ports in the specified
@ -206,6 +210,7 @@ typedef struct {
typedef struct {
EFI_ACPI_DMAR_STRUCTURE_HEADER Header;
UINT8 Reserved[3];
/**
Each ACPI device enumerated through an ANDD structure must have a unique
value for this field. To report an ACPI device with ACPI Device Number
@ -223,6 +228,7 @@ typedef struct {
**/
typedef struct {
EFI_ACPI_DMAR_STRUCTURE_HEADER Header;
/**
- Bit[0]: ATC_REQUIRED:
- If Set, indicates that every SoC integrated device enumerated
@ -258,6 +264,7 @@ typedef struct {
**/
typedef struct {
EFI_ACPI_DESCRIPTION_HEADER Header;
/**
This field indicates the maximum DMA physical addressability supported by
this platform. The system address map reported by the BIOS indicates what
@ -268,6 +275,7 @@ typedef struct {
the value of 100111b is reported in this field.
**/
UINT8 HostAddressWidth;
/**
- Bit[0]: INTR_REMAP - If Clear, the platform does not support interrupt
remapping. If Set, the platform supports interrupt remapping.

3
MdePkg/Include/IndustryStandard/ElTorito.h
View File

@ -48,7 +48,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define ELTORITO_28_DISKETTE 0x03
#define ELTORITO_HARD_DISK 0x04
#pragma pack(1)
///
@ -87,7 +86,6 @@ typedef union {
UINT8 Unused2[8]; ///< Must be 0
UINT32 VolSpaceSize[2]; ///< the number of Logical Blocks
} PrimaryVolume;
} CDROM_VOLUME_DESCRIPTOR;
///
@ -133,7 +131,6 @@ typedef union {
UINT16 SectionEntries; ///< Number of section entries following this header
CHAR8 Id[28];
} Section;
} ELTORITO_CATALOG;
#pragma pack()

84
MdePkg/Include/IndustryStandard/Emmc.h
View File

@ -69,60 +69,60 @@ typedef enum {
#pragma pack(1)
typedef struct {
UINT8 NotUsed:1; // Not used [0:0]
UINT8 Crc:7; // CRC [7:1]
UINT8 NotUsed : 1; // Not used [0:0]
UINT8 Crc : 7; // CRC [7:1]
UINT8 ManufacturingDate; // Manufacturing date [15:8]
UINT8 ProductSerialNumber[4]; // Product serial number [47:16]
UINT8 ProductRevision; // Product revision [55:48]
UINT8 ProductName[6]; // Product name [103:56]
UINT8 OemId; // OEM/Application ID [111:104]
UINT8 DeviceType:2; // Device/BGA [113:112]
UINT8 Reserved:6; // Reserved [119:114]
UINT8 DeviceType : 2; // Device/BGA [113:112]
UINT8 Reserved : 6; // Reserved [119:114]
UINT8 ManufacturerId; // Manufacturer ID [127:120]
} EMMC_CID;
typedef struct {
UINT32 NotUsed:1; // Not used [0:0]
UINT32 Crc:7; // CRC [7:1]
UINT32 Ecc:2; // ECC code [9:8]
UINT32 FileFormat:2; // File format [11:10]
UINT32 TmpWriteProtect:1; // Temporary write protection [12:12]
UINT32 PermWriteProtect:1; // Permanent write protection [13:13]
UINT32 Copy:1; // Copy flag (OTP) [14:14]
UINT32 FileFormatGrp:1; // File format group [15:15]
UINT32 ContentProtApp:1; // Content protection application [16:16]
UINT32 Reserved:4; // Reserved [20:17]
UINT32 WriteBlPartial:1; // Partial blocks for write allowed [21:21]
UINT32 WriteBlLen:4; // Max. write data block length [25:22]
UINT32 R2WFactor:3; // Write speed factor [28:26]
UINT32 DefaultEcc:2; // Manufacturer default ECC [30:29]
UINT32 WpGrpEnable:1; // Write protect group enable [31:31]
UINT32 NotUsed : 1; // Not used [0:0]
UINT32 Crc : 7; // CRC [7:1]
UINT32 Ecc : 2; // ECC code [9:8]
UINT32 FileFormat : 2; // File format [11:10]
UINT32 TmpWriteProtect : 1; // Temporary write protection [12:12]
UINT32 PermWriteProtect : 1; // Permanent write protection [13:13]
UINT32 Copy : 1; // Copy flag (OTP) [14:14]
UINT32 FileFormatGrp : 1; // File format group [15:15]
UINT32 ContentProtApp : 1; // Content protection application [16:16]
UINT32 Reserved : 4; // Reserved [20:17]
UINT32 WriteBlPartial : 1; // Partial blocks for write allowed [21:21]
UINT32 WriteBlLen : 4; // Max. write data block length [25:22]
UINT32 R2WFactor : 3; // Write speed factor [28:26]
UINT32 DefaultEcc : 2; // Manufacturer default ECC [30:29]
UINT32 WpGrpEnable : 1; // Write protect group enable [31:31]
UINT32 WpGrpSize:5; // Write protect group size [36:32]
UINT32 EraseGrpMult:5; // Erase group size multiplier [41:37]
UINT32 EraseGrpSize:5; // Erase group size [46:42]
UINT32 CSizeMult:3; // Device size multiplier [49:47]
UINT32 VddWCurrMax:3; // Max. write current @ VDD max [52:50]
UINT32 VddWCurrMin:3; // Max. write current @ VDD min [55:53]
UINT32 VddRCurrMax:3; // Max. read current @ VDD max [58:56]
UINT32 VddRCurrMin:3; // Max. read current @ VDD min [61:59]
UINT32 CSizeLow:2; // Device size low two bits [63:62]
UINT32 WpGrpSize : 5; // Write protect group size [36:32]
UINT32 EraseGrpMult : 5; // Erase group size multiplier [41:37]
UINT32 EraseGrpSize : 5; // Erase group size [46:42]
UINT32 CSizeMult : 3; // Device size multiplier [49:47]
UINT32 VddWCurrMax : 3; // Max. write current @ VDD max [52:50]
UINT32 VddWCurrMin : 3; // Max. write current @ VDD min [55:53]
UINT32 VddRCurrMax : 3; // Max. read current @ VDD max [58:56]
UINT32 VddRCurrMin : 3; // Max. read current @ VDD min [61:59]
UINT32 CSizeLow : 2; // Device size low two bits [63:62]
UINT32 CSizeHigh:10; // Device size high eight bits [73:64]
UINT32 Reserved1:2; // Reserved [75:74]
UINT32 DsrImp:1; // DSR implemented [76:76]
UINT32 ReadBlkMisalign:1; // Read block misalignment [77:77]
UINT32 WriteBlkMisalign:1; // Write block misalignment [78:78]
UINT32 ReadBlPartial:1; // Partial blocks for read allowed [79:79]
UINT32 ReadBlLen:4; // Max. read data block length [83:80]
UINT32 Ccc:12; // Device command classes [95:84]
UINT32 CSizeHigh : 10; // Device size high eight bits [73:64]
UINT32 Reserved1 : 2; // Reserved [75:74]
UINT32 DsrImp : 1; // DSR implemented [76:76]
UINT32 ReadBlkMisalign : 1; // Read block misalignment [77:77]
UINT32 WriteBlkMisalign : 1; // Write block misalignment [78:78]
UINT32 ReadBlPartial : 1; // Partial blocks for read allowed [79:79]
UINT32 ReadBlLen : 4; // Max. read data block length [83:80]
UINT32 Ccc : 12; // Device command classes [95:84]
UINT32 TranSpeed:8; // Max. bus clock frequency [103:96]
UINT32 Nsac:8; // Data read access-time 2 in CLK cycles (NSAC*100) [111:104]
UINT32 Taac:8; // Data read access-time 1 [119:112]
UINT32 Reserved2:2; // Reserved [121:120]
UINT32 SpecVers:4; // System specification version [125:122]
UINT32 CsdStructure:2; // CSD structure [127:126]
UINT32 TranSpeed : 8; // Max. bus clock frequency [103:96]
UINT32 Nsac : 8; // Data read access-time 2 in CLK cycles (NSAC*100) [111:104]
UINT32 Taac : 8; // Data read access-time 1 [119:112]
UINT32 Reserved2 : 2; // Reserved [121:120]
UINT32 SpecVers : 4; // System specification version [125:122]
UINT32 CsdStructure : 2; // CSD structure [127:126]
} EMMC_CSD;
typedef struct {

1
MdePkg/Include/IndustryStandard/HighPrecisionEventTimerTable.h
View File

@ -31,7 +31,6 @@ typedef union {
UINT32 Uint32;
} EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_BLOCK_ID;
///
/// High Precision Event Timer Table header definition.
///

8
MdePkg/Include/IndustryStandard/Hsti.h
View File

@ -49,24 +49,24 @@ typedef struct {
// IHV-defined bitfield corresponding to all security features which must be
// implemented to meet the security requirements defined by PLATFORM_SECURITY_VERSION Version.
//
//UINT8 SecurityFeaturesRequired[]; //Ignored for non-IHV
// UINT8 SecurityFeaturesRequired[]; //Ignored for non-IHV
//
// Publisher-defined bitfield corresponding to all security features which
// have implemented programmatic tests in this module.
//
//UINT8 SecurityFeaturesImplemented[];
// UINT8 SecurityFeaturesImplemented[];
//
// Publisher-defined bitfield corresponding to all security features which
// have been verified implemented by this implementation.
//
//UINT8 SecurityFeaturesVerified[];
// UINT8 SecurityFeaturesVerified[];
//
// A Null-terminated string, one failure per line (CR/LF terminated), with a
// unique identifier that the OEM/ODM can use to locate the documentation
// which will describe the steps to remediate the failure - a URL to the
// documentation is recommended.
//
//CHAR16 ErrorString[];
// CHAR16 ErrorString[];
} ADAPTER_INFO_PLATFORM_SECURITY;
#pragma pack()

7
MdePkg/Include/IndustryStandard/Http11.h
View File

@ -51,7 +51,6 @@
///
#define HTTP_HEADER_ACCEPT "Accept"
///
/// Accept-Charset Request Header
/// The Accept-Charset request-header field can be used to indicate what character sets
@ -76,7 +75,6 @@
///
#define HTTP_HEADER_ACCEPT_RANGES "Accept-Ranges"
///
/// Accept-Encoding Request Header
/// The Accept-Encoding request-header field is similar to Accept,
@ -105,7 +103,6 @@
#define HTTP_CONTENT_ENCODING_DEFLATE "deflate" /// The "zlib" format defined in RFC 1950 in combination with the "deflate"
/// compression mechanism described in RFC 1951.
///
/// Content-Type Header
/// The Content-Type entity-header field indicates the media type of the entity-body sent to
@ -129,7 +126,6 @@
#define HTTP_CONTENT_TYPE_IMAGE_PNG "image/png"
#define HTTP_CONTENT_TYPE_IMAGE_SVG_XML "image/svg+xml"
///
/// Content-Length Header
/// The Content-Length entity-header field indicates the size of the entity-body,
@ -197,7 +193,6 @@
///
#define HTTP_HEADER_IF_MATCH "If-Match"
///
/// The If-None-Match request-header field is used with a method to make it conditional.
/// A client that has one or more entities previously obtained from the resource can verify
@ -209,8 +204,6 @@
///
#define HTTP_HEADER_IF_NONE_MATCH "If-None-Match"
///
/// Authorization Request Header
/// The Authorization field value consists of credentials

1
MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
View File

@ -158,4 +158,3 @@ typedef struct {
#pragma pack()
#endif

10
MdePkg/Include/IndustryStandard/IoRemappingTable.h
View File

@ -101,7 +101,7 @@ typedef struct {
EFI_ACPI_6_0_IO_REMAPPING_NODE Node;
UINT32 NumItsIdentifiers;
//UINT32 ItsIdentifiers[NumItsIdentifiers];
// UINT32 ItsIdentifiers[NumItsIdentifiers];
} EFI_ACPI_6_0_IO_REMAPPING_ITS_NODE;
///
@ -133,7 +133,7 @@ typedef struct {
UINT16 Reserved;
UINT8 MemoryAccessFlags;
UINT8 AddressSizeLimit;
//UINT8 ObjectName[];
// UINT8 ObjectName[];
} EFI_ACPI_6_0_IO_REMAPPING_NAMED_COMP_NODE;
///
@ -162,8 +162,8 @@ typedef struct {
UINT32 SMMU_NSgCfgIrpt;
UINT32 SMMU_NSgCfgIrptFlags;
//EFI_ACPI_6_0_IO_REMAPPING_SMMU_CTX_INT ContextInterrupt[NumContextInterrupts];
//EFI_ACPI_6_0_IO_REMAPPING_SMMU_CTX_INT PmuInterrupt[NumPmuInterrupts];
// EFI_ACPI_6_0_IO_REMAPPING_SMMU_CTX_INT ContextInterrupt[NumContextInterrupts];
// EFI_ACPI_6_0_IO_REMAPPING_SMMU_CTX_INT PmuInterrupt[NumPmuInterrupts];
} EFI_ACPI_6_0_IO_REMAPPING_SMMU_NODE;
///
@ -195,7 +195,7 @@ typedef struct {
UINT32 OverflowInterruptGsiv;
UINT32 NodeReference;
UINT64 Page1Base;
//EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE OverflowInterruptMsiMapping[1];
// EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE OverflowInterruptMsiMapping[1];
} EFI_ACPI_6_0_IO_REMAPPING_PMCG_NODE;
#pragma pack()

10
MdePkg/Include/IndustryStandard/IpmiFruInformationStorage.h
View File

@ -27,8 +27,8 @@ typedef union {
/// Individual bit fields
///
struct {
UINT8 FormatVersionNumber:4;
UINT8 Reserved:4;
UINT8 FormatVersionNumber : 4;
UINT8 Reserved : 4;
} Bits;
///
/// All bit fields as a 8-bit value
@ -55,9 +55,9 @@ typedef union {
/// Individual bit fields
///
struct {
UINT8 RecordFormatVersion:4;
UINT8 Reserved:3;
UINT8 EndofList:1;
UINT8 RecordFormatVersion : 4;
UINT8 Reserved : 3;
UINT8 EndofList : 1;
} Bits;
///
/// All bit fields as a 8-bit value

1
MdePkg/Include/IndustryStandard/IpmiNetFnApp.h
View File

@ -80,7 +80,6 @@ typedef struct {
UINT32 AuxFirmwareRevInfo;
} IPMI_GET_DEVICE_ID_RESPONSE;
//
// Definitions for Cold Reset command
//

82
MdePkg/Include/IndustryStandard/IpmiNetFnChassis.h
View File

@ -68,8 +68,8 @@ typedef struct {
//
typedef union {
struct {
UINT8 ChassisControl:4;
UINT8 Reserved:4;
UINT8 ChassisControl : 4;
UINT8 Reserved : 4;
} Bits;
UINT8 Uint8;
} IPMI_CHASSIS_CONTROL_CHASSIS_CONTROL;
@ -153,8 +153,8 @@ typedef struct {
typedef union {
struct {
UINT8 Cause:4;
UINT8 Reserved:4;
UINT8 Cause : 4;
UINT8 Reserved : 4;
} Bits;
UINT8 Uint8;
} IPMI_SYSTEM_RESTART_CAUSE;
@ -175,8 +175,8 @@ typedef struct {
//
typedef union {
struct {
UINT8 ParameterSelector:7;
UINT8 MarkParameterInvalid:1;
UINT8 ParameterSelector : 7;
UINT8 MarkParameterInvalid : 1;
} Bits;
UINT8 Uint8;
} IPMI_SET_BOOT_OPTIONS_PARAMETER_VALID;
@ -187,7 +187,7 @@ typedef struct {
} IPMI_SET_BOOT_OPTIONS_REQUEST;
typedef struct {
UINT8 CompletionCode:8;
UINT8 CompletionCode : 8;
} IPMI_SET_BOOT_OPTIONS_RESPONSE;
//
@ -200,8 +200,8 @@ typedef struct {
//
typedef union {
struct {
UINT8 ParameterSelector:7;
UINT8 Reserved:1;
UINT8 ParameterSelector : 7;
UINT8 Reserved : 1;
} Bits;
UINT8 Uint8;
} IPMI_GET_BOOT_OPTIONS_PARAMETER_SELECTOR;
@ -264,7 +264,7 @@ typedef union {
struct {
UINT8 ServicePartitionDiscovered : 1;
UINT8 ServicePartitionScanRequest : 1;
UINT8 Reserved: 6;
UINT8 Reserved : 6;
} Bits;
UINT8 Uint8;
} IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_2;
@ -309,50 +309,50 @@ typedef struct {
typedef union {
struct {
UINT8 Reserved:5;
UINT8 BiosBootType:1;
UINT8 PersistentOptions:1;
UINT8 BootFlagValid:1;
UINT8 Reserved : 5;
UINT8 BiosBootType : 1;
UINT8 PersistentOptions : 1;
UINT8 BootFlagValid : 1;
} Bits;
UINT8 Uint8;
} IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_5_DATA_1;
typedef union {
struct {
UINT8 LockReset:1;
UINT8 ScreenBlank:1;
UINT8 BootDeviceSelector:4;
UINT8 LockKeyboard:1;
UINT8 CmosClear:1;
UINT8 LockReset : 1;
UINT8 ScreenBlank : 1;
UINT8 BootDeviceSelector : 4;
UINT8 LockKeyboard : 1;
UINT8 CmosClear : 1;
} Bits;
UINT8 Uint8;
} IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_5_DATA_2;
typedef union {
struct {
UINT8 ConsoleRedirection:2;
UINT8 LockSleep:1;
UINT8 UserPasswordBypass:1;
UINT8 ForceProgressEventTrap:1;
UINT8 BiosVerbosity:2;
UINT8 LockPower:1;
UINT8 ConsoleRedirection : 2;
UINT8 LockSleep : 1;
UINT8 UserPasswordBypass : 1;
UINT8 ForceProgressEventTrap : 1;
UINT8 BiosVerbosity : 2;
UINT8 LockPower : 1;
} Bits;
UINT8 Uint8;
} IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_5_DATA_3;
typedef union {
struct {
UINT8 BiosMuxControlOverride:3;
UINT8 BiosSharedModeOverride:1;
UINT8 Reserved:4;
UINT8 BiosMuxControlOverride : 3;
UINT8 BiosSharedModeOverride : 1;
UINT8 Reserved : 4;
} Bits;
UINT8 Uint8;
} IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_5_DATA_4;
typedef union {
struct {
UINT8 DeviceInstanceSelector:5;
UINT8 Reserved:3;
UINT8 DeviceInstanceSelector : 5;
UINT8 Reserved : 3;
} Bits;
UINT8 Uint8;
} IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_5_DATA_5;
@ -367,8 +367,8 @@ typedef struct {
typedef union {
struct {
UINT8 ChannelNumber:4;
UINT8 Reserved:4;
UINT8 ChannelNumber : 4;
UINT8 Reserved : 4;
} Bits;
UINT8 Uint8;
} IPMI_BOOT_OPTIONS_CHANNEL_NUMBER;
@ -397,16 +397,16 @@ typedef union {
typedef union {
struct {
UINT8 ParameterVersion:4;
UINT8 Reserved:4;
UINT8 ParameterVersion : 4;
UINT8 Reserved : 4;
} Bits;
UINT8 Uint8;
} IPMI_GET_BOOT_OPTIONS_PARAMETER_VERSION;
typedef union {
struct {
UINT8 ParameterSelector:7;
UINT8 ParameterValid:1;
UINT8 ParameterSelector : 7;
UINT8 ParameterValid : 1;
} Bits;
UINT8 Uint8;
} IPMI_GET_BOOT_OPTIONS_PARAMETER_VALID;
@ -428,11 +428,11 @@ typedef struct {
//
typedef union {
struct {
UINT8 DisablePoweroffButton:1;
UINT8 DisableResetButton:1;
UINT8 DisableDiagnosticInterruptButton:1;
UINT8 DisableStandbyButton:1;
UINT8 Reserved:4;
UINT8 DisablePoweroffButton : 1;
UINT8 DisableResetButton : 1;
UINT8 DisableDiagnosticInterruptButton : 1;
UINT8 DisableStandbyButton : 1;
UINT8 Reserved : 4;
} Bits;
UINT8 Uint8;
} IPMI_FRONT_PANEL_BUTTON_ENABLES;

20
MdePkg/Include/IndustryStandard/IpmiNetFnStorage.h
View File

@ -344,19 +344,19 @@ typedef struct {
} IPMI_SDR_RECORD_STRUCT_11;
typedef struct {
UINT16 RecordId; //1
UINT8 Version; //3
UINT8 RecordType; //4
UINT8 RecordLength; //5
UINT8 ManufacturerId[3]; //6
UINT16 RecordId; // 1
UINT8 Version; // 3
UINT8 RecordType; // 4
UINT8 RecordLength; // 5
UINT8 ManufacturerId[3]; // 6
UINT8 StringChars[20];
} IPMI_SDR_RECORD_STRUCT_C0;
typedef struct {
UINT16 RecordId; //1
UINT8 Version; //3
UINT8 RecordType; //4
UINT8 RecordLength; //5
UINT16 RecordId; // 1
UINT8 Version; // 3
UINT8 RecordType; // 4
UINT8 RecordLength; // 5
} IPMI_SDR_RECORD_STRUCT_HEADER;
typedef union {
@ -772,7 +772,7 @@ typedef struct {
#define IPMI_FORMAT_REV1 0x01
#define IPMI_SOFTWARE_ID 0x01
#define IPMI_PLATFORM_VAL_ID 0x01
#define IPMI_GENERATOR_ID(i,f) ((i << 1) | (f << 1) | IPMI_SOFTWARE_ID)
#define IPMI_GENERATOR_ID(i, f) ((i << 1) | (f << 1) | IPMI_SOFTWARE_ID)
#define IPMI_SENSOR_TYPE_EVENT_CODE_DISCRETE 0x6F

5
MdePkg/Include/IndustryStandard/IpmiNetFnTransport.h
View File

@ -264,8 +264,8 @@ typedef struct {
//
typedef union {
struct {
UINT8 SetInProgress:2;
UINT8 Reserved:6;
UINT8 SetInProgress : 2;
UINT8 Reserved : 6;
} Bits;
UINT8 Uint8;
} IPMI_LAN_SET_IN_PROGRESS;
@ -596,7 +596,6 @@ typedef union {
UINT8 Uint8;
} IPMI_TAP_DIAL_STRING_SERVICE_SELECTOR;
typedef struct {
UINT8 TapSelector;
IPMI_TAP_DIAL_STRING_SERVICE_SELECTOR TapDialStringServiceSelector;

4
MdePkg/Include/IndustryStandard/LegacyBiosMpTable.h
View File

@ -175,7 +175,7 @@ typedef enum {
EfiLegacyMpTableEntryIoIntTypeInt = 0,
EfiLegacyMpTableEntryIoIntTypeNmi = 1,
EfiLegacyMpTableEntryIoIntTypeSmi = 2,
EfiLegacyMpTableEntryIoIntTypeExtInt= 3,
EfiLegacyMpTableEntryIoIntTypeExtInt = 3,
} EFI_LEGACY_MP_TABLE_ENTRY_IO_INT_TYPE;
typedef enum {
@ -215,7 +215,7 @@ typedef enum {
typedef enum {
EfiLegacyMpTableEntryLocalIntFlagsPolaritySpec = 0x0,
EfiLegacyMpTableEntryLocalIntFlagsPolarityActiveHigh= 0x1,
EfiLegacyMpTableEntryLocalIntFlagsPolarityActiveHigh = 0x1,
EfiLegacyMpTableEntryLocalIntFlagsPolarityReserved = 0x2,
EfiLegacyMpTableEntryLocalIntFlagsPolarityActiveLow = 0x3,
} EFI_LEGACY_MP_TABLE_ENTRY_LOCAL_INT_FLAGS_POLARITY;

5
MdePkg/Include/IndustryStandard/LowPowerIdleTable.h
View File

@ -12,6 +12,7 @@
- GAS - Generic Address Structure
- LPI - Low Power Idle
**/
#ifndef _LOW_POWER_IDLE_TABLE_H_
#define _LOW_POWER_IDLE_TABLE_H_
@ -30,6 +31,7 @@
typedef union {
struct {
UINT32 Disabled : 1; ///< If set, LPI state is not used
/**
If set, Residency counter is not available for this LPI state and
Residency Counter Frequency is invalid
@ -52,6 +54,7 @@ typedef struct {
UINT16 UniqueId;
UINT8 Reserved[2]; ///< Must be Zero
ACPI_LPI_STATE_FLAGS Flags; ///< LPI state flags
/**
The LPI entry trigger, matching an existing _CST.Register object, represented as a
Generic Address Structure. All processors must request this state or deeper to trigger.
@ -59,11 +62,13 @@ typedef struct {
EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTURE EntryTrigger;
UINT32 Residency; ///< Minimum residency or break-even in uSec
UINT32 Latency; ///< Worst case exit latency in uSec
/**
[optional] Residency counter, represented as a Generic Address Structure.
If not present, Flags[1] bit should be set.
**/
EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTURE ResidencyCounter;
/**
[optional] Residency counter frequency in cycles per second. Value 0 indicates that
counter runs at TSC frequency. Valid only if Residency Counter is present.

264
MdePkg/Include/IndustryStandard/Nvme.h
View File

@ -38,7 +38,6 @@
#define NVME_SQTDBL_OFFSET(QID, DSTRD) 0x1000 + ((2 * (QID)) * (4 << (DSTRD))) // Submission Queue y (NVM) Tail Doorbell
#define NVME_CQHDBL_OFFSET(QID, DSTRD) 0x1000 + (((2 * (QID)) + 1) * (4 << (DSTRD))) // Completion Queue y (NVM) Head Doorbell
#pragma pack(1)
//
@ -46,16 +45,16 @@
//
typedef struct {
UINT16 Mqes; // Maximum Queue Entries Supported
UINT8 Cqr:1; // Contiguous Queues Required
UINT8 Ams:2; // Arbitration Mechanism Supported
UINT8 Rsvd1:5;
UINT8 Cqr : 1; // Contiguous Queues Required
UINT8 Ams : 2; // Arbitration Mechanism Supported
UINT8 Rsvd1 : 5;
UINT8 To; // Timeout
UINT16 Dstrd:4;
UINT16 Nssrs:1; // NVM Subsystem Reset Supported NSSRS
UINT16 Css:4; // Command Sets Supported - Bit 37
UINT16 Rsvd3:7;
UINT8 Mpsmin:4;
UINT8 Mpsmax:4;
UINT16 Dstrd : 4;
UINT16 Nssrs : 1; // NVM Subsystem Reset Supported NSSRS
UINT16 Css : 4; // Command Sets Supported - Bit 37
UINT16 Rsvd3 : 7;
UINT8 Mpsmin : 4;
UINT8 Mpsmax : 4;
UINT8 Rsvd4;
} NVME_CAP;
@ -71,14 +70,14 @@ typedef struct {
// 3.1.5 Offset 14h: CC - Controller Configuration
//
typedef struct {
UINT16 En:1; // Enable
UINT16 Rsvd1:3;
UINT16 Css:3; // I/O Command Set Selected
UINT16 Mps:4; // Memory Page Size
UINT16 Ams:3; // Arbitration Mechanism Selected
UINT16 Shn:2; // Shutdown Notification
UINT8 Iosqes:4; // I/O Submission Queue Entry Size
UINT8 Iocqes:4; // I/O Completion Queue Entry Size
UINT16 En : 1; // Enable
UINT16 Rsvd1 : 3;
UINT16 Css : 3; // I/O Command Set Selected
UINT16 Mps : 4; // Memory Page Size
UINT16 Ams : 3; // Arbitration Mechanism Selected
UINT16 Shn : 2; // Shutdown Notification
UINT8 Iosqes : 4; // I/O Submission Queue Entry Size
UINT8 Iocqes : 4; // I/O Completion Queue Entry Size
UINT8 Rsvd2;
} NVME_CC;
#define NVME_CC_SHN_NORMAL_SHUTDOWN 1
@ -88,11 +87,11 @@ typedef struct {
// 3.1.6 Offset 1Ch: CSTS - Controller Status
//
typedef struct {
UINT32 Rdy:1; // Ready
UINT32 Cfs:1; // Controller Fatal Status
UINT32 Shst:2; // Shutdown Status
UINT32 Nssro:1; // NVM Subsystem Reset Occurred
UINT32 Rsvd1:27;
UINT32 Rdy : 1; // Ready
UINT32 Cfs : 1; // Controller Fatal Status
UINT32 Shst : 2; // Shutdown Status
UINT32 Nssro : 1; // NVM Subsystem Reset Occurred
UINT32 Rsvd1 : 27;
} NVME_CSTS;
#define NVME_CSTS_SHST_SHUTDOWN_OCCURRING 1
#define NVME_CSTS_SHST_SHUTDOWN_COMPLETED 2
@ -100,10 +99,10 @@ typedef struct {
// 3.1.8 Offset 24h: AQA - Admin Queue Attributes
//
typedef struct {
UINT16 Asqs:12; // Submission Queue Size
UINT16 Rsvd1:4;
UINT16 Acqs:12; // Completion Queue Size
UINT16 Rsvd2:4;
UINT16 Asqs : 12; // Submission Queue Size
UINT16 Rsvd1 : 4;
UINT16 Acqs : 12; // Completion Queue Size
UINT16 Rsvd2 : 4;
} NVME_AQA;
//
@ -145,18 +144,18 @@ typedef struct {
// CDW 12
//
UINT16 Nlb; /* Number of Sectors */
UINT16 Rsvd1:10;
UINT16 Prinfo:4; /* Protection Info Check */
UINT16 Fua:1; /* Force Unit Access */
UINT16 Lr:1; /* Limited Retry */
UINT16 Rsvd1 : 10;
UINT16 Prinfo : 4; /* Protection Info Check */
UINT16 Fua : 1; /* Force Unit Access */
UINT16 Lr : 1; /* Limited Retry */
//
// CDW 13
//
UINT32 Af:4; /* Access Frequency */
UINT32 Al:2; /* Access Latency */
UINT32 Sr:1; /* Sequential Request */
UINT32 In:1; /* Incompressible */
UINT32 Rsvd2:24;
UINT32 Af : 4; /* Access Frequency */
UINT32 Al : 2; /* Access Latency */
UINT32 Sr : 1; /* Sequential Request */
UINT32 In : 1; /* Incompressible */
UINT32 Rsvd2 : 24;
//
// CDW 14
//
@ -180,18 +179,18 @@ typedef struct {
// CDW 12
//
UINT16 Nlb; /* Number of Sectors */
UINT16 Rsvd1:10;
UINT16 Prinfo:4; /* Protection Info Check */
UINT16 Fua:1; /* Force Unit Access */
UINT16 Lr:1; /* Limited Retry */
UINT16 Rsvd1 : 10;
UINT16 Prinfo : 4; /* Protection Info Check */
UINT16 Fua : 1; /* Force Unit Access */
UINT16 Lr : 1; /* Limited Retry */
//
// CDW 13
//
UINT32 Af:4; /* Access Frequency */
UINT32 Al:2; /* Access Latency */
UINT32 Sr:1; /* Sequential Request */
UINT32 In:1; /* Incompressible */
UINT32 Rsvd2:24;
UINT32 Af : 4; /* Access Frequency */
UINT32 Al : 2; /* Access Latency */
UINT32 Sr : 1; /* Sequential Request */
UINT32 In : 1; /* Incompressible */
UINT32 Rsvd2 : 24;
//
// CDW 14
//
@ -224,8 +223,8 @@ typedef struct {
//
// CDW 12
//
UINT32 Nlb:16; /* Number of Logical Blocks */
UINT32 Rsvd1:16;
UINT32 Nlb : 16; /* Number of Logical Blocks */
UINT32 Rsvd1 : 16;
} NVME_WRITE_UNCORRECTABLE;
//
@ -240,10 +239,10 @@ typedef struct {
// CDW 12
//
UINT16 Nlb; /* Number of Logical Blocks */
UINT16 Rsvd1:10;
UINT16 Prinfo:4; /* Protection Info Check */
UINT16 Fua:1; /* Force Unit Access */
UINT16 Lr:1; /* Limited Retry */
UINT16 Rsvd1 : 10;
UINT16 Prinfo : 4; /* Protection Info Check */
UINT16 Fua : 1; /* Force Unit Access */
UINT16 Lr : 1; /* Limited Retry */
//
// CDW 13
//
@ -271,10 +270,10 @@ typedef struct {
// CDW 12
//
UINT16 Nlb; /* Number of Logical Blocks */
UINT16 Rsvd1:10;
UINT16 Prinfo:4; /* Protection Info Check */
UINT16 Fua:1; /* Force Unit Access */
UINT16 Lr:1; /* Limited Retry */
UINT16 Rsvd1 : 10;
UINT16 Prinfo : 4; /* Protection Info Check */
UINT16 Fua : 1; /* Force Unit Access */
UINT16 Lr : 1; /* Limited Retry */
//
// CDW 13
//
@ -302,19 +301,19 @@ typedef union {
typedef struct {
UINT16 Mp; /* Maximum Power */
UINT8 Rsvd1; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Mps:1; /* Max Power Scale */
UINT8 Nops:1; /* Non-Operational State */
UINT8 Rsvd2:6; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Mps : 1; /* Max Power Scale */
UINT8 Nops : 1; /* Non-Operational State */
UINT8 Rsvd2 : 6; /* Reserved as of Nvm Express 1.1 Spec */
UINT32 Enlat; /* Entry Latency */
UINT32 Exlat; /* Exit Latency */
UINT8 Rrt:5; /* Relative Read Throughput */
UINT8 Rsvd3:3; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Rrl:5; /* Relative Read Latency */
UINT8 Rsvd4:3; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Rwt:5; /* Relative Write Throughput */
UINT8 Rsvd5:3; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Rwl:5; /* Relative Write Latency */
UINT8 Rsvd6:3; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Rrt : 5; /* Relative Read Throughput */
UINT8 Rsvd3 : 3; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Rrl : 5; /* Relative Read Latency */
UINT8 Rsvd4 : 3; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Rwt : 5; /* Relative Write Throughput */
UINT8 Rsvd5 : 3; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Rwl : 5; /* Relative Write Latency */
UINT8 Rsvd6 : 3; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Rsvd7[16]; /* Reserved as of Nvm Express 1.1 Spec */
} NVME_PSDESCRIPTOR;
@ -397,12 +396,12 @@ typedef struct {
typedef struct {
UINT16 Ms; /* Metadata Size */
UINT8 Lbads; /* LBA Data Size */
UINT8 Rp:2; /* Relative Performance */
UINT8 Rp : 2; /* Relative Performance */
#define LBAF_RP_BEST 00b
#define LBAF_RP_BETTER 01b
#define LBAF_RP_GOOD 10b
#define LBAF_RP_DEGRADED 11b
UINT8 Rsvd1:6; /* Reserved as of Nvm Express 1.1 Spec */
UINT8 Rsvd1 : 6; /* Reserved as of Nvm Express 1.1 Spec */
} NVME_LBAFORMAT;
//
@ -441,8 +440,8 @@ typedef struct {
//
// CDW 10
//
UINT32 Cns:2;
UINT32 Rsvd1:30;
UINT32 Cns : 2;
UINT32 Rsvd1 : 30;
} NVME_ADMIN_IDENTIFY;
//
@ -452,16 +451,16 @@ typedef struct {
//
// CDW 10
//
UINT32 Qid:16; /* Queue Identifier */
UINT32 Qsize:16; /* Queue Size */
UINT32 Qid : 16; /* Queue Identifier */
UINT32 Qsize : 16; /* Queue Size */
//
// CDW 11
//
UINT32 Pc:1; /* Physically Contiguous */
UINT32 Ien:1; /* Interrupts Enabled */
UINT32 Rsvd1:14; /* reserved as of Nvm Express 1.1 Spec */
UINT32 Iv:16; /* Interrupt Vector for MSI-X or MSI*/
UINT32 Pc : 1; /* Physically Contiguous */
UINT32 Ien : 1; /* Interrupts Enabled */
UINT32 Rsvd1 : 14; /* reserved as of Nvm Express 1.1 Spec */
UINT32 Iv : 16; /* Interrupt Vector for MSI-X or MSI*/
} NVME_ADMIN_CRIOCQ;
//
@ -471,16 +470,16 @@ typedef struct {
//
// CDW 10
//
UINT32 Qid:16; /* Queue Identifier */
UINT32 Qsize:16; /* Queue Size */
UINT32 Qid : 16; /* Queue Identifier */
UINT32 Qsize : 16; /* Queue Size */
//
// CDW 11
//
UINT32 Pc:1; /* Physically Contiguous */
UINT32 Qprio:2; /* Queue Priority */
UINT32 Rsvd1:13; /* Reserved as of Nvm Express 1.1 Spec */
UINT32 Cqid:16; /* Completion Queue ID */
UINT32 Pc : 1; /* Physically Contiguous */
UINT32 Qprio : 2; /* Queue Priority */
UINT32 Rsvd1 : 13; /* Reserved as of Nvm Express 1.1 Spec */
UINT32 Cqid : 16; /* Completion Queue ID */
} NVME_ADMIN_CRIOSQ;
//
@ -512,8 +511,8 @@ typedef struct {
//
// CDW 10
//
UINT32 Sqid:16; /* Submission Queue identifier */
UINT32 Cid:16; /* Command Identifier */
UINT32 Sqid : 16; /* Submission Queue identifier */
UINT32 Cid : 16; /* Command Identifier */
} NVME_ADMIN_ABORT;
//
@ -523,9 +522,9 @@ typedef struct {
//
// CDW 10
//
UINT32 Fs:3; /* Submission Queue identifier */
UINT32 Aa:2; /* Command Identifier */
UINT32 Rsvd1:27;
UINT32 Fs : 3; /* Submission Queue identifier */
UINT32 Aa : 2; /* Command Identifier */
UINT32 Rsvd1 : 27;
} NVME_ADMIN_FIRMWARE_ACTIVATE;
//
@ -549,9 +548,9 @@ typedef struct {
//
// CDW 10
//
UINT32 Fid:8; /* Feature Identifier */
UINT32 Sel:3; /* Select */
UINT32 Rsvd1:21;
UINT32 Fid : 8; /* Feature Identifier */
UINT32 Sel : 3; /* Select */
UINT32 Rsvd1 : 21;
} NVME_ADMIN_GET_FEATURES;
//
@ -561,13 +560,13 @@ typedef struct {
//
// CDW 10
//
UINT32 Lid:8; /* Log Page Identifier */
UINT32 Lid : 8; /* Log Page Identifier */
#define LID_ERROR_INFO 0x1
#define LID_SMART_INFO 0x2
#define LID_FW_SLOT_INFO 0x3
UINT32 Rsvd1:8;
UINT32 Numd:12; /* Number of Dwords */
UINT32 Rsvd2:4; /* Reserved as of Nvm Express 1.1 Spec */
UINT32 Rsvd1 : 8;
UINT32 Numd : 12; /* Number of Dwords */
UINT32 Rsvd2 : 4; /* Reserved as of Nvm Express 1.1 Spec */
} NVME_ADMIN_GET_LOG_PAGE;
//
@ -577,9 +576,9 @@ typedef struct {
//
// CDW 10
//
UINT32 Fid:8; /* Feature Identifier */
UINT32 Rsvd1:23;
UINT32 Sv:1; /* Save */
UINT32 Fid : 8; /* Feature Identifier */
UINT32 Rsvd1 : 23;
UINT32 Sv : 1; /* Save */
} NVME_ADMIN_SET_FEATURES;
//
@ -589,12 +588,12 @@ typedef struct {
//
// CDW 10
//
UINT32 Lbaf:4; /* LBA Format */
UINT32 Ms:1; /* Metadata Settings */
UINT32 Pi:3; /* Protection Information */
UINT32 Pil:1; /* Protection Information Location */
UINT32 Ses:3; /* Secure Erase Settings */
UINT32 Rsvd1:20;
UINT32 Lbaf : 4; /* LBA Format */
UINT32 Ms : 1; /* Metadata Settings */
UINT32 Pi : 3; /* Protection Information */
UINT32 Pil : 1; /* Protection Information Location */
UINT32 Ses : 3; /* Secure Erase Settings */
UINT32 Rsvd1 : 20;
} NVME_ADMIN_FORMAT_NVM;
//
@ -604,9 +603,9 @@ typedef struct {
//
// CDW 10
//
UINT32 Rsvd1:8;
UINT32 Spsp:16; /* SP Specific */
UINT32 Secp:8; /* Security Protocol */
UINT32 Rsvd1 : 8;
UINT32 Spsp : 16; /* SP Specific */
UINT32 Secp : 8; /* Security Protocol */
//
// CDW 11
//
@ -620,9 +619,9 @@ typedef struct {
//
// CDW 10
//
UINT32 Rsvd1:8;
UINT32 Spsp:16; /* SP Specific */
UINT32 Secp:8; /* Security Protocol */
UINT32 Rsvd1 : 8;
UINT32 Spsp : 16; /* SP Specific */
UINT32 Secp : 8; /* Security Protocol */
//
// CDW 11
//
@ -669,9 +668,9 @@ typedef struct {
// CDW 0, Common to all commands
//
UINT8 Opc; // Opcode
UINT8 Fuse:2; // Fused Operation
UINT8 Rsvd1:5;
UINT8 Psdt:1; // PRP or SGL for Data Transfer
UINT8 Fuse : 2; // Fused Operation
UINT8 Rsvd1 : 5;
UINT8 Psdt : 1; // PRP or SGL for Data Transfer
UINT16 Cid; // Command Identifier
//
@ -695,7 +694,6 @@ typedef struct {
UINT64 Prp[2]; // First and second PRP entries
NVME_PAYLOAD Payload;
} NVME_SQ;
//
@ -719,12 +717,12 @@ typedef struct {
// CDW 3
//
UINT16 Cid; // Command Identifier
UINT16 Pt:1; // Phase Tag
UINT16 Sc:8; // Status Code
UINT16 Sct:3; // Status Code Type
UINT16 Rsvd2:2;
UINT16 Mo:1; // More
UINT16 Dnr:1; // Do Not Retry
UINT16 Pt : 1; // Phase Tag
UINT16 Sc : 8; // Status Code
UINT16 Sct : 3; // Status Code Type
UINT16 Rsvd2 : 2;
UINT16 Mo : 1; // More
UINT16 Dnr : 1; // Do Not Retry
} NVME_CQ;
//
@ -777,9 +775,9 @@ typedef enum {
// (ref. spec. v1.1 figure 82).
//
typedef enum {
IdentifyNamespaceCns = 0x0,
IdentifyControllerCns = 0x1,
IdentifyActiveNsListCns = 0x2
IdentifyNamespaceCns = 0x0,
IdentifyControllerCns = 0x1,
IdentifyActiveNsListCns = 0x2
} NVME_ADMIN_IDENTIFY_CNS;
//
@ -825,13 +823,13 @@ typedef struct {
//
// Indicates the firmware slot from which the actively running firmware revision was loaded.
//
UINT8 ActivelyRunningFwSlot:3;
UINT8 :1;
UINT8 ActivelyRunningFwSlot : 3;
UINT8 : 1;
//
// Indicates the firmware slot that is going to be activated at the next controller reset. If this field is 0h, then the controller does not indicate the firmware slot that is going to be activated at the next controller reset.
//
UINT8 NextActiveFwSlot:3;
UINT8 :1;
UINT8 NextActiveFwSlot : 3;
UINT8 : 1;
} NVME_ACTIVE_FW_INFO;
//
@ -841,7 +839,7 @@ typedef struct {
typedef struct {
//
// Specifies information about the active firmware revision.
//s
// s
NVME_ACTIVE_FW_INFO ActiveFwInfo;
UINT8 Reserved1[7];
//
@ -859,12 +857,12 @@ typedef struct {
//
// This field indicates critical warnings for the state of the controller.
//
UINT8 CriticalWarningAvailableSpare:1;
UINT8 CriticalWarningTemperature:1;
UINT8 CriticalWarningReliability:1;
UINT8 CriticalWarningMediaReadOnly:1;
UINT8 CriticalWarningVolatileBackup:1;
UINT8 CriticalWarningReserved:3;
UINT8 CriticalWarningAvailableSpare : 1;
UINT8 CriticalWarningTemperature : 1;
UINT8 CriticalWarningReliability : 1;
UINT8 CriticalWarningMediaReadOnly : 1;
UINT8 CriticalWarningVolatileBackup : 1;
UINT8 CriticalWarningReserved : 3;
//
// Contains a value corresponding to a temperature in degrees Kelvin that represents the current composite temperature of the controller and namespace(s) associated with that controller. The manner in which this value is computed is implementation specific and may not represent the actual temperature of any physical point in the NVM subsystem.
//

19
MdePkg/Include/IndustryStandard/Pci22.h
View File

@ -193,7 +193,7 @@ typedef struct {
#define PCI_CLASS_BRIDGE_OTHER 0x80
#define PCI_CLASS_BRIDGE_ISA_PDECODE 0x80
#define PCI_CLASS_SCC 0x07 ///< Simple communications controllers
#define PCI_CLASS_SCC 0x07///< Simple communications controllers
#define PCI_SUBCLASS_SERIAL 0x00
#define PCI_IF_GENERIC_XT 0x00
#define PCI_IF_16450 0x01
@ -309,6 +309,7 @@ typedef struct {
**/
#define IS_CLASS1(_p, c) ((_p)->Hdr.ClassCode[2] == (c))
/**
Macro that checks whether the Base Class code and Sub-Class code of device matched.
@ -321,6 +322,7 @@ typedef struct {
**/
#define IS_CLASS2(_p, c, s) (IS_CLASS1 (_p, c) && ((_p)->Hdr.ClassCode[1] == (s)))
/**
Macro that checks whether the Base Class code, Sub-Class code and Interface code of device matched.
@ -345,6 +347,7 @@ typedef struct {
**/
#define IS_PCI_DISPLAY(_p) IS_CLASS1 (_p, PCI_CLASS_DISPLAY)
/**
Macro that checks whether device is a VGA-compatible controller.
@ -355,6 +358,7 @@ typedef struct {
**/
#define IS_PCI_VGA(_p) IS_CLASS3 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_VGA, PCI_IF_VGA_VGA)
/**
Macro that checks whether device is an 8514-compatible controller.
@ -365,6 +369,7 @@ typedef struct {
**/
#define IS_PCI_8514(_p) IS_CLASS3 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_VGA, PCI_IF_VGA_8514)
/**
Macro that checks whether device is built before the Class Code field was defined.
@ -375,6 +380,7 @@ typedef struct {
**/
#define IS_PCI_OLD(_p) IS_CLASS1 (_p, PCI_CLASS_OLD)
/**
Macro that checks whether device is a VGA-compatible device built before the Class Code field was defined.
@ -385,6 +391,7 @@ typedef struct {
**/
#define IS_PCI_OLD_VGA(_p) IS_CLASS2 (_p, PCI_CLASS_OLD, PCI_CLASS_OLD_VGA)
/**
Macro that checks whether device is an IDE controller.
@ -395,6 +402,7 @@ typedef struct {
**/
#define IS_PCI_IDE(_p) IS_CLASS2 (_p, PCI_CLASS_MASS_STORAGE, PCI_CLASS_MASS_STORAGE_IDE)
/**
Macro that checks whether device is a SCSI bus controller.
@ -405,6 +413,7 @@ typedef struct {
**/
#define IS_PCI_SCSI(_p) IS_CLASS2 (_p, PCI_CLASS_MASS_STORAGE, PCI_CLASS_MASS_STORAGE_SCSI)
/**
Macro that checks whether device is a RAID controller.
@ -415,6 +424,7 @@ typedef struct {
**/
#define IS_PCI_RAID(_p) IS_CLASS2 (_p, PCI_CLASS_MASS_STORAGE, PCI_CLASS_MASS_STORAGE_RAID)
/**
Macro that checks whether device is an ISA bridge.
@ -425,6 +435,7 @@ typedef struct {
**/
#define IS_PCI_LPC(_p) IS_CLASS2 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA)
/**
Macro that checks whether device is a PCI-to-PCI bridge.
@ -435,6 +446,7 @@ typedef struct {
**/
#define IS_PCI_P2P(_p) IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_P2P, PCI_IF_BRIDGE_P2P)
/**
Macro that checks whether device is a Subtractive Decode PCI-to-PCI bridge.
@ -445,6 +457,7 @@ typedef struct {
**/
#define IS_PCI_P2P_SUB(_p) IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_P2P, PCI_IF_BRIDGE_P2P_SUBTRACTIVE)
/**
Macro that checks whether device is a 16550-compatible serial controller.
@ -455,6 +468,7 @@ typedef struct {
**/
#define IS_PCI_16550_SERIAL(_p) IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)
/**
Macro that checks whether device is a Universal Serial Bus controller.
@ -477,6 +491,7 @@ typedef struct {
// Mask of Header type
//
#define HEADER_LAYOUT_CODE 0x7f
/**
Macro that checks whether device is a PCI-PCI bridge.
@ -487,6 +502,7 @@ typedef struct {
**/
#define IS_PCI_BRIDGE(_p) (((_p)->Hdr.HeaderType & HEADER_LAYOUT_CODE) == (HEADER_TYPE_PCI_TO_PCI_BRIDGE))
/**
Macro that checks whether device is a CardBus bridge.
@ -497,6 +513,7 @@ typedef struct {
**/
#define IS_CARDBUS_BRIDGE(_p) (((_p)->Hdr.HeaderType & HEADER_LAYOUT_CODE) == (HEADER_TYPE_CARDBUS_BRIDGE))
/**
Macro that checks whether device is a multiple functions device.

1
MdePkg/Include/IndustryStandard/Pci30.h
View File

@ -9,7 +9,6 @@
#ifndef __PCI30_H__
#define __PCI30_H__
#include <IndustryStandard/Pci23.h>
///

1
MdePkg/Include/IndustryStandard/PciCodeId.h
View File

@ -10,7 +10,6 @@
#ifndef __PCI_CODE_ID_H__
#define __PCI_CODE_ID_H__
///
/// PCI_CLASS_MASS_STORAGE, Base Class 01h.
///

48
MdePkg/Include/IndustryStandard/PciExpress21.h
View File

@ -26,7 +26,7 @@
@return The encode ECAM address.
**/
#define PCI_ECAM_ADDRESS(Bus,Device,Function,Offset) \
#define PCI_ECAM_ADDRESS(Bus, Device, Function, Offset) \
(((Offset) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))
#pragma pack(1)
@ -447,9 +447,9 @@ typedef struct {
#define EFI_PCIE_CAPABILITY_ID_SRIOV_VF_MIGRATION_STATE 0x3C
typedef struct {
UINT32 CapabilityId:16;
UINT32 CapabilityVersion:4;
UINT32 NextCapabilityOffset:12;
UINT32 CapabilityId : 16;
UINT32 CapabilityVersion : 4;
UINT32 NextCapabilityOffset : 12;
} PCI_EXPRESS_EXTENDED_CAPABILITIES_HEADER;
#define PCI_EXP_EXT_HDR PCI_EXPRESS_EXTENDED_CAPABILITIES_HEADER
@ -505,8 +505,8 @@ typedef struct {
#define PCI_EXPRESS_EXTENDED_CAPABILITY_VIRTUAL_CHANNEL_VER1 0x1
typedef struct {
UINT32 VcResourceCapability:24;
UINT32 PortArbTableOffset:8;
UINT32 VcResourceCapability : 24;
UINT32 PortArbTableOffset : 8;
UINT32 VcResourceControl;
UINT16 Reserved1;
UINT16 VcResourceStatus;
@ -514,10 +514,10 @@ typedef struct {
typedef struct {
PCI_EXPRESS_EXTENDED_CAPABILITIES_HEADER Header;
UINT32 ExtendedVcCount:3;
UINT32 PortVcCapability1:29;
UINT32 PortVcCapability2:24;
UINT32 VcArbTableOffset:8;
UINT32 ExtendedVcCount : 3;
UINT32 PortVcCapability1 : 29;
UINT32 PortVcCapability2 : 24;
UINT32 VcArbTableOffset : 8;
UINT16 PortVcControl;
UINT16 PortVcStatus;
PCI_EXPRESS_EXTENDED_CAPABILITIES_VIRTUAL_CHANNEL_VC Capability[1];
@ -558,12 +558,12 @@ typedef struct {
typedef struct {
PCI_EXPRESS_EXTENDED_CAPABILITIES_HEADER Header;
UINT32 DataSelect:8;
UINT32 Reserved:24;
UINT32 DataSelect : 8;
UINT32 Reserved : 24;
UINT32 Data;
UINT32 PowerBudgetCapability:1;
UINT32 Reserved2:7;
UINT32 Reserved3:24;
UINT32 PowerBudgetCapability : 1;
UINT32 Reserved2 : 7;
UINT32 Reserved3 : 24;
} PCI_EXPRESS_EXTENDED_CAPABILITIES_POWER_BUDGETING;
#define PCI_EXPRESS_EXTENDED_CAPABILITY_ACS_EXTENDED_ID 0x000D
@ -634,21 +634,20 @@ typedef struct {
typedef union {
struct {
UINT32 Reserved:4;
UINT32 BarSizeCapability:28;
UINT32 Reserved : 4;
UINT32 BarSizeCapability : 28;
} Bits;
UINT32 Uint32;
} PCI_EXPRESS_EXTENDED_CAPABILITIES_RESIZABLE_BAR_CAPABILITY;
typedef union {
struct {
UINT32 BarIndex:3;
UINT32 Reserved:2;
UINT32 ResizableBarNumber:3;
UINT32 BarSize:6;
UINT32 Reserved2:2;
UINT32 BarSizeCapability:16;
UINT32 BarIndex : 3;
UINT32 Reserved : 2;
UINT32 ResizableBarNumber : 3;
UINT32 BarSize : 6;
UINT32 Reserved2 : 2;
UINT32 BarSizeCapability : 16;
} Bits;
UINT32 Uint32;
} PCI_EXPRESS_EXTENDED_CAPABILITIES_RESIZABLE_BAR_CONTROL;
@ -688,7 +687,6 @@ typedef struct {
#define PCI_EXPRESS_EXTENDED_CAPABILITY_DYNAMIC_POWER_ALLOCATION_GET_SUBSTATE_MAX(POWER) (UINT16)(((POWER->DpaCapability)&0x0000000F))
#define PCI_EXPRESS_EXTENDED_CAPABILITY_LATENCE_TOLERANCE_REPORTING_ID 0x0018
#define PCI_EXPRESS_EXTENDED_CAPABILITY_LATENCE_TOLERANCE_REPORTING_VER1 0x1

22
MdePkg/Include/IndustryStandard/PciExpress40.h
View File

@ -60,8 +60,8 @@ typedef union {
typedef union {
struct {
UINT8 DownstreamPortTransmitterPreset : 4; //bit 0..3
UINT8 UpstreamPortTransmitterPreset : 4; //bit 4..7
UINT8 DownstreamPortTransmitterPreset : 4; // bit 0..3
UINT8 UpstreamPortTransmitterPreset : 4; // bit 4..7
} Bits;
UINT8 Uint8;
} PCI_EXPRESS_REG_PHYSICAL_LAYER_16_0_LANE_EQUALIZATION_CONTROL;
@ -84,26 +84,26 @@ typedef struct {
///@{
typedef union {
struct {
UINT32 DvsecVendorId : 16; //bit 0..15
UINT32 DvsecRevision : 4; //bit 16..19
UINT32 DvsecLength : 12; //bit 20..31
}Bits;
UINT32 DvsecVendorId : 16; // bit 0..15
UINT32 DvsecRevision : 4; // bit 16..19
UINT32 DvsecLength : 12; // bit 20..31
} Bits;
UINT32 Uint32;
}PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_1;
} PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_1;
typedef union {
struct {
UINT16 DvsecId : 16; //bit 0..15
}Bits;
UINT16 DvsecId : 16; // bit 0..15
} Bits;
UINT16 Uint16;
}PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_2;
} PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_2;
typedef struct {
PCI_EXPRESS_EXTENDED_CAPABILITIES_HEADER Header;
PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_1 DesignatedVendorSpecificHeader1;
PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_2 DesignatedVendorSpecificHeader2;
UINT8 DesignatedVendorSpecific[1];
}PCI_EXPRESS_EXTENDED_CAPABILITIES_DESIGNATED_VENDOR_SPECIFIC;
} PCI_EXPRESS_EXTENDED_CAPABILITIES_DESIGNATED_VENDOR_SPECIFIC;
///@}
#pragma pack()

4
MdePkg/Include/IndustryStandard/PciExpress50.h
View File

@ -112,8 +112,8 @@ typedef union {
typedef union {
struct {
UINT8 DownstreamPortTransmitterPreset : 4; //bit 0..3
UINT8 UpstreamPortTransmitterPreset : 4; //bit 4..7
UINT8 DownstreamPortTransmitterPreset : 4; // bit 0..3
UINT8 UpstreamPortTransmitterPreset : 4; // bit 4..7
} Bits;
UINT8 Uint8;
} PCI_EXPRESS_REG_PHYSICAL_LAYER_32_0_LANE_EQUALIZATION_CONTROL;

17
MdePkg/Include/IndustryStandard/PeImage.h
View File

@ -24,8 +24,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION 10
#define EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11
#define EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12
#define EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER 13 ///< defined PI Specification, 1.0
#define EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER 13///< defined PI Specification, 1.0
//
// PE32+ Machine type for EFI images
@ -232,7 +231,6 @@ typedef struct {
EFI_IMAGE_DATA_DIRECTORY DataDirectory[EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES];
} EFI_IMAGE_OPTIONAL_HEADER64;
///
/// @attention
/// EFI_IMAGE_NT_HEADERS32 is for use ONLY by tools.
@ -549,7 +547,6 @@ typedef struct {
///
#define EFI_IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR 60
//
// DLL Support
//
@ -605,7 +602,6 @@ typedef struct {
EFI_IMAGE_THUNK_DATA *FirstThunk;
} EFI_IMAGE_IMPORT_DESCRIPTOR;
///
/// Debug Directory Format.
///
@ -652,7 +648,6 @@ typedef struct {
//
} EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY;
///
/// Debug Data Structure defined by Apple Mach-O to Coff utility.
///
@ -686,16 +681,16 @@ typedef struct {
typedef struct {
union {
struct {
UINT32 NameOffset:31;
UINT32 NameIsString:1;
UINT32 NameOffset : 31;
UINT32 NameIsString : 1;
} s;
UINT32 Id;
} u1;
union {
UINT32 OffsetToData;
struct {
UINT32 OffsetToDirectory:31;
UINT32 DataIsDirectory:1;
UINT32 OffsetToDirectory : 31;
UINT32 DataIsDirectory : 1;
} s;
} u2;
} EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY;
@ -733,7 +728,6 @@ typedef struct {
EFI_IMAGE_DATA_DIRECTORY DataDirectory[2]; ///< Only base relocation and debug directory.
} EFI_TE_IMAGE_HEADER;
#define EFI_TE_IMAGE_HEADER_SIGNATURE SIGNATURE_16('V', 'Z')
//
@ -742,7 +736,6 @@ typedef struct {
#define EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC 0
#define EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG 1
///
/// Union of PE32, PE32+, and TE headers.
///

1
MdePkg/Include/IndustryStandard/Scsi.h
View File

@ -377,7 +377,6 @@ typedef struct {
UINT8 Reserved[4];
} EFI_SCSI_DISK_UNMAP_BLOCK_DESP;
#pragma pack()
//

164
MdePkg/Include/IndustryStandard/Sd.h
View File

@ -64,10 +64,10 @@
#pragma pack(1)
typedef struct {
UINT8 NotUsed:1; // Not used [0:0]
UINT8 Crc:7; // CRC [7:1]
UINT16 ManufacturingDate:12; // Manufacturing date [19:8]
UINT16 Reserved:4; // Reserved [23:20]
UINT8 NotUsed : 1; // Not used [0:0]
UINT8 Crc : 7; // CRC [7:1]
UINT16 ManufacturingDate : 12; // Manufacturing date [19:8]
UINT16 Reserved : 4; // Reserved [23:20]
UINT8 ProductSerialNumber[4]; // Product serial number [55:24]
UINT8 ProductRevision; // Product revision [63:56]
UINT8 ProductName[5]; // Product name [103:64]
@ -76,98 +76,98 @@ typedef struct {
} SD_CID;
typedef struct {
UINT32 NotUsed:1; // Not used [0:0]
UINT32 Crc:7; // CRC [7:1]
UINT32 Reserved:2; // Reserved [9:8]
UINT32 FileFormat:2; // File format [11:10]
UINT32 TmpWriteProtect:1; // Temporary write protection [12:12]
UINT32 PermWriteProtect:1; // Permanent write protection [13:13]
UINT32 Copy:1; // Copy flag (OTP) [14:14]
UINT32 FileFormatGrp:1; // File format group [15:15]
UINT32 Reserved1:5; // Reserved [20:16]
UINT32 WriteBlPartial:1; // Partial blocks for write allowed [21:21]
UINT32 WriteBlLen:4; // Max. write data block length [25:22]
UINT32 R2WFactor:3; // Write speed factor [28:26]
UINT32 Reserved2:2; // Manufacturer default ECC [30:29]
UINT32 WpGrpEnable:1; // Write protect group enable [31:31]
UINT32 NotUsed : 1; // Not used [0:0]
UINT32 Crc : 7; // CRC [7:1]
UINT32 Reserved : 2; // Reserved [9:8]
UINT32 FileFormat : 2; // File format [11:10]
UINT32 TmpWriteProtect : 1; // Temporary write protection [12:12]
UINT32 PermWriteProtect : 1; // Permanent write protection [13:13]
UINT32 Copy : 1; // Copy flag (OTP) [14:14]
UINT32 FileFormatGrp : 1; // File format group [15:15]
UINT32 Reserved1 : 5; // Reserved [20:16]
UINT32 WriteBlPartial : 1; // Partial blocks for write allowed [21:21]
UINT32 WriteBlLen : 4; // Max. write data block length [25:22]
UINT32 R2WFactor : 3; // Write speed factor [28:26]
UINT32 Reserved2 : 2; // Manufacturer default ECC [30:29]
UINT32 WpGrpEnable : 1; // Write protect group enable [31:31]
UINT32 WpGrpSize:7; // Write protect group size [38:32]
UINT32 SectorSize:7; // Erase sector size [45:39]
UINT32 EraseBlkEn:1; // Erase single block enable [46:46]
UINT32 CSizeMul:3; // device size multiplier [49:47]
UINT32 VddWCurrMax:3; // max. write current @VDD max [52:50]
UINT32 VddWCurrMin:3; // max. write current @VDD min [55:53]
UINT32 VddRCurrMax:3; // max. read current @VDD max [58:56]
UINT32 VddRCurrMin:3; // max. read current @VDD min [61:59]
UINT32 CSizeLow:2; // Device size low 2 bits [63:62]
UINT32 WpGrpSize : 7; // Write protect group size [38:32]
UINT32 SectorSize : 7; // Erase sector size [45:39]
UINT32 EraseBlkEn : 1; // Erase single block enable [46:46]
UINT32 CSizeMul : 3; // device size multiplier [49:47]
UINT32 VddWCurrMax : 3; // max. write current @VDD max [52:50]
UINT32 VddWCurrMin : 3; // max. write current @VDD min [55:53]
UINT32 VddRCurrMax : 3; // max. read current @VDD max [58:56]
UINT32 VddRCurrMin : 3; // max. read current @VDD min [61:59]
UINT32 CSizeLow : 2; // Device size low 2 bits [63:62]
UINT32 CSizeHigh:10; // Device size high 10 bits [73:64]
UINT32 Reserved4:2; // Reserved [75:74]
UINT32 DsrImp:1; // DSR implemented [76:76]
UINT32 ReadBlkMisalign:1; // Read block misalignment [77:77]
UINT32 WriteBlkMisalign:1; // Write block misalignment [78:78]
UINT32 ReadBlPartial:1; // Partial blocks for read allowed [79:79]
UINT32 ReadBlLen:4; // Max. read data block length [83:80]
UINT32 Ccc:12; // Card command classes [95:84]
UINT32 CSizeHigh : 10; // Device size high 10 bits [73:64]
UINT32 Reserved4 : 2; // Reserved [75:74]
UINT32 DsrImp : 1; // DSR implemented [76:76]
UINT32 ReadBlkMisalign : 1; // Read block misalignment [77:77]
UINT32 WriteBlkMisalign : 1; // Write block misalignment [78:78]
UINT32 ReadBlPartial : 1; // Partial blocks for read allowed [79:79]
UINT32 ReadBlLen : 4; // Max. read data block length [83:80]
UINT32 Ccc : 12; // Card command classes [95:84]
UINT32 TranSpeed:8; // Max. data transfer rate [103:96]
UINT32 Nsac:8; // Data read access-time in CLK cycles (NSAC*100) [111:104]
UINT32 Taac:8; // Data read access-time [119:112]
UINT32 Reserved5:6; // Reserved [125:120]
UINT32 CsdStructure:2; // CSD structure [127:126]
UINT32 TranSpeed : 8; // Max. data transfer rate [103:96]
UINT32 Nsac : 8; // Data read access-time in CLK cycles (NSAC*100) [111:104]
UINT32 Taac : 8; // Data read access-time [119:112]
UINT32 Reserved5 : 6; // Reserved [125:120]
UINT32 CsdStructure : 2; // CSD structure [127:126]
} SD_CSD;
typedef struct {
UINT32 NotUsed:1; // Not used [0:0]
UINT32 Crc:7; // CRC [7:1]
UINT32 Reserved:2; // Reserved [9:8]
UINT32 FileFormat:2; // File format [11:10]
UINT32 TmpWriteProtect:1; // Temporary write protection [12:12]
UINT32 PermWriteProtect:1; // Permanent write protection [13:13]
UINT32 Copy:1; // Copy flag (OTP) [14:14]
UINT32 FileFormatGrp:1; // File format group [15:15]
UINT32 Reserved1:5; // Reserved [20:16]
UINT32 WriteBlPartial:1; // Partial blocks for write allowed [21:21]
UINT32 WriteBlLen:4; // Max. write data block length [25:22]
UINT32 R2WFactor:3; // Write speed factor [28:26]
UINT32 Reserved2:2; // Manufacturer default ECC [30:29]
UINT32 WpGrpEnable:1; // Write protect group enable [31:31]
UINT32 NotUsed : 1; // Not used [0:0]
UINT32 Crc : 7; // CRC [7:1]
UINT32 Reserved : 2; // Reserved [9:8]
UINT32 FileFormat : 2; // File format [11:10]
UINT32 TmpWriteProtect : 1; // Temporary write protection [12:12]
UINT32 PermWriteProtect : 1; // Permanent write protection [13:13]
UINT32 Copy : 1; // Copy flag (OTP) [14:14]
UINT32 FileFormatGrp : 1; // File format group [15:15]
UINT32 Reserved1 : 5; // Reserved [20:16]
UINT32 WriteBlPartial : 1; // Partial blocks for write allowed [21:21]
UINT32 WriteBlLen : 4; // Max. write data block length [25:22]
UINT32 R2WFactor : 3; // Write speed factor [28:26]
UINT32 Reserved2 : 2; // Manufacturer default ECC [30:29]
UINT32 WpGrpEnable : 1; // Write protect group enable [31:31]
UINT32 WpGrpSize:7; // Write protect group size [38:32]
UINT32 SectorSize:7; // Erase sector size [45:39]
UINT32 EraseBlkEn:1; // Erase single block enable [46:46]
UINT32 Reserved3:1; // Reserved [47:47]
UINT32 CSizeLow:16; // Device size low 16 bits [63:48]
UINT32 WpGrpSize : 7; // Write protect group size [38:32]
UINT32 SectorSize : 7; // Erase sector size [45:39]
UINT32 EraseBlkEn : 1; // Erase single block enable [46:46]
UINT32 Reserved3 : 1; // Reserved [47:47]
UINT32 CSizeLow : 16; // Device size low 16 bits [63:48]
UINT32 CSizeHigh:6; // Device size high 6 bits [69:64]
UINT32 Reserved4:6; // Reserved [75:70]
UINT32 DsrImp:1; // DSR implemented [76:76]
UINT32 ReadBlkMisalign:1; // Read block misalignment [77:77]
UINT32 WriteBlkMisalign:1; // Write block misalignment [78:78]
UINT32 ReadBlPartial:1; // Partial blocks for read allowed [79:79]
UINT32 ReadBlLen:4; // Max. read data block length [83:80]
UINT32 Ccc:12; // Card command classes [95:84]
UINT32 CSizeHigh : 6; // Device size high 6 bits [69:64]
UINT32 Reserved4 : 6; // Reserved [75:70]
UINT32 DsrImp : 1; // DSR implemented [76:76]
UINT32 ReadBlkMisalign : 1; // Read block misalignment [77:77]
UINT32 WriteBlkMisalign : 1; // Write block misalignment [78:78]
UINT32 ReadBlPartial : 1; // Partial blocks for read allowed [79:79]
UINT32 ReadBlLen : 4; // Max. read data block length [83:80]
UINT32 Ccc : 12; // Card command classes [95:84]
UINT32 TranSpeed:8; // Max. data transfer rate [103:96]
UINT32 Nsac:8; // Data read access-time in CLK cycles (NSAC*100) [111:104]
UINT32 Taac:8; // Data read access-time [119:112]
UINT32 Reserved5:6; // Reserved [125:120]
UINT32 CsdStructure:2; // CSD structure [127:126]
UINT32 TranSpeed : 8; // Max. data transfer rate [103:96]
UINT32 Nsac : 8; // Data read access-time in CLK cycles (NSAC*100) [111:104]
UINT32 Taac : 8; // Data read access-time [119:112]
UINT32 Reserved5 : 6; // Reserved [125:120]
UINT32 CsdStructure : 2; // CSD structure [127:126]
} SD_CSD2;
typedef struct {
UINT32 Reserved; // Reserved [31:0]
UINT32 CmdSupport:4; // Command Support bits [35:32]
UINT32 Reserved1:6; // Reserved [41:36]
UINT32 SdSpec4:1; // Spec. Version 4.00 or higher [42:42]
UINT32 ExSecurity:4; // Extended Security Support [46:43]
UINT32 SdSpec3:1; // Spec. Version 3.00 or higher [47:47]
UINT32 SdBusWidths:4; // DAT Bus widths supported [51:48]
UINT32 SdSecurity:3; // CPRM security support [54:52]
UINT32 DataStatAfterErase:1; // Data status after erases [55]
UINT32 SdSpec:4; // SD Memory Card Spec. Version [59:56]
UINT32 ScrStructure:4; // SCR Structure [63:60]
UINT32 CmdSupport : 4; // Command Support bits [35:32]
UINT32 Reserved1 : 6; // Reserved [41:36]
UINT32 SdSpec4 : 1; // Spec. Version 4.00 or higher [42:42]
UINT32 ExSecurity : 4; // Extended Security Support [46:43]
UINT32 SdSpec3 : 1; // Spec. Version 3.00 or higher [47:47]
UINT32 SdBusWidths : 4; // DAT Bus widths supported [51:48]
UINT32 SdSecurity : 3; // CPRM security support [54:52]
UINT32 DataStatAfterErase : 1; // Data status after erases [55]
UINT32 SdSpec : 4; // SD Memory Card Spec. Version [59:56]
UINT32 ScrStructure : 4; // SCR Structure [63:60]
} SD_SCR;
#pragma pack()

2
MdePkg/Include/IndustryStandard/SdramSpdDdr3.h
View File

@ -741,7 +741,7 @@ typedef struct {
} SPD3_MODULE_REVISION_CODE;
typedef struct {
UINT8 ManufacturerSpecificData[175 - 150 + 1];///< 150-175 Manufacturer's Specific Data
UINT8 ManufacturerSpecificData[175 - 150 + 1]; ///< 150-175 Manufacturer's Specific Data
} SPD3_MANUFACTURER_SPECIFIC;
///

4
MdePkg/Include/IndustryStandard/SdramSpdDdr4.h
View File

@ -788,7 +788,7 @@ typedef struct {
SPD4_SDRAM_OPTIONAL_FEATURES_STRUCT SdramOptionalFeatures; ///< 7 SDRAM Optional Features
SPD4_SDRAM_THERMAL_REFRESH_STRUCT ThermalAndRefreshOptions; ///< 8 SDRAM Thermal and Refresh Options
SPD4_OTHER_SDRAM_OPTIONAL_FEATURES_STRUCT OtherOptionalFeatures; ///< 9 Other SDRAM Optional Features
SPD4_SECONDARY_SDRAM_PACKAGE_TYPE_STRUCT SecondarySdramPackageType;///< 10 Secondary SDRAM Package Type
SPD4_SECONDARY_SDRAM_PACKAGE_TYPE_STRUCT SecondarySdramPackageType; ///< 10 Secondary SDRAM Package Type
SPD4_MODULE_NOMINAL_VOLTAGE_STRUCT ModuleNominalVoltage; ///< 11 Module Nominal Voltage, VDD
SPD4_MODULE_ORGANIZATION_STRUCT ModuleOrganization; ///< 12 Module Organization
SPD4_MODULE_MEMORY_BUS_WIDTH_STRUCT ModuleMemoryBusWidth; ///< 13 Module Memory Bus Width
@ -920,7 +920,7 @@ typedef struct {
UINT8 ManufacturerSpecificData[381 - 353 + 1]; ///< 353-381 Manufacturer's Specific Data
} SPD4_MANUFACTURER_SPECIFIC;
typedef UINT8 SPD4_MODULE_REVISION_CODE;///< 349 Module Revision Code
typedef UINT8 SPD4_MODULE_REVISION_CODE; ///< 349 Module Revision Code
typedef UINT8 SPD4_DRAM_STEPPING; ///< 352 Dram Stepping
typedef struct {

4
MdePkg/Include/IndustryStandard/SdramSpdLpDdr.h
View File

@ -255,7 +255,7 @@ typedef union {
} SPD_LPDDR_TRFC_AB_MTB_STRUCT;
typedef union {
struct {
struct {
UINT16 tRFCpb : 16; ///< Bits 15:0
} Bits;
UINT16 Data;
@ -436,7 +436,7 @@ typedef struct {
UINT8 ManufacturerSpecificData[381 - 353 + 1]; ///< 353-381 Manufacturer's Specific Data
} SPD_LPDDR_MANUFACTURER_SPECIFIC;
typedef UINT8 SPD_LPDDR_MODULE_REVISION_CODE;///< 349 Module Revision Code
typedef UINT8 SPD_LPDDR_MODULE_REVISION_CODE; ///< 349 Module Revision Code
typedef UINT8 SPD_LPDDR_DRAM_STEPPING; ///< 352 Dram Stepping
typedef struct {

2
MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
View File

@ -11,7 +11,6 @@
#ifndef _SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_H_
#define _SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_H_
#include <IndustryStandard/Acpi.h>
//
@ -70,7 +69,6 @@ typedef struct {
///
#define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERFACE_TYPE_16450 1
//
// The Serial Port Subtypes for ARM are documented in Table 3 of the DBG2 Specification
//

2
MdePkg/Include/IndustryStandard/ServiceProcessorManagementInterfaceTable.h
View File

@ -10,6 +10,7 @@
v2.0 Revision 1.1, Dated October 2013.
https://www.intel.com/content/dam/www/public/us/en/documents/specification-updates/ipmi-intelligent-platform-mgt-interface-spec-2nd-gen-v2-0-spec-update.pdf
**/
#ifndef _SERVICE_PROCESSOR_MANAGEMENT_INTERFACE_TABLE_H_
#define _SERVICE_PROCESSOR_MANAGEMENT_INTERFACE_TABLE_H_
@ -37,7 +38,6 @@ typedef union {
UINT32 Uid;
} EFI_ACPI_SERVICE_PROCESSOR_MANAGEMENT_INTERFACE_TABLE_DEVICE_ID;
///
/// Definition for Service Processor Management Interface Description Table
///

418
MdePkg/Include/IndustryStandard/SmBios.h
View File

@ -190,38 +190,38 @@ typedef UINT8 SMBIOS_TABLE_STRING;
/// Defines which functions the BIOS supports. PCI, PCMCIA, Flash, etc.
///
typedef struct {
UINT32 Reserved :2; ///< Bits 0-1.
UINT32 Unknown :1;
UINT32 BiosCharacteristicsNotSupported :1;
UINT32 IsaIsSupported :1;
UINT32 McaIsSupported :1;
UINT32 EisaIsSupported :1;
UINT32 PciIsSupported :1;
UINT32 PcmciaIsSupported :1;
UINT32 PlugAndPlayIsSupported :1;
UINT32 ApmIsSupported :1;
UINT32 BiosIsUpgradable :1;
UINT32 BiosShadowingAllowed :1;
UINT32 VlVesaIsSupported :1;
UINT32 EscdSupportIsAvailable :1;
UINT32 BootFromCdIsSupported :1;
UINT32 SelectableBootIsSupported :1;
UINT32 RomBiosIsSocketed :1;
UINT32 BootFromPcmciaIsSupported :1;
UINT32 EDDSpecificationIsSupported :1;
UINT32 JapaneseNecFloppyIsSupported :1;
UINT32 JapaneseToshibaFloppyIsSupported :1;
UINT32 Floppy525_360IsSupported :1;
UINT32 Floppy525_12IsSupported :1;
UINT32 Floppy35_720IsSupported :1;
UINT32 Floppy35_288IsSupported :1;
UINT32 PrintScreenIsSupported :1;
UINT32 Keyboard8042IsSupported :1;
UINT32 SerialIsSupported :1;
UINT32 PrinterIsSupported :1;
UINT32 CgaMonoIsSupported :1;
UINT32 NecPc98 :1;
UINT32 ReservedForVendor :32; ///< Bits 32-63. Bits 32-47 reserved for BIOS vendor
UINT32 Reserved : 2; ///< Bits 0-1.
UINT32 Unknown : 1;
UINT32 BiosCharacteristicsNotSupported : 1;
UINT32 IsaIsSupported : 1;
UINT32 McaIsSupported : 1;
UINT32 EisaIsSupported : 1;
UINT32 PciIsSupported : 1;
UINT32 PcmciaIsSupported : 1;
UINT32 PlugAndPlayIsSupported : 1;
UINT32 ApmIsSupported : 1;
UINT32 BiosIsUpgradable : 1;
UINT32 BiosShadowingAllowed : 1;
UINT32 VlVesaIsSupported : 1;
UINT32 EscdSupportIsAvailable : 1;
UINT32 BootFromCdIsSupported : 1;
UINT32 SelectableBootIsSupported : 1;
UINT32 RomBiosIsSocketed : 1;
UINT32 BootFromPcmciaIsSupported : 1;
UINT32 EDDSpecificationIsSupported : 1;
UINT32 JapaneseNecFloppyIsSupported : 1;
UINT32 JapaneseToshibaFloppyIsSupported : 1;
UINT32 Floppy525_360IsSupported : 1;
UINT32 Floppy525_12IsSupported : 1;
UINT32 Floppy35_720IsSupported : 1;
UINT32 Floppy35_288IsSupported : 1;
UINT32 PrintScreenIsSupported : 1;
UINT32 Keyboard8042IsSupported : 1;
UINT32 SerialIsSupported : 1;
UINT32 PrinterIsSupported : 1;
UINT32 CgaMonoIsSupported : 1;
UINT32 NecPc98 : 1;
UINT32 ReservedForVendor : 32; ///< Bits 32-63. Bits 32-47 reserved for BIOS vendor
///< and bits 48-63 reserved for System Vendor.
} MISC_BIOS_CHARACTERISTICS;
@ -231,14 +231,14 @@ typedef struct {
/// within the BIOS Information structure.
///
typedef struct {
UINT8 AcpiIsSupported :1;
UINT8 UsbLegacyIsSupported :1;
UINT8 AgpIsSupported :1;
UINT8 I2OBootIsSupported :1;
UINT8 Ls120BootIsSupported :1;
UINT8 AtapiZipDriveBootIsSupported :1;
UINT8 Boot1394IsSupported :1;
UINT8 SmartBatteryIsSupported :1;
UINT8 AcpiIsSupported : 1;
UINT8 UsbLegacyIsSupported : 1;
UINT8 AgpIsSupported : 1;
UINT8 I2OBootIsSupported : 1;
UINT8 Ls120BootIsSupported : 1;
UINT8 AtapiZipDriveBootIsSupported : 1;
UINT8 Boot1394IsSupported : 1;
UINT8 SmartBatteryIsSupported : 1;
} MBCE_BIOS_RESERVED;
///
@ -247,12 +247,12 @@ typedef struct {
/// within the BIOS Information structure.
///
typedef struct {
UINT8 BiosBootSpecIsSupported :1;
UINT8 FunctionKeyNetworkBootIsSupported :1;
UINT8 TargetContentDistributionEnabled :1;
UINT8 UefiSpecificationSupported :1;
UINT8 VirtualMachineSupported :1;
UINT8 ExtensionByte2Reserved :3;
UINT8 BiosBootSpecIsSupported : 1;
UINT8 FunctionKeyNetworkBootIsSupported : 1;
UINT8 TargetContentDistributionEnabled : 1;
UINT8 UefiSpecificationSupported : 1;
UINT8 VirtualMachineSupported : 1;
UINT8 ExtensionByte2Reserved : 3;
} MBCE_SYSTEM_RESERVED;
///
@ -267,8 +267,8 @@ typedef struct {
/// Extended BIOS ROM size.
///
typedef struct {
UINT16 Size :14;
UINT16 Unit :2;
UINT16 Size : 14;
UINT16 Unit : 2;
} EXTENDED_BIOS_ROM_SIZE;
///
@ -332,12 +332,12 @@ typedef struct {
/// Base Board - Feature Flags.
///
typedef struct {
UINT8 Motherboard :1;
UINT8 RequiresDaughterCard :1;
UINT8 Removable :1;
UINT8 Replaceable :1;
UINT8 HotSwappable :1;
UINT8 Reserved :3;
UINT8 Motherboard : 1;
UINT8 RequiresDaughterCard : 1;
UINT8 Removable : 1;
UINT8 Replaceable : 1;
UINT8 HotSwappable : 1;
UINT8 Reserved : 3;
} BASE_BOARD_FEATURE_FLAGS;
///
@ -454,7 +454,6 @@ typedef struct {
UINT8 ContainedElementMaximum;
} CONTAINED_ELEMENT;
///
/// System Enclosure or Chassis (Type 3).
///
@ -739,12 +738,12 @@ typedef enum {
/// Processor Information - Voltage.
///
typedef struct {
UINT8 ProcessorVoltageCapability5V :1;
UINT8 ProcessorVoltageCapability3_3V :1;
UINT8 ProcessorVoltageCapability2_9V :1;
UINT8 ProcessorVoltageCapabilityReserved :1; ///< Bit 3, must be zero.
UINT8 ProcessorVoltageReserved :3; ///< Bits 4-6, must be zero.
UINT8 ProcessorVoltageIndicateLegacy :1;
UINT8 ProcessorVoltageCapability5V : 1;
UINT8 ProcessorVoltageCapability3_3V : 1;
UINT8 ProcessorVoltageCapability2_9V : 1;
UINT8 ProcessorVoltageCapabilityReserved : 1; ///< Bit 3, must be zero.
UINT8 ProcessorVoltageReserved : 3; ///< Bits 4-6, must be zero.
UINT8 ProcessorVoltageIndicateLegacy : 1;
} PROCESSOR_VOLTAGE;
///
@ -820,62 +819,62 @@ typedef enum {
/// Processor ID Field Description
///
typedef struct {
UINT32 ProcessorSteppingId:4;
UINT32 ProcessorModel: 4;
UINT32 ProcessorFamily: 4;
UINT32 ProcessorType: 2;
UINT32 ProcessorReserved1: 2;
UINT32 ProcessorXModel: 4;
UINT32 ProcessorXFamily: 8;
UINT32 ProcessorReserved2: 4;
UINT32 ProcessorSteppingId : 4;
UINT32 ProcessorModel : 4;
UINT32 ProcessorFamily : 4;
UINT32 ProcessorType : 2;
UINT32 ProcessorReserved1 : 2;
UINT32 ProcessorXModel : 4;
UINT32 ProcessorXFamily : 8;
UINT32 ProcessorReserved2 : 4;
} PROCESSOR_SIGNATURE;
typedef struct {
UINT32 ProcessorFpu :1;
UINT32 ProcessorVme :1;
UINT32 ProcessorDe :1;
UINT32 ProcessorPse :1;
UINT32 ProcessorTsc :1;
UINT32 ProcessorMsr :1;
UINT32 ProcessorPae :1;
UINT32 ProcessorMce :1;
UINT32 ProcessorCx8 :1;
UINT32 ProcessorApic :1;
UINT32 ProcessorReserved1 :1;
UINT32 ProcessorSep :1;
UINT32 ProcessorMtrr :1;
UINT32 ProcessorPge :1;
UINT32 ProcessorMca :1;
UINT32 ProcessorCmov :1;
UINT32 ProcessorPat :1;
UINT32 ProcessorPse36 :1;
UINT32 ProcessorPsn :1;
UINT32 ProcessorClfsh :1;
UINT32 ProcessorReserved2 :1;
UINT32 ProcessorDs :1;
UINT32 ProcessorAcpi :1;
UINT32 ProcessorMmx :1;
UINT32 ProcessorFxsr :1;
UINT32 ProcessorSse :1;
UINT32 ProcessorSse2 :1;
UINT32 ProcessorSs :1;
UINT32 ProcessorReserved3 :1;
UINT32 ProcessorTm :1;
UINT32 ProcessorReserved4 :2;
UINT32 ProcessorFpu : 1;
UINT32 ProcessorVme : 1;
UINT32 ProcessorDe : 1;
UINT32 ProcessorPse : 1;
UINT32 ProcessorTsc : 1;
UINT32 ProcessorMsr : 1;
UINT32 ProcessorPae : 1;
UINT32 ProcessorMce : 1;
UINT32 ProcessorCx8 : 1;
UINT32 ProcessorApic : 1;
UINT32 ProcessorReserved1 : 1;
UINT32 ProcessorSep : 1;
UINT32 ProcessorMtrr : 1;
UINT32 ProcessorPge : 1;
UINT32 ProcessorMca : 1;
UINT32 ProcessorCmov : 1;
UINT32 ProcessorPat : 1;
UINT32 ProcessorPse36 : 1;
UINT32 ProcessorPsn : 1;
UINT32 ProcessorClfsh : 1;
UINT32 ProcessorReserved2 : 1;
UINT32 ProcessorDs : 1;
UINT32 ProcessorAcpi : 1;
UINT32 ProcessorMmx : 1;
UINT32 ProcessorFxsr : 1;
UINT32 ProcessorSse : 1;
UINT32 ProcessorSse2 : 1;
UINT32 ProcessorSs : 1;
UINT32 ProcessorReserved3 : 1;
UINT32 ProcessorTm : 1;
UINT32 ProcessorReserved4 : 2;
} PROCESSOR_FEATURE_FLAGS;
typedef struct {
UINT16 ProcessorReserved1 :1;
UINT16 ProcessorUnknown :1;
UINT16 Processor64BitCapable :1;
UINT16 ProcessorMultiCore :1;
UINT16 ProcessorHardwareThread :1;
UINT16 ProcessorExecuteProtection :1;
UINT16 ProcessorEnhancedVirtualization :1;
UINT16 ProcessorPowerPerformanceCtrl :1;
UINT16 Processor128BitCapable :1;
UINT16 ProcessorArm64SocId :1;
UINT16 ProcessorReserved2 :6;
UINT16 ProcessorReserved1 : 1;
UINT16 ProcessorUnknown : 1;
UINT16 Processor64BitCapable : 1;
UINT16 ProcessorMultiCore : 1;
UINT16 ProcessorHardwareThread : 1;
UINT16 ProcessorExecuteProtection : 1;
UINT16 ProcessorEnhancedVirtualization : 1;
UINT16 ProcessorPowerPerformanceCtrl : 1;
UINT16 Processor128BitCapable : 1;
UINT16 ProcessorArm64SocId : 1;
UINT16 ProcessorReserved2 : 6;
} PROCESSOR_CHARACTERISTIC_FLAGS;
///
@ -883,10 +882,10 @@ typedef struct {
///
typedef union {
struct {
UINT8 CpuStatus :3; ///< Indicates the status of the processor.
UINT8 Reserved1 :3; ///< Reserved for future use. Must be set to zero.
UINT8 SocketPopulated :1; ///< Indicates if the processor socket is populated or not.
UINT8 Reserved2 :1; ///< Reserved for future use. Must be set to zero.
UINT8 CpuStatus : 3; ///< Indicates the status of the processor.
UINT8 Reserved1 : 3; ///< Reserved for future use. Must be set to zero.
UINT8 SocketPopulated : 1; ///< Indicates if the processor socket is populated or not.
UINT8 Reserved2 : 1; ///< Reserved for future use. Must be set to zero.
} Bits;
UINT8 Data;
} PROCESSOR_STATUS_DATA;
@ -962,13 +961,13 @@ typedef enum {
/// Memory Controller Error Correcting Capability.
///
typedef struct {
UINT8 Other :1;
UINT8 Unknown :1;
UINT8 None :1;
UINT8 SingleBitErrorCorrect :1;
UINT8 DoubleBitErrorCorrect :1;
UINT8 ErrorScrubbing :1;
UINT8 Reserved :2;
UINT8 Other : 1;
UINT8 Unknown : 1;
UINT8 None : 1;
UINT8 SingleBitErrorCorrect : 1;
UINT8 DoubleBitErrorCorrect : 1;
UINT8 ErrorScrubbing : 1;
UINT8 Reserved : 2;
} MEMORY_ERROR_CORRECT_CAPABILITY;
///
@ -988,12 +987,12 @@ typedef enum {
/// Memory Controller Information - Memory Speeds.
///
typedef struct {
UINT16 Other :1;
UINT16 Unknown :1;
UINT16 SeventyNs:1;
UINT16 SixtyNs :1;
UINT16 FiftyNs :1;
UINT16 Reserved :11;
UINT16 Other : 1;
UINT16 Unknown : 1;
UINT16 SeventyNs : 1;
UINT16 SixtyNs : 1;
UINT16 FiftyNs : 1;
UINT16 Reserved : 11;
} MEMORY_SPEED_TYPE;
///
@ -1026,26 +1025,26 @@ typedef struct {
/// Memory Module Information - Memory Types
///
typedef struct {
UINT16 Other :1;
UINT16 Unknown :1;
UINT16 Standard :1;
UINT16 FastPageMode:1;
UINT16 Edo :1;
UINT16 Parity :1;
UINT16 Ecc :1;
UINT16 Simm :1;
UINT16 Dimm :1;
UINT16 BurstEdo :1;
UINT16 Sdram :1;
UINT16 Reserved :5;
UINT16 Other : 1;
UINT16 Unknown : 1;
UINT16 Standard : 1;
UINT16 FastPageMode : 1;
UINT16 Edo : 1;
UINT16 Parity : 1;
UINT16 Ecc : 1;
UINT16 Simm : 1;
UINT16 Dimm : 1;
UINT16 BurstEdo : 1;
UINT16 Sdram : 1;
UINT16 Reserved : 5;
} MEMORY_CURRENT_TYPE;
///
/// Memory Module Information - Memory Size.
///
typedef struct {
UINT8 InstalledOrEnabledSize :7; ///< Size (n), where 2**n is the size in MB.
UINT8 SingleOrDoubleBank :1;
UINT8 InstalledOrEnabledSize : 7; ///< Size (n), where 2**n is the size in MB.
UINT8 SingleOrDoubleBank : 1;
} MEMORY_INSTALLED_ENABLED_SIZE;
///
@ -1074,14 +1073,14 @@ typedef struct {
/// Cache Information - SRAM Type.
///
typedef struct {
UINT16 Other :1;
UINT16 Unknown :1;
UINT16 NonBurst :1;
UINT16 Burst :1;
UINT16 PipelineBurst :1;
UINT16 Synchronous :1;
UINT16 Asynchronous :1;
UINT16 Reserved :9;
UINT16 Other : 1;
UINT16 Unknown : 1;
UINT16 NonBurst : 1;
UINT16 Burst : 1;
UINT16 PipelineBurst : 1;
UINT16 Synchronous : 1;
UINT16 Asynchronous : 1;
UINT16 Reserved : 9;
} CACHE_SRAM_TYPE_DATA;
///
@ -1379,27 +1378,27 @@ typedef enum {
/// System Slots - Slot Characteristics 1.
///
typedef struct {
UINT8 CharacteristicsUnknown :1;
UINT8 Provides50Volts :1;
UINT8 Provides33Volts :1;
UINT8 SharedSlot :1;
UINT8 PcCard16Supported :1;
UINT8 CardBusSupported :1;
UINT8 ZoomVideoSupported :1;
UINT8 ModemRingResumeSupported:1;
UINT8 CharacteristicsUnknown : 1;
UINT8 Provides50Volts : 1;
UINT8 Provides33Volts : 1;
UINT8 SharedSlot : 1;
UINT8 PcCard16Supported : 1;
UINT8 CardBusSupported : 1;
UINT8 ZoomVideoSupported : 1;
UINT8 ModemRingResumeSupported : 1;
} MISC_SLOT_CHARACTERISTICS1;
///
/// System Slots - Slot Characteristics 2.
///
typedef struct {
UINT8 PmeSignalSupported :1;
UINT8 HotPlugDevicesSupported :1;
UINT8 SmbusSignalSupported :1;
UINT8 BifurcationSupported :1;
UINT8 AsyncSurpriseRemoval :1;
UINT8 FlexbusSlotCxl10Capable :1;
UINT8 FlexbusSlotCxl20Capable :1;
UINT8 Reserved :1; ///< Set to 0.
UINT8 PmeSignalSupported : 1;
UINT8 HotPlugDevicesSupported : 1;
UINT8 SmbusSignalSupported : 1;
UINT8 BifurcationSupported : 1;
UINT8 AsyncSurpriseRemoval : 1;
UINT8 FlexbusSlotCxl10Capable : 1;
UINT8 FlexbusSlotCxl20Capable : 1;
UINT8 Reserved : 1; ///< Set to 0.
} MISC_SLOT_CHARACTERISTICS2;
///
@ -1509,7 +1508,6 @@ typedef struct {
UINT8 StringCount;
} SMBIOS_TABLE_TYPE12;
///
/// BIOS Language Information (Type 13).
///
@ -1753,22 +1751,22 @@ typedef enum {
/// Memory Device - Type Detail
///
typedef struct {
UINT16 Reserved :1;
UINT16 Other :1;
UINT16 Unknown :1;
UINT16 FastPaged :1;
UINT16 StaticColumn :1;
UINT16 PseudoStatic :1;
UINT16 Rambus :1;
UINT16 Synchronous :1;
UINT16 Cmos :1;
UINT16 Edo :1;
UINT16 WindowDram :1;
UINT16 CacheDram :1;
UINT16 Nonvolatile :1;
UINT16 Registered :1;
UINT16 Unbuffered :1;
UINT16 LrDimm :1;
UINT16 Reserved : 1;
UINT16 Other : 1;
UINT16 Unknown : 1;
UINT16 FastPaged : 1;
UINT16 StaticColumn : 1;
UINT16 PseudoStatic : 1;
UINT16 Rambus : 1;
UINT16 Synchronous : 1;
UINT16 Cmos : 1;
UINT16 Edo : 1;
UINT16 WindowDram : 1;
UINT16 CacheDram : 1;
UINT16 Nonvolatile : 1;
UINT16 Registered : 1;
UINT16 Unbuffered : 1;
UINT16 LrDimm : 1;
} MEMORY_DEVICE_TYPE_DETAIL;
///
@ -1786,7 +1784,6 @@ typedef enum {
// Optane DC Persistent Memory in SMBIOS spec 3.4.0
//
MemoryTechnologyIntelOptanePersistentMemory = 0x07
} MEMORY_DEVICE_TECHNOLOGY;
///
@ -1797,13 +1794,13 @@ typedef union {
/// Individual bit fields
///
struct {
UINT16 Reserved :1; ///< Set to 0.
UINT16 Other :1;
UINT16 Unknown :1;
UINT16 VolatileMemory :1;
UINT16 ByteAccessiblePersistentMemory :1;
UINT16 BlockAccessiblePersistentMemory :1;
UINT16 Reserved2 :10; ///< Set to 0.
UINT16 Reserved : 1; ///< Set to 0.
UINT16 Other : 1;
UINT16 Unknown : 1;
UINT16 VolatileMemory : 1;
UINT16 ByteAccessiblePersistentMemory : 1;
UINT16 BlockAccessiblePersistentMemory : 1;
UINT16 Reserved2 : 10; ///< Set to 0.
} Bits;
///
/// All bit fields as a 16-bit value
@ -2113,8 +2110,8 @@ typedef struct {
/// Voltage Probe - Location and Status.
///
typedef struct {
UINT8 VoltageProbeSite :5;
UINT8 VoltageProbeStatus :3;
UINT8 VoltageProbeSite : 5;
UINT8 VoltageProbeStatus : 3;
} MISC_VOLTAGE_PROBE_LOCATION;
///
@ -2140,8 +2137,8 @@ typedef struct {
/// Cooling Device - Device Type and Status.
///
typedef struct {
UINT8 CoolingDevice :5;
UINT8 CoolingDeviceStatus :3;
UINT8 CoolingDevice : 5;
UINT8 CoolingDeviceStatus : 3;
} MISC_COOLING_DEVICE_TYPE;
///
@ -2167,8 +2164,8 @@ typedef struct {
/// Temperature Probe - Location and Status.
///
typedef struct {
UINT8 TemperatureProbeSite :5;
UINT8 TemperatureProbeStatus :3;
UINT8 TemperatureProbeSite : 5;
UINT8 TemperatureProbeStatus : 3;
} MISC_TEMPERATURE_PROBE_LOCATION;
///
@ -2194,8 +2191,8 @@ typedef struct {
/// Electrical Current Probe - Location and Status.
///
typedef struct {
UINT8 ElectricalCurrentProbeSite :5;
UINT8 ElectricalCurrentProbeStatus :3;
UINT8 ElectricalCurrentProbeSite : 5;
UINT8 ElectricalCurrentProbeStatus : 3;
} MISC_ELECTRICAL_CURRENT_PROBE_LOCATION;
///
@ -2443,13 +2440,13 @@ typedef struct {
/// System Power Supply - Power Supply Characteristics.
///
typedef struct {
UINT16 PowerSupplyHotReplaceable:1;
UINT16 PowerSupplyPresent :1;
UINT16 PowerSupplyUnplugged :1;
UINT16 InputVoltageRangeSwitch :4;
UINT16 PowerSupplyStatus :3;
UINT16 PowerSupplyType :4;
UINT16 Reserved :2;
UINT16 PowerSupplyHotReplaceable : 1;
UINT16 PowerSupplyPresent : 1;
UINT16 PowerSupplyUnplugged : 1;
UINT16 InputVoltageRangeSwitch : 4;
UINT16 PowerSupplyStatus : 3;
UINT16 PowerSupplyType : 4;
UINT16 Reserved : 2;
} SYS_POWER_SUPPLY_CHARACTERISTICS;
///
@ -2501,7 +2498,7 @@ typedef struct {
///
/// Onboard Devices Extended Information - Onboard Device Types.
///
typedef enum{
typedef enum {
OnBoardDeviceExtendedTypeOther = 0x01,
OnBoardDeviceExtendedTypeUnknown = 0x02,
OnBoardDeviceExtendedTypeVideo = 0x03,
@ -2545,7 +2542,7 @@ typedef struct {
/// Management Controller Host Interface - Interface Types.
/// 00h - 3Fh: MCTP Host Interfaces
///
typedef enum{
typedef enum {
MCHostInterfaceTypeNetworkHostInterface = 0x40,
MCHostInterfaceTypeOemDefined = 0xF0
} MC_HOST_INTERFACE_TYPE;
@ -2553,7 +2550,7 @@ typedef enum{
///
/// Management Controller Host Interface - Protocol Types.
///
typedef enum{
typedef enum {
MCHostInterfaceProtocolTypeIPMI = 0x02,
MCHostInterfaceProtocolTypeMCTP = 0x03,
MCHostInterfaceProtocolTypeRedfishOverIP = 0x04,
@ -2584,11 +2581,10 @@ typedef struct {
UINT8 InterfaceTypeSpecificData[4]; ///< This field has a minimum of four bytes
} SMBIOS_TABLE_TYPE42;
///
/// Processor Specific Block - Processor Architecture Type
///
typedef enum{
typedef enum {
ProcessorSpecificBlockArchTypeReserved = 0x00,
ProcessorSpecificBlockArchTypeIa32 = 0x01,
ProcessorSpecificBlockArchTypeX64 = 0x02,

2
MdePkg/Include/IndustryStandard/SmBus.h
View File

@ -10,7 +10,6 @@
#ifndef _SMBUS_H_
#define _SMBUS_H_
///
/// UDID of SMBUS device.
///
@ -72,4 +71,3 @@ typedef enum _EFI_SMBUS_OPERATION {
typedef UINTN EFI_SMBUS_DEVICE_COMMAND;
#endif

52
MdePkg/Include/IndustryStandard/Spdm.h
View File

@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __SPDM_H__
#define __SPDM_H__
@ -63,17 +62,17 @@ typedef struct {
SPDM_MESSAGE_HEADER Header;
UINT8 Reserved;
UINT8 VersionNumberEntryCount;
//SPDM_VERSION_NUMBER VersionNumberEntry[VersionNumberEntryCount];
// SPDM_VERSION_NUMBER VersionNumberEntry[VersionNumberEntryCount];
} SPDM_VERSION_RESPONSE;
///
/// SPDM VERSION structure
///
typedef struct {
UINT16 Alpha:4;
UINT16 UpdateVersionNumber:4;
UINT16 MinorVersion:4;
UINT16 MajorVersion:4;
UINT16 Alpha : 4;
UINT16 UpdateVersionNumber : 4;
UINT16 MinorVersion : 4;
UINT16 MajorVersion : 4;
} SPDM_VERSION_NUMBER;
///
@ -119,8 +118,8 @@ typedef struct {
UINT8 ExtAsymCount;
UINT8 ExtHashCount;
UINT16 Reserved3;
//UINT32 ExtAsym[ExtAsymCount];
//UINT32 ExtHash[ExtHashCount];
// UINT32 ExtAsym[ExtAsymCount];
// UINT32 ExtHash[ExtHashCount];
} SPDM_NEGOTIATE_ALGORITHMS_REQUEST;
///
@ -161,8 +160,8 @@ typedef struct {
UINT8 ExtAsymSelCount;
UINT8 ExtHashSelCount;
UINT16 Reserved3;
//UINT32 ExtAsymSel[ExtAsymSelCount];
//UINT32 ExtHashSel[ExtHashSelCount];
// UINT32 ExtAsymSel[ExtAsymSelCount];
// UINT32 ExtHashSel[ExtHashSelCount];
} SPDM_ALGORITHMS_RESPONSE;
///
@ -188,7 +187,7 @@ typedef struct {
///
typedef struct {
SPDM_MESSAGE_HEADER Header;
//UINT8 Digest[DigestSize];
// UINT8 Digest[DigestSize];
} SPDM_DIGESTS_RESPONSE;
///
@ -207,7 +206,7 @@ typedef struct {
SPDM_MESSAGE_HEADER Header;
UINT16 PortionLength;
UINT16 RemainderLength;
//UINT8 CertChain[CertChainSize];
// UINT8 CertChain[CertChainSize];
} SPDM_CERTIFICATE_RESPONSE;
///
@ -223,12 +222,12 @@ typedef struct {
///
typedef struct {
SPDM_MESSAGE_HEADER Header;
//UINT8 CertChainHash[DigestSize];
//UINT8 Nonce[32];
//UINT8 MeasurementSummaryHash[DigestSize];
//UINT16 OpaqueLength;
//UINT8 OpaqueData[OpaqueLength];
//UINT8 Signature[KeySize];
// UINT8 CertChainHash[DigestSize];
// UINT8 Nonce[32];
// UINT8 MeasurementSummaryHash[DigestSize];
// UINT16 OpaqueLength;
// UINT8 OpaqueData[OpaqueLength];
// UINT8 Signature[KeySize];
} SPDM_CHALLENGE_AUTH_RESPONSE;
///
@ -246,7 +245,7 @@ typedef struct {
UINT8 Index;
UINT8 MeasurementSpecification;
UINT16 MeasurementSize;
//UINT8 Measurement[MeasurementSize];
// UINT8 Measurement[MeasurementSize];
} SPDM_MEASUREMENT_BLOCK_COMMON_HEADER;
#define SPDM_MEASUREMENT_BLOCK_HEADER_SPECIFICATION_DMTF BIT0
@ -257,7 +256,7 @@ typedef struct {
typedef struct {
UINT8 DMTFSpecMeasurementValueType;
UINT16 DMTFSpecMeasurementValueSize;
//UINT8 DMTFSpecMeasurementValue[DMTFSpecMeasurementValueSize];
// UINT8 DMTFSpecMeasurementValue[DMTFSpecMeasurementValueSize];
} SPDM_MEASUREMENT_BLOCK_DMTF_HEADER;
///
@ -276,11 +275,11 @@ typedef struct {
SPDM_MESSAGE_HEADER Header;
UINT8 NumberOfBlocks;
UINT8 MeasurementRecordLength[3];
//UINT8 MeasurementRecord[MeasurementRecordLength];
//UINT8 Nonce[32];
//UINT16 OpaqueLength;
//UINT8 OpaqueData[OpaqueLength];
//UINT8 Signature[KeySize];
// UINT8 MeasurementRecord[MeasurementRecordLength];
// UINT8 Nonce[32];
// UINT16 OpaqueLength;
// UINT8 OpaqueData[OpaqueLength];
// UINT8 Signature[KeySize];
} SPDM_MEASUREMENTS_RESPONSE;
///
@ -290,7 +289,7 @@ typedef struct {
SPDM_MESSAGE_HEADER Header;
// Param1 == Error Code
// Param2 == Error Data
//UINT8 ExtendedErrorData[];
// UINT8 ExtendedErrorData[];
} SPDM_ERROR_RESPONSE;
///
@ -317,4 +316,3 @@ typedef struct {
#pragma pack()
#endif

12
MdePkg/Include/IndustryStandard/TcgStorageCore.h
View File

@ -21,7 +21,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
/// UID in host native byte order
typedef UINT64 TCG_UID;
#define TCG_TO_UID(b0, b1, b2, b3, b4, b5, b6, b7) (TCG_UID)( \
#define TCG_TO_UID(b0, b1, b2, b3, b4, b5, b6, b7) (TCG_UID)(\
(UINT64)(b0) | \
((UINT64)(b1) << 8) | \
((UINT64)(b2) << 16) | \
@ -52,7 +52,7 @@ typedef struct {
UINT8 Payload[0];
} TCG_PACKET;
#define TCG_SUBPACKET_ALIGNMENT 4 // 4-byte alignment per spec
#define TCG_SUBPACKET_ALIGNMENT 4// 4-byte alignment per spec
typedef struct {
UINT8 ReservedBE[6];
@ -77,7 +77,6 @@ typedef union {
TCG_TINY_ATOM_BITS TinyAtomBits;
} TCG_SIMPLE_TOKEN_TINY_ATOM;
typedef struct {
UINT8 Length : 4;
UINT8 SignOrCont : 1;
@ -91,7 +90,6 @@ typedef union {
TCG_SHORT_ATOM_BITS ShortAtomBits;
} TCG_SIMPLE_TOKEN_SHORT_ATOM;
#define TCG_MEDIUM_ATOM_LENGTH_HIGH_SHIFT 0x8
#define TCG_MEDIUM_ATOM_LENGTH_HIGH_MASK 0x7
@ -110,7 +108,6 @@ typedef union {
TCG_MEDIUM_ATOM_BITS MediumAtomBits;
} TCG_SIMPLE_TOKEN_MEDIUM_ATOM;
#define TCG_LONG_ATOM_LENGTH_HIGH_SHIFT 16
#define TCG_LONG_ATOM_LENGTH_MID_SHIFT 8
@ -132,7 +129,6 @@ typedef union {
TCG_LONG_ATOM_BITS LongAtomBits;
} TCG_SIMPLE_TOKEN_LONG_ATOM;
// TCG Core Spec v2 - Table 04 - Token Types
typedef enum {
TcgTokenTypeReserved,
@ -215,7 +211,6 @@ typedef enum {
#define TCG_METHOD_STATUS_CODE_AUTHORITY_LOCKED_OUT 0x12
#define TCG_METHOD_STATUS_CODE_FAIL 0x3F
// Feature Codes
#define TCG_FEATURE_INVALID (UINT16)0x0000
#define TCG_FEATURE_TPER (UINT16)0x0001
@ -274,7 +269,6 @@ typedef struct {
UINT8 List[504]; // 8...
} TCG_SUPPORTED_SECURITY_PROTOCOLS;
// Level 0 Discovery
typedef struct {
UINT32 LengthBE; // number of valid bytes in discovery response, not including length field
@ -291,7 +285,6 @@ typedef struct _TCG_LEVEL0_FEATURE_DESCRIPTOR_HEADER {
UINT8 Length; // length of feature dependent data in bytes
} TCG_LEVEL0_FEATURE_DESCRIPTOR_HEADER;
typedef struct {
TCG_LEVEL0_FEATURE_DESCRIPTOR_HEADER Header;
UINT8 LockingSupported : 1;
@ -314,7 +307,6 @@ typedef struct {
UINT8 Reserved615[10];
} TCG_BLOCK_SID_FEATURE_DESCRIPTOR;
typedef struct {
TCG_LEVEL0_FEATURE_DESCRIPTOR_HEADER Header;
UINT8 SyncSupported : 1;

2
MdePkg/Include/IndustryStandard/TcgStorageOpal.h
View File

@ -64,7 +64,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define OPAL_LOCKING_SP_LOCKING_GLOBALRANGE TCG_TO_UID( 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x01 )
#define OPAL_LOCKING_SP_LOCKING_RANGE1 TCG_TO_UID( 0x00, 0x00, 0x08, 0x02, 0x00, 0x03, 0x00, 0x01 )
// LOCKING SP ACE Table Preconfiguration
#define OPAL_LOCKING_SP_ACE_LOCKING_GLOBALRANGE_GET_ALL TCG_TO_UID( 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0xD0, 0x00 )
#define OPAL_LOCKING_SP_ACE_LOCKING_GLOBALRANGE_SET_RDLOCKED TCG_TO_UID( 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0xE0, 0x00 )
@ -73,7 +72,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define OPAL_LOCKING_SP_ACE_K_AES_256_GLOBALRANGE_GENKEY TCG_TO_UID( 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0xB8, 0x00 )
#define OPAL_LOCKING_SP_ACE_K_AES_128_GLOBALRANGE_GENKEY TCG_TO_UID( 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0xB0, 0x00 )
// LOCKING SP LockingInfo Table Preconfiguration
#define OPAL_LOCKING_SP_LOCKING_INFO TCG_TO_UID( 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x01 )

1
MdePkg/Include/IndustryStandard/Tls1.h
View File

@ -98,4 +98,3 @@ typedef struct {
#pragma pack()
#endif

50
MdePkg/Include/IndustryStandard/Tpm12.h
View File

@ -6,7 +6,6 @@
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TPM12_H_
#define _TPM12_H_
@ -431,14 +430,13 @@ typedef struct tdTPM_VERSION {
UINT8 revMinor;
} TPM_VERSION;
#define TPM_SHA1_160_HASH_LEN 0x14
#define TPM_SHA1BASED_NONCE_LEN TPM_SHA1_160_HASH_LEN
///
/// Part 2, section 5.4: TPM_DIGEST
///
typedef struct tdTPM_DIGEST{
typedef struct tdTPM_DIGEST {
UINT8 digest[TPM_SHA1_160_HASH_LEN];
} TPM_DIGEST;
@ -468,7 +466,7 @@ typedef TPM_DIGEST TPM_AUDITDIGEST;
///
/// Part 2, section 5.5: TPM_NONCE
///
typedef struct tdTPM_NONCE{
typedef struct tdTPM_NONCE {
UINT8 nonce[20];
} TPM_NONCE;
@ -621,7 +619,7 @@ typedef struct tdTPM_STORE_PUBKEY {
///
/// Part 2, section 10.5: TPM_PUBKEY
///
typedef struct tdTPM_PUBKEY{
typedef struct tdTPM_PUBKEY {
TPM_KEY_PARMS algorithmParms;
TPM_STORE_PUBKEY pubKey;
} TPM_PUBKEY;
@ -629,7 +627,7 @@ typedef struct tdTPM_PUBKEY{
///
/// Part 2, section 5.12: TPM_MIGRATIONKEYAUTH
///
typedef struct tdTPM_MIGRATIONKEYAUTH{
typedef struct tdTPM_MIGRATIONKEYAUTH {
TPM_PUBKEY migrationKey;
TPM_MIGRATE_SCHEME migrationScheme;
TPM_DIGEST digest;
@ -638,7 +636,7 @@ typedef struct tdTPM_MIGRATIONKEYAUTH{
///
/// Part 2, section 5.13: TPM_COUNTER_VALUE
///
typedef struct tdTPM_COUNTER_VALUE{
typedef struct tdTPM_COUNTER_VALUE {
TPM_STRUCTURE_TAG tag;
UINT8 label[4];
TPM_ACTUAL_COUNT counter;
@ -668,7 +666,7 @@ typedef struct tdTPM_MSA_COMPOSITE {
///
/// Part 2, section 5.16: TPM_CMK_AUTH
///
typedef struct tdTPM_CMK_AUTH{
typedef struct tdTPM_CMK_AUTH {
TPM_DIGEST migrationAuthorityDigest;
TPM_DIGEST destinationKeyDigest;
TPM_DIGEST sourceKeyDigest;
@ -695,7 +693,7 @@ typedef struct tdTPM_SELECT_SIZE {
///
/// Part 2, section 5,19: TPM_CMK_MIGAUTH
///
typedef struct tdTPM_CMK_MIGAUTH{
typedef struct tdTPM_CMK_MIGAUTH {
TPM_STRUCTURE_TAG tag;
TPM_DIGEST msaDigest;
TPM_DIGEST pubKeyDigest;
@ -704,7 +702,7 @@ typedef struct tdTPM_CMK_MIGAUTH{
///
/// Part 2, section 5.20: TPM_CMK_SIGTICKET
///
typedef struct tdTPM_CMK_SIGTICKET{
typedef struct tdTPM_CMK_SIGTICKET {
TPM_STRUCTURE_TAG tag;
TPM_DIGEST verKeyDigest;
TPM_DIGEST signedData;
@ -713,7 +711,7 @@ typedef struct tdTPM_CMK_SIGTICKET{
///
/// Part 2, section 5.21: TPM_CMK_MA_APPROVAL
///
typedef struct tdTPM_CMK_MA_APPROVAL{
typedef struct tdTPM_CMK_MA_APPROVAL {
TPM_STRUCTURE_TAG tag;
TPM_DIGEST migrationAuthorityDigest;
} TPM_CMK_MA_APPROVAL;
@ -731,7 +729,7 @@ typedef struct tdTPM_CMK_MA_APPROVAL{
///
/// Part 2, section 7.1: TPM_PERMANENT_FLAGS
///
typedef struct tdTPM_PERMANENT_FLAGS{
typedef struct tdTPM_PERMANENT_FLAGS {
TPM_STRUCTURE_TAG tag;
BOOLEAN disable;
BOOLEAN ownership;
@ -782,7 +780,7 @@ typedef struct tdTPM_PERMANENT_FLAGS{
///
/// Part 2, section 7.2: TPM_STCLEAR_FLAGS
///
typedef struct tdTPM_STCLEAR_FLAGS{
typedef struct tdTPM_STCLEAR_FLAGS {
TPM_STRUCTURE_TAG tag;
BOOLEAN deactivated;
BOOLEAN disableForceClear;
@ -803,7 +801,7 @@ typedef struct tdTPM_STCLEAR_FLAGS{
///
/// Part 2, section 7.3: TPM_STANY_FLAGS
///
typedef struct tdTPM_STANY_FLAGS{
typedef struct tdTPM_STANY_FLAGS {
TPM_STRUCTURE_TAG tag;
BOOLEAN postInitialise;
TPM_MODIFIER_INDICATOR localityModifier;
@ -863,7 +861,7 @@ typedef struct tdTPM_STANY_FLAGS{
/// Part 2, section 7.5: TPM_STCLEAR_DATA
/// available inside TPM only
///
typedef struct tdTPM_STCLEAR_DATA{
typedef struct tdTPM_STCLEAR_DATA {
TPM_STRUCTURE_TAG tag;
TPM_NONCE contextNonceKey;
TPM_COUNT_ID countID;
@ -871,7 +869,7 @@ typedef struct tdTPM_STANY_FLAGS{
BOOLEAN disableResetLock;
TPM_PCRVALUE PCR[TPM_NUM_PCR];
UINT32 deferredPhysicalPresence;
}TPM_STCLEAR_DATA;
} TPM_STCLEAR_DATA;
//
// Part 2, section 7.5.1: STCLEAR_DATA Subcap for SetCapability
@ -952,7 +950,7 @@ typedef struct tdTPM_PCR_INFO_LONG {
///
/// Part 2, section 8.5: TPM_PCR_INFO_SHORT
///
typedef struct tdTPM_PCR_INFO_SHORT{
typedef struct tdTPM_PCR_INFO_SHORT {
TPM_PCR_SELECTION pcrSelection;
TPM_LOCALITY_SELECTION localityAtRelease;
TPM_COMPOSITE_HASH digestAtRelease;
@ -961,7 +959,7 @@ typedef struct tdTPM_PCR_INFO_SHORT{
///
/// Part 2, section 8.8: TPM_PCR_ATTRIBUTES
///
typedef struct tdTPM_PCR_ATTRIBUTES{
typedef struct tdTPM_PCR_ATTRIBUTES {
BOOLEAN pcrReset;
TPM_LOCALITY_SELECTION pcrExtendLocal;
TPM_LOCALITY_SELECTION pcrResetLocal;
@ -1043,7 +1041,7 @@ typedef struct tdTPM_BOUND_DATA {
/// Part 2, section 10.2: TPM_KEY
/// [size_is(encDataSize)] BYTE* encData;
///
typedef struct tdTPM_KEY{
typedef struct tdTPM_KEY {
TPM_STRUCT_VER ver;
TPM_KEY_USAGE keyUsage;
TPM_KEY_FLAGS keyFlags;
@ -1060,7 +1058,7 @@ typedef struct tdTPM_KEY{
/// Part 2, section 10.3: TPM_KEY12
/// [size_is(encDataSize)] BYTE* encData;
///
typedef struct tdTPM_KEY12{
typedef struct tdTPM_KEY12 {
TPM_STRUCTURE_TAG tag;
UINT16 fill;
TPM_KEY_USAGE keyUsage;
@ -1086,7 +1084,8 @@ typedef struct tdTPM_STORE_PRIVKEY {
///
/// Part 2, section 10.6: TPM_STORE_ASYMKEY
///
typedef struct tdTPM_STORE_ASYMKEY { // pos len total
typedef struct tdTPM_STORE_ASYMKEY {
// pos len total
TPM_PAYLOAD_TYPE payload; // 0 1 1
TPM_SECRET usageAuth; // 1 20 21
TPM_SECRET migrationAuth; // 21 20 41
@ -1098,7 +1097,8 @@ typedef struct tdTPM_STORE_ASYMKEY { // pos len total
/// Part 2, section 10.8: TPM_MIGRATE_ASYMKEY
/// [size_is(partPrivKeyLen)] BYTE* partPrivKey;
///
typedef struct tdTPM_MIGRATE_ASYMKEY { // pos len total
typedef struct tdTPM_MIGRATE_ASYMKEY {
// pos len total
TPM_PAYLOAD_TYPE payload; // 0 1 1
TPM_SECRET usageAuth; // 1 20 21
TPM_DIGEST pubDataDigest; // 21 20 41
@ -1203,7 +1203,6 @@ typedef struct tdTPM_EK_BLOB_AUTH {
TPM_SECRET authValue;
} TPM_EK_BLOB_AUTH;
///
/// Part 2, section 12.5 TPM_IDENTITY_CONTENTS
///
@ -1824,7 +1823,7 @@ typedef struct tdTPM_FAMILY_TABLE_ENTRY {
//
#define TPM_NUM_FAMILY_TABLE_ENTRY_MIN 8
typedef struct tdTPM_FAMILY_TABLE{
typedef struct tdTPM_FAMILY_TABLE {
TPM_FAMILY_TABLE_ENTRY famTableRow[TPM_NUM_FAMILY_TABLE_ENTRY_MIN];
} TPM_FAMILY_TABLE;
@ -1861,7 +1860,7 @@ typedef struct tdTPM_DELEGATE_TABLE_ROW {
//
#define TPM_NUM_DELEGATE_TABLE_ENTRY_MIN 2
typedef struct tdTPM_DELEGATE_TABLE{
typedef struct tdTPM_DELEGATE_TABLE {
TPM_DELEGATE_TABLE_ROW delRow[TPM_NUM_DELEGATE_TABLE_ENTRY_MIN];
} TPM_DELEGATE_TABLE;
@ -2130,7 +2129,6 @@ typedef struct tdTPM_DAA_SENSITIVE {
UINT8 *internalData;
} TPM_DAA_SENSITIVE;
//
// Part 2, section 23: Redirection
//

48
MdePkg/Include/IndustryStandard/Tpm20.h
View File

@ -10,7 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TPM20_H_
#define _TPM20_H_
@ -146,8 +145,8 @@ typedef UINT8 BYTE;
//
// NOTE: Comment because it has same name as TPM1.2 (value is same, so not runtime issue)
//
//typedef UINT32 TPM_ALGORITHM_ID;
//typedef UINT32 TPM_MODIFIER_INDICATOR;
// typedef UINT32 TPM_ALGORITHM_ID;
// typedef UINT32 TPM_MODIFIER_INDICATOR;
typedef UINT32 TPM_AUTHORIZATION_SIZE;
typedef UINT32 TPM_PARAMETER_SIZE;
typedef UINT16 TPM_KEY_SIZE;
@ -166,14 +165,14 @@ typedef UINT16 TPM_ALG_ID;
//
#define TPM_ALG_ERROR (TPM_ALG_ID)(0x0000)
#define TPM_ALG_FIRST (TPM_ALG_ID)(0x0001)
//#define TPM_ALG_RSA (TPM_ALG_ID)(0x0001)
//#define TPM_ALG_SHA (TPM_ALG_ID)(0x0004)
// #define TPM_ALG_RSA (TPM_ALG_ID)(0x0001)
// #define TPM_ALG_SHA (TPM_ALG_ID)(0x0004)
#define TPM_ALG_SHA1 (TPM_ALG_ID)(0x0004)
//#define TPM_ALG_HMAC (TPM_ALG_ID)(0x0005)
// #define TPM_ALG_HMAC (TPM_ALG_ID)(0x0005)
#define TPM_ALG_AES (TPM_ALG_ID)(0x0006)
//#define TPM_ALG_MGF1 (TPM_ALG_ID)(0x0007)
// #define TPM_ALG_MGF1 (TPM_ALG_ID)(0x0007)
#define TPM_ALG_KEYEDHASH (TPM_ALG_ID)(0x0008)
//#define TPM_ALG_XOR (TPM_ALG_ID)(0x000A)
// #define TPM_ALG_XOR (TPM_ALG_ID)(0x000A)
#define TPM_ALG_SHA256 (TPM_ALG_ID)(0x000B)
#define TPM_ALG_SHA384 (TPM_ALG_ID)(0x000C)
#define TPM_ALG_SHA512 (TPM_ALG_ID)(0x000D)
@ -639,7 +638,7 @@ typedef UINT32 TPM_PS;
//
// NOTE: Comment because it has same name as TPM1.2 (value is same, so not runtime issue)
//
//typedef UINT32 TPM_HANDLE;
// typedef UINT32 TPM_HANDLE;
// Table 26 - TPM_HT Constants
typedef UINT8 TPM_HT;
@ -919,13 +918,13 @@ typedef struct {
// Table 68 - TPM2B_DIGEST Structure
typedef struct {
UINT16 size;
BYTE buffer[sizeof(TPMU_HA)];
BYTE buffer[sizeof (TPMU_HA)];
} TPM2B_DIGEST;
// Table 69 - TPM2B_DATA Structure
typedef struct {
UINT16 size;
BYTE buffer[sizeof(TPMT_HA)];
BYTE buffer[sizeof (TPMT_HA)];
} TPM2B_DATA;
// Table 70 - TPM2B_NONCE Types
@ -958,7 +957,7 @@ typedef struct {
// Table 76 - TPM2B_TIMEOUT Structure
typedef struct {
UINT16 size;
BYTE buffer[sizeof(UINT64)];
BYTE buffer[sizeof (UINT64)];
} TPM2B_TIMEOUT;
// Table 77 -- TPM2B_IV Structure <I/O>
@ -976,7 +975,7 @@ typedef union {
// Table 79 - TPM2B_NAME Structure
typedef struct {
UINT16 size;
BYTE name[sizeof(TPMU_NAME)];
BYTE name[sizeof (TPMU_NAME)];
} TPM2B_NAME;
// Table 80 - TPMS_PCR_SELECT Structure
@ -1078,7 +1077,7 @@ typedef struct {
// Table 97 - TPM2B_DIGEST_VALUES Structure
typedef struct {
UINT16 size;
BYTE buffer[sizeof(TPML_DIGEST_VALUES)];
BYTE buffer[sizeof (TPML_DIGEST_VALUES)];
} TPM2B_DIGEST_VALUES;
// Table 98 - TPML_PCR_SELECTION Structure
@ -1217,7 +1216,7 @@ typedef struct {
// Table 117 - TPM2B_ATTEST Structure
typedef struct {
UINT16 size;
BYTE attestationData[sizeof(TPMS_ATTEST)];
BYTE attestationData[sizeof (TPMS_ATTEST)];
} TPM2B_ATTEST;
// Table 118 - TPMS_AUTH_COMMAND Structure
@ -1543,16 +1542,16 @@ typedef struct {
// Table 173 - TPMU_ENCRYPTED_SECRET Union
typedef union {
BYTE ecc[sizeof(TPMS_ECC_POINT)];
BYTE ecc[sizeof (TPMS_ECC_POINT)];
BYTE rsa[MAX_RSA_KEY_BYTES];
BYTE symmetric[sizeof(TPM2B_DIGEST)];
BYTE keyedHash[sizeof(TPM2B_DIGEST)];
BYTE symmetric[sizeof (TPM2B_DIGEST)];
BYTE keyedHash[sizeof (TPM2B_DIGEST)];
} TPMU_ENCRYPTED_SECRET;
// Table 174 - TPM2B_ENCRYPTED_SECRET Structure
typedef struct {
UINT16 size;
BYTE secret[sizeof(TPMU_ENCRYPTED_SECRET)];
BYTE secret[sizeof (TPMU_ENCRYPTED_SECRET)];
} TPM2B_ENCRYPTED_SECRET;
// 12 Key/Object Complex
@ -1665,7 +1664,7 @@ typedef struct {
// Table 190 - TPM2B_PRIVATE Structure
typedef struct {
UINT16 size;
BYTE buffer[sizeof(_PRIVATE)];
BYTE buffer[sizeof (_PRIVATE)];
} TPM2B_PRIVATE;
// Table 191 - _ID_OBJECT Structure
@ -1677,7 +1676,7 @@ typedef struct {
// Table 192 - TPM2B_ID_OBJECT Structure
typedef struct {
UINT16 size;
BYTE credential[sizeof(_ID_OBJECT)];
BYTE credential[sizeof (_ID_OBJECT)];
} TPM2B_ID_OBJECT;
// 13 NV Storage Structures
@ -1686,11 +1685,11 @@ typedef struct {
//
// NOTE: Comment here to resolve conflict
//
//typedef struct {
// typedef struct {
// UINT32 index : 22;
// UINT32 space : 2;
// UINT32 RH_NV : 8;
//} TPM_NV_INDEX;
// } TPM_NV_INDEX;
// Table 195 - TPMA_NV Bits
typedef struct {
@ -1754,7 +1753,7 @@ typedef struct {
// Table 200 - TPM2B_CONTEXT_DATA Structure
typedef struct {
UINT16 size;
BYTE buffer[sizeof(TPMS_CONTEXT_DATA)];
BYTE buffer[sizeof (TPMS_CONTEXT_DATA)];
} TPM2B_CONTEXT_DATA;
// Table 201 - TPMS_CONTEXT Structure
@ -1784,7 +1783,6 @@ typedef struct {
TPMS_CREATION_DATA creationData;
} TPM2B_CREATION_DATA;
//
// Command Header
//

6
MdePkg/Include/IndustryStandard/Tpm2Acpi.h
View File

@ -26,9 +26,9 @@ typedef struct {
UINT32 Flags;
UINT64 AddressOfControlArea;
UINT32 StartMethod;
//UINT8 PlatformSpecificParameters[]; // size up to 12
//UINT32 Laml; // Optional
//UINT64 Lasa; // Optional
// UINT8 PlatformSpecificParameters[]; // size up to 12
// UINT32 Laml; // Optional
// UINT64 Lasa; // Optional
} EFI_TPM2_ACPI_TABLE;
#define EFI_TPM2_ACPI_TABLE_START_METHOD_ACPI 2

80
MdePkg/Include/IndustryStandard/TpmPtp.h
View File

@ -44,7 +44,7 @@ typedef struct {
///
/// Shows which interrupts are supported by that particular TPM.
///
UINT32 InterfaceCapability;// 14h
UINT32 InterfaceCapability; // 14h
///
/// Status Register. Provides status of the TPM.
///
@ -103,18 +103,18 @@ typedef PTP_FIFO_REGISTERS *PTP_FIFO_REGISTERS_PTR;
//
typedef union {
struct {
UINT32 InterfaceType:4;
UINT32 InterfaceVersion:4;
UINT32 CapLocality:1;
UINT32 Reserved1:2;
UINT32 CapDataXferSizeSupport:2;
UINT32 CapFIFO:1;
UINT32 CapCRB:1;
UINT32 CapIFRes:2;
UINT32 InterfaceSelector:2;
UINT32 IntfSelLock:1;
UINT32 Reserved2:4;
UINT32 Reserved3:8;
UINT32 InterfaceType : 4;
UINT32 InterfaceVersion : 4;
UINT32 CapLocality : 1;
UINT32 Reserved1 : 2;
UINT32 CapDataXferSizeSupport : 2;
UINT32 CapFIFO : 1;
UINT32 CapCRB : 1;
UINT32 CapIFRes : 2;
UINT32 InterfaceSelector : 2;
UINT32 IntfSelLock : 1;
UINT32 Reserved2 : 4;
UINT32 Reserved3 : 8;
} Bits;
UINT32 Uint32;
} PTP_FIFO_INTERFACE_IDENTIFIER;
@ -124,19 +124,19 @@ typedef union {
//
typedef union {
struct {
UINT32 DataAvailIntSupport:1;
UINT32 StsValidIntSupport:1;
UINT32 LocalityChangeIntSupport:1;
UINT32 InterruptLevelHigh:1;
UINT32 InterruptLevelLow:1;
UINT32 InterruptEdgeRising:1;
UINT32 InterruptEdgeFalling:1;
UINT32 CommandReadyIntSupport:1;
UINT32 BurstCountStatic:1;
UINT32 DataTransferSizeSupport:2;
UINT32 Reserved:17;
UINT32 InterfaceVersion:3;
UINT32 Reserved2:1;
UINT32 DataAvailIntSupport : 1;
UINT32 StsValidIntSupport : 1;
UINT32 LocalityChangeIntSupport : 1;
UINT32 InterruptLevelHigh : 1;
UINT32 InterruptLevelLow : 1;
UINT32 InterruptEdgeRising : 1;
UINT32 InterruptEdgeFalling : 1;
UINT32 CommandReadyIntSupport : 1;
UINT32 BurstCountStatic : 1;
UINT32 DataTransferSizeSupport : 2;
UINT32 Reserved : 17;
UINT32 InterfaceVersion : 3;
UINT32 Reserved2 : 1;
} Bits;
UINT32 Uint32;
} PTP_FIFO_INTERFACE_CAPABILITY;
@ -148,7 +148,6 @@ typedef union {
#define INTERFACE_CAPABILITY_INTERFACE_VERSION_TIS_13 0x2
#define INTERFACE_CAPABILITY_INTERFACE_VERSION_PTP 0x3
//
// Define bits of ACCESS and STATUS registers
//
@ -230,7 +229,6 @@ typedef union {
///
#define PTP_FIFO_STS_EX_CANCEL BIT0
//
// PTP CRB definition
//
@ -329,19 +327,19 @@ typedef PTP_CRB_REGISTERS *PTP_CRB_REGISTERS_PTR;
//
typedef union {
struct {
UINT32 InterfaceType:4;
UINT32 InterfaceVersion:4;
UINT32 CapLocality:1;
UINT32 CapCRBIdleBypass:1;
UINT32 Reserved1:1;
UINT32 CapDataXferSizeSupport:2;
UINT32 CapFIFO:1;
UINT32 CapCRB:1;
UINT32 CapIFRes:2;
UINT32 InterfaceSelector:2;
UINT32 IntfSelLock:1;
UINT32 Reserved2:4;
UINT32 Rid:8;
UINT32 InterfaceType : 4;
UINT32 InterfaceVersion : 4;
UINT32 CapLocality : 1;
UINT32 CapCRBIdleBypass : 1;
UINT32 Reserved1 : 1;
UINT32 CapDataXferSizeSupport : 2;
UINT32 CapFIFO : 1;
UINT32 CapCRB : 1;
UINT32 CapIFRes : 2;
UINT32 InterfaceSelector : 2;
UINT32 IntfSelLock : 1;
UINT32 Reserved2 : 4;
UINT32 Rid : 8;
} Bits;
UINT32 Uint32;
} PTP_CRB_INTERFACE_IDENTIFIER;

2
MdePkg/Include/IndustryStandard/TpmTis.h
View File

@ -87,7 +87,7 @@ typedef struct {
///
/// Vendor-defined configuration registers.
///
UINT8 VendorDefined[0x70];// 0f90h
UINT8 VendorDefined[0x70]; // 0f90h
} TIS_PC_REGISTERS;
//

65
MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
View File

@ -65,7 +65,6 @@
#define EFI_EXIT_BOOT_SERVICES_SUCCEEDED \
"Exit Boot Services Returned with Success"
#define EV_POSTCODE_INFO_POST_CODE "POST CODE"
#define POST_CODE_STR_LEN (sizeof(EV_POSTCODE_INFO_POST_CODE) - 1)
@ -151,9 +150,9 @@ typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB {
///
typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB2 {
UINT8 BlobDescriptionSize;
//UINT8 BlobDescription[BlobDescriptionSize];
//EFI_PHYSICAL_ADDRESS BlobBase;
//UINT64 BlobLength;
// UINT8 BlobDescription[BlobDescriptionSize];
// EFI_PHYSICAL_ADDRESS BlobBase;
// UINT64 BlobLength;
} UEFI_PLATFORM_FIRMWARE_BLOB2;
///
@ -214,9 +213,9 @@ typedef struct tdUEFI_HANDOFF_TABLE_POINTERS {
///
typedef struct tdUEFI_HANDOFF_TABLE_POINTERS2 {
UINT8 TableDescriptionSize;
//UINT8 TableDescription[TableDescriptionSize];
//UINT64 NumberOfTables;
//EFI_CONFIGURATION_TABLE TableEntry[1];
// UINT8 TableDescription[TableDescriptionSize];
// UINT64 NumberOfTables;
// EFI_CONFIGURATION_TABLE TableEntry[1];
} UEFI_HANDOFF_TABLE_POINTERS2;
///
@ -292,7 +291,7 @@ typedef struct {
UINT16 Length;
UINT32 SpdmHashAlgo;
UINT32 DeviceType;
//SPDM_MEASUREMENT_BLOCK SpdmMeasurementBlock;
// SPDM_MEASUREMENT_BLOCK SpdmMeasurementBlock;
} TCG_DEVICE_SECURITY_EVENT_DATA_HEADER;
#define TCG_DEVICE_SECURITY_EVENT_DATA_PCI_CONTEXT_VERSION 0
@ -323,9 +322,9 @@ typedef struct {
typedef struct {
UINT16 Version;
UINT16 Length;
//UINT8 DeviceDescriptor[DescLen];
//UINT8 BodDescriptor[DescLen];
//UINT8 ConfigurationDescriptor[DescLen][NumOfConfiguration];
// UINT8 DeviceDescriptor[DescLen];
// UINT8 BodDescriptor[DescLen];
// UINT8 ConfigurationDescriptor[DescLen][NumOfConfiguration];
} TCG_DEVICE_SECURITY_EVENT_DATA_USB_CONTEXT;
//
@ -343,7 +342,7 @@ typedef struct tdTCG_PCR_EVENT2 {
// TCG PCR Event2 Header
// Follow TCG EFI Protocol Spec 5.2 Crypto Agile Log Entry Format
//
typedef struct tdTCG_PCR_EVENT2_HDR{
typedef struct tdTCG_PCR_EVENT2_HDR {
TCG_PCRINDEX PCRIndex;
TCG_EVENTTYPE EventType;
TPML_DIGEST_VALUES Digests;
@ -411,30 +410,30 @@ typedef struct {
// The number of hashing algorithms used in this event log (except the first event).
// All events in this event log use all hashing algorithms defined here.
//
//UINT32 numberOfAlgorithms;
// UINT32 numberOfAlgorithms;
//
// This field is added in "Spec ID Event03".
// An array of size numberOfAlgorithms of value pairs.
//
//TCG_EfiSpecIdEventAlgorithmSize digestSize[numberOfAlgorithms];
// TCG_EfiSpecIdEventAlgorithmSize digestSize[numberOfAlgorithms];
//
// Size in bytes of the VendorInfo field.
// Maximum value SHALL be FFh bytes.
//
//UINT8 vendorInfoSize;
// UINT8 vendorInfoSize;
//
// Provided for use by the BIOS implementer.
// The value might be used, for example, to provide more detailed information about the specific BIOS such as BIOS revision numbers, etc.
// The values within this field are not standardized and are implementer-specific.
// Platform-specific or -unique information SHALL NOT be provided in this field.
//
//UINT8 vendorInfo[vendorInfoSize];
// UINT8 vendorInfo[vendorInfoSize];
} TCG_EfiSpecIDEventStruct;
typedef struct tdTCG_PCClientTaggedEvent {
UINT32 taggedEventID;
UINT32 taggedEventDataSize;
//UINT8 taggedEventData[taggedEventDataSize];
// UINT8 taggedEventData[taggedEventDataSize];
} TCG_PCClientTaggedEvent;
#define TCG_Sp800_155_PlatformId_Event_SIGNATURE "SP800-155 Event"
@ -454,24 +453,23 @@ typedef struct tdTCG_Sp800_155_PlatformId_Event2 {
//
// Below structure is newly added in TCG_Sp800_155_PlatformId_Event2.
//
//UINT8 PlatformManufacturerStrSize;
//UINT8 PlatformManufacturerStr[PlatformManufacturerStrSize];
//UINT8 PlatformModelSize;
//UINT8 PlatformModel[PlatformModelSize];
//UINT8 PlatformVersionSize;
//UINT8 PlatformVersion[PlatformVersionSize];
//UINT8 PlatformModelSize;
//UINT8 PlatformModel[PlatformModelSize];
//UINT8 FirmwareManufacturerStrSize;
//UINT8 FirmwareManufacturerStr[FirmwareManufacturerStrSize];
//UINT32 FirmwareManufacturerId;
//UINT8 FirmwareVersion;
//UINT8 FirmwareVersion[FirmwareVersionSize]];
// UINT8 PlatformManufacturerStrSize;
// UINT8 PlatformManufacturerStr[PlatformManufacturerStrSize];
// UINT8 PlatformModelSize;
// UINT8 PlatformModel[PlatformModelSize];
// UINT8 PlatformVersionSize;
// UINT8 PlatformVersion[PlatformVersionSize];
// UINT8 PlatformModelSize;
// UINT8 PlatformModel[PlatformModelSize];
// UINT8 FirmwareManufacturerStrSize;
// UINT8 FirmwareManufacturerStr[FirmwareManufacturerStrSize];
// UINT32 FirmwareManufacturerId;
// UINT8 FirmwareVersion;
// UINT8 FirmwareVersion[FirmwareVersionSize]];
} TCG_Sp800_155_PlatformId_Event2;
#define TCG_EfiStartupLocalityEvent_SIGNATURE "StartupLocality"
//
// The Locality Indicator which sent the TPM2_Startup command
//
@ -481,7 +479,7 @@ typedef struct tdTCG_Sp800_155_PlatformId_Event2 {
//
// Startup Locality Event
//
typedef struct tdTCG_EfiStartupLocalityEvent{
typedef struct tdTCG_EfiStartupLocalityEvent {
UINT8 Signature[16];
//
// The Locality Indicator which sent the TPM2_Startup command
@ -489,12 +487,9 @@ typedef struct tdTCG_EfiStartupLocalityEvent{
UINT8 StartupLocality;
} TCG_EfiStartupLocalityEvent;
//
// Restore original structure alignment
//
#pragma pack ()
#endif

5
MdePkg/Include/IndustryStandard/Usb.h
View File

@ -78,7 +78,6 @@
#define USB_DEV_SYNCH_FRAME 0x0C
#define USB_DEV_SYNCH_FRAME_REQ_TYPE 0x82
//
// USB standard descriptors and reqeust
//
@ -173,7 +172,6 @@ typedef struct {
#pragma pack()
typedef enum {
//
// USB request type
@ -234,12 +232,11 @@ typedef enum {
USB_ENDPOINT_DIR_IN = 0x80,
//
//Use 200 ms to increase the error handling response time
// Use 200 ms to increase the error handling response time
//
EFI_USB_INTERRUPT_DELAY = 2000000
} USB_TYPES_DEFINITION;
//
// HID constants definition, see Device Class Definition
// for Human Interface Devices (HID) rev1.11

1
MdePkg/Include/IndustryStandard/WatchdogActionTable.h
View File

@ -6,7 +6,6 @@
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _WATCHDOG_ACTION_TABLE_H_
#define _WATCHDOG_ACTION_TABLE_H_

1
MdePkg/Include/IndustryStandard/WindowsSmmSecurityMitigationTable.h
View File

@ -7,7 +7,6 @@
**/
#ifndef _WINDOWS_SMM_SECURITY_MITIGATION_TABLE_H_
#define _WINDOWS_SMM_SECURITY_MITIGATION_TABLE_H_

3
MdePkg/Include/IndustryStandard/WindowsUxCapsule.h
View File

@ -7,7 +7,6 @@
**/
#ifndef _WINDOWS_UX_CAPSULE_GUID_H_
#define _WINDOWS_UX_CAPSULE_GUID_H_
@ -21,7 +20,7 @@ typedef struct {
UINT32 Mode;
UINT32 OffsetX;
UINT32 OffsetY;
//UINT8 Image[];
// UINT8 Image[];
} DISPLAY_DISPLAY_PAYLOAD;
typedef struct {

486
MdePkg/Include/Library/BaseLib.h
View File

File diff suppressed because it is too large Load Diff

1
MdePkg/Include/Library/CpuLib.h
View File

@ -41,5 +41,4 @@ CpuFlushTlb (
VOID
);
#endif

67
MdePkg/Include/Library/DebugLib.h
View File

@ -129,7 +129,6 @@ DebugPrint (
...
);
/**
Prints a debug message to the debug output device if the specified
error level is enabled.
@ -153,7 +152,6 @@ DebugVPrint (
IN VA_LIST VaListMarker
);
/**
Prints a debug message to the debug output device if the specified
error level is enabled.
@ -179,7 +177,6 @@ DebugBPrint (
IN BASE_LIST BaseListMarker
);
/**
Prints an assert message containing a filename, line number, and description.
This may be followed by a breakpoint or a dead loop.
@ -209,7 +206,6 @@ DebugAssert (
IN CONST CHAR8 *Description
);
/**
Fills a target buffer with PcdDebugClearMemoryValue, and returns the target buffer.
@ -232,7 +228,6 @@ DebugClearMemory (
IN UINTN Length
);
/**
Returns TRUE if ASSERT() macros are enabled.
@ -249,7 +244,6 @@ DebugAssertEnabled (
VOID
);
/**
Returns TRUE if DEBUG() macros are enabled.
@ -266,7 +260,6 @@ DebugPrintEnabled (
VOID
);
/**
Returns TRUE if DEBUG_CODE() macros are enabled.
@ -283,7 +276,6 @@ DebugCodeEnabled (
VOID
);
/**
Returns TRUE if DEBUG_CLEAR_MEMORY() macro is enabled.
@ -325,6 +317,7 @@ DebugPrintLevelEnabled (
**/
#if defined (EDKII_UNIT_TEST_FRAMEWORK_ENABLED)
/**
Unit test library replacement for DebugAssert() in DebugLib.
@ -344,17 +337,17 @@ UnitTestDebugAssert (
IN CONST CHAR8 *Description
);
#if defined(__clang__) && defined(__FILE_NAME__)
#if defined (__clang__) && defined (__FILE_NAME__)
#define _ASSERT(Expression) UnitTestDebugAssert (__FILE_NAME__, DEBUG_LINE_NUMBER, DEBUG_EXPRESSION_STRING (Expression))
#else
#else
#define _ASSERT(Expression) UnitTestDebugAssert (__FILE__, DEBUG_LINE_NUMBER, DEBUG_EXPRESSION_STRING (Expression))
#endif
#endif
#else
#if defined(__clang__) && defined(__FILE_NAME__)
#if defined (__clang__) && defined (__FILE_NAME__)
#define _ASSERT(Expression) DebugAssert (__FILE_NAME__, DEBUG_LINE_NUMBER, DEBUG_EXPRESSION_STRING (Expression))
#else
#else
#define _ASSERT(Expression) DebugAssert (__FILE__, DEBUG_LINE_NUMBER, DEBUG_EXPRESSION_STRING (Expression))
#endif
#endif
#endif
/**
@ -370,14 +363,14 @@ UnitTestDebugAssert (
**/
#if !defined(MDE_CPU_EBC) && (!defined (_MSC_VER) || _MSC_VER > 1400)
#define _DEBUG_PRINT(PrintLevel, ...) \
#if !defined (MDE_CPU_EBC) && (!defined (_MSC_VER) || _MSC_VER > 1400)
#define _DEBUG_PRINT(PrintLevel, ...) \
do { \
if (DebugPrintLevelEnabled (PrintLevel)) { \
DebugPrint (PrintLevel, ##__VA_ARGS__); \
} \
} while (FALSE)
#define _DEBUG(Expression) _DEBUG_PRINT Expression
#define _DEBUG(Expression) _DEBUG_PRINT Expression
#else
#define _DEBUG(Expression) DebugPrint Expression
#endif
@ -394,8 +387,8 @@ UnitTestDebugAssert (
@param Expression Boolean expression.
**/
#if !defined(MDEPKG_NDEBUG)
#define ASSERT(Expression) \
#if !defined (MDEPKG_NDEBUG)
#define ASSERT(Expression) \
do { \
if (DebugAssertEnabled ()) { \
if (!(Expression)) { \
@ -405,7 +398,7 @@ UnitTestDebugAssert (
} \
} while (FALSE)
#else
#define ASSERT(Expression)
#define ASSERT(Expression)
#endif
/**
@ -420,15 +413,15 @@ UnitTestDebugAssert (
**/
#if !defined(MDEPKG_NDEBUG)
#define DEBUG(Expression) \
#if !defined (MDEPKG_NDEBUG)
#define DEBUG(Expression) \
do { \
if (DebugPrintEnabled ()) { \
_DEBUG (Expression); \
} \
} while (FALSE)
#else
#define DEBUG(Expression)
#define DEBUG(Expression)
#endif
/**
@ -443,8 +436,8 @@ UnitTestDebugAssert (
@param StatusParameter EFI_STATUS value to evaluate.
**/
#if !defined(MDEPKG_NDEBUG)
#define ASSERT_EFI_ERROR(StatusParameter) \
#if !defined (MDEPKG_NDEBUG)
#define ASSERT_EFI_ERROR(StatusParameter) \
do { \
if (DebugAssertEnabled ()) { \
if (EFI_ERROR (StatusParameter)) { \
@ -454,7 +447,7 @@ UnitTestDebugAssert (
} \
} while (FALSE)
#else
#define ASSERT_EFI_ERROR(StatusParameter)
#define ASSERT_EFI_ERROR(StatusParameter)
#endif
/**
@ -469,8 +462,8 @@ UnitTestDebugAssert (
@param StatusParameter RETURN_STATUS value to evaluate.
**/
#if !defined(MDEPKG_NDEBUG)
#define ASSERT_RETURN_ERROR(StatusParameter) \
#if !defined (MDEPKG_NDEBUG)
#define ASSERT_RETURN_ERROR(StatusParameter) \
do { \
if (DebugAssertEnabled ()) { \
if (RETURN_ERROR (StatusParameter)) { \
@ -481,7 +474,7 @@ UnitTestDebugAssert (
} \
} while (FALSE)
#else
#define ASSERT_RETURN_ERROR(StatusParameter)
#define ASSERT_RETURN_ERROR(StatusParameter)
#endif
/**
@ -506,8 +499,8 @@ UnitTestDebugAssert (
@param Guid The pointer to a protocol GUID.
**/
#if !defined(MDEPKG_NDEBUG)
#define ASSERT_PROTOCOL_ALREADY_INSTALLED(Handle, Guid) \
#if !defined (MDEPKG_NDEBUG)
#define ASSERT_PROTOCOL_ALREADY_INSTALLED(Handle, Guid) \
do { \
if (DebugAssertEnabled ()) { \
VOID *Instance; \
@ -524,7 +517,7 @@ UnitTestDebugAssert (
} \
} while (FALSE)
#else
#define ASSERT_PROTOCOL_ALREADY_INSTALLED(Handle, Guid)
#define ASSERT_PROTOCOL_ALREADY_INSTALLED(Handle, Guid)
#endif
/**
@ -538,7 +531,6 @@ UnitTestDebugAssert (
**/
#define DEBUG_CODE_BEGIN() do { if (DebugCodeEnabled ()) { UINT8 __DebugCodeLocal
/**
The macro that marks the end of debug source code.
@ -550,7 +542,6 @@ UnitTestDebugAssert (
**/
#define DEBUG_CODE_END() __DebugCodeLocal = 0; __DebugCodeLocal++; } } while (FALSE)
/**
The macro that declares a section of debug source code.
@ -564,7 +555,6 @@ UnitTestDebugAssert (
Expression \
DEBUG_CODE_END ()
/**
The macro that calls DebugClearMemory() to clear a buffer to a default value.
@ -582,7 +572,6 @@ UnitTestDebugAssert (
} \
} while (FALSE)
/**
Macro that calls DebugAssert() if the containing record does not have a
matching signature. If the signatures matches, then a pointer to the data
@ -625,13 +614,13 @@ UnitTestDebugAssert (
@param TestSignature The 32-bit signature value to match.
**/
#if !defined(MDEPKG_NDEBUG)
#define CR(Record, TYPE, Field, TestSignature) \
#if !defined (MDEPKG_NDEBUG)
#define CR(Record, TYPE, Field, TestSignature) \
(DebugAssertEnabled () && (BASE_CR (Record, TYPE, Field)->Signature != TestSignature)) ? \
(TYPE *) (_ASSERT (CR has Bad Signature), Record) : \
BASE_CR (Record, TYPE, Field)
#else
#define CR(Record, TYPE, Field, TestSignature) \
#define CR(Record, TYPE, Field, TestSignature) \
BASE_CR (Record, TYPE, Field)
#endif

2
MdePkg/Include/Library/DebugPrintErrorLevelLib.h
View File

@ -5,6 +5,7 @@
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DEBUG_PRINT_ERROR_LEVEL_LIB_H_
#define _DEBUG_PRINT_ERROR_LEVEL_LIB_H_
@ -34,4 +35,5 @@ EFIAPI
SetDebugPrintErrorLevel (
UINT32 ErrorLevel
);
#endif

4
MdePkg/Include/Library/DxeCoreEntryPoint.h
View File

@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
///
extern VOID *gHobList;
/**
The entry point of PE/COFF Image for the DXE Core.
@ -33,7 +32,6 @@ _ModuleEntryPoint (
IN VOID *HobStart
);
/**
Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().
@ -48,7 +46,6 @@ EfiMain (
IN VOID *HobStart
);
/**
Autogenerated function that calls the library constructors for all of the module's dependent libraries.
@ -72,7 +69,6 @@ ProcessLibraryConstructorList (
IN EFI_SYSTEM_TABLE *SystemTable
);
/**
Autogenerated function that calls a set of module entry points.

2
MdePkg/Include/Library/DxeServicesLib.h
View File

@ -169,7 +169,6 @@ GetSectionFromFv (
OUT UINTN *Size
);
/**
Searches the FFS file the currently executing module was loaded from and returns the first matching FFS section.
@ -221,7 +220,6 @@ GetSectionFromFfs (
OUT UINTN *Size
);
/**
Get the image file buffer data and buffer size by its device path.

1
MdePkg/Include/Library/DxeServicesTableLib.h
View File

@ -25,4 +25,3 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
extern EFI_DXE_SERVICES *gDS;
#endif

1
MdePkg/Include/Library/ExtractGuidedSectionLib.h
View File

@ -14,6 +14,7 @@ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __EXTRACT_GUIDED_SECTION_H__
#define __EXTRACT_GUIDED_SECTION_H__

22
MdePkg/Include/Library/FileHandleLib.h
View File

@ -29,7 +29,7 @@ extern CONST UINT16 gUnicodeFileTag;
@retval NULL Information could not be retrieved.
@retval !NULL The information about the file.
**/
EFI_FILE_INFO*
EFI_FILE_INFO *
EFIAPI
FileHandleGetInfo (
IN EFI_FILE_HANDLE FileHandle
@ -92,7 +92,7 @@ FileHandleSetInfo (
**/
EFI_STATUS
EFIAPI
FileHandleRead(
FileHandleRead (
IN EFI_FILE_HANDLE FileHandle,
IN OUT UINTN *BufferSize,
OUT VOID *Buffer
@ -124,7 +124,7 @@ FileHandleRead(
**/
EFI_STATUS
EFIAPI
FileHandleWrite(
FileHandleWrite (
IN EFI_FILE_HANDLE FileHandle,
IN OUT UINTN *BufferSize,
IN VOID *Buffer
@ -214,6 +214,7 @@ FileHandleGetPosition (
IN EFI_FILE_HANDLE FileHandle,
OUT UINT64 *Position
);
/**
Flushes data on a file.
@ -302,7 +303,7 @@ FileHandleFindFirstFile (
**/
EFI_STATUS
EFIAPI
FileHandleFindNextFile(
FileHandleFindNextFile (
IN EFI_FILE_HANDLE DirHandle,
OUT EFI_FILE_INFO *Buffer,
OUT BOOLEAN *NoFile
@ -401,7 +402,7 @@ FileHandleGetFileName (
**/
EFI_STATUS
EFIAPI
FileHandleReadLine(
FileHandleReadLine (
IN EFI_FILE_HANDLE Handle,
IN OUT CHAR16 *Buffer,
IN OUT UINTN *Size,
@ -424,9 +425,9 @@ FileHandleReadLine(
@sa FileHandleReadLine
**/
CHAR16*
CHAR16 *
EFIAPI
FileHandleReturnLine(
FileHandleReturnLine (
IN EFI_FILE_HANDLE Handle,
IN OUT BOOLEAN *Ascii
);
@ -454,7 +455,7 @@ FileHandleReturnLine(
**/
EFI_STATUS
EFIAPI
FileHandleWriteLine(
FileHandleWriteLine (
IN EFI_FILE_HANDLE Handle,
IN CHAR16 *Buffer
);
@ -473,7 +474,7 @@ FileHandleWriteLine(
**/
EFI_STATUS
EFIAPI
FileHandlePrintLine(
FileHandlePrintLine (
IN EFI_FILE_HANDLE Handle,
IN CONST CHAR16 *Format,
...
@ -493,9 +494,8 @@ FileHandlePrintLine(
**/
BOOLEAN
EFIAPI
FileHandleEof(
FileHandleEof (
IN EFI_FILE_HANDLE Handle
);
#endif //_FILE_HANDLE_LIBRARY_HEADER_

4
MdePkg/Include/Library/IoLib.h
View File

@ -26,7 +26,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define IO_LIB_ADDRESS(Segment,Port) \
#define IO_LIB_ADDRESS(Segment, Port) \
( ((Port) & 0xffff) | (((Segment) & 0xffff) << 16) )
/**
@ -2804,6 +2804,4 @@ MmioWriteBuffer64 (
IN CONST UINT64 *Buffer
);
#endif

2
MdePkg/Include/Library/MmUnblockMemoryLib.h
View File

@ -39,6 +39,6 @@ EFIAPI
MmUnblockMemoryRequest (
IN PHYSICAL_ADDRESS UnblockAddress,
IN UINT64 NumberOfPages
);
);
#endif // MM_UNBLOCK_MEMORY_LIB_H_

11
MdePkg/Include/Library/OrderedCollectionLib.h
View File

@ -82,7 +82,6 @@ INTN
IN CONST VOID *UserStruct
);
//
// Some functions below are read-only, while others are read-write. If any
// write operation is expected to run concurrently with any other operation on
@ -107,7 +106,6 @@ OrderedCollectionUserStruct (
IN CONST ORDERED_COLLECTION_ENTRY *Entry
);
/**
Allocate and initialize the ORDERED_COLLECTION structure.
@ -132,7 +130,6 @@ OrderedCollectionInit (
IN ORDERED_COLLECTION_KEY_COMPARE KeyCompare
);
/**
Check whether the collection is empty (has no entries).
@ -150,7 +147,6 @@ OrderedCollectionIsEmpty (
IN CONST ORDERED_COLLECTION *Collection
);
/**
Uninitialize and release an empty ORDERED_COLLECTION structure.
@ -167,7 +163,6 @@ OrderedCollectionUninit (
IN ORDERED_COLLECTION *Collection
);
/**
Look up the collection entry that links the user structure that matches the
specified standalone key.
@ -192,7 +187,6 @@ OrderedCollectionFind (
IN CONST VOID *StandaloneKey
);
/**
Find the collection entry of the minimum user structure stored in the
collection.
@ -214,7 +208,6 @@ OrderedCollectionMin (
IN CONST ORDERED_COLLECTION *Collection
);
/**
Find the collection entry of the maximum user structure stored in the
collection.
@ -237,7 +230,6 @@ OrderedCollectionMax (
IN CONST ORDERED_COLLECTION *Collection
);
/**
Get the collection entry of the least user structure that is greater than the
one linked by Entry.
@ -258,7 +250,6 @@ OrderedCollectionNext (
IN CONST ORDERED_COLLECTION_ENTRY *Entry
);
/**
Get the collection entry of the greatest user structure that is less than the
one linked by Entry.
@ -279,7 +270,6 @@ OrderedCollectionPrev (
IN CONST ORDERED_COLLECTION_ENTRY *Entry
);
/**
Insert (link) a user structure into the collection, allocating a new
collection entry.
@ -349,7 +339,6 @@ OrderedCollectionInsert (
IN VOID *UserStruct
);
/**
Delete an entry from the collection, unlinking the associated user structure.

62
MdePkg/Include/Library/PcdLib.h
View File

@ -22,7 +22,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#ifndef __PCD_LIB_H__
#define __PCD_LIB_H__
/**
Retrieves a token number based on a token name.
@ -36,7 +35,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdToken(TokenName) _PCD_TOKEN_##TokenName
/**
Retrieves a Boolean PCD feature flag based on a token name.
@ -51,7 +49,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define FeaturePcdGet(TokenName) _PCD_GET_MODE_BOOL_##TokenName
/**
Retrieves an 8-bit fixed PCD token value based on a token name.
@ -66,7 +63,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define FixedPcdGet8(TokenName) _PCD_VALUE_##TokenName
/**
Retrieves a 16-bit fixed PCD token value based on a token name.
@ -81,7 +77,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define FixedPcdGet16(TokenName) _PCD_VALUE_##TokenName
/**
Retrieves a 32-bit fixed PCD token value based on a token name.
@ -96,7 +91,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define FixedPcdGet32(TokenName) _PCD_VALUE_##TokenName
/**
Retrieves a 64-bit fixed PCD token value based on a token name.
@ -111,7 +105,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define FixedPcdGet64(TokenName) _PCD_VALUE_##TokenName
/**
Retrieves a Boolean fixed PCD token value based on a token name.
@ -126,7 +119,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define FixedPcdGetBool(TokenName) _PCD_VALUE_##TokenName
/**
Retrieves a pointer to a fixed PCD token buffer based on a token name.
@ -141,7 +133,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define FixedPcdGetPtr(TokenName) ((VOID *)_PCD_VALUE_##TokenName)
/**
Retrieves an 8-bit binary patchable PCD token value based on a token name.
@ -170,7 +161,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdGet16(TokenName) _gPcd_BinaryPatch_##TokenName
/**
Retrieves a 32-bit binary patchable PCD token value based on a token name.
@ -185,7 +175,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdGet32(TokenName) _gPcd_BinaryPatch_##TokenName
/**
Retrieves a 64-bit binary patchable PCD token value based on a token name.
@ -200,7 +189,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdGet64(TokenName) _gPcd_BinaryPatch_##TokenName
/**
Retrieves a Boolean binary patchable PCD token value based on a token name.
@ -215,7 +203,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdGetBool(TokenName) _gPcd_BinaryPatch_##TokenName
/**
Retrieves a pointer to a binary patchable PCD token buffer based on a token name.
@ -230,7 +217,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdGetPtr(TokenName) ((VOID *)_gPcd_BinaryPatch_##TokenName)
/**
Sets an 8-bit binary patchable PCD token value based on a token name.
@ -246,7 +232,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdSet8(TokenName, Value) (_gPcd_BinaryPatch_##TokenName = (Value))
/**
Sets a 16-bit binary patchable PCD token value based on a token name.
@ -262,7 +247,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdSet16(TokenName, Value) (_gPcd_BinaryPatch_##TokenName = (Value))
/**
Sets a 32-bit binary patchable PCD token value based on a token name.
@ -278,7 +262,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdSet32(TokenName, Value) (_gPcd_BinaryPatch_##TokenName = (Value))
/**
Sets a 64-bit binary patchable PCD token value based on a token name.
@ -294,7 +277,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdSet64(TokenName, Value) (_gPcd_BinaryPatch_##TokenName = (Value))
/**
Sets a Boolean binary patchable PCD token value based on a token name.
@ -310,7 +292,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdSetBool(TokenName, Value) (_gPcd_BinaryPatch_##TokenName = (Value))
/**
Sets a pointer to a binary patchable PCD token buffer based on a token name.
@ -340,6 +321,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
(Size), \
(Buffer) \
)
/**
Retrieves an 8-bit PCD token value based on a token name.
@ -353,7 +335,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGet8(TokenName) _PCD_GET_MODE_8_##TokenName
/**
Retrieves a 16-bit PCD token value based on a token name.
@ -367,7 +348,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGet16(TokenName) _PCD_GET_MODE_16_##TokenName
/**
Retrieves a 32-bit PCD token value based on a token name.
@ -381,7 +361,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGet32(TokenName) _PCD_GET_MODE_32_##TokenName
/**
Retrieves a 64-bit PCD token value based on a token name.
@ -395,7 +374,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGet64(TokenName) _PCD_GET_MODE_64_##TokenName
/**
Retrieves a pointer to a PCD token buffer based on a token name.
@ -409,7 +387,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGetPtr(TokenName) _PCD_GET_MODE_PTR_##TokenName
/**
Retrieves a Boolean PCD token value based on a token name.
@ -423,7 +400,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGetBool(TokenName) _PCD_GET_MODE_BOOL_##TokenName
/**
Retrieves the size of a fixed PCD token based on a token name.
@ -437,7 +413,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define FixedPcdGetSize(TokenName) _PCD_SIZE_##TokenName
/**
Retrieves the size of a binary patchable PCD token based on a token name.
@ -451,7 +426,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PatchPcdGetSize(TokenName) _gPcd_BinaryPatch_Size_##TokenName
/**
Retrieves the size of the PCD token based on a token name.
@ -465,7 +439,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGetSize(TokenName) _PCD_GET_MODE_SIZE_##TokenName
/**
Retrieve the size of a given PCD token.
@ -561,8 +534,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define PcdSetPtrS(TokenName, SizeOfBuffer, Buffer) \
_PCD_SET_MODE_PTR_S_##TokenName ((SizeOfBuffer), (Buffer))
/**
Sets a boolean PCD token value based on a token name.
@ -590,7 +561,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
@return Return the token number.
**/
#define PcdTokenEx(Guid,TokenName) _PCD_TOKEN_EX_##TokenName(Guid)
#define PcdTokenEx(Guid, TokenName) _PCD_TOKEN_EX_##TokenName(Guid)
/**
Retrieves an 8-bit PCD token value based on a GUID and a token name.
@ -628,7 +599,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGetEx16(Guid, TokenName) LibPcdGetEx16 ((Guid), PcdTokenEx(Guid,TokenName))
/**
Retrieves a 32-bit PCD token value based on a GUID and a token name.
@ -647,7 +617,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGetEx32(Guid, TokenName) LibPcdGetEx32 ((Guid), PcdTokenEx(Guid,TokenName))
/**
Retrieves a 64-bit PCD token value based on a GUID and a token name.
@ -666,7 +635,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGetEx64(Guid, TokenName) LibPcdGetEx64 ((Guid), PcdTokenEx(Guid,TokenName))
/**
Retrieves a pointer to a PCD token buffer based on a GUID and a token name.
@ -685,7 +653,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGetExPtr(Guid, TokenName) LibPcdGetExPtr ((Guid), PcdTokenEx(Guid,TokenName))
/**
Retrieves a Boolean PCD token value based on a GUID and a token name.
@ -704,8 +671,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PcdGetExBool(Guid, TokenName) LibPcdGetExBool ((Guid), PcdTokenEx(Guid,TokenName))
/**
Sets an 8-bit PCD token value based on a GUID and a token name.
@ -810,7 +775,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#define PcdSetExPtrS(Guid, TokenName, SizeOfBuffer, Buffer) \
LibPcdSetExPtrS ((Guid), PcdTokenEx(Guid,TokenName), (SizeOfBuffer), (Buffer))
/**
Sets an boolean PCD token value based on a GUID and a token name.
@ -848,7 +812,6 @@ LibPcdSetSku (
IN UINTN SkuId
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -865,7 +828,6 @@ LibPcdGet8 (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -882,7 +844,6 @@ LibPcdGet16 (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -899,7 +860,6 @@ LibPcdGet32 (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -916,7 +876,6 @@ LibPcdGet64 (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -933,7 +892,6 @@ LibPcdGetPtr (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -950,7 +908,6 @@ LibPcdGetBool (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve the size of a given PCD token.
@ -965,7 +922,6 @@ LibPcdGetSize (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -987,7 +943,6 @@ LibPcdGetEx8 (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -1009,7 +964,6 @@ LibPcdGetEx16 (
IN UINTN TokenNumber
);
/**
Returns the 32-bit value for the token specified by TokenNumber and Guid.
If Guid is NULL, then ASSERT().
@ -1028,7 +982,6 @@ LibPcdGetEx32 (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -1050,7 +1003,6 @@ LibPcdGetEx64 (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -1072,7 +1024,6 @@ LibPcdGetExPtr (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve a value for a given PCD token.
@ -1094,7 +1045,6 @@ LibPcdGetExBool (
IN UINTN TokenNumber
);
/**
This function provides a means by which to retrieve the size of a given PCD token.
@ -1116,7 +1066,6 @@ LibPcdGetExSize (
IN UINTN TokenNumber
);
/**
This function provides a means by which to set a value for a given PCD token.
@ -1418,7 +1367,6 @@ VOID
IN UINTN TokenDataSize
);
/**
Set up a notification function that is called when a specified token is set.
@ -1443,7 +1391,6 @@ LibPcdCallbackOnSet (
IN PCD_CALLBACK NotificationFunction
);
/**
Disable a notification function that was established with LibPcdCallbackonSet().
@ -1465,7 +1412,6 @@ LibPcdCancelCallback (
IN PCD_CALLBACK NotificationFunction
);
/**
Retrieves the next token in a token space.
@ -1492,8 +1438,6 @@ LibPcdGetNextToken (
IN UINTN TokenNumber
);
/**
Used to retrieve the list of available PCD token space GUIDs.
@ -1513,7 +1457,6 @@ LibPcdGetNextTokenSpace (
IN CONST GUID *TokenSpaceGuid
);
/**
Sets a value of a patchable PCD entry that is type pointer.
@ -1677,7 +1620,6 @@ typedef struct {
CHAR8 *PcdName;
} PCD_INFO;
/**
Retrieve additional information associated with a PCD token.

3
MdePkg/Include/Library/PciCf8Lib.h
View File

@ -13,7 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#ifndef __PCI_CF8_LIB_H__
#define __PCI_CF8_LIB_H__
/**
Macro that converts PCI Bus, PCI Device, PCI Function and PCI Register to an
address that can be passed to the PCI Library functions.
@ -30,7 +29,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
@return The encode PCI address.
**/
#define PCI_CF8_LIB_ADDRESS(Bus,Device,Function,Offset) \
#define PCI_CF8_LIB_ADDRESS(Bus, Device, Function, Offset) \
(((Offset) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))
/**

2
MdePkg/Include/Library/PciExpressLib.h
View File

@ -32,7 +32,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
@return The encode PCI address.
**/
#define PCI_EXPRESS_LIB_ADDRESS(Bus,Device,Function,Offset) PCI_ECAM_ADDRESS ((Bus), (Device), (Function), (Offset))
#define PCI_EXPRESS_LIB_ADDRESS(Bus, Device, Function, Offset) PCI_ECAM_ADDRESS ((Bus), (Device), (Function), (Offset))
/**
Registers a PCI device so PCI configuration registers may be accessed after

2
MdePkg/Include/Library/PciLib.h
View File

@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
@return The encoded PCI address.
**/
#define PCI_LIB_ADDRESS(Bus,Device,Function,Register) \
#define PCI_LIB_ADDRESS(Bus, Device, Function, Register) \
(((Register) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))
/**

3
MdePkg/Include/Library/PciSegmentLib.h
View File

@ -31,7 +31,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#ifndef __PCI_SEGMENT_LIB__
#define __PCI_SEGMENT_LIB__
/**
Macro that converts PCI Segment, PCI Bus, PCI Device, PCI Function,
and PCI Register to an address that can be passed to the PCI Segment Library functions.
@ -49,7 +48,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
@return The address that is compatible with the PCI Segment Library functions.
**/
#define PCI_SEGMENT_LIB_ADDRESS(Segment,Bus,Device,Function,Register) \
#define PCI_SEGMENT_LIB_ADDRESS(Segment, Bus, Device, Function, Register) \
((Segment != 0) ? \
( ((Register) & 0xfff) | \
(((Function) & 0x07) << 12) | \

1
MdePkg/Include/Library/PeCoffGetEntryPointLib.h
View File

@ -76,7 +76,6 @@ PeCoffLoaderGetPdbPointer (
IN VOID *Pe32Data
);
/**
Returns the size of the PE/COFF headers

3
MdePkg/Include/Library/PeCoffLib.h
View File

@ -296,7 +296,6 @@ PeCoffLoaderLoadImage (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext
);
/**
Reads contents of a PE/COFF image from a buffer in system memory.
@ -329,7 +328,6 @@ PeCoffLoaderImageReadFromMemory (
OUT VOID *Buffer
);
/**
Reapply fixups on a fixed up PE32/PE32+ image to allow virtual calling at EFI
runtime.
@ -383,4 +381,5 @@ EFIAPI
PeCoffLoaderUnloadImage (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext
);
#endif

Some files were not shown because too many files have changed in this diff Show More