MdeModulePkg: Apply uncrustify changes

[mirror_edk2.git] / MdePkg / Include / Pi / PiFirmwareFile.h

diff --git a/MdePkg/Include/Pi/PiFirmwareFile.h b/MdePkg/Include/Pi/PiFirmwareFile.h
index b982c9eda3b6524ab9cd480929afde0a0d0a9db0..ec7729e9c36e5b2910d07e32999a284095cde394 100644 (file)
--- a/MdePkg/Include/Pi/PiFirmwareFile.h
+++ b/MdePkg/Include/Pi/PiFirmwareFile.h
@@ -2,13 +2,7 @@
   The firmware file related definitions in PI.\r
 \r
 Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under\r
-the terms and conditions of the BSD License that accompanies this distribution.\r
-The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php.\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
   @par Revision Reference:\r
   PI Version 1.6.\r
@@ -71,10 +65,15 @@ typedef UINT8 EFI_FFS_FILE_STATE;
 #define EFI_FV_FILETYPE_DRIVER                0x07\r
 #define EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER  0x08\r
 #define EFI_FV_FILETYPE_APPLICATION           0x09\r
-#define EFI_FV_FILETYPE_SMM                   0x0A\r
+#define EFI_FV_FILETYPE_MM                    0x0A\r
+#define EFI_FV_FILETYPE_SMM                   EFI_FV_FILETYPE_MM\r
 #define EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE 0x0B\r
-#define EFI_FV_FILETYPE_COMBINED_SMM_DXE      0x0C\r
-#define EFI_FV_FILETYPE_SMM_CORE              0x0D\r
+#define EFI_FV_FILETYPE_COMBINED_MM_DXE       0x0C\r
+#define EFI_FV_FILETYPE_COMBINED_SMM_DXE      EFI_FV_FILETYPE_COMBINED_MM_DXE\r
+#define EFI_FV_FILETYPE_MM_CORE               0x0D\r
+#define EFI_FV_FILETYPE_SMM_CORE              EFI_FV_FILETYPE_MM_CORE\r
+#define EFI_FV_FILETYPE_MM_STANDALONE         0x0E\r
+#define EFI_FV_FILETYPE_MM_CORE_STANDALONE    0x0F\r
 #define EFI_FV_FILETYPE_OEM_MIN               0xc0\r
 #define EFI_FV_FILETYPE_OEM_MAX               0xdf\r
 #define EFI_FV_FILETYPE_DEBUG_MIN             0xe0\r
@@ -180,8 +179,15 @@ typedef struct {
 #define IS_FFS_FILE2(FfsFileHeaderPtr) \\r
     (((((EFI_FFS_FILE_HEADER *) (UINTN) FfsFileHeaderPtr)->Attributes) & FFS_ATTRIB_LARGE_FILE) == FFS_ATTRIB_LARGE_FILE)\r
 \r
-#define FFS_FILE_SIZE(FfsFileHeaderPtr) \\r
-    ((UINT32) (*((UINT32 *) ((EFI_FFS_FILE_HEADER *) (UINTN) FfsFileHeaderPtr)->Size) & 0x00ffffff))\r
+///\r
+/// The argument passed as the FfsFileHeaderPtr parameter to the\r
+/// FFS_FILE_SIZE() function-like macro below must not have side effects:\r
+/// FfsFileHeaderPtr is evaluated multiple times.\r
+///\r
+#define FFS_FILE_SIZE(FfsFileHeaderPtr) ((UINT32) ( \\r
+    (((EFI_FFS_FILE_HEADER *) (UINTN) (FfsFileHeaderPtr))->Size[0]      ) | \\r
+    (((EFI_FFS_FILE_HEADER *) (UINTN) (FfsFileHeaderPtr))->Size[1] <<  8) | \\r
+    (((EFI_FFS_FILE_HEADER *) (UINTN) (FfsFileHeaderPtr))->Size[2] << 16)))\r
 \r
 #define FFS_FILE2_SIZE(FfsFileHeaderPtr) \\r
     ((UINT32) (((EFI_FFS_FILE_HEADER2 *) (UINTN) FfsFileHeaderPtr)->ExtendedSize))\r
@@ -217,7 +223,8 @@ typedef UINT8 EFI_SECTION_TYPE;
 #define EFI_SECTION_FREEFORM_SUBTYPE_GUID 0x18\r
 #define EFI_SECTION_RAW                   0x19\r
 #define EFI_SECTION_PEI_DEPEX             0x1B\r
-#define EFI_SECTION_SMM_DEPEX             0x1C\r
+#define EFI_SECTION_MM_DEPEX              0x1C\r
+#define EFI_SECTION_SMM_DEPEX             EFI_SECTION_MM_DEPEX\r
 \r
 ///\r
 /// Common section header.\r
@@ -480,11 +487,18 @@ typedef struct {
   CHAR16                        VersionString[1];\r
 } EFI_VERSION_SECTION2;\r
 \r
-#define IS_SECTION2(SectionHeaderPtr) \\r
-    ((UINT32) (*((UINT32 *) ((EFI_COMMON_SECTION_HEADER *) (UINTN) SectionHeaderPtr)->Size) & 0x00ffffff) == 0x00ffffff)\r
+///\r
+/// The argument passed as the SectionHeaderPtr parameter to the SECTION_SIZE()\r
+/// and IS_SECTION2() function-like macros below must not have side effects:\r
+/// SectionHeaderPtr is evaluated multiple times.\r
+///\r
+#define SECTION_SIZE(SectionHeaderPtr) ((UINT32) ( \\r
+    (((EFI_COMMON_SECTION_HEADER *) (UINTN) (SectionHeaderPtr))->Size[0]      ) | \\r
+    (((EFI_COMMON_SECTION_HEADER *) (UINTN) (SectionHeaderPtr))->Size[1] <<  8) | \\r
+    (((EFI_COMMON_SECTION_HEADER *) (UINTN) (SectionHeaderPtr))->Size[2] << 16)))\r
 \r
-#define SECTION_SIZE(SectionHeaderPtr) \\r
-    ((UINT32) (*((UINT32 *) ((EFI_COMMON_SECTION_HEADER *) (UINTN) SectionHeaderPtr)->Size) & 0x00ffffff))\r
+#define IS_SECTION2(SectionHeaderPtr) \\r
+    (SECTION_SIZE (SectionHeaderPtr) == 0x00ffffff)\r
 \r
 #define SECTION2_SIZE(SectionHeaderPtr) \\r
     (((EFI_COMMON_SECTION_HEADER2 *) (UINTN) SectionHeaderPtr)->ExtendedSize)\r