Minor coding style adjustment for DxeCore.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5196 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 554a07c42b88797ba3a133232e9d4e7c189bcd28..5a0efad1b79b05e1bd8a53c4b0b0eedf41e20111 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -76,7 +76,7 @@ VOID            *mFwVolEventRegistration;
 //\r
 // List of file types supported by dispatcher\r
 //\r
 //\r
 // List of file types supported by dispatcher\r
 //\r

-static EFI_FV_FILETYPE mDxeFileTypes[] = { \r
+STATIC EFI_FV_FILETYPE mDxeFileTypes[] = { \r

   EFI_FV_FILETYPE_DRIVER, \r
   EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER, \r
   EFI_FV_FILETYPE_DXE_CORE,\r
   EFI_FV_FILETYPE_DRIVER, \r
   EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER, \r
   EFI_FV_FILETYPE_DXE_CORE,\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 30f7fe33be76b9cc32b2324a749e8264a0c610a5..63eeeecd74ad07692b36eeaef07bdad5ab198c75 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -2269,7 +2269,7 @@ DxeMainUefiDecompressGetInfo (
   This protocol is designed so that the decompression algorithm can be\r
   implemented without using any memory services. As a result, the Decompress()\r
   Function is not allowed to call AllocatePool() or AllocatePages() in its\r
   This protocol is designed so that the decompression algorithm can be\r
   implemented without using any memory services. As a result, the Decompress()\r
   Function is not allowed to call AllocatePool() or AllocatePages() in its\r

-  implementation. It is the caller¡¯s responsibility to allocate and free the\r
+  implementation. It is the caller's responsibility to allocate and free the\r

   Destination and Scratch buffers.\r
   If the compressed source data specified by Source and SourceSize is\r
   sucessfully decompressed into Destination, then EFI_SUCCESS is returned. If\r
   Destination and Scratch buffers.\r
   If the compressed source data specified by Source and SourceSize is\r
   sucessfully decompressed into Destination, then EFI_SUCCESS is returned. If\r


@@ -2355,7 +2355,7 @@ OpenSectionStream (
                                 callee allocated) of *Buffer.\r
   @param  AuthenticationStatus  A pointer to a caller-allocated UINT32 that\r
                                 indicates the authentication status of the\r
                                 callee allocated) of *Buffer.\r
   @param  AuthenticationStatus  A pointer to a caller-allocated UINT32 that\r
                                 indicates the authentication status of the\r

-                                output buffer. If the input section¡¯s\r
+                                output buffer. If the input section's\r

                                 GuidedSectionHeader.Attributes field\r
                                 has the EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r
                                 bit as clear, AuthenticationStatus must return\r
                                 GuidedSectionHeader.Attributes field\r
                                 has the EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r
                                 bit as clear, AuthenticationStatus must return\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index b0a5c60f285ed98b9a72918b7ae9763c6ccbb0b5..1e600a9877e8b468373f16e23501d364ade0219c 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -840,7 +840,7 @@ DxeMainUefiDecompressGetInfo (
   This protocol is designed so that the decompression algorithm can be\r
   implemented without using any memory services. As a result, the Decompress()\r
   Function is not allowed to call AllocatePool() or AllocatePages() in its\r
   This protocol is designed so that the decompression algorithm can be\r
   implemented without using any memory services. As a result, the Decompress()\r
   Function is not allowed to call AllocatePool() or AllocatePages() in its\r

-  implementation. It is the caller¡¯s responsibility to allocate and free the\r
+  implementation. It is the caller's responsibility to allocate and free the\r

   Destination and Scratch buffers.\r
   If the compressed source data specified by Source and SourceSize is\r
   sucessfully decompressed into Destination, then EFI_SUCCESS is returned. If\r
   Destination and Scratch buffers.\r
   If the compressed source data specified by Source and SourceSize is\r
   sucessfully decompressed into Destination, then EFI_SUCCESS is returned. If\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
index 42a7a054e60b68a7a49551f591a5081bc3889a6c..2c2283d3a06328cb2c967881db767351bf2a83c5 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
@@ -220,7 +220,7 @@ typedef struct {
   CHAR16                       *GuidString;\r
 } GUID_TO_STRING_PROTOCOL_ENTRY;\r
 \r
   CHAR16                       *GuidString;\r
 } GUID_TO_STRING_PROTOCOL_ENTRY;\r
 \r

-static const GUID_TO_STRING_PROTOCOL_ENTRY MissingProtocols[] = {\r
+STATIC CONST GUID_TO_STRING_PROTOCOL_ENTRY MissingProtocols[] = {\r

   { &gEfiSecurityArchProtocolGuid,         (CHAR16 *)L"Security"           },\r
   { &gEfiCpuArchProtocolGuid,              (CHAR16 *)L"CPU"                },\r
   { &gEfiMetronomeArchProtocolGuid,        (CHAR16 *)L"Metronome"          },\r
   { &gEfiSecurityArchProtocolGuid,         (CHAR16 *)L"Security"           },\r
   { &gEfiCpuArchProtocolGuid,              (CHAR16 *)L"CPU"                },\r
   { &gEfiMetronomeArchProtocolGuid,        (CHAR16 *)L"Metronome"          },\r

diff --git a/MdeModulePkg/Core/Dxe/Event/timer.c b/MdeModulePkg/Core/Dxe/Event/timer.c
index 1388512fb8adf69972dfef9e405f559ea833f1a5..35ab5874a2a6396d2d43e37b56095f1dfe35acad 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Event/timer.c
+++ b/MdeModulePkg/Core/Dxe/Event/timer.c
@@ -64,12 +64,12 @@ CoreInsertEventTimer (
 // Internal data\r
 //\r
 \r
 // Internal data\r
 //\r
 \r

-static LIST_ENTRY       mEfiTimerList = INITIALIZE_LIST_HEAD_VARIABLE (mEfiTimerList);\r
-static EFI_LOCK         mEfiTimerLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL - 1);\r
-static EFI_EVENT        mEfiCheckTimerEvent;\r
+STATIC LIST_ENTRY       mEfiTimerList = INITIALIZE_LIST_HEAD_VARIABLE (mEfiTimerList);\r
+STATIC EFI_LOCK         mEfiTimerLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL - 1);\r
+STATIC EFI_EVENT        mEfiCheckTimerEvent;\r

 \r
 \r

-static EFI_LOCK         mEfiSystemTimeLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL);\r
-static UINT64           mEfiSystemTime = 0;\r
+STATIC EFI_LOCK         mEfiSystemTimeLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL);\r
+STATIC UINT64           mEfiSystemTime = 0;\r

 \r
 //\r
 // Timer functions\r
 \r
 //\r
 // Timer functions\r

diff --git a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c b/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
index e318b4239f4f9e5f9dc4debd13cc02cbd9984b42..afe668fe45a0b5739bbf4dfff7cf1458c95efe16 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
+++ b/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
@@ -17,13 +17,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <DxeMain.h>\r
 \r
 \r
 #include <DxeMain.h>\r
 \r
 \r

-static EFI_DEBUG_IMAGE_INFO_TABLE_HEADER  mDebugInfoTableHeader = {\r
+STATIC EFI_DEBUG_IMAGE_INFO_TABLE_HEADER  mDebugInfoTableHeader = {\r

   0,          // volatile UINT32                 UpdateStatus;\r
   0,          // UINT32                          TableSize;\r
   NULL        // EFI_DEBUG_IMAGE_INFO            *EfiDebugImageInfoTable;\r
 };\r
 \r
   0,          // volatile UINT32                 UpdateStatus;\r
   0,          // UINT32                          TableSize;\r
   NULL        // EFI_DEBUG_IMAGE_INFO            *EfiDebugImageInfoTable;\r
 };\r
 \r

-static EFI_SYSTEM_TABLE_POINTER *mDebugTable = NULL;\r
+STATIC EFI_SYSTEM_TABLE_POINTER *mDebugTable = NULL;\r

 \r
     \r
 \r
 \r
     \r
 \r

diff --git a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
index 54049cffb621079ede841cb31bae8ca7f363bda5..7ed011cb494fa5461e3b3b542eeb8262b3e670b1 100644 (file)
--- a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
+++ b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
@@ -272,7 +272,7 @@ FreeChildNode (
                                  stream. \r
   @param  AuthenticationStatus   A pointer to a caller-allocated UINT32 that\r
                                  indicates the authentication status of the\r
                                  stream. \r
   @param  AuthenticationStatus   A pointer to a caller-allocated UINT32 that\r
                                  indicates the authentication status of the\r

-                                 output buffer. If the input section¡¯s\r
+                                 output buffer. If the input section's\r

                                  GuidedSectionHeader.Attributes field\r
                                  has the EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r
                                  bit as clear, AuthenticationStatus must return\r
                                  GuidedSectionHeader.Attributes field\r
                                  has the EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r
                                  bit as clear, AuthenticationStatus must return\r


@@ -531,7 +531,7 @@ OpenSectionStream (
                                 callee allocated) of *Buffer.\r
   @param  AuthenticationStatus  A pointer to a caller-allocated UINT32 that\r
                                 indicates the authentication status of the\r
                                 callee allocated) of *Buffer.\r
   @param  AuthenticationStatus  A pointer to a caller-allocated UINT32 that\r
                                 indicates the authentication status of the\r

-                                output buffer. If the input section¡¯s\r
+                                output buffer. If the input section's\r

                                 GuidedSectionHeader.Attributes field\r
                                 has the EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r
                                 bit as clear, AuthenticationStatus must return\r
                                 GuidedSectionHeader.Attributes field\r
                                 has the EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r
                                 bit as clear, AuthenticationStatus must return\r


@@ -1326,7 +1326,7 @@ FreeChildNode (
                                  stream. \r
   @param  AuthenticationStatus   A pointer to a caller-allocated UINT32 that\r
                                  indicates the authentication status of the\r
                                  stream. \r
   @param  AuthenticationStatus   A pointer to a caller-allocated UINT32 that\r
                                  indicates the authentication status of the\r

-                                 output buffer. If the input section¡¯s\r
+                                 output buffer. If the input section's\r

                                  GuidedSectionHeader.Attributes field\r
                                  has the EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r
                                  bit as clear, AuthenticationStatus must return\r
                                  GuidedSectionHeader.Attributes field\r
                                  has the EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r
                                  bit as clear, AuthenticationStatus must return\r