[patch 0/8] Fix coding style issues

[patch 0/8] Fix coding style issues

[Dandan Bi]

Dandan Bi (8):
  SecurityPkg/FmpAuthenticationLib: Fix Guid format issues
  IntelSiliconPkg: Fix format issues
  MdeModulePkg/CapsuleApp: Fix Guid format issues
  MdeModulePkg/EbcDxe: Make variable name follow rules
  MdeModulePkg/EmmcDxe: Avoid Non-Boolean type used as Boolean
  MdeModulePkg/TerminalDxe: Initialize variable after declaration
  MdeModulePkg/SataControllerDxe: Fix coding style issue
  MdeModulePkg/NonDiscoverableDeviceRegistrationLib: Fix coding style
    issues

 .../IndustryStandard/FirmwareInterfaceTable.h      |  2 +-
 .../Include/IndustryStandard/FirmwareVersionInfo.h |  2 +-
 .../Include/IndustryStandard/IgdOpRegion.h         |  2 +-
 .../DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c      |  2 +-
 .../DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf    |  2 +-
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf | 18 +++++++++---------
 .../Pci/SataControllerDxe/SataControllerDxe.inf    |  2 +-
 MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c          |  2 +-
 .../Library/NonDiscoverableDeviceRegistrationLib.h |  4 +++-
 .../NonDiscoverableDeviceRegistrationLib.c         | 14 ++++++++++++--
 .../NonDiscoverableDeviceRegistrationLib.inf       | 22 ++++++++++++----------
 .../Universal/Console/TerminalDxe/TerminalConOut.c |  4 +++-
 .../Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c    |  8 ++++----
 .../Universal/EbcDxe/EbcDebugger/EdbCommon.h       |  2 +-
 .../Universal/EbcDxe/EbcDebugger/EdbSymbol.c       | 18 +++++++++---------
 .../FmpAuthenticationLibPkcs7.inf                  |  2 +-
 .../FmpAuthenticationLibRsa2048Sha256.inf          |  4 ++--
 17 files changed, 63 insertions(+), 47 deletions(-)

-- 
1.9.5.msysgit.1

[patch 1/8] SecurityPkg/FmpAuthenticationLib: Fix Guid format issues

[Dandan Bi]

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 .../Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf   | 2 +-
 .../FmpAuthenticationLibRsa2048Sha256.inf                             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
index bce958d..215b3cb 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
+++ b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
@@ -44,6 +44,6 @@ [LibraryClasses]
   DebugLib
   MemoryAllocationLib
   BaseCryptLib
 
 [Guids]
-  gEfiCertPkcs7Guid        ## CONSUMES
+  gEfiCertPkcs7Guid        ## CONSUMES   ## GUID
diff --git a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
index b58966d..633f407 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
+++ b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
@@ -47,7 +47,7 @@ [LibraryClasses]
 
 [Pcd]
   gEfiSecurityPkgTokenSpaceGuid.PcdRsa2048Sha256PublicKeyBuffer     ## CONSUMES
 
 [Guids]
-  gEfiCertTypeRsa2048Sha256Guid         ## CONSUMES
-  gEfiHashAlgorithmSha256Guid           ## CONSUMES
+  gEfiCertTypeRsa2048Sha256Guid         ## CONSUMES   ## GUID
+  gEfiHashAlgorithmSha256Guid           ## CONSUMES   ## GUID
-- 
1.9.5.msysgit.1

[patch 2/8] IntelSiliconPkg: Fix format issues

[Dandan Bi]

1. Fix doxygen formt
2. Fix Guid format

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h   | 2 +-
 IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h      | 2 +-
 IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h              | 2 +-
 IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c   | 2 +-
 IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h b/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h
index 39f20ea..cdc080b 100644
--- a/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h
+++ b/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h
@@ -1,9 +1,9 @@
 /** @file
   FirmwareInterfaceTable (FIT) related definitions.
 
-  @todo: update document/spec reference
+  @todo update document/spec reference
 
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
diff --git a/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h b/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
index b982d79..bcb741f 100644
--- a/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
+++ b/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
@@ -1,9 +1,9 @@
 /** @file
   Intel Firmware Version Info (FVI) related definitions.
 
-  @todo: update document/spec reference
+  @todo update document/spec reference
 
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
diff --git a/IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h b/IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h
index fd6f813..5ce80a5 100644
--- a/IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h
+++ b/IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h
@@ -29,11 +29,11 @@
 /**
   OpRegion structures:
   Sub-structures define the different parts of the OpRegion followed by the
   main structure representing the entire OpRegion.
 
-  @note: These structures are packed to 1 byte offsets because the exact
+  @note These structures are packed to 1 byte offsets because the exact
   data location is required by the supporting design specification due to
   the fact that the data is used by ASL and Graphics driver code compiled
   separately.
 **/
 #pragma pack(1)
diff --git a/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c b/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c
index 8d513e0..facab9a 100644
--- a/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c
+++ b/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c
@@ -28,11 +28,11 @@
 #include <Protocol/Smbios.h>
 
 /**
 
   Get the full size of SMBIOS structure including optional strings that follow the formatted structure.
-  @note: This function is copy from SmbiosDxe in MdeModulePkg.
+  @note This function is copy from SmbiosDxe in MdeModulePkg.
 
   @param[in] This                 The EFI_SMBIOS_PROTOCOL instance.
   @param[in] Head                 Pointer to the beginning of SMBIOS structure.
   @param[out] Size                The returned size.
   @param[out] NumberOfStrings     The returned number of optional strings that follow the formatted structure.
diff --git a/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf b/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf
index afac26f..4fb2551 100644
--- a/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf
+++ b/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf
@@ -35,10 +35,10 @@ [LibraryClasses]
 BaseLib
 HobLib
 UefiLib
 
 [Guids]
-gIntelSmbiosDataHobGuid ## CONSUMES
+gIntelSmbiosDataHobGuid ## CONSUMES   ## GUID
 
 [Depex]
 gEfiSmbiosProtocolGuid
 
-- 
1.9.5.msysgit.1

[patch 3/8] MdeModulePkg/CapsuleApp: Fix Guid format issues

[Dandan Bi]

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
index 97cd9ba..c255096 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
@@ -38,19 +38,19 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 
 [Guids]
-  gEfiFileInfoGuid                       ## CONSUMES
-  gEfiPartTypeSystemPartGuid             ## CONSUMES
-  gEfiGlobalVariableGuid                 ## CONSUMES
-  gEfiCapsuleReportGuid                  ## CONSUMES
-  gEfiFmpCapsuleGuid                     ## CONSUMES
-  gWindowsUxCapsuleGuid                  ## CONSUMES
-  gEfiCertTypeRsa2048Sha256Guid          ## CONSUMES
-  gEfiCertPkcs7Guid                      ## CONSUMES
-  gEfiSystemResourceTableGuid            ## CONSUMES
+  gEfiFileInfoGuid                       ## CONSUMES   ## GUID
+  gEfiPartTypeSystemPartGuid             ## CONSUMES   ## GUID
+  gEfiGlobalVariableGuid                 ## CONSUMES   ## GUID
+  gEfiCapsuleReportGuid                  ## CONSUMES   ## GUID
+  gEfiFmpCapsuleGuid                     ## CONSUMES   ## GUID
+  gWindowsUxCapsuleGuid                  ## CONSUMES   ## GUID
+  gEfiCertTypeRsa2048Sha256Guid          ## CONSUMES   ## GUID
+  gEfiCertPkcs7Guid                      ## CONSUMES   ## GUID
+  gEfiSystemResourceTableGuid            ## CONSUMES   ## GUID
 
 [Protocols]
   gEfiLoadedImageProtocolGuid            ## CONSUMES
   gEfiSimpleFileSystemProtocolGuid       ## CONSUMES
   gEfiGraphicsOutputProtocolGuid         ## CONSUMES
-- 
1.9.5.msysgit.1

[patch 4/8] MdeModulePkg/EbcDxe: Make variable name follow rules

[Dandan Bi]

For variable name, it should contain lower case characters.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 .../Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c        |  8 ++++----
 MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h  |  2 +-
 MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c  | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
index 9c5707e..ba62c6a 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
@@ -164,21 +164,21 @@ DebuggerDisplaySymbolAccrodingToAddress (
     EDBPrint (L"        Address      Type  Symbol\n");
     EDBPrint (L"  ================== ==== ========\n");
 //  EDBPrint (L"  0xFFFFFFFF00000000 ( F) TestMain\n");
     EDBPrint (
       L"  0x%016lx %s %a\n",
-      (UINT64)Entry->RVA + Object->BaseAddress,
+      (UINT64)Entry->Rva + Object->BaseAddress,
       EdbSymbolTypeToStr (Entry->Type),
       Entry->Name
       );
   } else {
     EDBPrint (L"   Address   Type  Symbol\n");
     EDBPrint (L"  ========== ==== ========\n");
 //  EDBPrint (L"  0xFFFF0000 ( F) TestMain\n");
     EDBPrint (
       L"  0x%08x %s %a\n",
-      Entry->RVA + Object->BaseAddress,
+      Entry->Rva + Object->BaseAddress,
       EdbSymbolTypeToStr (Entry->Type),
       Entry->Name
       );
   }
 
@@ -271,19 +271,19 @@ DebuggerDisplaySymbolAccrodingToName (
       }
 
       if (sizeof(UINTN) == sizeof(UINT64)) {
         EDBPrint (
           L"  0x%016lx %s %a (%a)\n",
-          (UINT64)Entry->RVA + Object->BaseAddress,
+          (UINT64)Entry->Rva + Object->BaseAddress,
           EdbSymbolTypeToStr (Entry->Type),
           Entry->Name,
           Entry->ObjName
           );
       } else {
         EDBPrint (
           L"  0x%08x %s %a (%a)\n",
-          Entry->RVA + Object->BaseAddress,
+          Entry->Rva + Object->BaseAddress,
           EdbSymbolTypeToStr (Entry->Type),
           Entry->Name,
           Entry->ObjName
           );
       }
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
index 2a54be1..d452b2b 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
@@ -88,11 +88,11 @@ typedef enum {
   EfiDebuggerSymbolTypeMax,
 } EFI_DEBUGGER_SYMBOL_TYPE;
 
 typedef struct {
   CHAR8                      Name[EFI_DEBUGGER_SYMBOL_NAME_MAX];
-  UINTN                      RVA;
+  UINTN                      Rva;
   EFI_DEBUGGER_SYMBOL_TYPE   Type;
   CHAR8                      ObjName[EFI_DEBUGGER_SYMBOL_NAME_MAX];
   CHAR8                      *CodBuffer;
   UINTN                      CodBufferSize;
   UINTN                      FuncOffsetBase;
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
index e6a677d..4e640ea 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
@@ -65,11 +65,11 @@ EdbLoadSymbolSingleEntry (
   //
   AsciiStrnCpyS (Entry->Name, sizeof(Entry->Name), Name, sizeof(Entry->Name) - 1);
   if (ObjName != NULL) {
     AsciiStrnCpyS (Entry->ObjName, sizeof(Entry->ObjName), ObjName, sizeof(Entry->ObjName) - 1);
   }
-  Entry->RVA = Address % EFI_DEBUGGER_DEFAULT_LINK_IMAGEBASE;
+  Entry->Rva = Address % EFI_DEBUGGER_DEFAULT_LINK_IMAGEBASE;
   Entry->Type = Type;
 
   //
   // Increase Count
   //
@@ -513,29 +513,29 @@ EbdFindSymbolAddress (
     //
     // Go through each entry
     //
     Entry = Object->Entry;
     for (SubIndex = 0; SubIndex < Object->EntryCount; SubIndex++, Entry++) {
-      if (Address != Entry->RVA + Object->BaseAddress) {
+      if (Address != Entry->Rva + Object->BaseAddress) {
         //
         // Check for nearest address
         //
-        if (Address > Entry->RVA + Object->BaseAddress) {
+        if (Address > Entry->Rva + Object->BaseAddress) {
           //
           // Record it if Current RVA < Address
           //
-          if (CandidateLowerAddress < Entry->RVA + Object->BaseAddress) {
-            CandidateLowerAddress = Entry->RVA + Object->BaseAddress;
+          if (CandidateLowerAddress < Entry->Rva + Object->BaseAddress) {
+            CandidateLowerAddress = Entry->Rva + Object->BaseAddress;
             LowEntry = Entry;
             LowObject = Object;
           }
         } else {
           //
           // Record it if Current RVA > Address
           //
-          if (CandidateUpperAddress > Entry->RVA + Object->BaseAddress) {
-            CandidateUpperAddress = Entry->RVA + Object->BaseAddress;
+          if (CandidateUpperAddress > Entry->Rva + Object->BaseAddress) {
+            CandidateUpperAddress = Entry->Rva + Object->BaseAddress;
             UpperEntry = Entry;
             UpperObject = Object;
           }
         }
         continue;
@@ -1710,11 +1710,11 @@ FindSymbolStr (
     Entry = Object[ObjectIndex].Entry;
     for (EntryIndex = 0; EntryIndex < Object[ObjectIndex].EntryCount; EntryIndex++) {
       //
       // if Address match, return Name
       //
-      if (Address == (Entry[EntryIndex].RVA + Object[ObjectIndex].BaseAddress)) {
+      if (Address == (Entry[EntryIndex].Rva + Object[ObjectIndex].BaseAddress)) {
         return Entry[EntryIndex].Name;
       }
     }
   }
 
@@ -2217,11 +2217,11 @@ Symboltoi (
           return EFI_NO_MAPPING;
         } else {
           //
           // record Address
           //
-          *Address = (Entry[EntryIndex].RVA + Object[ObjectIndex].BaseAddress);
+          *Address = (Entry[EntryIndex].Rva + Object[ObjectIndex].BaseAddress);
         }
       }
     }
   }
 
-- 
1.9.5.msysgit.1

[patch 5/8] MdeModulePkg/EmmcDxe: Avoid Non-Boolean type used as Boolean

[Dandan Bi]

Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c
index fc705e1..c432d26 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c
+++ b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c
@@ -899,11 +899,11 @@ EmmcReadWrite (
     BufferSize = BlockNum * BlockSize;
     Status = EmmcRwMultiBlocks (Partition, Lba, Buffer, BufferSize, IsRead, Token, LastRw);
     if (EFI_ERROR (Status)) {
       return Status;
     }
-    DEBUG ((EFI_D_INFO, "Emmc%a(): Part %d Lba 0x%x BlkNo 0x%x Event %p with %r\n", IsRead ? "Read " : "Write", Partition->PartitionType, Lba, BlockNum, Token ? Token->Event : NULL, Status));
+    DEBUG ((EFI_D_INFO, "Emmc%a(): Part %d Lba 0x%x BlkNo 0x%x Event %p with %r\n", IsRead ? "Read " : "Write", Partition->PartitionType, Lba, BlockNum, (Token != NULL) ? Token->Event : NULL, Status));
 
     Lba   += BlockNum;
     Buffer = (UINT8*)Buffer + BufferSize;
     Remaining -= BlockNum;
   }
-- 
1.9.5.msysgit.1

[patch 6/8] MdeModulePkg/TerminalDxe: Initialize variable after declaration

[Dandan Bi]

Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index 9625f4d..c9b4ffc 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -186,10 +186,11 @@ TerminalConOutOutputString (
   UTF8_CHAR                   Utf8Char;
   CHAR8                       GraphicChar;
   CHAR8                       AsciiChar;
   EFI_STATUS                  Status;
   UINT8                       ValidBytes;
+  CHAR8                       CrLfStr[2];
   //
   //  flag used to indicate whether condition happens which will cause
   //  return EFI_WARN_UNKNOWN_GLYPH
   //
   BOOLEAN                     Warning;
@@ -324,11 +325,12 @@ TerminalConOutOutputString (
           // the next character, but the driver thinks it has wrapped
           // already.  Print CR LF to synchronize the terminal with
           // the driver, but only if we're not in the middle of
           // printing an escape sequence.
           //
-          CHAR8 CrLfStr[] = {'\r', '\n'};
+          CrLfStr[0] = '\r';
+          CrLfStr[1] = '\n';
 
           Length = sizeof(CrLfStr);
 
           Status = TerminalDevice->SerialIo->Write (
                                                 TerminalDevice->SerialIo,
-- 
1.9.5.msysgit.1

[patch 7/8] MdeModulePkg/SataControllerDxe: Fix coding style issue

[Dandan Bi]

Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
index e24b2a0..39cdffc 100644
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
+++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
@@ -1,8 +1,8 @@
 ## @file
 #  
-#    Component description file for the Sata Controller driver.
+#    Component Description File for the Sata Controller driver.
 #
 #  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
-- 
1.9.5.msysgit.1

[patch 8/8] MdeModulePkg/NonDiscoverableDeviceRegistrationLib: Fix coding style issues

[Dandan Bi]

1. Fix issues comments
2. Fix Guid/protocol format

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 .../Library/NonDiscoverableDeviceRegistrationLib.h |  4 +++-
 .../NonDiscoverableDeviceRegistrationLib.c         | 14 ++++++++++++--
 .../NonDiscoverableDeviceRegistrationLib.inf       | 22 ++++++++++++----------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h b/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h
index 120d914..c2d9e48 100644
--- a/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h
+++ b/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h
@@ -30,21 +30,23 @@ typedef enum {
 } NON_DISCOVERABLE_DEVICE_TYPE;
 
 /**
   Register a non-discoverable MMIO device
 
-  @param[in]      DeviceType          The type of non-discoverable device
+  @param[in]      Type                The type of non-discoverable device
   @param[in]      DmaType             Whether the device is DMA coherent
   @param[in]      InitFunc            Initialization routine to be invoked when
                                       the device is enabled
   @param[in,out]  Handle              The handle onto which to install the
                                       non-discoverable device protocol.
                                       If Handle is NULL or *Handle is NULL, a
                                       new handle will be allocated.
   @param[in]      NumMmioResources    The number of UINTN base/size pairs that
                                       follow, each describing an MMIO region
                                       owned by the device
+  @param[in]  ...                     The variable argument list which contains the
+                                      info about MmioResources.
 
   @retval EFI_SUCCESS                 The registration succeeded.
   @retval Other                       The registration failed.
 
 **/
diff --git a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
index 94cd946..6f46dfa 100644
--- a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
+++ b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
@@ -23,10 +23,18 @@
 #include <Library/UefiBootServicesTableLib.h>
 
 #include <Protocol/DevicePath.h>
 #include <Protocol/NonDiscoverableDevice.h>
 
+/**
+  Get Guid form the type of non-discoverable device.
+
+  @param[in]  Type    The type of non-discoverable device.
+
+  @retval   Return the Guid.
+
+**/
 STATIC
 CONST EFI_GUID *
 GetGuidFromType (
   IN  NON_DISCOVERABLE_DEVICE_TYPE  Type
   )
@@ -72,23 +80,25 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL            End;
 } NON_DISCOVERABLE_DEVICE_PATH;
 #pragma pack ()
 
 /**
-  Register a non-discoverable MMIO device
+  Register a non-discoverable MMIO device.
 
-  @param[in]      DeviceType          The type of non-discoverable device
+  @param[in]      Type                The type of non-discoverable device
   @param[in]      DmaType             Whether the device is DMA coherent
   @param[in]      InitFunc            Initialization routine to be invoked when
                                       the device is enabled
   @param[in,out]  Handle              The handle onto which to install the
                                       non-discoverable device protocol.
                                       If Handle is NULL or *Handle is NULL, a
                                       new handle will be allocated.
   @param[in]      NumMmioResources    The number of UINTN base/size pairs that
                                       follow, each describing an MMIO region
                                       owned by the device
+  @param[in]  ...                     The variable argument list which contains the
+                                      info about MmioResources.
 
   @retval EFI_SUCCESS                 The registration succeeded.
   @retval EFI_INVALID_PARAMETER       An invalid argument was given
   @retval Other                       The registration failed.
 
diff --git a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
index ba32324..dfcf8dc 100644
--- a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
+++ b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
@@ -1,6 +1,8 @@
 # @file
+# Component Description File for NonDiscoverableDeviceRegistrationLib.
+#
 # Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
@@ -30,17 +32,17 @@ [LibraryClasses]
   DebugLib
   DevicePathLib
   UefiBootServicesTableLib
 
 [Protocols]
-  gEdkiiNonDiscoverableDeviceProtocolGuid
+  gEdkiiNonDiscoverableDeviceProtocolGuid    ## PRODUCES
 
 [Guids]
-  gEdkiiNonDiscoverableAhciDeviceGuid
-  gEdkiiNonDiscoverableAmbaDeviceGuid
-  gEdkiiNonDiscoverableEhciDeviceGuid
-  gEdkiiNonDiscoverableNvmeDeviceGuid
-  gEdkiiNonDiscoverableOhciDeviceGuid
-  gEdkiiNonDiscoverableSdhciDeviceGuid
-  gEdkiiNonDiscoverableUfsDeviceGuid
-  gEdkiiNonDiscoverableUhciDeviceGuid
-  gEdkiiNonDiscoverableXhciDeviceGuid
+  gEdkiiNonDiscoverableAhciDeviceGuid    ## CONSUMES   ## GUID
+  gEdkiiNonDiscoverableAmbaDeviceGuid    ## CONSUMES   ## GUID
+  gEdkiiNonDiscoverableEhciDeviceGuid    ## CONSUMES   ## GUID
+  gEdkiiNonDiscoverableNvmeDeviceGuid    ## CONSUMES   ## GUID
+  gEdkiiNonDiscoverableOhciDeviceGuid    ## CONSUMES   ## GUID
+  gEdkiiNonDiscoverableSdhciDeviceGuid   ## CONSUMES   ## GUID
+  gEdkiiNonDiscoverableUfsDeviceGuid     ## CONSUMES   ## GUID
+  gEdkiiNonDiscoverableUhciDeviceGuid    ## CONSUMES   ## GUID
+  gEdkiiNonDiscoverableXhciDeviceGuid    ## CONSUMES   ## GUID
-- 
1.9.5.msysgit.1

Re: [patch 2/8] IntelSiliconPkg: Fix format issues

[Yao, Jiewen]

Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: Bi, Dandan
> Sent: Monday, December 19, 2016 3:20 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [patch 2/8] IntelSiliconPkg: Fix format issues
> 
> 1. Fix doxygen formt
> 2. Fix Guid format
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>
> ---
>  IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h   | 2 +-
>  IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h      | 2 +-
>  IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h              | 2 +-
>  IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c   | 2 +-
>  IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h
> b/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h
> index 39f20ea..cdc080b 100644
> --- a/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h
> +++ b/IntelSiliconPkg/Include/IndustryStandard/FirmwareInterfaceTable.h
> @@ -1,9 +1,9 @@
>  /** @file
>    FirmwareInterfaceTable (FIT) related definitions.
> 
> -  @todo: update document/spec reference
> +  @todo update document/spec reference
> 
>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>    This program and the accompanying materials
>    are licensed and made available under the terms and conditions of the BSD
> License
>    which accompanies this distribution.  The full text of the license may be
> found at
> diff --git a/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
> b/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
> index b982d79..bcb741f 100644
> --- a/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
> +++ b/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
> @@ -1,9 +1,9 @@
>  /** @file
>    Intel Firmware Version Info (FVI) related definitions.
> 
> -  @todo: update document/spec reference
> +  @todo update document/spec reference
> 
>    Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>    This program and the accompanying materials
>    are licensed and made available under the terms and conditions of the BSD
> License
>    which accompanies this distribution.  The full text of the license may be
> found at
> diff --git a/IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h
> b/IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h
> index fd6f813..5ce80a5 100644
> --- a/IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h
> +++ b/IntelSiliconPkg/Include/IndustryStandard/IgdOpRegion.h
> @@ -29,11 +29,11 @@
>  /**
>    OpRegion structures:
>    Sub-structures define the different parts of the OpRegion followed by the
>    main structure representing the entire OpRegion.
> 
> -  @note: These structures are packed to 1 byte offsets because the exact
> +  @note These structures are packed to 1 byte offsets because the exact
>    data location is required by the supporting design specification due to
>    the fact that the data is used by ASL and Graphics driver code compiled
>    separately.
>  **/
>  #pragma pack(1)
> diff --git
> a/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c
> b/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c
> index 8d513e0..facab9a 100644
> --- a/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c
> +++ b/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.c
> @@ -28,11 +28,11 @@
>  #include <Protocol/Smbios.h>
> 
>  /**
> 
>    Get the full size of SMBIOS structure including optional strings that follow the
> formatted structure.
> -  @note: This function is copy from SmbiosDxe in MdeModulePkg.
> +  @note This function is copy from SmbiosDxe in MdeModulePkg.
> 
>    @param[in] This                 The EFI_SMBIOS_PROTOCOL instance.
>    @param[in] Head                 Pointer to the beginning of SMBIOS
> structure.
>    @param[out] Size                The returned size.
>    @param[out] NumberOfStrings     The returned number of optional strings
> that follow the formatted structure.
> diff --git
> a/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf
> b/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf
> index afac26f..4fb2551 100644
> --- a/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf
> +++ b/IntelSiliconPkg/Library/DxeSmbiosDataHobLib/DxeSmbiosDataHobLib.inf
> @@ -35,10 +35,10 @@ [LibraryClasses]
>  BaseLib
>  HobLib
>  UefiLib
> 
>  [Guids]
> -gIntelSmbiosDataHobGuid ## CONSUMES
> +gIntelSmbiosDataHobGuid ## CONSUMES   ## GUID
> 
>  [Depex]
>  gEfiSmbiosProtocolGuid
> 
> --
> 1.9.5.msysgit.1

Re: [patch 1/8] SecurityPkg/FmpAuthenticationLib: Fix Guid format issues

[Yao, Jiewen]

Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: Bi, Dandan
> Sent: Monday, December 19, 2016 3:20 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [patch 1/8] SecurityPkg/FmpAuthenticationLib: Fix Guid format issues
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>
> ---
>  .../Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf   | 2 +-
>  .../FmpAuthenticationLibRsa2048Sha256.inf                             | 4
> ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git
> a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.i
> nf
> b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.i
> nf
> index bce958d..215b3cb 100644
> ---
> a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.i
> nf
> +++
> b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.i
> nf
> @@ -44,6 +44,6 @@ [LibraryClasses]
>    DebugLib
>    MemoryAllocationLib
>    BaseCryptLib
> 
>  [Guids]
> -  gEfiCertPkcs7Guid        ## CONSUMES
> +  gEfiCertPkcs7Guid        ## CONSUMES   ## GUID
> diff --git
> a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationL
> ibRsa2048Sha256.inf
> b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthentication
> LibRsa2048Sha256.inf
> index b58966d..633f407 100644
> ---
> a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationL
> ibRsa2048Sha256.inf
> +++
> b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthentication
> LibRsa2048Sha256.inf
> @@ -47,7 +47,7 @@ [LibraryClasses]
> 
>  [Pcd]
>    gEfiSecurityPkgTokenSpaceGuid.PcdRsa2048Sha256PublicKeyBuffer     ##
> CONSUMES
> 
>  [Guids]
> -  gEfiCertTypeRsa2048Sha256Guid         ## CONSUMES
> -  gEfiHashAlgorithmSha256Guid           ## CONSUMES
> +  gEfiCertTypeRsa2048Sha256Guid         ## CONSUMES   ## GUID
> +  gEfiHashAlgorithmSha256Guid           ## CONSUMES   ## GUID
> --
> 1.9.5.msysgit.1

Re: [patch 3/8] MdeModulePkg/CapsuleApp: Fix Guid format issues

[Yao, Jiewen]

Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Dandan Bi
> Sent: Monday, December 19, 2016 3:20 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [edk2] [patch 3/8] MdeModulePkg/CapsuleApp: Fix Guid format issues
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>
> ---
>  MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf | 18
> +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
> b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
> index 97cd9ba..c255096 100644
> --- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
> +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
> @@ -38,19 +38,19 @@ [Sources]
>  [Packages]
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
> 
>  [Guids]
> -  gEfiFileInfoGuid                       ## CONSUMES
> -  gEfiPartTypeSystemPartGuid             ## CONSUMES
> -  gEfiGlobalVariableGuid                 ## CONSUMES
> -  gEfiCapsuleReportGuid                  ## CONSUMES
> -  gEfiFmpCapsuleGuid                     ## CONSUMES
> -  gWindowsUxCapsuleGuid                  ## CONSUMES
> -  gEfiCertTypeRsa2048Sha256Guid          ## CONSUMES
> -  gEfiCertPkcs7Guid                      ## CONSUMES
> -  gEfiSystemResourceTableGuid            ## CONSUMES
> +  gEfiFileInfoGuid                       ## CONSUMES   ## GUID
> +  gEfiPartTypeSystemPartGuid             ## CONSUMES   ## GUID
> +  gEfiGlobalVariableGuid                 ## CONSUMES   ## GUID
> +  gEfiCapsuleReportGuid                  ## CONSUMES   ## GUID
> +  gEfiFmpCapsuleGuid                     ## CONSUMES   ## GUID
> +  gWindowsUxCapsuleGuid                  ## CONSUMES   ## GUID
> +  gEfiCertTypeRsa2048Sha256Guid          ## CONSUMES   ## GUID
> +  gEfiCertPkcs7Guid                      ## CONSUMES   ## GUID
> +  gEfiSystemResourceTableGuid            ## CONSUMES   ## GUID
> 
>  [Protocols]
>    gEfiLoadedImageProtocolGuid            ## CONSUMES
>    gEfiSimpleFileSystemProtocolGuid       ## CONSUMES
>    gEfiGraphicsOutputProtocolGuid         ## CONSUMES
> --
> 1.9.5.msysgit.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [patch 4/8] MdeModulePkg/EbcDxe: Make variable name follow rules

[Yao, Jiewen]

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Dandan Bi
> Sent: Monday, December 19, 2016 3:20 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [edk2] [patch 4/8] MdeModulePkg/EbcDxe: Make variable name follow
> rules
> 
> For variable name, it should contain lower case characters.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>
> ---
>  .../Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c        |  8 ++++----
>  MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h  |  2 +-
>  MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c  | 18
> +++++++++---------
>  3 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
> b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
> index 9c5707e..ba62c6a 100644
> --- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
> +++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
> @@ -164,21 +164,21 @@ DebuggerDisplaySymbolAccrodingToAddress (
>      EDBPrint (L"        Address      Type  Symbol\n");
>      EDBPrint (L"  ================== ==== ========\n");
>  //  EDBPrint (L"  0xFFFFFFFF00000000 ( F) TestMain\n");
>      EDBPrint (
>        L"  0x%016lx %s %a\n",
> -      (UINT64)Entry->RVA + Object->BaseAddress,
> +      (UINT64)Entry->Rva + Object->BaseAddress,
>        EdbSymbolTypeToStr (Entry->Type),
>        Entry->Name
>        );
>    } else {
>      EDBPrint (L"   Address   Type  Symbol\n");
>      EDBPrint (L"  ========== ==== ========\n");
>  //  EDBPrint (L"  0xFFFF0000 ( F) TestMain\n");
>      EDBPrint (
>        L"  0x%08x %s %a\n",
> -      Entry->RVA + Object->BaseAddress,
> +      Entry->Rva + Object->BaseAddress,
>        EdbSymbolTypeToStr (Entry->Type),
>        Entry->Name
>        );
>    }
> 
> @@ -271,19 +271,19 @@ DebuggerDisplaySymbolAccrodingToName (
>        }
> 
>        if (sizeof(UINTN) == sizeof(UINT64)) {
>          EDBPrint (
>            L"  0x%016lx %s %a (%a)\n",
> -          (UINT64)Entry->RVA + Object->BaseAddress,
> +          (UINT64)Entry->Rva + Object->BaseAddress,
>            EdbSymbolTypeToStr (Entry->Type),
>            Entry->Name,
>            Entry->ObjName
>            );
>        } else {
>          EDBPrint (
>            L"  0x%08x %s %a (%a)\n",
> -          Entry->RVA + Object->BaseAddress,
> +          Entry->Rva + Object->BaseAddress,
>            EdbSymbolTypeToStr (Entry->Type),
>            Entry->Name,
>            Entry->ObjName
>            );
>        }
> diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
> b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
> index 2a54be1..d452b2b 100644
> --- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
> +++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
> @@ -88,11 +88,11 @@ typedef enum {
>    EfiDebuggerSymbolTypeMax,
>  } EFI_DEBUGGER_SYMBOL_TYPE;
> 
>  typedef struct {
>    CHAR8
> Name[EFI_DEBUGGER_SYMBOL_NAME_MAX];
> -  UINTN                      RVA;
> +  UINTN                      Rva;
>    EFI_DEBUGGER_SYMBOL_TYPE   Type;
>    CHAR8
> ObjName[EFI_DEBUGGER_SYMBOL_NAME_MAX];
>    CHAR8                      *CodBuffer;
>    UINTN                      CodBufferSize;
>    UINTN                      FuncOffsetBase;
> diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
> b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
> index e6a677d..4e640ea 100644
> --- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
> +++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
> @@ -65,11 +65,11 @@ EdbLoadSymbolSingleEntry (
>    //
>    AsciiStrnCpyS (Entry->Name, sizeof(Entry->Name), Name,
> sizeof(Entry->Name) - 1);
>    if (ObjName != NULL) {
>      AsciiStrnCpyS (Entry->ObjName, sizeof(Entry->ObjName), ObjName,
> sizeof(Entry->ObjName) - 1);
>    }
> -  Entry->RVA = Address % EFI_DEBUGGER_DEFAULT_LINK_IMAGEBASE;
> +  Entry->Rva = Address % EFI_DEBUGGER_DEFAULT_LINK_IMAGEBASE;
>    Entry->Type = Type;
> 
>    //
>    // Increase Count
>    //
> @@ -513,29 +513,29 @@ EbdFindSymbolAddress (
>      //
>      // Go through each entry
>      //
>      Entry = Object->Entry;
>      for (SubIndex = 0; SubIndex < Object->EntryCount; SubIndex++, Entry++) {
> -      if (Address != Entry->RVA + Object->BaseAddress) {
> +      if (Address != Entry->Rva + Object->BaseAddress) {
>          //
>          // Check for nearest address
>          //
> -        if (Address > Entry->RVA + Object->BaseAddress) {
> +        if (Address > Entry->Rva + Object->BaseAddress) {
>            //
>            // Record it if Current RVA < Address
>            //
> -          if (CandidateLowerAddress < Entry->RVA + Object->BaseAddress) {
> -            CandidateLowerAddress = Entry->RVA + Object->BaseAddress;
> +          if (CandidateLowerAddress < Entry->Rva + Object->BaseAddress) {
> +            CandidateLowerAddress = Entry->Rva + Object->BaseAddress;
>              LowEntry = Entry;
>              LowObject = Object;
>            }
>          } else {
>            //
>            // Record it if Current RVA > Address
>            //
> -          if (CandidateUpperAddress > Entry->RVA + Object->BaseAddress) {
> -            CandidateUpperAddress = Entry->RVA + Object->BaseAddress;
> +          if (CandidateUpperAddress > Entry->Rva + Object->BaseAddress) {
> +            CandidateUpperAddress = Entry->Rva + Object->BaseAddress;
>              UpperEntry = Entry;
>              UpperObject = Object;
>            }
>          }
>          continue;
> @@ -1710,11 +1710,11 @@ FindSymbolStr (
>      Entry = Object[ObjectIndex].Entry;
>      for (EntryIndex = 0; EntryIndex < Object[ObjectIndex].EntryCount;
> EntryIndex++) {
>        //
>        // if Address match, return Name
>        //
> -      if (Address == (Entry[EntryIndex].RVA +
> Object[ObjectIndex].BaseAddress)) {
> +      if (Address == (Entry[EntryIndex].Rva +
> Object[ObjectIndex].BaseAddress)) {
>          return Entry[EntryIndex].Name;
>        }
>      }
>    }
> 
> @@ -2217,11 +2217,11 @@ Symboltoi (
>            return EFI_NO_MAPPING;
>          } else {
>            //
>            // record Address
>            //
> -          *Address = (Entry[EntryIndex].RVA +
> Object[ObjectIndex].BaseAddress);
> +          *Address = (Entry[EntryIndex].Rva +
> Object[ObjectIndex].BaseAddress);
>          }
>        }
>      }
>    }
> 
> --
> 1.9.5.msysgit.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [patch 5/8] MdeModulePkg/EmmcDxe: Avoid Non-Boolean type used as Boolean

[Tian, Feng]

Reviewed-by: Feng Tian <feng.tian@Intel.com>

Thanks
Feng

-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Dandan Bi
Sent: Monday, December 19, 2016 3:20 PM
To: edk2-devel@lists.01.org
Cc: Tian, Feng <feng.tian@intel.com>
Subject: [edk2] [patch 5/8] MdeModulePkg/EmmcDxe: Avoid Non-Boolean type used as Boolean

Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c
index fc705e1..c432d26 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c
+++ b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c
@@ -899,11 +899,11 @@ EmmcReadWrite (
     BufferSize = BlockNum * BlockSize;
     Status = EmmcRwMultiBlocks (Partition, Lba, Buffer, BufferSize, IsRead, Token, LastRw);
     if (EFI_ERROR (Status)) {
       return Status;
     }
-    DEBUG ((EFI_D_INFO, "Emmc%a(): Part %d Lba 0x%x BlkNo 0x%x Event %p with %r\n", IsRead ? "Read " : "Write", Partition->PartitionType, Lba, BlockNum, Token ? Token->Event : NULL, Status));
+    DEBUG ((EFI_D_INFO, "Emmc%a(): Part %d Lba 0x%x BlkNo 0x%x Event %p with %r\n", IsRead ? "Read " : "Write", Partition->PartitionType, Lba, BlockNum, (Token != NULL) ? Token->Event : NULL, Status));
 
     Lba   += BlockNum;
     Buffer = (UINT8*)Buffer + BufferSize;
     Remaining -= BlockNum;
   }
-- 
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [patch 8/8] MdeModulePkg/NonDiscoverableDeviceRegistrationLib: Fix coding style issues

[Ard Biesheuvel]

On 19 December 2016 at 07:20, Dandan Bi <dandan.bi@intel.com> wrote:
> 1. Fix issues comments
> 2. Fix Guid/protocol format
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  .../Library/NonDiscoverableDeviceRegistrationLib.h |  4 +++-
>  .../NonDiscoverableDeviceRegistrationLib.c         | 14 ++++++++++++--
>  .../NonDiscoverableDeviceRegistrationLib.inf       | 22 ++++++++++++----------
>  3 files changed, 27 insertions(+), 13 deletions(-)
>
> diff --git a/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h b/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h
> index 120d914..c2d9e48 100644
> --- a/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h
> +++ b/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h
> @@ -30,21 +30,23 @@ typedef enum {
>  } NON_DISCOVERABLE_DEVICE_TYPE;
>
>  /**
>    Register a non-discoverable MMIO device
>
> -  @param[in]      DeviceType          The type of non-discoverable device
> +  @param[in]      Type                The type of non-discoverable device
>    @param[in]      DmaType             Whether the device is DMA coherent
>    @param[in]      InitFunc            Initialization routine to be invoked when
>                                        the device is enabled
>    @param[in,out]  Handle              The handle onto which to install the
>                                        non-discoverable device protocol.
>                                        If Handle is NULL or *Handle is NULL, a
>                                        new handle will be allocated.
>    @param[in]      NumMmioResources    The number of UINTN base/size pairs that
>                                        follow, each describing an MMIO region
>                                        owned by the device
> +  @param[in]  ...                     The variable argument list which contains the
> +                                      info about MmioResources.
>
>    @retval EFI_SUCCESS                 The registration succeeded.
>    @retval Other                       The registration failed.
>
>  **/
> diff --git a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
> index 94cd946..6f46dfa 100644
> --- a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
> +++ b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
> @@ -23,10 +23,18 @@
>  #include <Library/UefiBootServicesTableLib.h>
>
>  #include <Protocol/DevicePath.h>
>  #include <Protocol/NonDiscoverableDevice.h>
>
> +/**
> +  Get Guid form the type of non-discoverable device.
> +
> +  @param[in]  Type    The type of non-discoverable device.
> +
> +  @retval   Return the Guid.
> +
> +**/
>  STATIC
>  CONST EFI_GUID *
>  GetGuidFromType (
>    IN  NON_DISCOVERABLE_DEVICE_TYPE  Type
>    )
> @@ -72,23 +80,25 @@ typedef struct {
>    EFI_DEVICE_PATH_PROTOCOL            End;
>  } NON_DISCOVERABLE_DEVICE_PATH;
>  #pragma pack ()
>
>  /**
> -  Register a non-discoverable MMIO device
> +  Register a non-discoverable MMIO device.
>
> -  @param[in]      DeviceType          The type of non-discoverable device
> +  @param[in]      Type                The type of non-discoverable device
>    @param[in]      DmaType             Whether the device is DMA coherent
>    @param[in]      InitFunc            Initialization routine to be invoked when
>                                        the device is enabled
>    @param[in,out]  Handle              The handle onto which to install the
>                                        non-discoverable device protocol.
>                                        If Handle is NULL or *Handle is NULL, a
>                                        new handle will be allocated.
>    @param[in]      NumMmioResources    The number of UINTN base/size pairs that
>                                        follow, each describing an MMIO region
>                                        owned by the device
> +  @param[in]  ...                     The variable argument list which contains the
> +                                      info about MmioResources.
>
>    @retval EFI_SUCCESS                 The registration succeeded.
>    @retval EFI_INVALID_PARAMETER       An invalid argument was given
>    @retval Other                       The registration failed.
>
> diff --git a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
> index ba32324..dfcf8dc 100644
> --- a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
> +++ b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
> @@ -1,6 +1,8 @@
>  # @file
> +# Component Description File for NonDiscoverableDeviceRegistrationLib.
> +#
>  # Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
>  #
>  # This program and the accompanying materials
>  # are licensed and made available under the terms and conditions of the BSD License
>  # which accompanies this distribution.  The full text of the license may be found at
> @@ -30,17 +32,17 @@ [LibraryClasses]
>    DebugLib
>    DevicePathLib
>    UefiBootServicesTableLib
>
>  [Protocols]
> -  gEdkiiNonDiscoverableDeviceProtocolGuid
> +  gEdkiiNonDiscoverableDeviceProtocolGuid    ## PRODUCES
>
>  [Guids]
> -  gEdkiiNonDiscoverableAhciDeviceGuid
> -  gEdkiiNonDiscoverableAmbaDeviceGuid
> -  gEdkiiNonDiscoverableEhciDeviceGuid
> -  gEdkiiNonDiscoverableNvmeDeviceGuid
> -  gEdkiiNonDiscoverableOhciDeviceGuid
> -  gEdkiiNonDiscoverableSdhciDeviceGuid
> -  gEdkiiNonDiscoverableUfsDeviceGuid
> -  gEdkiiNonDiscoverableUhciDeviceGuid
> -  gEdkiiNonDiscoverableXhciDeviceGuid
> +  gEdkiiNonDiscoverableAhciDeviceGuid    ## CONSUMES   ## GUID
> +  gEdkiiNonDiscoverableAmbaDeviceGuid    ## CONSUMES   ## GUID
> +  gEdkiiNonDiscoverableEhciDeviceGuid    ## CONSUMES   ## GUID
> +  gEdkiiNonDiscoverableNvmeDeviceGuid    ## CONSUMES   ## GUID
> +  gEdkiiNonDiscoverableOhciDeviceGuid    ## CONSUMES   ## GUID
> +  gEdkiiNonDiscoverableSdhciDeviceGuid   ## CONSUMES   ## GUID
> +  gEdkiiNonDiscoverableUfsDeviceGuid     ## CONSUMES   ## GUID
> +  gEdkiiNonDiscoverableUhciDeviceGuid    ## CONSUMES   ## GUID
> +  gEdkiiNonDiscoverableXhciDeviceGuid    ## CONSUMES   ## GUID
> --
> 1.9.5.msysgit.1
>

Re: [patch 6/8] MdeModulePkg/TerminalDxe: Initialize variable after declaration

[Tian, Feng]

Reviewed-by: Feng Tian <feng.tian@Intel.com>

Thanks
Feng

-----Original Message-----
From: Bi, Dandan 
Sent: Monday, December 19, 2016 3:20 PM
To: edk2-devel@lists.01.org
Cc: Tian, Feng <feng.tian@intel.com>
Subject: [patch 6/8] MdeModulePkg/TerminalDxe: Initialize variable after declaration

Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index 9625f4d..c9b4ffc 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -186,10 +186,11 @@ TerminalConOutOutputString (
   UTF8_CHAR                   Utf8Char;
   CHAR8                       GraphicChar;
   CHAR8                       AsciiChar;
   EFI_STATUS                  Status;
   UINT8                       ValidBytes;
+  CHAR8                       CrLfStr[2];
   //
   //  flag used to indicate whether condition happens which will cause
   //  return EFI_WARN_UNKNOWN_GLYPH
   //
   BOOLEAN                     Warning;
@@ -324,11 +325,12 @@ TerminalConOutOutputString (
           // the next character, but the driver thinks it has wrapped
           // already.  Print CR LF to synchronize the terminal with
           // the driver, but only if we're not in the middle of
           // printing an escape sequence.
           //
-          CHAR8 CrLfStr[] = {'\r', '\n'};
+          CrLfStr[0] = '\r';
+          CrLfStr[1] = '\n';
 
           Length = sizeof(CrLfStr);
 
           Status = TerminalDevice->SerialIo->Write (
                                                 TerminalDevice->SerialIo,
-- 
1.9.5.msysgit.1

Re: [patch 7/8] MdeModulePkg/SataControllerDxe: Fix coding style issue

[Tian, Feng]

Could you help add some specific descriptions like below to the INF file?

SataController driver to manage SATA compliance IDE/AHCI host controllers.

Others look good to me

Reviewed-by: Feng Tian <feng.tian@intel.com>

Thanks
Feng

-----Original Message-----
From: Bi, Dandan 
Sent: Monday, December 19, 2016 3:20 PM
To: edk2-devel@lists.01.org
Cc: Tian, Feng <feng.tian@intel.com>
Subject: [patch 7/8] MdeModulePkg/SataControllerDxe: Fix coding style issue

Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
index e24b2a0..39cdffc 100644
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
+++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
@@ -1,8 +1,8 @@
 ## @file
 #  
-#    Component description file for the Sata Controller driver.
+#    Component Description File for the Sata Controller driver.
 #
 #  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>  #  This program and the accompanying materials  #  are licensed and made available under the terms and conditions of the BSD License  #  which accompanies this distribution.  The full text of the license may be found at
--
1.9.5.msysgit.1