Fix some coding style issues in MdeModulePkg.

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

9 files changed, 36 insertions, 14 deletions

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
index 951222a428..f6ad7c8eb6 100755
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
@@ -29,7 +29,6 @@
   FV protocol, then it will return the first FV that contains the ACPI table

   storage file.

 

-  @param  Protocol      The protocol to find.

   @param  Instance      Return pointer to the first instance of the protocol

 

   @return EFI_SUCCESS           The function completed successfully.

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 14a1913879..0d0293da19 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -1847,6 +1847,14 @@ EraseCursor (
   return EFI_SUCCESS;

 }

 

+/**

+  HII Database Protocol notification event handler.

+

+  Register font package when HII Database Protocol has been installed.

+

+  @param[in] Event    Event whose notification function is being invoked.

+  @param[in] Context  Pointer to the notification function's context.

+**/

 VOID

 EFIAPI

 RegisterFontPackage (

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index 4f4e4eb60c..ac8ddca875 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
@@ -111,7 +111,7 @@ typedef struct {
 

 #define RESET_STATE_DEFAULT               0x00

 #define RESET_STATE_ESC_R                 0x01

-#define RESET_STATE_ESC_R_ESC_r           0x02

+#define RESET_STATE_ESC_R_ESC_R           0x02

 

 #define TERMINAL_CON_IN_DEV_FROM_THIS(a)  CR (a, TERMINAL_DEV, SimpleInput, TERMINAL_DEV_SIGNATURE)

 #define TERMINAL_CON_OUT_DEV_FROM_THIS(a) CR (a, TERMINAL_DEV, SimpleTextOutput, TERMINAL_DEV_SIGNATURE)

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index ec97420f37..a3104ddc5a 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -1346,14 +1346,14 @@ UnicodeToEfiKey (
         if (TerminalDevice->ResetState == RESET_STATE_DEFAULT) {

           TerminalDevice->ResetState = RESET_STATE_ESC_R;

           SetDefaultResetState = FALSE;

-        } else if (TerminalDevice->ResetState == RESET_STATE_ESC_R_ESC_r) {

+        } else if (TerminalDevice->ResetState == RESET_STATE_ESC_R_ESC_R) {

           gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);

         }

         Key.ScanCode = SCAN_NULL;

         break;

       case 'r':

         if (TerminalDevice->ResetState == RESET_STATE_ESC_R) {

-          TerminalDevice->ResetState = RESET_STATE_ESC_R_ESC_r;

+          TerminalDevice->ResetState = RESET_STATE_ESC_R_ESC_R;

           SetDefaultResetState = FALSE;

         }

         Key.ScanCode = SCAN_NULL;

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
index 0a003ad721..15a12d70fe 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
@@ -863,6 +863,14 @@ FtwGetLastWrite (
   return Status;

 }

 

+/**

+  Firmware Volume Block Protocol notification event handler.

+

+  Initialization for Fault Tolerant Write is done in this handler.

+

+  @param[in] Event    Event whose notification function is being invoked.

+  @param[in] Context  Pointer to the notification function's context.

+**/

 VOID

 EFIAPI

 FvbNotificationEvent (

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index e377fc4ce0..2f38b56e2b 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -168,7 +168,7 @@ GetDevicePath (
   Converts the unicode character of the string from uppercase to lowercase.

   This is a internal function.

 

-  @param Str     String to be converted

+  @param ConfigString  String to be converted

 

 **/

 VOID

@@ -773,7 +773,7 @@ InsertBlockData (
 /**

   This function checks VarOffset and VarWidth is in the block range.

 

-  @param  BlockArray         The block array is to be checked. 

+  @param  RequestBlockArray  The block array is to be checked. 

   @param  VarOffset          Offset of var to the structure

   @param  VarWidth           Width of var.

   

@@ -831,7 +831,7 @@ EFI_STATUS
 EFIAPI

 ParseIfrData (

   IN     UINT8               *Package,

-  IN     UINT32              PackageLenth,

+  IN     UINT32              PackageLength,

   IN     EFI_STRING          ConfigHdr,

   IN     IFR_BLOCK_DATA      *RequestBlockArray,

   IN OUT IFR_VARSTORAGE_DATA *VarStorageData,

@@ -874,7 +874,7 @@ ParseIfrData (
   // Go through the form package to parse OpCode one by one.

   //

   IfrOffset   = sizeof (EFI_HII_PACKAGE_HEADER);

-  while (IfrOffset < PackageLenth) {

+  while (IfrOffset < PackageLength) {

     IfrOpHdr  = (EFI_IFR_OP_HEADER *) (Package + IfrOffset);

 

     switch (IfrOpHdr->OpCode) {

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
index 6bf1d6ec7c..622fe530b3 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
@@ -1363,8 +1363,7 @@ EmuQueryVariableInfo (
 

   This function allocates memory space for variable store area and initializes its attributes.

 

-  @param  VariableBase         Base of the variable store area created

-  @param  LastVariableOffset   Size of VARIABLE_STORE_HEADER

+  @param  VolatileStore  Indicates if the variable store is volatile.

 

 **/

 EFI_STATUS

diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index b2fa201c74..aa428cac49 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -465,7 +465,7 @@ FindVariable (
       //

       // Record Variable in VariableIndex HOB

       //

-      if (IndexTable->Length < VARIABLE_INDEX_TABLE_VOLUME && StopRecord != TRUE) {

+      if (IndexTable->Length < VARIABLE_INDEX_TABLE_VOLUME && !StopRecord) {

         Offset = (UINT32)((UINTN)Variable - (UINTN)LastVariable);

         //

         // The distance of two neighbouring VAR_ADDED variable is larger than 2^16, 

@@ -476,7 +476,7 @@ FindVariable (
           StopRecord = TRUE;

         }

 

-        if (StopRecord != TRUE) {

+        if (!StopRecord) {

           IndexTable->Index[IndexTable->Length++] = (UINT16) Offset;

         }

         LastVariable = Variable;

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 4f0ea3c4b7..50c1cca82a 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -2215,7 +2215,7 @@ ReclaimForOS(
 /**

   Initializes variable store area for non-volatile and volatile variable.

 

-  @param  SystemTable           The pointer of EFI_SYSTEM_TABLE.

+  @param  FvbProtocol           Pointer to an instance of EFI Firmware Volume Block Protocol.

 

   @retval EFI_SUCCESS           Function successfully executed.

   @retval EFI_OUT_OF_RESOURCES  Fail to allocate enough memory resource.

@@ -2240,6 +2240,7 @@ VariableCommonInitialize (
   UINT64                          VariableStoreLength;

   EFI_EVENT                       ReadyToBootEvent;

   UINTN                           ScratchSize;

+  UINTN                           VariableSize;

 

   Status = EFI_SUCCESS;

   //

@@ -2353,7 +2354,6 @@ VariableCommonInitialize (
     Status        = EFI_SUCCESS;

 

     while (IsValidVariableHeader (NextVariable)) {

-      UINTN VariableSize = 0;

       VariableSize = NextVariable->NameSize + NextVariable->DataSize + sizeof (VARIABLE_HEADER);

       if ((NextVariable->Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {

         mVariableModuleGlobal->HwErrVariableTotalSize += HEADER_ALIGN (VariableSize);

@@ -2449,6 +2449,14 @@ VariableClassAddressChangeEvent (
   EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal);

 }

 

+/**

+  Firmware Volume Block Protocol notification event handler.

+

+  Discover NV Variable Store and install Variable Arch Protocol.

+

+  @param[in] Event    Event whose notification function is being invoked.

+  @param[in] Context  Pointer to the notification function's context.

+**/

 VOID

 EFIAPI

 FvbNotificationEvent (