ARM Packages: Replace tabs by spaces for indentation

Replace tabs by spaces for indentation to comply to EDK2 coding standards.
Done in files with extension ".S", ".c", ".h", ".asm", ".dsc", ".inc", "*.inf",
 "*.dec" or ".fdf" and located in ArmPkg, ArmPlatformPkg, EmbeddedPkg,
BeagleBoardPkg or Omap35xxPkg.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
Reviewed-By: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15901 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Include/Guid/ArmMpCoreInfo.h b/ArmPkg/Include/Guid/ArmMpCoreInfo.h
index fe690e274bc16cbdb8588bb6bb274a8fa7a87e2b..07dec5dc488f3ef47c16e49b9fd1afa15c185702 100644 (file)
--- a/ArmPkg/Include/Guid/ArmMpCoreInfo.h
+++ b/ArmPkg/Include/Guid/ArmMpCoreInfo.h
@@ -31,22 +31,22 @@ typedef struct {
 } ARM_CORE_INFO;\r
 \r
 typedef struct{\r
 } ARM_CORE_INFO;\r
 \r
 typedef struct{\r

-       UINT64   Signature;\r
-       UINT32   Length;\r
-       UINT32   Revision;\r
-       UINT64   OemId;\r
-       UINT64   OemTableId;\r
-       UINTN    OemRevision;\r
-       UINTN    CreatorId;\r
-       UINTN    CreatorRevision;\r
-       EFI_GUID Identifier;\r
-       UINTN    DataLen;\r
+        UINT64   Signature;\r
+        UINT32   Length;\r
+        UINT32   Revision;\r
+        UINT64   OemId;\r
+        UINT64   OemTableId;\r
+        UINTN    OemRevision;\r
+        UINTN    CreatorId;\r
+        UINTN    CreatorRevision;\r
+        EFI_GUID Identifier;\r
+        UINTN    DataLen;\r

 } ARM_PROCESSOR_TABLE_HEADER;\r
 \r
 typedef struct {\r
 } ARM_PROCESSOR_TABLE_HEADER;\r
 \r
 typedef struct {\r

-       ARM_PROCESSOR_TABLE_HEADER   Header;\r
-       UINTN                        NumberOfEntries;\r
-       ARM_CORE_INFO                *ArmCpus;\r
+        ARM_PROCESSOR_TABLE_HEADER   Header;\r
+        UINTN                        NumberOfEntries;\r
+        ARM_CORE_INFO                *ArmCpus;\r

 } ARM_PROCESSOR_TABLE;\r
 \r
 \r
 } ARM_PROCESSOR_TABLE;\r
 \r
 \r

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
index 7fb454c3dde45d836b6b6b473bd76e44f98470b2..60e92fdc6a484ecfbdfb04b64d004d39e3b90c13 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
@@ -51,7 +51,7 @@ GCC_ASM_EXPORT(ArmDisableInterrupts)
 GCC_ASM_EXPORT (ArmEnableVFP)\r
 \r
 Arm11PartNumberMask:  .word       0xFFF0\r
 GCC_ASM_EXPORT (ArmEnableVFP)\r
 \r
 Arm11PartNumberMask:  .word       0xFFF0\r

-Arm11PartNumber:      .word          0xB020\r
+Arm11PartNumber:      .word       0xB020\r

 \r
 .set DC_ON, (0x1<<2)\r
 .set IC_ON, (0x1<<12)\r
 \r
 .set DC_ON, (0x1<<2)\r
 .set IC_ON, (0x1<<12)\r

diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
index 6d6665b3ce2d8ef19a77444aad031683a222c72b..8864c16056687e8b17fe66eba608ed37db51cada 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
@@ -181,7 +181,7 @@ ArmCallSEV
 \r
 ArmReadSctlr\r
   mrc     p15, 0, r0, c1, c0, 0      // Read SCTLR into R0 (Read control register configuration data)\r
 \r
 ArmReadSctlr\r
   mrc     p15, 0, r0, c1, c0, 0      // Read SCTLR into R0 (Read control register configuration data)\r

-  bx     lr\r
+  bx      lr\r

 \r
 \r
 ArmReadCpuActlr\r
 \r
 \r
 ArmReadCpuActlr\r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm
index 0a0d06f528f9773dcf5b5b3dd38b638136821c1f..3d589654f040e28f7602af15e09bb79176a5e12c 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm
@@ -44,7 +44,7 @@ __aeabi_uread4
 ;  );\r
 ;\r
 __aeabi_uread8\r
 ;  );\r
 ;\r
 __aeabi_uread8\r

-    mov            r3, r0\r
+    mov     r3, r0\r

 \r
     ldrb    r1, [r3]\r
     ldrb    r2, [r3, #1]\r
 \r
     ldrb    r1, [r3]\r
     ldrb    r2, [r3, #1]\r

diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
index 0be21a6211dcee8edcd3fb9fc4b8ad4d08e139a5..179fc224be54c8666ec4df07ee70d7a459292ad3 100644 (file)
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
@@ -186,7 +186,7 @@ DefaultExceptionHandler (
   UINT32    PcAdjust = 0;\r
 \r
   CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"\n%a Exception PC at 0x%08x  CPSR 0x%08x ",\r
   UINT32    PcAdjust = 0;\r
 \r
   CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"\n%a Exception PC at 0x%08x  CPSR 0x%08x ",\r

-         gExceptionTypeString[ExceptionType], SystemContext.SystemContextArm->PC, SystemContext.SystemContextArm->CPSR);\r
+         gExceptionTypeString[ExceptionType], SystemContext.SystemContextArm->PC, SystemContext.SystemContextArm->CPSR);\r

   SerialPortWrite ((UINT8 *) Buffer, CharCount);\r
 \r
   DEBUG_CODE_BEGIN ();\r
   SerialPortWrite ((UINT8 *) Buffer, CharCount);\r
 \r
   DEBUG_CODE_BEGIN ();\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h b/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h
index f594d69881d96ad0a2e61d79080f0a8d3a3de748..5b8f5e2289070c5738a171abe469a2967a5f6fb7 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h
@@ -76,7 +76,7 @@
 #define SP810_CTRL_BASE                       (ARM_EB_BOARD_PERIPH_BASE + 0x01000)\r
 \r
 // SYSTRCL Register\r
 #define SP810_CTRL_BASE                       (ARM_EB_BOARD_PERIPH_BASE + 0x01000)\r
 \r
 // SYSTRCL Register\r

-#define ARM_EB_SYSCTRL                                                                                   0x10001000\r
+#define ARM_EB_SYSCTRL                        0x10001000\r

 \r
 // Dynamic Memory Controller Base\r
 #define ARM_EB_DMC_BASE                       0x10018000\r
 \r
 // Dynamic Memory Controller Base\r
 #define ARM_EB_DMC_BASE                       0x10018000\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
index f324105e6b59055135b2aaa1093c7b7702ca3a43..2978753c357c56cee05bfa0a05e7ad879ef76af3 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
@@ -29,10 +29,10 @@ GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)
 //  IN UINTN MpId\r
 //  );\r
 ASM_PFX(ArmPlatformGetCorePosition):\r
 //  IN UINTN MpId\r
 //  );\r
 ASM_PFX(ArmPlatformGetCorePosition):\r

-  and  r1, r0, #ARM_CORE_MASK\r
-  and  r0, r0, #ARM_CLUSTER_MASK\r
-  add  r0, r1, r0, LSR #7\r
-  bx   lr\r
+  and   r1, r0, #ARM_CORE_MASK\r
+  and   r0, r0, #ARM_CLUSTER_MASK\r
+  add   r0, r1, r0, LSR #7\r
+  bx    lr\r

 \r
 //UINTN\r
 //ArmPlatformIsPrimaryCore (\r
 \r
 //UINTN\r
 //ArmPlatformIsPrimaryCore (\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm
index 65394704414940ba65f038f3d26948faeedc047c..99a2ed46914daa14c6e87023c8139e9b6d975a49 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm
@@ -30,10 +30,10 @@
 //  IN UINTN MpId\r
 //  );\r
 ArmPlatformGetCorePosition FUNCTION\r
 //  IN UINTN MpId\r
 //  );\r
 ArmPlatformGetCorePosition FUNCTION\r

-  and  r1, r0, #ARM_CORE_MASK\r
-  and  r0, r0, #ARM_CLUSTER_MASK\r
-  add  r0, r1, r0, LSR #7\r
-  bx   lr\r
+  and   r1, r0, #ARM_CORE_MASK\r
+  and   r0, r0, #ARM_CLUSTER_MASK\r
+  add   r0, r1, r0, LSR #7\r
+  bx    lr\r

   ENDFUNC\r
 \r
 //UINTN\r
   ENDFUNC\r
 \r
 //UINTN\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
index 4962666cf16f1367aef89ffd4f2297670e4f2ba6..4d0811cc5eaf137e3253261b4e1ced52788934bf 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
@@ -200,9 +200,9 @@ ArmFastbootPlatformInit (
   // Read the GPT partition entry array into memory so we can get the partition names\r
   Status = ReadPartitionEntries (FlashBlockIo, &PartitionEntries);\r
   if (EFI_ERROR (Status)) {\r
   // Read the GPT partition entry array into memory so we can get the partition names\r
   Status = ReadPartitionEntries (FlashBlockIo, &PartitionEntries);\r
   if (EFI_ERROR (Status)) {\r

-       DEBUG ((EFI_D_ERROR, "Warning: Failed to read partitions from Android NVM device (status: %r)\n", Status));\r
-       // Failing to locate partitions should not prevent to do other Android FastBoot actions\r
-       return EFI_SUCCESS;\r
+    DEBUG ((EFI_D_ERROR, "Warning: Failed to read partitions from Android NVM device (status: %r)\n", Status));\r
+    // Failing to locate partitions should not prevent to do other Android FastBoot actions\r
+    return EFI_SUCCESS;\r

   }\r
 \r
   // Get every Block IO protocol instance installed in the system\r
   }\r
 \r
   // Get every Block IO protocol instance installed in the system\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
index e208a84ca27eb74cb34c28c2d04184970add765a..20bfe52610e3383205dce88569914ed0a0322569 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
@@ -32,10 +32,10 @@ ASM_PFX(ArmPlatformPeiBootAction):
 //  IN UINTN MpId\r
 //  );\r
 ASM_PFX(ArmPlatformGetCorePosition):\r
 //  IN UINTN MpId\r
 //  );\r
 ASM_PFX(ArmPlatformGetCorePosition):\r

-  and  r1, r0, #ARM_CORE_MASK\r
-  and  r0, r0, #ARM_CLUSTER_MASK\r
-  add  r0, r1, r0, LSR #7\r
-  bx   lr\r
+  and   r1, r0, #ARM_CORE_MASK\r
+  and   r0, r0, #ARM_CLUSTER_MASK\r
+  add   r0, r1, r0, LSR #7\r
+  bx    lr\r

 \r
 //UINTN\r
 //ArmPlatformIsPrimaryCore (\r
 \r
 //UINTN\r
 //ArmPlatformIsPrimaryCore (\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
index 2e323a1dd2d09f5a88cbc3c6d183aa29bd6cba6a..f377cf2e72c62cde3dd05711a15678da6f95444a 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
@@ -35,10 +35,10 @@ ArmPlatformPeiBootAction FUNCTION
 //  IN UINTN MpId\r
 //  );\r
 ArmPlatformGetCorePosition FUNCTION\r
 //  IN UINTN MpId\r
 //  );\r
 ArmPlatformGetCorePosition FUNCTION\r

-  and  r1, r0, #ARM_CORE_MASK\r
-  and  r0, r0, #ARM_CLUSTER_MASK\r
-  add  r0, r1, r0, LSR #7\r
-  bx   lr\r
+  and   r1, r0, #ARM_CORE_MASK\r
+  and   r0, r0, #ARM_CLUSTER_MASK\r
+  add   r0, r1, r0, LSR #7\r
+  bx    lr\r

   ENDFUNC\r
 \r
 //UINTN\r
   ENDFUNC\r
 \r
 //UINTN\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.asm
index 86e1873e2363edd25da11ce91576dff0582bb9f5..aa48ed730e169b3140a6d0b4bdd2c82347b65d6c 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.asm
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.asm
@@ -35,7 +35,7 @@
 ArmPlatformGetPrimaryCoreMpId FUNCTION\r
   LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r0)\r
   ldr     r0, [r0]\r
 ArmPlatformGetPrimaryCoreMpId FUNCTION\r
   LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r0)\r
   ldr     r0, [r0]\r

-  bx     lr\r
+  bx      lr\r

   ENDFUNC\r
 \r
 //UINTN\r
   ENDFUNC\r
 \r
 //UINTN\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S
index b24085cb248f2c5b33dac259ac2d3ce275d9dd23..50ff7139170056e0f7e6d3b44c056d087d7ab600 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S
@@ -61,10 +61,10 @@ ASM_PFX(ArmPlatformIsPrimaryCore):
   ldrh  w1, [x1]\r
   cmp   w0, w1\r
   b.ne  1f\r
   ldrh  w1, [x1]\r
   cmp   w0, w1\r
   b.ne  1f\r

-  mov  x0, #1\r
+  mov   x0, #1\r

   ret\r
 1:\r
   ret\r
 1:\r

-  mov  x0, #0\r
+  mov   x0, #0\r

   ret\r
 \r
 //UINTN\r
   ret\r
 \r
 //UINTN\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
index 00a55e1db3e6a9f117ac737ae75d958e521e8ed5..e739050b0db513cf5f0fed64c41de432d610431c 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
@@ -101,7 +101,7 @@ ASM_PFX(ArmPlatformIsPrimaryCore):
   cmp   r0, r1\r
   moveq r0, #1\r
   movne r0, #0\r
   cmp   r0, r1\r
   moveq r0, #1\r
   movne r0, #0\r

-  bx   lr\r
+  bx    lr\r

 \r
 //UINTN\r
 //ArmPlatformGetCorePosition (\r
 \r
 //UINTN\r
 //ArmPlatformGetCorePosition (\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
index d786323f7b65eb705626e0ca5ecaf536a64110e2..f4ad51d36e0685099cd8c74beb69f4d2895812ee 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
@@ -107,7 +107,7 @@ ArmPlatformIsPrimaryCore FUNCTION
   cmp   r0, r1\r
   moveq r0, #1\r
   movne r0, #0\r
   cmp   r0, r1\r
   moveq r0, #1\r
   movne r0, #0\r

-  bx   lr\r
+  bx    lr\r

   ENDFUNC\r
 \r
 //UINTN\r
   ENDFUNC\r
 \r
 //UINTN\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Scripts/uefi-aarch64-bootstrap/model.lds.S b/ArmPlatformPkg/ArmVExpressPkg/Scripts/uefi-aarch64-bootstrap/model.lds.S
index cc719c56b9921e0800cd51aba24110c860fbc877..d963aec550e7e14abaebfd3cef650a5f1e3f814a 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Scripts/uefi-aarch64-bootstrap/model.lds.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Scripts/uefi-aarch64-bootstrap/model.lds.S
@@ -55,23 +55,23 @@ INPUT(./boot3f.o)
 \r
 SECTIONS\r
 {\r
 \r
 SECTIONS\r
 {\r

-       . = PHYS_OFFSET;\r
+  . = PHYS_OFFSET;\r

 #ifdef BOOT1\r
 #ifdef BOOT1\r

-       .text : { boot1.o }\r
+  .text : { boot1.o }\r

 #endif\r
 \r
 #ifdef BOOT2\r
 #endif\r
 \r
 #ifdef BOOT2\r

-       .text : { boot2.o }\r
+  .text : { boot2.o }\r

 #endif\r
 \r
 #ifdef BOOT3\r
 #endif\r
 \r
 #ifdef BOOT3\r

-       .text : { boot3.o }\r
+  .text : { boot3.o }\r

 #endif\r
 \r
 #ifdef BOOT3F\r
 #endif\r
 \r
 #ifdef BOOT3F\r

-       .text : { boot3f.o }\r
+  .text : { boot3f.o }\r

 #endif\r
 \r
 #endif\r
 \r

-       .data : { *(.data) }\r
-       .bss : { *(.bss) }\r
+  .data : { *(.data) }\r
+  .bss : { *(.bss) }\r

 }\r
 }\r

diff --git a/ArmPlatformPkg/Bds/Bds.c b/ArmPlatformPkg/Bds/Bds.c
index b84faf91b653306f814791873107c875b03db7ed..debc93218bfe41d8625cdd5d3747b5930655993b 100644 (file)
--- a/ArmPlatformPkg/Bds/Bds.c
+++ b/ArmPlatformPkg/Bds/Bds.c
@@ -393,7 +393,7 @@ StartDefaultBootOnTimeout (
       }\r
       // Discard key in the buffer\r
       do {\r
       }\r
       // Discard key in the buffer\r
       do {\r

-       Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
+        Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r

       } while(!EFI_ERROR(Status));\r
       gBS->CloseEvent (WaitList[0]);\r
       Print(L"\n\r");\r
       } while(!EFI_ERROR(Status));\r
       gBS->CloseEvent (WaitList[0]);\r
       Print(L"\n\r");\r


@@ -408,8 +408,8 @@ StartDefaultBootOnTimeout (
         UnicodeSPrint (BootVariableName, 9 * sizeof(CHAR16), L"Boot%04X", BootOrder[Index]);\r
         Status = BdsStartBootOption (BootVariableName);\r
         if(!EFI_ERROR(Status)){\r
         UnicodeSPrint (BootVariableName, 9 * sizeof(CHAR16), L"Boot%04X", BootOrder[Index]);\r
         Status = BdsStartBootOption (BootVariableName);\r
         if(!EFI_ERROR(Status)){\r

-               // Boot option returned successfully, hence don't need to start next boot option\r
-               break;\r
+          // Boot option returned successfully, hence don't need to start next boot option\r
+          break;\r

         }\r
         // In case of success, we should not return from this call.\r
       }\r
         }\r
         // In case of success, we should not return from this call.\r
       }\r

diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
index 798f82819f764555529d3051a99d0b441ce81d69..77f93cbb675e6fc163e66714997af9d1aa0adfca 100644 (file)
--- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
+++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
@@ -778,21 +778,21 @@ EFI_STATUS
 EFIAPI\r
 LcdGraphicsBlt (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL        *This,\r
 EFIAPI\r
 LcdGraphicsBlt (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL        *This,\r

-       IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *BltBuffer,     OPTIONAL\r
-       IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION   BltOperation,\r
-       IN UINTN                               SourceX,\r
-       IN UINTN                               SourceY,\r
-       IN UINTN                               DestinationX,\r
-       IN UINTN                               DestinationY,\r
-       IN UINTN                               Width,\r
-       IN UINTN                               Height,\r
-       IN UINTN                               Delta           OPTIONAL   // Number of BYTES in a row of the BltBuffer\r
+  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *BltBuffer,     OPTIONAL\r
+  IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION   BltOperation,\r
+  IN UINTN                               SourceX,\r
+  IN UINTN                               SourceY,\r
+  IN UINTN                               DestinationX,\r
+  IN UINTN                               DestinationY,\r
+  IN UINTN                               Width,\r
+  IN UINTN                               Height,\r
+  IN UINTN                               Delta           OPTIONAL   // Number of BYTES in a row of the BltBuffer\r

   )\r
 {\r
   )\r
 {\r

-       EFI_STATUS         Status;\r
-       UINT32             HorizontalResolution;\r
+  EFI_STATUS         Status;\r
+  UINT32             HorizontalResolution;\r

   UINT32             VerticalResolution;\r
   UINT32             VerticalResolution;\r

-       LCD_INSTANCE*      Instance;\r
+  LCD_INSTANCE*      Instance;\r

 \r
   Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r
 \r
 \r
   Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r
 \r


@@ -811,24 +811,24 @@ LcdGraphicsBlt (
       BltOperation,DestinationX,DestinationY,Width,Height,HorizontalResolution,VerticalResolution));\r
 \r
   // Check we have reasonable parameters\r
       BltOperation,DestinationX,DestinationY,Width,Height,HorizontalResolution,VerticalResolution));\r
 \r
   // Check we have reasonable parameters\r

-       if (Width == 0 || Height == 0) {\r
+  if (Width == 0 || Height == 0) {\r

     DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: ERROR - Invalid dimension: Zero size area.\n" ));\r
     DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: ERROR - Invalid dimension: Zero size area.\n" ));\r

-               Status = EFI_INVALID_PARAMETER;\r
-               goto EXIT;\r
-       }\r
-\r
-       if ((BltOperation == EfiBltVideoFill) || (BltOperation == EfiBltBufferToVideo) || (BltOperation == EfiBltVideoToBltBuffer)) {\r
-         ASSERT( BltBuffer != NULL);\r
-       }\r
-\r
-       /*if ((DestinationX >= HorizontalResolution) || (DestinationY >= VerticalResolution)) {\r
-         DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: ERROR - Invalid destination.\n" ));\r
-         Status = EFI_INVALID_PARAMETER;\r
-         goto EXIT;\r
-       }*/\r
-\r
-       // If we are reading data out of the video buffer, check that the source area is within the display limits\r
-       if ((BltOperation == EfiBltVideoToBltBuffer) || (BltOperation == EfiBltVideoToVideo)) {\r
+    Status = EFI_INVALID_PARAMETER;\r
+    goto EXIT;\r
+  }\r
+\r
+  if ((BltOperation == EfiBltVideoFill) || (BltOperation == EfiBltBufferToVideo) || (BltOperation == EfiBltVideoToBltBuffer)) {\r
+    ASSERT( BltBuffer != NULL);\r
+  }\r
+\r
+  /*if ((DestinationX >= HorizontalResolution) || (DestinationY >= VerticalResolution)) {\r
+    DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: ERROR - Invalid destination.\n" ));\r
+    Status = EFI_INVALID_PARAMETER;\r
+    goto EXIT;\r
+  }*/\r
+\r
+  // If we are reading data out of the video buffer, check that the source area is within the display limits\r
+  if ((BltOperation == EfiBltVideoToBltBuffer) || (BltOperation == EfiBltVideoToVideo)) {\r

     if ((SourceY + Height > VerticalResolution) || (SourceX + Width > HorizontalResolution)) {\r
       DEBUG((DEBUG_INFO, "LcdGraphicsBlt: ERROR - Invalid source resolution.\n" ));\r
       DEBUG((DEBUG_INFO, "                      - SourceY=%d + Height=%d > VerticalResolution=%d.\n", SourceY, Height, VerticalResolution ));\r
     if ((SourceY + Height > VerticalResolution) || (SourceX + Width > HorizontalResolution)) {\r
       DEBUG((DEBUG_INFO, "LcdGraphicsBlt: ERROR - Invalid source resolution.\n" ));\r
       DEBUG((DEBUG_INFO, "                      - SourceY=%d + Height=%d > VerticalResolution=%d.\n", SourceY, Height, VerticalResolution ));\r


@@ -836,10 +836,10 @@ LcdGraphicsBlt (
       Status = EFI_INVALID_PARAMETER;\r
       goto EXIT;\r
     }\r
       Status = EFI_INVALID_PARAMETER;\r
       goto EXIT;\r
     }\r

-       }\r
+  }\r

 \r
 \r

-       // If we are writing data into the video buffer, that the destination area is within the display limits\r
-       if ((BltOperation == EfiBltVideoFill) || (BltOperation == EfiBltBufferToVideo) || (BltOperation == EfiBltVideoToVideo)) {\r
+  // If we are writing data into the video buffer, that the destination area is within the display limits\r
+  if ((BltOperation == EfiBltVideoFill) || (BltOperation == EfiBltBufferToVideo) || (BltOperation == EfiBltVideoToVideo)) {\r

     if ((DestinationY + Height > VerticalResolution) || (DestinationX + Width > HorizontalResolution)) {\r
       DEBUG((DEBUG_INFO, "LcdGraphicsBlt: ERROR - Invalid destination resolution.\n" ));\r
       DEBUG((DEBUG_INFO, "                      - DestinationY=%d + Height=%d > VerticalResolution=%d.\n", DestinationY, Height, VerticalResolution ));\r
     if ((DestinationY + Height > VerticalResolution) || (DestinationX + Width > HorizontalResolution)) {\r
       DEBUG((DEBUG_INFO, "LcdGraphicsBlt: ERROR - Invalid destination resolution.\n" ));\r
       DEBUG((DEBUG_INFO, "                      - DestinationY=%d + Height=%d > VerticalResolution=%d.\n", DestinationY, Height, VerticalResolution ));\r


@@ -847,36 +847,36 @@ LcdGraphicsBlt (
       Status = EFI_INVALID_PARAMETER;\r
       goto EXIT;\r
     }\r
       Status = EFI_INVALID_PARAMETER;\r
       goto EXIT;\r
     }\r

-       }\r
+  }\r

 \r
   //\r
   // Perform the Block Transfer Operation\r
   //\r
 \r
 \r
   //\r
   // Perform the Block Transfer Operation\r
   //\r
 \r

-       switch (BltOperation) {\r
-       case EfiBltVideoFill:\r
-         Status = BltVideoFill (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
-               break;\r
+  switch (BltOperation) {\r
+  case EfiBltVideoFill:\r
+    Status = BltVideoFill (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
+    break;\r

 \r
 \r

-       case EfiBltVideoToBltBuffer:\r
-         Status = BltVideoToBltBuffer (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
+  case EfiBltVideoToBltBuffer:\r
+    Status = BltVideoToBltBuffer (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r

     break;\r
 \r
   case EfiBltBufferToVideo:\r
     Status = BltBufferToVideo (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
     break;\r
 \r
   case EfiBltBufferToVideo:\r
     Status = BltBufferToVideo (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r

-               break;\r
+    break;\r

 \r
 \r

-       case EfiBltVideoToVideo:\r
-         Status = BltVideoToVideo (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
-               break;\r
+  case EfiBltVideoToVideo:\r
+    Status = BltVideoToVideo (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
+    break;\r

 \r
 \r

-       case EfiGraphicsOutputBltOperationMax:\r
-       default:\r
-               DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: Invalid Operation\n"));\r
-               Status = EFI_INVALID_PARAMETER;\r
-               break;\r
-       }\r
+  case EfiGraphicsOutputBltOperationMax:\r
+  default:\r
+    DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: Invalid Operation\n"));\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
+  }\r

 \r
 EXIT:\r
 \r
 EXIT:\r

-       return Status;\r
+  return Status;\r

 }\r
 }\r

diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
index 0091c7597c70b27684ed8dc1d737aa0ea653fbb4..cbc20343496be130cf2b07710bb3455d0720817a 100644 (file)
--- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
+++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
@@ -161,52 +161,52 @@ LcdGraphicsOutputDxeInitialize (
     goto EXIT;\r
   }\r
 \r
     goto EXIT;\r
   }\r
 \r

-       // Install the Graphics Output Protocol and the Device Path\r
-       Status = gBS->InstallMultipleProtocolInterfaces(\r
-                       &Instance->Handle,\r
-                       &gEfiGraphicsOutputProtocolGuid, &Instance->Gop,\r
-                       &gEfiDevicePathProtocolGuid,     &Instance->DevicePath,\r
-                       NULL\r
-          );\r
-\r
-       if (EFI_ERROR(Status)) {\r
-         DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the protocol. Exit Status=%r\n", Status));\r
-               goto EXIT;\r
-       }\r
-\r
-       // Register for an ExitBootServicesEvent\r
-       // When ExitBootServices starts, this function here will make sure that the graphics driver will shut down properly,\r
-       // i.e. it will free up all allocated memory and perform any necessary hardware re-configuration.\r
-       Status = gBS->CreateEvent (\r
-           EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
-           TPL_NOTIFY,\r
-           LcdGraphicsExitBootServicesEvent, NULL,\r
-                       &Instance->ExitBootServicesEvent\r
-                       );\r
-\r
-       if (EFI_ERROR(Status)) {\r
-         DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the ExitBootServicesEvent handler. Exit Status=%r\n", Status));\r
-               goto EXIT_ERROR_UNINSTALL_PROTOCOL;\r
-       }\r
-\r
-       // To get here, everything must be fine, so just exit\r
-       goto EXIT;\r
+  // Install the Graphics Output Protocol and the Device Path\r
+  Status = gBS->InstallMultipleProtocolInterfaces(\r
+            &Instance->Handle,\r
+            &gEfiGraphicsOutputProtocolGuid, &Instance->Gop,\r
+            &gEfiDevicePathProtocolGuid,     &Instance->DevicePath,\r
+            NULL\r
+            );\r
+\r
+  if (EFI_ERROR(Status)) {\r
+    DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the protocol. Exit Status=%r\n", Status));\r
+    goto EXIT;\r
+  }\r
+\r
+  // Register for an ExitBootServicesEvent\r
+  // When ExitBootServices starts, this function here will make sure that the graphics driver will shut down properly,\r
+  // i.e. it will free up all allocated memory and perform any necessary hardware re-configuration.\r
+  Status = gBS->CreateEvent (\r
+            EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+            TPL_NOTIFY,\r
+            LcdGraphicsExitBootServicesEvent, NULL,\r
+            &Instance->ExitBootServicesEvent\r
+            );\r
+\r
+  if (EFI_ERROR(Status)) {\r
+    DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the ExitBootServicesEvent handler. Exit Status=%r\n", Status));\r
+    goto EXIT_ERROR_UNINSTALL_PROTOCOL;\r
+  }\r
+\r
+  // To get here, everything must be fine, so just exit\r
+  goto EXIT;\r

 \r
 EXIT_ERROR_UNINSTALL_PROTOCOL:\r
 \r
 EXIT_ERROR_UNINSTALL_PROTOCOL:\r

-       /* The following function could return an error message,\r
-        * however, to get here something must have gone wrong already,\r
-        * so preserve the original error, i.e. don't change\r
-        * the Status variable, even it fails to uninstall the protocol.\r
-        */\r
-       gBS->UninstallMultipleProtocolInterfaces (\r
-           Instance->Handle,\r
-           &gEfiGraphicsOutputProtocolGuid, &Instance->Gop, // Uninstall Graphics Output protocol\r
-           &gEfiDevicePathProtocolGuid,     &Instance->DevicePath,     // Uninstall device path\r
-           NULL\r
-           );\r
+  /* The following function could return an error message,\r
+   * however, to get here something must have gone wrong already,\r
+   * so preserve the original error, i.e. don't change\r
+   * the Status variable, even it fails to uninstall the protocol.\r
+   */\r
+  gBS->UninstallMultipleProtocolInterfaces (\r
+    Instance->Handle,\r
+    &gEfiGraphicsOutputProtocolGuid, &Instance->Gop, // Uninstall Graphics Output protocol\r
+    &gEfiDevicePathProtocolGuid,     &Instance->DevicePath,     // Uninstall device path\r
+    NULL\r
+    );\r

 \r
 EXIT:\r
 \r
 EXIT:\r

-       return Status;\r
+  return Status;\r

 \r
 }\r
 \r
 \r
 }\r
 \r


@@ -239,15 +239,15 @@ EFI_STATUS
 EFIAPI\r
 LcdGraphicsQueryMode (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL            *This,\r
 EFIAPI\r
 LcdGraphicsQueryMode (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL            *This,\r

-       IN UINT32                                  ModeNumber,\r
-       OUT UINTN                                  *SizeOfInfo,\r
-       OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION   **Info\r
-       )\r
+  IN UINT32                                  ModeNumber,\r
+  OUT UINTN                                  *SizeOfInfo,\r
+  OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION   **Info\r
+  )\r

 {\r
 {\r

-       EFI_STATUS Status = EFI_SUCCESS;\r
-       LCD_INSTANCE *Instance;\r
+  EFI_STATUS Status = EFI_SUCCESS;\r
+  LCD_INSTANCE *Instance;\r

 \r
 \r

-       Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r
+  Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r

 \r
   // Setup the hardware if not already done\r
   if( !mDisplayInitialized ) {\r
 \r
   // Setup the hardware if not already done\r
   if( !mDisplayInitialized ) {\r


@@ -257,14 +257,14 @@ LcdGraphicsQueryMode (
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-       // Error checking\r
-       if ( (This == NULL) || (Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode) ) {\r
-         DEBUG((DEBUG_ERROR, "LcdGraphicsQueryMode: ERROR - For mode number %d : Invalid Parameter.\n", ModeNumber ));\r
-               Status = EFI_INVALID_PARAMETER;\r
-               goto EXIT;\r
-       }\r
+  // Error checking\r
+  if ( (This == NULL) || (Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode) ) {\r
+    DEBUG((DEBUG_ERROR, "LcdGraphicsQueryMode: ERROR - For mode number %d : Invalid Parameter.\n", ModeNumber ));\r
+    Status = EFI_INVALID_PARAMETER;\r
+    goto EXIT;\r
+  }\r

 \r
 \r

-       *Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
+  *Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r

   if (*Info == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto EXIT;\r
   if (*Info == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto EXIT;\r


@@ -278,7 +278,7 @@ LcdGraphicsQueryMode (
   }\r
 \r
 EXIT:\r
   }\r
 \r
 EXIT:\r

-       return Status;\r
+  return Status;\r

 }\r
 \r
 /***************************************\r
 }\r
 \r
 /***************************************\r


@@ -289,15 +289,15 @@ EFI_STATUS
 EFIAPI\r
 LcdGraphicsSetMode (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL   *This,\r
 EFIAPI\r
 LcdGraphicsSetMode (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL   *This,\r

-       IN UINT32                         ModeNumber\r
-       )\r
+  IN UINT32                         ModeNumber\r
+  )\r

 {\r
 {\r

-       EFI_STATUS                      Status               = EFI_SUCCESS;\r
-       EFI_GRAPHICS_OUTPUT_BLT_PIXEL   FillColour;\r
-       LCD_INSTANCE*                   Instance;\r
-       LCD_BPP                         Bpp;\r
+  EFI_STATUS                      Status = EFI_SUCCESS;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL   FillColour;\r
+  LCD_INSTANCE*                   Instance;\r
+  LCD_BPP                         Bpp;\r

 \r
 \r

-       Instance = LCD_INSTANCE_FROM_GOP_THIS (This);\r
+  Instance = LCD_INSTANCE_FROM_GOP_THIS (This);\r

 \r
   // Setup the hardware if not already done\r
   if(!mDisplayInitialized) {\r
 \r
   // Setup the hardware if not already done\r
   if(!mDisplayInitialized) {\r


@@ -314,33 +314,33 @@ LcdGraphicsSetMode (
     goto EXIT;\r
   }\r
 \r
     goto EXIT;\r
   }\r
 \r

-       // Set the oscillator frequency to support the new mode\r
+  // Set the oscillator frequency to support the new mode\r

   Status = LcdPlatformSetMode (ModeNumber);\r
   if (EFI_ERROR(Status)) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto EXIT;\r
   }\r
 \r
   Status = LcdPlatformSetMode (ModeNumber);\r
   if (EFI_ERROR(Status)) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto EXIT;\r
   }\r
 \r

-       // Update the UEFI mode information\r
-       This->Mode->Mode = ModeNumber;\r
-       LcdPlatformQueryMode (ModeNumber,&Instance->ModeInfo);\r
-       Status = LcdPlatformGetBpp(ModeNumber, &Bpp);\r
-       if (EFI_ERROR(Status)) {\r
-         DEBUG ((DEBUG_ERROR, "LcdGraphicsSetMode: ERROR - Couldn't get bytes per pixel, status: %r\n", Status));\r
-         goto EXIT;\r
-       }\r
-       This->Mode->FrameBufferSize =  Instance->ModeInfo.VerticalResolution\r
-                                    * Instance->ModeInfo.PixelsPerScanLine\r
-                                    * GetBytesPerPixel(Bpp);\r
+  // Update the UEFI mode information\r
+  This->Mode->Mode = ModeNumber;\r
+  LcdPlatformQueryMode (ModeNumber,&Instance->ModeInfo);\r
+  Status = LcdPlatformGetBpp(ModeNumber, &Bpp);\r
+  if (EFI_ERROR(Status)) {\r
+    DEBUG ((DEBUG_ERROR, "LcdGraphicsSetMode: ERROR - Couldn't get bytes per pixel, status: %r\n", Status));\r
+    goto EXIT;\r
+  }\r
+  This->Mode->FrameBufferSize =  Instance->ModeInfo.VerticalResolution\r
+                               * Instance->ModeInfo.PixelsPerScanLine\r
+                               * GetBytesPerPixel(Bpp);\r

 \r
   // Set the hardware to the new mode\r
 \r
   // Set the hardware to the new mode\r

-       Status = LcdSetMode (ModeNumber);\r
+  Status = LcdSetMode (ModeNumber);\r

   if (EFI_ERROR(Status)) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto EXIT;\r
   }\r
 \r
   if (EFI_ERROR(Status)) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto EXIT;\r
   }\r
 \r

-       // The UEFI spec requires that we now clear the visible portions of the output display to black.\r
+  // The UEFI spec requires that we now clear the visible portions of the output display to black.\r

 \r
   // Set the fill colour to black\r
   SetMem (&FillColour, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0);\r
 \r
   // Set the fill colour to black\r
   SetMem (&FillColour, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0);\r


@@ -359,7 +359,7 @@ LcdGraphicsSetMode (
       0);\r
 \r
 EXIT:\r
       0);\r
 \r
 EXIT:\r

-       return Status;\r
+  return Status;\r

 }\r
 \r
 UINTN\r
 }\r
 \r
 UINTN\r

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h
index a6854aa3ccb3d14db03a93841245b7ca00a31e46..801e6c46f677a13b8fffc82d15ea3c55947d4f3f 100644 (file)
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h
@@ -149,7 +149,7 @@ struct _NOR_FLASH_INSTANCE {
   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL FvbProtocol;\r
   VOID*                               ShadowBuffer;\r
 \r
   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL FvbProtocol;\r
   VOID*                               ShadowBuffer;\r
 \r

-  NOR_FLASH_DEVICE_PATH                      DevicePath;\r
+  NOR_FLASH_DEVICE_PATH               DevicePath;\r

 };\r
 \r
 EFI_STATUS\r
 };\r
 \r
 EFI_STATUS\r

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
index a844025a1f70b87a9741ccc7a0f2de9d4226219b..4f56bae330229404100ae448f4e1d4a27702e399 100644 (file)
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
@@ -141,7 +141,7 @@ ValidateFvHeader (
   EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;\r
   VARIABLE_STORE_HEADER       *VariableStoreHeader;\r
   UINTN                       VariableStoreLength;\r
   EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;\r
   VARIABLE_STORE_HEADER       *VariableStoreHeader;\r
   UINTN                       VariableStoreLength;\r

-  UINTN                                                  FvLength;\r
+  UINTN                       FvLength;\r

 \r
   FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER*)Instance->RegionBaseAddress;\r
 \r
 \r
   FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER*)Instance->RegionBaseAddress;\r
 \r

diff --git a/ArmPlatformPkg/Include/Drivers/PL341Dmc.h b/ArmPlatformPkg/Include/Drivers/PL341Dmc.h
index 268b6da5c0cd9a6fc72861f90e158bea2a4f25ca..caba8f445bd83c23d6f6063bc24faa7c52f99407 100644 (file)
--- a/ArmPlatformPkg/Include/Drivers/PL341Dmc.h
+++ b/ArmPlatformPkg/Include/Drivers/PL341Dmc.h
@@ -17,36 +17,36 @@
 \r
 \r
 typedef struct  {\r
 \r
 \r
 typedef struct  {\r

-    UINTN      HasQos;        // has QoS registers\r
-    UINTN      MaxChip;       // number of memory chips accessible\r
-    BOOLEAN  IsUserCfg;\r
+    UINTN   HasQos;        // has QoS registers\r
+    UINTN   MaxChip;       // number of memory chips accessible\r
+    BOOLEAN IsUserCfg;\r

     UINT32  User0Cfg;\r
     UINT32  User2Cfg;\r
     UINT32  User0Cfg;\r
     UINT32  User2Cfg;\r

-    UINT32     RefreshPeriod;\r
-    UINT32     CasLatency;\r
-    UINT32     WriteLatency;\r
-    UINT32     t_mrd;\r
-    UINT32     t_ras;\r
-    UINT32     t_rc;\r
-    UINT32     t_rcd;\r
-    UINT32     t_rfc;\r
-    UINT32     t_rp;\r
-    UINT32     t_rrd;\r
-    UINT32     t_wr;\r
-    UINT32     t_wtr;\r
-    UINT32     t_xp;\r
-    UINT32     t_xsr;\r
-    UINT32     t_esr;\r
-    UINT32     MemoryCfg;\r
-    UINT32     MemoryCfg2;\r
-    UINT32     MemoryCfg3;\r
-    UINT32     ChipCfg0;\r
-    UINT32     ChipCfg1;\r
-    UINT32     ChipCfg2;\r
-    UINT32     ChipCfg3;\r
-    UINT32     t_faw;\r
-    UINT32     t_data_en;\r
-    UINT32     t_wdata_en;\r
+    UINT32  RefreshPeriod;\r
+    UINT32  CasLatency;\r
+    UINT32  WriteLatency;\r
+    UINT32  t_mrd;\r
+    UINT32  t_ras;\r
+    UINT32  t_rc;\r
+    UINT32  t_rcd;\r
+    UINT32  t_rfc;\r
+    UINT32  t_rp;\r
+    UINT32  t_rrd;\r
+    UINT32  t_wr;\r
+    UINT32  t_wtr;\r
+    UINT32  t_xp;\r
+    UINT32  t_xsr;\r
+    UINT32  t_esr;\r
+    UINT32  MemoryCfg;\r
+    UINT32  MemoryCfg2;\r
+    UINT32  MemoryCfg3;\r
+    UINT32  ChipCfg0;\r
+    UINT32  ChipCfg1;\r
+    UINT32  ChipCfg2;\r
+    UINT32  ChipCfg3;\r
+    UINT32  t_faw;\r
+    UINT32  t_data_en;\r
+    UINT32  t_wdata_en;\r

     UINT32  ModeReg;\r
     UINT32  ExtModeReg;\r
 } PL341_DMC_CONFIG;\r
     UINT32  ModeReg;\r
     UINT32  ExtModeReg;\r
 } PL341_DMC_CONFIG;\r


@@ -107,7 +107,7 @@ typedef struct  {
 #define DMC_MEMORY_CFG2_REG         0x4C\r
 #define DMC_MEMORY_CFG3_REG         0x50\r
 #define DMC_T_FAW_REG               0x54\r
 #define DMC_MEMORY_CFG2_REG         0x4C\r
 #define DMC_MEMORY_CFG3_REG         0x50\r
 #define DMC_T_FAW_REG               0x54\r

-#define DMC_T_RDATA_EN              0x5C       /* DFI read data enable register */\r
+#define DMC_T_RDATA_EN              0x5C        /* DFI read data enable register */\r

 #define DMC_T_WRLAT_DIFF            0x60        /* DFI write data enable register */\r
 \r
 // Returns the state of the memory controller:\r
 #define DMC_T_WRLAT_DIFF            0x60        /* DFI write data enable register */\r
 \r
 // Returns the state of the memory controller:\r


@@ -182,66 +182,66 @@ typedef struct  {
 //\r
 // PHY Register Settings\r
 //\r
 //\r
 // PHY Register Settings\r
 //\r

-#define PHY_PTM_DFI_CLK_RANGE                                  0xE00           // DDR2 PHY PTM register offset\r
-#define PHY_PTM_IOTERM                                                 0xE04\r
-#define PHY_PTM_PLL_EN                                         0xe0c\r
-#define PHY_PTM_PLL_RANGE                                      0xe18\r
-#define PHY_PTM_FEEBACK_DIV                                    0xe1c\r
-#define PHY_PTM_RCLK_DIV                                       0xe20\r
-#define PHY_PTM_LOCK_STATUS                                    0xe28\r
-#define PHY_PTM_INIT_DONE                                      0xe34\r
-#define PHY_PTM_ADDCOM_IOSTR_OFF                               0xec8\r
-#define PHY_PTM_SQU_TRAINING                                   0xee8\r
-#define PHY_PTM_SQU_STAT                                       0xeec\r
+#define PHY_PTM_DFI_CLK_RANGE       0xE00  // DDR2 PHY PTM register offset\r
+#define PHY_PTM_IOTERM              0xE04\r
+#define PHY_PTM_PLL_EN              0xe0c\r
+#define PHY_PTM_PLL_RANGE           0xe18\r
+#define PHY_PTM_FEEBACK_DIV         0xe1c\r
+#define PHY_PTM_RCLK_DIV            0xe20\r
+#define PHY_PTM_LOCK_STATUS         0xe28\r
+#define PHY_PTM_INIT_DONE           0xe34\r
+#define PHY_PTM_ADDCOM_IOSTR_OFF    0xec8\r
+#define PHY_PTM_SQU_TRAINING        0xee8\r
+#define PHY_PTM_SQU_STAT            0xeec\r

 \r
 // ==============================================================================\r
 // PIPD 40G DDR2/DDR3 PHY Register definitions\r
 //\r
 // Offsets from APB Base Address\r
 // ==============================================================================\r
 \r
 // ==============================================================================\r
 // PIPD 40G DDR2/DDR3 PHY Register definitions\r
 //\r
 // Offsets from APB Base Address\r
 // ==============================================================================\r

-#define PHY_BYTE0_OFFSET                                       0x000\r
-#define PHY_BYTE1_OFFSET                                       0x200\r
-#define PHY_BYTE2_OFFSET                                       0x400\r
-#define PHY_BYTE3_OFFSET                                       0x600\r
+#define PHY_BYTE0_OFFSET            0x000\r
+#define PHY_BYTE1_OFFSET            0x200\r
+#define PHY_BYTE2_OFFSET            0x400\r
+#define PHY_BYTE3_OFFSET            0x600\r

 \r
 \r

-#define PHY_BYTE0_COARSE_SQADJ_INIT                    0x064   ;// Coarse squelch adjust\r
-#define PHY_BYTE1_COARSE_SQADJ_INIT                    0x264   ;// Coarse squelch adjust\r
-#define PHY_BYTE2_COARSE_SQADJ_INIT                    0x464   ;// Coarse squelch adjust\r
-#define PHY_BYTE3_COARSE_SQADJ_INIT                    0x664   ;// Coarse squelch adjust\r
+#define PHY_BYTE0_COARSE_SQADJ_INIT 0x064  ;// Coarse squelch adjust\r
+#define PHY_BYTE1_COARSE_SQADJ_INIT 0x264  ;// Coarse squelch adjust\r
+#define PHY_BYTE2_COARSE_SQADJ_INIT 0x464  ;// Coarse squelch adjust\r
+#define PHY_BYTE3_COARSE_SQADJ_INIT 0x664  ;// Coarse squelch adjust\r

 \r
 \r

-#define PHY_BYTE0_IOSTR_OFFSET                         0x004\r
-#define PHY_BYTE1_IOSTR_OFFSET                         0x204\r
-#define PHY_BYTE2_IOSTR_OFFSET                         0x404\r
-#define PHY_BYTE3_IOSTR_OFFSET                         0x604\r
+#define PHY_BYTE0_IOSTR_OFFSET      0x004\r
+#define PHY_BYTE1_IOSTR_OFFSET      0x204\r
+#define PHY_BYTE2_IOSTR_OFFSET      0x404\r
+#define PHY_BYTE3_IOSTR_OFFSET      0x604\r

 \r
 \r
 ;//--------------------------------------------------------------------------\r
 \r
 // DFI Clock ranges:\r
 \r
 \r
 \r
 ;//--------------------------------------------------------------------------\r
 \r
 // DFI Clock ranges:\r
 \r

-#define PHY_PTM_DFI_CLK_RANGE_200MHz                   0x0\r
-#define PHY_PTM_DFI_CLK_RANGE_201_267MHz       0x1\r
-#define PHY_PTM_DFI_CLK_RANGE_268_333MHz       0x2\r
-#define PHY_PTM_DFI_CLK_RANGE_334_400MHz       0x3\r
-#define PHY_PTM_DFI_CLK_RANGE_401_533MHz       0x4\r
-#define PHY_PTM_DFI_CLK_RANGE_534_667MHz       0x5\r
-#define PHY_PTM_DFI_CLK_RANGE_668_800MHz       0x6\r
+#define PHY_PTM_DFI_CLK_RANGE_200MHz            0x0\r
+#define PHY_PTM_DFI_CLK_RANGE_201_267MHz        0x1\r
+#define PHY_PTM_DFI_CLK_RANGE_268_333MHz        0x2\r
+#define PHY_PTM_DFI_CLK_RANGE_334_400MHz        0x3\r
+#define PHY_PTM_DFI_CLK_RANGE_401_533MHz        0x4\r
+#define PHY_PTM_DFI_CLK_RANGE_534_667MHz        0x5\r
+#define PHY_PTM_DFI_CLK_RANGE_668_800MHz        0x6\r

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

-#define  PHY_PTM_DFI_CLK_RANGE_VAL                     PHY_PTM_DFI_CLK_RANGE_334_400MHz\r
+#define  PHY_PTM_DFI_CLK_RANGE_VAL              PHY_PTM_DFI_CLK_RANGE_334_400MHz\r

 \r
 //--------------------------------------------------------------------------\r
 \r
 \r
 // PLL Range\r
 \r
 \r
 //--------------------------------------------------------------------------\r
 \r
 \r
 // PLL Range\r
 \r

-#define PHY_PTM_PLL_RANGE_200_400MHz           0x0     // b0 = frequency >= 200 MHz and < 400 MHz\r
-#define PHY_PTM_PLL_RANGE_400_800MHz           0x1     // b1 = frequency >= 400 MHz.\r
-#define PHY_PTM_FEEBACK_DIV_200_400MHz         0x0     // b0 = frequency >= 200 MHz and < 400 MHz\r
-#define PHY_PTM_FEEBACK_DIV_400_800MHz         0x1     // b1 = frequency >= 400 MHz.\r
-#define PHY_PTM_REFCLK_DIV_200_400MHz          0x0\r
-#define PHY_PTM_REFCLK_DIV_400_800MHz          0x1\r
+#define PHY_PTM_PLL_RANGE_200_400MHz            0x0     // b0 = frequency >= 200 MHz and < 400 MHz\r
+#define PHY_PTM_PLL_RANGE_400_800MHz            0x1     // b1 = frequency >= 400 MHz.\r
+#define PHY_PTM_FEEBACK_DIV_200_400MHz          0x0     // b0 = frequency >= 200 MHz and < 400 MHz\r
+#define PHY_PTM_FEEBACK_DIV_400_800MHz          0x1     // b1 = frequency >= 400 MHz.\r
+#define PHY_PTM_REFCLK_DIV_200_400MHz           0x0\r
+#define PHY_PTM_REFCLK_DIV_400_800MHz           0x1\r

 \r
 #define TC_UIOLHNC_MASK                         0x000003C0\r
 #define TC_UIOLHNC_SHIFT                        0x6\r
 \r
 #define TC_UIOLHNC_MASK                         0x000003C0\r
 #define TC_UIOLHNC_SHIFT                        0x6\r


@@ -252,18 +252,18 @@ typedef struct  {
 #define TC_UIOHSTOP_SHIFT                       0x0\r
 #define TC_UIOLHXC_VALUE                        0x4\r
 \r
 #define TC_UIOHSTOP_SHIFT                       0x0\r
 #define TC_UIOLHXC_VALUE                        0x4\r
 \r

-#define PHY_PTM_SQU_TRAINING_ENABLE                            0x1\r
-#define PHY_PTM_SQU_TRAINING_DISABLE                           0x0\r
+#define PHY_PTM_SQU_TRAINING_ENABLE             0x1\r
+#define PHY_PTM_SQU_TRAINING_DISABLE            0x0\r

 \r
 \r
 //--------------------------------------\r
 // JEDEC DDR2 Device Register definitions and settings\r
 //--------------------------------------\r
 \r
 \r
 //--------------------------------------\r
 // JEDEC DDR2 Device Register definitions and settings\r
 //--------------------------------------\r

-#define DDR_MODESET_SHFT                                               14\r
-#define DDR_MODESET_MR                                                 0x0             ;// Mode register\r
-#define DDR_MODESET_EMR                                                        0x1             ;// Extended Mode register\r
-#define DDR_MODESET_EMR2                                               0x2\r
-#define DDR_MODESET_EMR3                                               0x3\r
+#define DDR_MODESET_SHFT                        14\r
+#define DDR_MODESET_MR                          0x0  ;// Mode register\r
+#define DDR_MODESET_EMR                         0x1  ;// Extended Mode register\r
+#define DDR_MODESET_EMR2                        0x2\r
+#define DDR_MODESET_EMR3                        0x3\r

 \r
 //\r
 // Extended Mode Register settings\r
 \r
 //\r
 // Extended Mode Register settings\r


@@ -290,21 +290,21 @@ typedef struct  {
 \r
 #define DDR_EMR_ODS_VAL                         DDR_EMR_ODS_FULL\r
 \r
 \r
 #define DDR_EMR_ODS_VAL                         DDR_EMR_ODS_FULL\r
 \r

-#define DDR_SDRAM_START_ADDR                                   0x10000000\r
+#define DDR_SDRAM_START_ADDR                    0x10000000\r

 \r
 \r
 // ----------------------------------------\r
 // PHY IOTERM values\r
 // ----------------------------------------\r
 \r
 \r
 // ----------------------------------------\r
 // PHY IOTERM values\r
 // ----------------------------------------\r

-#define PHY_PTM_IOTERM_OFF                                     0x0\r
-#define PHY_PTM_IOTERM_150R                                    0x1\r
-#define PHY_PTM_IOTERM_75R                                     0x2\r
-#define PHY_PTM_IOTERM_50R                                     0x3\r
-\r
-#define PHY_BYTE_IOSTR_60OHM                           0x0\r
-#define PHY_BYTE_IOSTR_40OHM                           0x1\r
-#define PHY_BYTE_IOSTR_30OHM                           0x2\r
-#define PHY_BYTE_IOSTR_30AOHM                          0x3\r
+#define PHY_PTM_IOTERM_OFF                      0x0\r
+#define PHY_PTM_IOTERM_150R                     0x1\r
+#define PHY_PTM_IOTERM_75R                      0x2\r
+#define PHY_PTM_IOTERM_50R                      0x3\r
+\r
+#define PHY_BYTE_IOSTR_60OHM                    0x0\r
+#define PHY_BYTE_IOSTR_40OHM                    0x1\r
+#define PHY_BYTE_IOSTR_30OHM                    0x2\r
+#define PHY_BYTE_IOSTR_30AOHM                   0x3\r

 \r
 #define DDR2_MR_BURST_LENGTH_4     (2)\r
 #define DDR2_MR_BURST_LENGTH_8     (3)\r
 \r
 #define DDR2_MR_BURST_LENGTH_4     (2)\r
 #define DDR2_MR_BURST_LENGTH_8     (3)\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
index 0438d91f490e7237b647cc5f9de3bec9f50ce8ce..e52ea5afa2cba9e567d90085dbbfde666321b617 100644 (file)
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
@@ -33,10 +33,10 @@ ASM_PFX(ArmPlatformPeiBootAction):
 //  IN UINTN MpId\r
 //  );\r
 ASM_PFX(ArmPlatformGetCorePosition):\r
 //  IN UINTN MpId\r
 //  );\r
 ASM_PFX(ArmPlatformGetCorePosition):\r

-  and  r1, r0, #ARM_CORE_MASK\r
-  and  r0, r0, #ARM_CLUSTER_MASK\r
-  add  r0, r1, r0, LSR #7\r
-  bx   lr\r
+  and   r1, r0, #ARM_CORE_MASK\r
+  and   r0, r0, #ARM_CLUSTER_MASK\r
+  add   r0, r1, r0, LSR #7\r
+  bx    lr\r

 \r
 //UINTN\r
 //ArmPlatformGetPrimaryCoreMpId (\r
 \r
 //UINTN\r
 //ArmPlatformGetPrimaryCoreMpId (\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
index aafa9c60d2fa789d96ad179ce85346dc2c8b2eb7..95704c100a7ad4ab5fc4bc8dcf4fdfd1c21b8b40 100644 (file)
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
@@ -36,10 +36,10 @@ ArmPlatformPeiBootAction FUNCTION
 //  IN UINTN MpId\r
 //  );\r
 ArmPlatformGetCorePosition FUNCTION\r
 //  IN UINTN MpId\r
 //  );\r
 ArmPlatformGetCorePosition FUNCTION\r

-  and  r1, r0, #ARM_CORE_MASK\r
-  and  r0, r0, #ARM_CLUSTER_MASK\r
-  add  r0, r1, r0, LSR #7\r
-  bx   lr\r
+  and   r1, r0, #ARM_CORE_MASK\r
+  and   r0, r0, #ARM_CLUSTER_MASK\r
+  add   r0, r1, r0, LSR #7\r
+  bx    lr\r

   ENDFUNC\r
 \r
 //UINTN\r
   ENDFUNC\r
 \r
 //UINTN\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm b/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm
index e7fd4a06a8953f83410ceb532ffcc486c3f0b1d1..99218cd10adee69c2a9d7b569be7b1b487006466 100644 (file)
--- a/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm
+++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm
@@ -61,7 +61,7 @@ ArmPlatformStackSet FUNCTION
   // Restore the Link register\r
   mov   lr, r7\r
 \r
   // Restore the Link register\r
   mov   lr, r7\r
 \r

-  beq  ArmPlatformStackSetPrimary\r
+  beq   ArmPlatformStackSetPrimary\r

   bne   ArmPlatformStackSetSecondary\r
   ENDFUNC\r
 \r
   bne   ArmPlatformStackSetSecondary\r
   ENDFUNC\r
 \r


@@ -73,19 +73,19 @@ ArmPlatformStackSet FUNCTION
 //  IN UINTN SecondaryStackSize\r
 //  );\r
 ArmPlatformStackSetPrimary FUNCTION\r
 //  IN UINTN SecondaryStackSize\r
 //  );\r
 ArmPlatformStackSetPrimary FUNCTION\r

-  mov  r4, lr\r
+  mov   r4, lr\r

 \r
   // Add stack of primary stack to StackBase\r
 \r
   // Add stack of primary stack to StackBase\r

-  add  r0, r0, r2\r
+  add   r0, r0, r2\r

 \r
   // Compute SecondaryCoresCount * SecondaryCoreStackSize\r
   LoadConstantToReg (_gPcd_FixedAtBuild_PcdCoreCount, r1)\r
 \r
   // Compute SecondaryCoresCount * SecondaryCoreStackSize\r
   LoadConstantToReg (_gPcd_FixedAtBuild_PcdCoreCount, r1)\r

-  ldr  r1, [r1]\r
-  sub  r1, #1\r
-  mul  r3, r3, r1\r
+  ldr   r1, [r1]\r
+  sub   r1, #1\r
+  mul   r3, r3, r1\r

 \r
   // Set Primary Stack ((StackBase + PrimaryStackSize) + (SecondaryCoresCount * SecondaryCoreStackSize))\r
 \r
   // Set Primary Stack ((StackBase + PrimaryStackSize) + (SecondaryCoresCount * SecondaryCoreStackSize))\r

-  add  sp, r0, r3\r
+  add   sp, r0, r3\r

 \r
   bx    r4\r
   ENDFUNC\r
 \r
   bx    r4\r
   ENDFUNC\r


@@ -98,28 +98,28 @@ ArmPlatformStackSetPrimary FUNCTION
 //  IN UINTN SecondaryStackSize\r
 //  );\r
 ArmPlatformStackSetSecondary FUNCTION\r
 //  IN UINTN SecondaryStackSize\r
 //  );\r
 ArmPlatformStackSetSecondary FUNCTION\r

-  mov  r4, lr\r
+  mov   r4, lr\r

   mov   sp, r0\r
 \r
   // Get Core Position\r
   mov   sp, r0\r
 \r
   // Get Core Position\r

-  mov  r0, r1\r
+  mov   r0, r1\r

   bl ArmPlatformGetCorePosition\r
   bl ArmPlatformGetCorePosition\r

-  mov  r5, r0\r
+  mov   r5, r0\r

 \r
   // Get Primary Core Position\r
   bl ArmPlatformGetPrimaryCoreMpId\r
   bl ArmPlatformGetCorePosition\r
 \r
   // Get Secondary Core Position. We should get consecutive secondary stack number from 1...(CoreCount-1)\r
 \r
   // Get Primary Core Position\r
   bl ArmPlatformGetPrimaryCoreMpId\r
   bl ArmPlatformGetCorePosition\r
 \r
   // Get Secondary Core Position. We should get consecutive secondary stack number from 1...(CoreCount-1)\r

-  cmp  r5, r0\r
+  cmp   r5, r0\r

   subhi r5, r5, #1\r
   subhi r5, r5, #1\r

-  add  r5, r5, #1\r
+  add   r5, r5, #1\r

 \r
   // Compute top of the secondary stack\r
 \r
   // Compute top of the secondary stack\r

-  mul  r3, r3, r5\r
+  mul   r3, r3, r5\r

 \r
   // Set stack\r
 \r
   // Set stack\r

-  add  sp, sp, r3\r
+  add   sp, sp, r3\r

 \r
   bx r4\r
   ENDFUNC\r
 \r
   bx r4\r
   ENDFUNC\r

diff --git a/ArmPlatformPkg/Library/EblCmdLib/Arm/EblCmdMmu.c b/ArmPlatformPkg/Library/EblCmdLib/Arm/EblCmdMmu.c
index bc074de117bee069566b4f99ae33415e2c93b917..fe9d3eae147388229b042310664056b90b259a5c 100644 (file)
--- a/ArmPlatformPkg/Library/EblCmdLib/Arm/EblCmdMmu.c
+++ b/ArmPlatformPkg/Library/EblCmdLib/Arm/EblCmdMmu.c
@@ -26,41 +26,41 @@
 #define GET_TT_LARGEPAGE_ATTRIBUTES(TTEntry)  ((TTEntry) & 0xFFFF)\r
 \r
 // Section\r
 #define GET_TT_LARGEPAGE_ATTRIBUTES(TTEntry)  ((TTEntry) & 0xFFFF)\r
 \r
 // Section\r

-#define TT_DESCRIPTOR_SECTION_STRONGLY_ORDER      (TT_DESCRIPTOR_SECTION_TYPE_SECTION                                                                                                    | \\r
-                                                                                                       TT_DESCRIPTOR_SECTION_NG_GLOBAL                                                                                                           | \\r
-                                                                                                       TT_DESCRIPTOR_SECTION_S_NOT_SHARED                                                                                                        | \\r
-                                                                                                       TT_DESCRIPTOR_SECTION_DOMAIN(0)                                                                                                           | \\r
-                                                                                                       TT_DESCRIPTOR_SECTION_AP_RW_RW                                                                                                            | \\r
-                                                                                                       TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED)\r
+#define TT_DESCRIPTOR_SECTION_STRONGLY_ORDER   (TT_DESCRIPTOR_SECTION_TYPE_SECTION    | \\r
+                                                TT_DESCRIPTOR_SECTION_NG_GLOBAL       | \\r
+                                                TT_DESCRIPTOR_SECTION_S_NOT_SHARED    | \\r
+                                                TT_DESCRIPTOR_SECTION_DOMAIN(0)       | \\r
+                                                TT_DESCRIPTOR_SECTION_AP_RW_RW        | \\r
+                                                TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED)\r

 \r
 // Small Page\r
 \r
 // Small Page\r

-#define TT_DESCRIPTOR_PAGE_STRONGLY_ORDER                      (TT_DESCRIPTOR_PAGE_TYPE_PAGE                                                                                                              | \\r
-                                                                                                               TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                                                                      | \\r
-                                                                                                               TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                                                                   | \\r
-                                                                                                               TT_DESCRIPTOR_PAGE_AP_RW_RW                                                                                                       | \\r
-                                                                                                               TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED)\r
+#define TT_DESCRIPTOR_PAGE_STRONGLY_ORDER      (TT_DESCRIPTOR_PAGE_TYPE_PAGE          | \\r
+                                                TT_DESCRIPTOR_PAGE_NG_GLOBAL          | \\r
+                                                TT_DESCRIPTOR_PAGE_S_NOT_SHARED       | \\r
+                                                TT_DESCRIPTOR_PAGE_AP_RW_RW           | \\r
+                                                TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED)\r

 \r
 // Large Page\r
 \r
 // Large Page\r

-#define TT_DESCRIPTOR_LARGEPAGE_WRITE_BACK              (TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE                                                           | \\r
-                                                        TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \\r
-                                                        TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \\r
-                                                        TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \\r
-                                                        TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK_ALLOC)\r
-#define TT_DESCRIPTOR_LARGEPAGE_WRITE_THROUGH           (TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE                                                           | \\r
-                                                        TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \\r
-                                                        TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \\r
-                                                        TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \\r
-                                                        TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC)\r
-#define TT_DESCRIPTOR_LARGEPAGE_DEVICE                  (TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE                                                           | \\r
-                                                        TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \\r
-                                                        TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \\r
-                                                        TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \\r
-                                                        TT_DESCRIPTOR_SECTION_CACHE_POLICY_SHAREABLE_DEVICE)\r
-#define TT_DESCRIPTOR_LARGEPAGE_UNCACHED                (TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE                                                           | \\r
-                                                        TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \\r
-                                                        TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \\r
-                                                        TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \\r
-                                                        TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE)\r
+#define TT_DESCRIPTOR_LARGEPAGE_WRITE_BACK     (TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE     | \\r
+                                                TT_DESCRIPTOR_PAGE_NG_GLOBAL          | \\r
+                                                TT_DESCRIPTOR_PAGE_S_NOT_SHARED       | \\r
+                                                TT_DESCRIPTOR_PAGE_AP_RW_RW           | \\r
+                                                TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK_ALLOC)\r
+#define TT_DESCRIPTOR_LARGEPAGE_WRITE_THROUGH  (TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE     | \\r
+                                                TT_DESCRIPTOR_PAGE_NG_GLOBAL          | \\r
+                                                TT_DESCRIPTOR_PAGE_S_NOT_SHARED       | \\r
+                                                TT_DESCRIPTOR_PAGE_AP_RW_RW           | \\r
+                                                TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC)\r
+#define TT_DESCRIPTOR_LARGEPAGE_DEVICE         (TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE     | \\r
+                                                TT_DESCRIPTOR_PAGE_NG_GLOBAL          | \\r
+                                                TT_DESCRIPTOR_PAGE_S_NOT_SHARED       | \\r
+                                                TT_DESCRIPTOR_PAGE_AP_RW_RW           | \\r
+                                                TT_DESCRIPTOR_SECTION_CACHE_POLICY_SHAREABLE_DEVICE)\r
+#define TT_DESCRIPTOR_LARGEPAGE_UNCACHED       (TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE     | \\r
+                                                TT_DESCRIPTOR_PAGE_NG_GLOBAL          | \\r
+                                                TT_DESCRIPTOR_PAGE_S_NOT_SHARED       | \\r
+                                                TT_DESCRIPTOR_PAGE_AP_RW_RW           | \\r
+                                                TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE)\r

 \r
 \r
 typedef enum { Level0, Level1,Level2 } MMU_LEVEL;\r
 \r
 \r
 typedef enum { Level0, Level1,Level2 } MMU_LEVEL;\r


@@ -296,7 +296,7 @@ DumpMmuLevel (
   UINT32      Index = 0, Count;\r
   MMU_ENTRY   LastEntry, Entry;\r
 \r
   UINT32      Index = 0, Count;\r
   MMU_ENTRY   LastEntry, Entry;\r
 \r

-       ASSERT((Level == Level1) || (Level == Level2));\r
+  ASSERT((Level == Level1) || (Level == Level2));\r

 \r
   if (Level == Level1)    Count = 4096;\r
   else                    Count = 256;\r
 \r
   if (Level == Level1)    Count = 4096;\r
   else                    Count = 256;\r

diff --git a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
index 9ac7500f19bbad30383a7dd88920f36e0794f46c..edf479ff43e5ff56acc881334db4ef8fd469953f 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
+++ b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
@@ -40,7 +40,7 @@ _ModuleEntryPoint
   mov   r5, r0\r
 \r
   // Is it the Primary Core ?\r
   mov   r5, r0\r
 \r
   // Is it the Primary Core ?\r

-  bl   ArmPlatformIsPrimaryCore\r
+  bl    ArmPlatformIsPrimaryCore\r

 \r
   // Get the top of the primary stacks (and the base of the secondary stacks)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoresStackBase), r1)\r
 \r
   // Get the top of the primary stacks (and the base of the secondary stacks)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoresStackBase), r1)\r

diff --git a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S
index 4fe10addc183b76adeaf87307fe43d188eb2beba..f00960f1669081aea69f7e17ca7e879eb42b9e8e 100644 (file)
--- a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S
@@ -69,13 +69,13 @@ _SetupStackPosition:
   //\r
 \r
   // Calculate how much space there is between the top of the Firmware and the Top of the System Memory\r
   //\r
 \r
   // Calculate how much space there is between the top of the Firmware and the Top of the System Memory\r

-  subs r0, r1, r3      // r0 = SystemMemoryTop - FdTop\r
-  bmi  _SetupStack     // Jump if negative (FdTop > SystemMemoryTop). Case when the PrePi is in XIP memory outside of the DRAM\r
-  cmp  r0, r4\r
-  bge  _SetupStack\r
+  subs  r0, r1, r3      // r0 = SystemMemoryTop - FdTop\r
+  bmi   _SetupStack     // Jump if negative (FdTop > SystemMemoryTop). Case when the PrePi is in XIP memory outside of the DRAM\r
+  cmp   r0, r4\r
+  bge   _SetupStack\r

 \r
   // Case the top of stacks is the FdBaseAddress\r
 \r
   // Case the top of stacks is the FdBaseAddress\r

-  mov  r1, r2\r
+  mov   r1, r2\r

 \r
 _SetupStack:\r
   // r1 contains the top of the stack (and the UEFI Memory)\r
 \r
 _SetupStack:\r
   // r1 contains the top of the stack (and the UEFI Memory)\r


@@ -109,18 +109,18 @@ _GetStackBase:
 \r
   // Stack for the secondary core = Number of Cores - 1\r
   LoadConstantToReg (FixedPcdGet32(PcdCoreCount), r0)\r
 \r
   // Stack for the secondary core = Number of Cores - 1\r
   LoadConstantToReg (FixedPcdGet32(PcdCoreCount), r0)\r

-  sub  r0, r0, #1\r
+  sub   r0, r0, #1\r

   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r1)\r
   mul   r1, r1, r0\r
   sub   r10, r10, r1\r
 \r
   // r10 = The base of the MpCore Stacks (primary stack & secondary stacks)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r1)\r
   mul   r1, r1, r0\r
   sub   r10, r10, r1\r
 \r
   // r10 = The base of the MpCore Stacks (primary stack & secondary stacks)\r

-  mov  r0, r10\r
-  mov  r1, r8\r
+  mov   r0, r10\r
+  mov   r1, r8\r

   //ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r3)\r
   //ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r3)\r

-  bl   ASM_PFX(ArmPlatformStackSet)\r
+  bl    ASM_PFX(ArmPlatformStackSet)\r

 \r
   // Is it the Primary Core ?\r
   mov   r0, r8\r
 \r
   // Is it the Primary Core ?\r
   mov   r0, r8\r

diff --git a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm
index 4e2bb16c99ae40d33ad9decc54f4e07aee76e988..cbb3a08008696c3410f839b506ebf363bd5c3536 100644 (file)
--- a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm
+++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm
@@ -71,13 +71,13 @@ _SetupStackPosition
   //\r
 \r
   // Calculate how much space there is between the top of the Firmware and the Top of the System Memory\r
   //\r
 \r
   // Calculate how much space there is between the top of the Firmware and the Top of the System Memory\r

-  subs r0, r1, r3      // r0 = SystemMemoryTop - FdTop\r
-  bmi  _SetupStack     // Jump if negative (FdTop > SystemMemoryTop). Case when the PrePi is in XIP memory outside of the DRAM\r
-  cmp  r0, r4\r
-  bge  _SetupStack\r
+  subs  r0, r1, r3      // r0 = SystemMemoryTop - FdTop\r
+  bmi   _SetupStack     // Jump if negative (FdTop > SystemMemoryTop). Case when the PrePi is in XIP memory outside of the DRAM\r
+  cmp   r0, r4\r
+  bge   _SetupStack\r

 \r
   // Case the top of stacks is the FdBaseAddress\r
 \r
   // Case the top of stacks is the FdBaseAddress\r

-  mov  r1, r2\r
+  mov   r1, r2\r

 \r
 _SetupStack\r
   // r1 contains the top of the stack (and the UEFI Memory)\r
 \r
 _SetupStack\r
   // r1 contains the top of the stack (and the UEFI Memory)\r


@@ -111,18 +111,18 @@ _GetStackBase
 \r
   // Stack for the secondary core = Number of Cores - 1\r
   LoadConstantToReg (FixedPcdGet32(PcdCoreCount), r0)\r
 \r
   // Stack for the secondary core = Number of Cores - 1\r
   LoadConstantToReg (FixedPcdGet32(PcdCoreCount), r0)\r

-  sub  r0, r0, #1\r
+  sub   r0, r0, #1\r

   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r1)\r
   mul   r1, r1, r0\r
   sub   r10, r10, r1\r
 \r
   // r10 = The base of the MpCore Stacks (primary stack & secondary stacks)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r1)\r
   mul   r1, r1, r0\r
   sub   r10, r10, r1\r
 \r
   // r10 = The base of the MpCore Stacks (primary stack & secondary stacks)\r

-  mov  r0, r10\r
-  mov  r1, r8\r
+  mov   r0, r10\r
+  mov   r1, r8\r

   //ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r3)\r
   //ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r3)\r

-  bl   ArmPlatformStackSet\r
+  bl    ArmPlatformStackSet\r

 \r
   // Is it the Primary Core ?\r
   mov   r0, r8\r
 \r
   // Is it the Primary Core ?\r
   mov   r0, r8\r

diff --git a/ArmPlatformPkg/Sec/Arm/Helper.S b/ArmPlatformPkg/Sec/Arm/Helper.S
index 2e2801fe85f2ce4ffb328b55ef4fad6a53f1b8d7..ac40102218752fab4ab78f46610596659b3b7e22 100644 (file)
--- a/ArmPlatformPkg/Sec/Arm/Helper.S
+++ b/ArmPlatformPkg/Sec/Arm/Helper.S
@@ -72,10 +72,10 @@ ASM_PFX(copy_cpsr_into_spsr):
 # Set the Non Secure Mode\r
 ASM_PFX(set_non_secure_mode):\r
     push    { r1 }\r
 # Set the Non Secure Mode\r
 ASM_PFX(set_non_secure_mode):\r
     push    { r1 }\r

-    and            r0, r0, #0x1f     @ Keep only the mode bits\r
+    and     r0, r0, #0x1f     @ Keep only the mode bits\r

     mrs     r1, spsr          @ Read the spsr\r
     bic     r1, r1, #0x1f     @ Clear all mode bits\r
     mrs     r1, spsr          @ Read the spsr\r
     bic     r1, r1, #0x1f     @ Clear all mode bits\r

-    orr            r1, r1, r0\r
+    orr     r1, r1, r0\r

     msr     spsr_cxsf, r1     @ write back spsr (may have caused a mode switch)\r
     isb\r
     pop     { r1 }\r
     msr     spsr_cxsf, r1     @ write back spsr (may have caused a mode switch)\r
     isb\r
     pop     { r1 }\r

diff --git a/ArmPlatformPkg/Sec/Arm/Helper.asm b/ArmPlatformPkg/Sec/Arm/Helper.asm
index febcdb18a1b27a90f41c15b3c6d3a4c4909789ec..8aa7d7840d56459bab93c7b9a8a149237efe77a2 100644 (file)
--- a/ArmPlatformPkg/Sec/Arm/Helper.asm
+++ b/ArmPlatformPkg/Sec/Arm/Helper.asm
@@ -67,7 +67,7 @@ set_non_secure_mode
     and     r0, r0, #0x1f     // Keep only the mode bits\r
     mrs     r1, spsr          // Read the spsr\r
     bic     r1, r1, #0x1f     // Clear all mode bits\r
     and     r0, r0, #0x1f     // Keep only the mode bits\r
     mrs     r1, spsr          // Read the spsr\r
     bic     r1, r1, #0x1f     // Clear all mode bits\r

-    orr            r1, r1, r0\r
+    orr     r1, r1, r0\r

     msr     spsr_cxsf, r1     // write back spsr (may have caused a mode switch)\r
     isb\r
     pop     { r1 }\r
     msr     spsr_cxsf, r1     // write back spsr (may have caused a mode switch)\r
     isb\r
     pop     { r1 }\r

diff --git a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S
index 158a08f5e39e45756e703dc1cbd1f59e789c8c15..51b91b965d8b5708d1b4d84d0af24dbcbe9e0e59 100644 (file)
--- a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S
+++ b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S
@@ -51,7 +51,7 @@ _IdentifyCpu:
   mov   r9, r0\r
 \r
   // Is it the Primary Core ?\r
   mov   r9, r0\r
 \r
   // Is it the Primary Core ?\r

-  bl   ASM_PFX(ArmPlatformIsPrimaryCore)\r
+  bl    ASM_PFX(ArmPlatformIsPrimaryCore)\r

   cmp   r0, #1\r
   // Only the primary core initialize the memory (SMC)\r
   beq   _InitMem\r
   cmp   r0, #1\r
   // Only the primary core initialize the memory (SMC)\r
   beq   _InitMem\r

diff --git a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm
index a97041d021d0d7c1016a14fe709f8ea62fee5a11..b30fab2141feebe324b381f49aecd29e29e191d0 100644 (file)
--- a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm
+++ b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm
@@ -53,7 +53,7 @@ _IdentifyCpu
   mov   r9, r0\r
 \r
   // Is it the Primary Core ?\r
   mov   r9, r0\r
 \r
   // Is it the Primary Core ?\r

-  bl   ArmPlatformIsPrimaryCore\r
+  bl    ArmPlatformIsPrimaryCore\r

   cmp   r0, #1\r
   // Only the primary core initialize the memory (SMC)\r
   beq   _InitMem\r
   cmp   r0, #1\r
   // Only the primary core initialize the memory (SMC)\r
   beq   _InitMem\r

diff --git a/BeagleBoardPkg/Include/BeagleBoard.h b/BeagleBoardPkg/Include/BeagleBoard.h
index cae398a984df4448fa82fc34b8539b99e1b67872..f9955b03752e249d373ba1f38c31448fade21656 100755 (executable)
--- a/BeagleBoardPkg/Include/BeagleBoard.h
+++ b/BeagleBoardPkg/Include/BeagleBoard.h
@@ -94,7 +94,7 @@
 #define SP810_CTRL_BASE                       (ARM_EB_BOARD_PERIPH_BASE + 0x01000)\r
 \r
 // SYSTRCL Register\r
 #define SP810_CTRL_BASE                       (ARM_EB_BOARD_PERIPH_BASE + 0x01000)\r
 \r
 // SYSTRCL Register\r

-#define ARM_EB_SYSCTRL                                                                                   0x10001000\r
+#define ARM_EB_SYSCTRL                        0x10001000\r

 \r
 // Uart0\r
 #define PL011_CONSOLE_UART_BASE               (ARM_EB_BOARD_PERIPH_BASE + 0x09000)\r
 \r
 // Uart0\r
 #define PL011_CONSOLE_UART_BASE               (ARM_EB_BOARD_PERIPH_BASE + 0x09000)\r

diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S
index 8e02088efc65e40c00346f164539ba74ffe417ba..f157925464484cf7c60b565007f3a8ab413f0d3d 100644 (file)
--- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S
+++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S
@@ -29,8 +29,8 @@ GCC_ASM_IMPORT(ArmReadMpidr)
 //  );\r
 ASM_PFX(ArmPlatformIsPrimaryCore):\r
   // BeagleBoard has a single core. We must always return 1.\r
 //  );\r
 ASM_PFX(ArmPlatformIsPrimaryCore):\r
   // BeagleBoard has a single core. We must always return 1.\r

-  mov  r0, #1\r
-  bx   lr\r
+  mov   r0, #1\r
+  bx    lr\r

 \r
 ASM_PFX(ArmPlatformPeiBootAction):\r
   bx    lr\r
 \r
 ASM_PFX(ArmPlatformPeiBootAction):\r
   bx    lr\r


@@ -42,6 +42,6 @@ ASM_PFX(ArmPlatformPeiBootAction):
 ASM_PFX(ArmPlatformGetPrimaryCoreMpId):\r
   // The BeagleBoard is a uniprocessor platform. The MPIDR of primary core is\r
   // always the MPIDR of the calling CPU.\r
 ASM_PFX(ArmPlatformGetPrimaryCoreMpId):\r
   // The BeagleBoard is a uniprocessor platform. The MPIDR of primary core is\r
   // always the MPIDR of the calling CPU.\r

-  b    ASM_PFX(ArmReadMpidr)\r
+  b   ASM_PFX(ArmReadMpidr)\r

 \r
 ASM_FUNCTION_REMOVE_IF_UNREFERENCED\r
 \r
 ASM_FUNCTION_REMOVE_IF_UNREFERENCED\r

diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm
index 39a2a536add8e5bdeb43f7fea6b0cbabb8731482..86906c87bcc1c0196eada337cbdc126f93f72708 100644 (file)
--- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm
+++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.asm
@@ -22,7 +22,7 @@
   EXPORT    ArmPlatformIsPrimaryCore\r
   EXPORT    ArmPlatformGetPrimaryCoreMpId\r
 \r
   EXPORT    ArmPlatformIsPrimaryCore\r
   EXPORT    ArmPlatformGetPrimaryCoreMpId\r
 \r

-  IMPORT       ArmReadMpidr\r
+  IMPORT    ArmReadMpidr\r

 \r
   AREA BeagleBoardHelper, CODE, READONLY\r
 \r
 \r
   AREA BeagleBoardHelper, CODE, READONLY\r
 \r


@@ -32,8 +32,8 @@
 //  );\r
 ArmPlatformIsPrimaryCore FUNCTION\r
   // BeagleBoard has a single core. We must always return 1.\r
 //  );\r
 ArmPlatformIsPrimaryCore FUNCTION\r
   // BeagleBoard has a single core. We must always return 1.\r

-  mov  r0, #1\r
-  bx   lr\r
+  mov   r0, #1\r
+  bx    lr\r

   ENDFUNC\r
 \r
 ArmPlatformPeiBootAction FUNCTION\r
   ENDFUNC\r
 \r
 ArmPlatformPeiBootAction FUNCTION\r


@@ -47,7 +47,7 @@ ArmPlatformPeiBootAction FUNCTION
 ArmPlatformGetPrimaryCoreMpId FUNCTION\r
   // The BeagleBoard is a uniprocessor platform. The MPIDR of primary core is\r
   // always the MPIDR of the calling CPU.\r
 ArmPlatformGetPrimaryCoreMpId FUNCTION\r
   // The BeagleBoard is a uniprocessor platform. The MPIDR of primary core is\r
   // always the MPIDR of the calling CPU.\r

-  b            ArmReadMpidr\r
+  b     ArmReadMpidr\r

   ENDFUNC\r
 \r
   END\r
   ENDFUNC\r
 \r
   END\r

diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.h b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.h
index 7d83b4f62ef8a63ee0d3983d14b442563b44d2dd..cc883e80797ee89ce4d4fc97fbeec4024177a8fd 100644 (file)
--- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.h
+++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.h
@@ -89,12 +89,12 @@ typedef struct {
  *\r
  *  Parameters:\r
  *\r
  *\r
  *  Parameters:\r
  *\r

- *     @param pobj:    A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
+ *  @param pobj:  A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r

  *\r
  *  Description:\r
  *\r
  *\r
  *  Description:\r
  *\r

- *     This function starts a network interface. If the network interface successfully starts, then\r
- *     EFI_SUCCESS will be returned.\r
+ *  This function starts a network interface. If the network interface successfully starts, then\r
+ *  EFI_SUCCESS will be returned.\r

  */\r
 EFI_STATUS\r
 EFIAPI\r
  */\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/EmbeddedPkg/Ebl/Command.c b/EmbeddedPkg/Ebl/Command.c
index 7c00bcae85748505b4d02fe8fed0a40858cf2088..04ea79464fd11416492a60233402d673f684b208 100644 (file)
--- a/EmbeddedPkg/Ebl/Command.c
+++ b/EmbeddedPkg/Ebl/Command.c
@@ -644,9 +644,9 @@ OutputData (
           TextLine[Line++] = ConvertToTextLine(*Address++);\r
           break;\r
 \r
           TextLine[Line++] = ConvertToTextLine(*Address++);\r
           break;\r
 \r

-                         default:\r
-                                 AsciiPrint ("Width must be 1, 2, or 4!\n");\r
-                                 return EFI_INVALID_PARAMETER;\r
+        default:\r
+          AsciiPrint ("Width must be 1, 2, or 4!\n");\r
+          return EFI_INVALID_PARAMETER;\r

       }\r
     }\r
 \r
       }\r
     }\r
 \r

diff --git a/EmbeddedPkg/Ebl/Network.c b/EmbeddedPkg/Ebl/Network.c
index d02c9988e1ff3bada6183f7369ce8ef6c0228909..c0055d5bb7d1264b67808cbc15f050c6eaf1d50e 100644 (file)
--- a/EmbeddedPkg/Ebl/Network.c
+++ b/EmbeddedPkg/Ebl/Network.c
@@ -61,7 +61,7 @@ EblIpCmd (
       goto Exit;\r
     }\r
 \r
       goto Exit;\r
     }\r
 \r

-       AsciiPrint("IP Address:   %d.%d.%d.%d\n", Ip.v4.Addr[0], Ip.v4.Addr[1],Ip.v4.Addr[2], Ip.v4.Addr[3]);\r
+    AsciiPrint("IP Address:   %d.%d.%d.%d\n", Ip.v4.Addr[0], Ip.v4.Addr[1],Ip.v4.Addr[2], Ip.v4.Addr[3]);\r

 \r
   } else if ((Argv[1][0] == 'r') && (Argc == 2)) {\r
     // Get new address via dhcp\r
 \r
   } else if ((Argv[1][0] == 'r') && (Argc == 2)) {\r
     // Get new address via dhcp\r

diff --git a/EmbeddedPkg/GdbStub/Arm/Processor.c b/EmbeddedPkg/GdbStub/Arm/Processor.c
index 80803b2d913e7803b7a4aba713b079d13712430c..96b4f570c4ebb0733c086df2faa7c3ef69e7b623 100644 (file)
--- a/EmbeddedPkg/GdbStub/Arm/Processor.c
+++ b/EmbeddedPkg/GdbStub/Arm/Processor.c
@@ -398,7 +398,7 @@ LIST_ENTRY  BreakpointList;
 /**\r
  Insert Single Step in the SystemContext\r
 \r
 /**\r
  Insert Single Step in the SystemContext\r
 \r

- @param        SystemContext   Register content at time of the exception\r
+ @param SystemContext  Register content at time of the exception\r

  **/\r
 VOID\r
 AddSingleStep (\r
  **/\r
 VOID\r
 AddSingleStep (\r


@@ -429,7 +429,7 @@ AddSingleStep (
 /**\r
  Remove Single Step in the SystemContext\r
 \r
 /**\r
  Remove Single Step in the SystemContext\r
 \r

- @param        SystemContext   Register content at time of the exception\r
+ @param SystemContext  Register content at time of the exception\r

  **/\r
 VOID\r
 RemoveSingleStep (\r
  **/\r
 VOID\r
 RemoveSingleStep (\r

diff --git a/EmbeddedPkg/GdbStub/GdbStubInternal.h b/EmbeddedPkg/GdbStub/GdbStubInternal.h
index 659be6b38f50ee2bcb06d76f44bf2017085aa83b..521c3442e0e21e56cca0214200fd74457e9b3651 100644 (file)
--- a/EmbeddedPkg/GdbStub/GdbStubInternal.h
+++ b/EmbeddedPkg/GdbStub/GdbStubInternal.h
@@ -272,7 +272,7 @@ CheckIsa (
 VOID\r
 GdbSendTSignal (\r
   IN  EFI_SYSTEM_CONTEXT  SystemContext,\r
 VOID\r
 GdbSendTSignal (\r
   IN  EFI_SYSTEM_CONTEXT  SystemContext,\r

-  IN  UINT8                  GdbExceptionType\r
+  IN  UINT8               GdbExceptionType\r

   );\r
 \r
 \r
   );\r
 \r
 \r

diff --git a/EmbeddedPkg/GdbStub/Ia32/Processor.c b/EmbeddedPkg/GdbStub/Ia32/Processor.c
index a4c4ded0c09b45172a6c2c13de308104efe3e8b1..bd94b311092189bd0e42acc41f1195f7b2067ac3 100644 (file)
--- a/EmbeddedPkg/GdbStub/Ia32/Processor.c
+++ b/EmbeddedPkg/GdbStub/Ia32/Processor.c
@@ -316,7 +316,7 @@ WriteNthRegister (
 \r
   // check if this is a valid Register Number\r
   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {\r
 \r
   // check if this is a valid Register Number\r
   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {\r

-       SendError (GDB_EINVALIDREGNUM);\r
+    SendError (GDB_EINVALIDREGNUM);\r

     return;\r
   }\r
   InBufPtr++;  // skips the '=' character\r
     return;\r
   }\r
   InBufPtr++;  // skips the '=' character\r


@@ -344,7 +344,7 @@ WriteGeneralRegisters (
   // check to see if the buffer is the right size which is\r
   // 1 (for 'G') + 16 (for 16 registers) * 8 ( for 8 hex chars each) = 129\r
   if (AsciiStrLen(InBuffer) != 129) { // 16 regs, 8 hex chars each, and the end '\0' (escape seq)\r
   // check to see if the buffer is the right size which is\r
   // 1 (for 'G') + 16 (for 16 registers) * 8 ( for 8 hex chars each) = 129\r
   if (AsciiStrLen(InBuffer) != 129) { // 16 regs, 8 hex chars each, and the end '\0' (escape seq)\r

-       //Bad message. Message is not the right length\r
+    //Bad message. Message is not the right length\r

     SendError (GDB_EBADBUFSIZE);\r
     return;\r
   }\r
     SendError (GDB_EBADBUFSIZE);\r
     return;\r
   }\r

diff --git a/EmbeddedPkg/GdbStub/X64/Processor.c b/EmbeddedPkg/GdbStub/X64/Processor.c
index 8a39c4828f4c7dcafe644653bfe1509a28fe1dd3..cbe50d78ec0932fbe1a9d388dc2ce1a69ef45ebc 100644 (file)
--- a/EmbeddedPkg/GdbStub/X64/Processor.c
+++ b/EmbeddedPkg/GdbStub/X64/Processor.c
@@ -285,7 +285,7 @@ WriteNthRegister (
 \r
   // check if this is a valid Register Number\r
   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {\r
 \r
   // check if this is a valid Register Number\r
   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {\r

-       SendError (GDB_EINVALIDREGNUM);\r
+    SendError (GDB_EINVALIDREGNUM);\r

     return;\r
   }\r
   InBufPtr++;  // skips the '=' character\r
     return;\r
   }\r
   InBufPtr++;  // skips the '=' character\r

diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h b/EmbeddedPkg/Include/Library/PrePiLib.h
index 9ac7f38a1f4bbf378213019129437539f8ba7160..cf70fca3b619da90ddfb08726fe41e4e15691ed7 100644 (file)
--- a/EmbeddedPkg/Include/Library/PrePiLib.h
+++ b/EmbeddedPkg/Include/Library/PrePiLib.h
@@ -160,11 +160,10 @@ FfsGetVolumeInfo (
 /**\r
   Get Fv image from the FV type file, then add FV & FV2 Hob.\r
 \r
 /**\r
   Get Fv image from the FV type file, then add FV & FV2 Hob.\r
 \r

-       @param FileHandle               File handle of a Fv type file.\r
+  @param FileHandle      File handle of a Fv type file.\r

 \r
 \r

-\r
-  @retval EFI_NOT_FOUND                                FV image can't be found.\r
-  @retval EFI_SUCCESS                                          Successfully to process it.\r
+  @retval EFI_NOT_FOUND  FV image can't be found.\r
+  @retval EFI_SUCCESS    Successfully to process it.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -177,12 +176,12 @@ FfsProcessFvFile (
 /**\r
   Search through every FV until you find a file of type FileType\r
 \r
 /**\r
   Search through every FV until you find a file of type FileType\r
 \r

-       @param FileType             File handle of a Fv type file.\r
-  @param Volumehandle   On succes Volume Handle of the match\r
-  @param FileHandle     On success File Handle of the match\r
+  @param FileType        File handle of a Fv type file.\r
+  @param Volumehandle    On succes Volume Handle of the match\r
+  @param FileHandle      On success File Handle of the match\r

 \r
 \r

-  @retval EFI_NOT_FOUND                                FV image can't be found.\r
-  @retval EFI_SUCCESS                                          Successfully found FileType\r
+  @retval EFI_NOT_FOUND  FV image can't be found.\r
+  @retval EFI_SUCCESS    Successfully found FileType\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -197,11 +196,11 @@ FfsAnyFvFindFirstFile (
 /**\r
   Get Fv image from the FV type file, then add FV & FV2 Hob.\r
 \r
 /**\r
   Get Fv image from the FV type file, then add FV & FV2 Hob.\r
 \r

-       @param FileHandle               File handle of a Fv type file.\r
+  @param FileHandle  File handle of a Fv type file.\r

 \r
 \r
 \r
 \r

-  @retval EFI_NOT_FOUND                                FV image can't be found.\r
-  @retval EFI_SUCCESS                                          Successfully to process it.\r
+  @retval EFI_NOT_FOUND  FV image can't be found.\r
+  @retval EFI_SUCCESS    Successfully to process it.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/EmbeddedPkg/Include/Protocol/EmbeddedExternalDevice.h b/EmbeddedPkg/Include/Protocol/EmbeddedExternalDevice.h
index 5fe06eb8ce42e140f560b375a5b9bb5ff0f8d4ab..06d2f034d01cd94626b07db0dcad3bd16d23d430 100644 (file)
--- a/EmbeddedPkg/Include/Protocol/EmbeddedExternalDevice.h
+++ b/EmbeddedPkg/Include/Protocol/EmbeddedExternalDevice.h
@@ -91,4 +91,4 @@ struct _EMBEDDED_EXTERNAL_DEVICE {
 \r
 extern EFI_GUID gEmbeddedExternalDeviceProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEmbeddedExternalDeviceProtocolGuid;\r
 \r

-#endif // __EMBEDDED_EXTERNAL_DEVICE_H__\r
+#endif  // __EMBEDDED_EXTERNAL_DEVICE_H__\r

diff --git a/EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.h b/EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.h
index 85328486d35a29eca4a7c7a8d5d55982f3086c1d..dfdc016d9d6a45a73177da6d1df322dc5991f6ac 100755 (executable)
--- a/EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.h
+++ b/EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.h
@@ -218,7 +218,7 @@ CheckIsa (
 VOID\r
 GdbSendTSignal (\r
   IN  EFI_SYSTEM_CONTEXT  SystemContext,\r
 VOID\r
 GdbSendTSignal (\r
   IN  EFI_SYSTEM_CONTEXT  SystemContext,\r

-  IN  UINT8                  GdbExceptionType\r
+  IN  UINT8               GdbExceptionType\r

   );\r
 \r
 \r
   );\r
 \r
 \r

diff --git a/EmbeddedPkg/Library/GdbDebugAgent/Ia32/Processor.c b/EmbeddedPkg/Library/GdbDebugAgent/Ia32/Processor.c
index c5a421c69e658270d20a829797e0dd3874a1cd56..d465b21183e73c5ff78d3aff75ae3b08d4ea64a8 100755 (executable)
--- a/EmbeddedPkg/Library/GdbDebugAgent/Ia32/Processor.c
+++ b/EmbeddedPkg/Library/GdbDebugAgent/Ia32/Processor.c
@@ -302,7 +302,7 @@ WriteNthRegister (
 \r
   // check if this is a valid Register Number\r
   if ((RegNumber < 0) || (RegNumber >= sizeof (gRegisterOffsets)/sizeof (UINTN))) {\r
 \r
   // check if this is a valid Register Number\r
   if ((RegNumber < 0) || (RegNumber >= sizeof (gRegisterOffsets)/sizeof (UINTN))) {\r

-       SendError (GDB_EINVALIDREGNUM);\r
+    SendError (GDB_EINVALIDREGNUM);\r

     return;\r
   }\r
   InBufPtr++;  // skips the '=' character\r
     return;\r
   }\r
   InBufPtr++;  // skips the '=' character\r


@@ -330,7 +330,7 @@ WriteGeneralRegisters (
   // check to see if the buffer is the right size which is\r
   // 1 (for 'G') + 16 (for 16 registers) * 8 ( for 8 hex chars each) = 129\r
   if (AsciiStrLen(InBuffer) != 129) { // 16 regs, 8 hex chars each, and the end '\0' (escape seq)\r
   // check to see if the buffer is the right size which is\r
   // 1 (for 'G') + 16 (for 16 registers) * 8 ( for 8 hex chars each) = 129\r
   if (AsciiStrLen(InBuffer) != 129) { // 16 regs, 8 hex chars each, and the end '\0' (escape seq)\r

-       //Bad message. Message is not the right length\r
+    //Bad message. Message is not the right length\r

     SendError (GDB_EBADBUFSIZE);\r
     return;\r
   }\r
     SendError (GDB_EBADBUFSIZE);\r
     return;\r
   }\r

diff --git a/EmbeddedPkg/Library/GdbDebugAgent/X64/Processor.c b/EmbeddedPkg/Library/GdbDebugAgent/X64/Processor.c
index 8a39c4828f4c7dcafe644653bfe1509a28fe1dd3..cbe50d78ec0932fbe1a9d388dc2ce1a69ef45ebc 100755 (executable)
--- a/EmbeddedPkg/Library/GdbDebugAgent/X64/Processor.c
+++ b/EmbeddedPkg/Library/GdbDebugAgent/X64/Processor.c
@@ -285,7 +285,7 @@ WriteNthRegister (
 \r
   // check if this is a valid Register Number\r
   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {\r
 \r
   // check if this is a valid Register Number\r
   if ((RegNumber < 0) || (RegNumber >= MaxRegisterCount())) {\r

-       SendError (GDB_EINVALIDREGNUM);\r
+    SendError (GDB_EINVALIDREGNUM);\r

     return;\r
   }\r
   InBufPtr++;  // skips the '=' character\r
     return;\r
   }\r
   InBufPtr++;  // skips the '=' character\r

diff --git a/EmbeddedPkg/Library/PrePiLib/FwVol.c b/EmbeddedPkg/Library/PrePiLib/FwVol.c
index 34ae0f59acce96ed1bd4fd38761f7056f21cd2ef..f73f1c0da47e00c3af6f6276d758c5834f86d43e 100644 (file)
--- a/EmbeddedPkg/Library/PrePiLib/FwVol.c
+++ b/EmbeddedPkg/Library/PrePiLib/FwVol.c
@@ -695,12 +695,12 @@ FfsGetVolumeInfo (
 /**\r
   Search through every FV until you find a file of type FileType\r
 \r
 /**\r
   Search through every FV until you find a file of type FileType\r
 \r

-       @param FileType             File handle of a Fv type file.\r
-  @param Volumehandle   On succes Volume Handle of the match\r
-  @param FileHandle     On success File Handle of the match\r
+  @param FileType        File handle of a Fv type file.\r
+  @param Volumehandle    On succes Volume Handle of the match\r
+  @param FileHandle      On success File Handle of the match\r

 \r
 \r

-  @retval EFI_NOT_FOUND                                FV image can't be found.\r
-  @retval EFI_SUCCESS                                          Successfully found FileType\r
+  @retval EFI_NOT_FOUND  FV image can't be found.\r
+  @retval EFI_SUCCESS    Successfully found FileType\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -743,11 +743,11 @@ FfsAnyFvFindFirstFile (
 /**\r
   Get Fv image from the FV type file, then add FV & FV2 Hob.\r
 \r
 /**\r
   Get Fv image from the FV type file, then add FV & FV2 Hob.\r
 \r

-       @param FileHandle               File handle of a Fv type file.\r
+  @param FileHandle  File handle of a Fv type file.\r

 \r
 \r
 \r
 \r

-  @retval EFI_NOT_FOUND                                FV image can't be found.\r
-  @retval EFI_SUCCESS                                          Successfully to process it.\r
+  @retval EFI_NOT_FOUND  FV image can't be found.\r
+  @retval EFI_SUCCESS    Successfully to process it.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
index 4e2e4de7db23b94e6d3e186beb917a513ac11b67..418328afe496286814784f0aa2a5441983d0ea4d 100644 (file)
--- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
+++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
@@ -397,49 +397,49 @@ EFI_STATUS
 EFIAPI\r
 LcdGraphicsBlt (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL        *This,\r
 EFIAPI\r
 LcdGraphicsBlt (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL        *This,\r

-       IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *BltBuffer,     OPTIONAL\r
-       IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION   BltOperation,\r
-       IN UINTN                               SourceX,\r
-       IN UINTN                               SourceY,\r
-       IN UINTN                               DestinationX,\r
-       IN UINTN                               DestinationY,\r
-       IN UINTN                               Width,\r
-       IN UINTN                               Height,\r
-       IN UINTN                               Delta           OPTIONAL   // Number of BYTES in a row of the BltBuffer\r
+  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *BltBuffer,     OPTIONAL\r
+  IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION   BltOperation,\r
+  IN UINTN                               SourceX,\r
+  IN UINTN                               SourceY,\r
+  IN UINTN                               DestinationX,\r
+  IN UINTN                               DestinationY,\r
+  IN UINTN                               Width,\r
+  IN UINTN                               Height,\r
+  IN UINTN                               Delta           OPTIONAL   // Number of BYTES in a row of the BltBuffer\r

   )\r
 {\r
   EFI_STATUS    Status;\r
   )\r
 {\r
   EFI_STATUS    Status;\r

-       LCD_INSTANCE  *Instance;\r
+  LCD_INSTANCE  *Instance;\r

 \r
 \r

-       Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r
+  Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r

 \r
   if (!mDisplayInitialized) {\r
     InitializeDisplay (Instance);\r
   }\r
 \r
   switch (BltOperation) {\r
 \r
   if (!mDisplayInitialized) {\r
     InitializeDisplay (Instance);\r
   }\r
 \r
   switch (BltOperation) {\r

-         case EfiBltVideoFill:\r
-           Status = BltVideoFill (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
-                 break;\r
-\r
-         case EfiBltVideoToBltBuffer:\r
-           Status = BltVideoToBltBuffer (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
-      break;\r
-\r
-    case EfiBltBufferToVideo:\r
-      Status = BltBufferToVideo (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
-                 break;\r
-\r
-         case EfiBltVideoToVideo:\r
-           Status = BltVideoToVideo (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
-                 break;\r
-\r
-         case EfiGraphicsOutputBltOperationMax:\r
-         default:\r
-                 DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: Invalid Operation\n"));\r
-                 Status = EFI_INVALID_PARAMETER;\r
-                 break;\r
-       }\r
+  case EfiBltVideoFill:\r
+    Status = BltVideoFill (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
+    break;\r
+\r
+  case EfiBltVideoToBltBuffer:\r
+    Status = BltVideoToBltBuffer (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
+    break;\r
+\r
+  case EfiBltBufferToVideo:\r
+    Status = BltBufferToVideo (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
+    break;\r
+\r
+  case EfiBltVideoToVideo:\r
+    Status = BltVideoToVideo (This, BltBuffer, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);\r
+    break;\r
+\r
+  case EfiGraphicsOutputBltOperationMax:\r
+  default:\r
+    DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: Invalid Operation\n"));\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
+}\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r

diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
index bfd9f3be43f05e96b1cba998d47d74843ea86f59..4364dd71a02b91b0a1e98e0c44b0622d972b5461 100644 (file)
--- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
+++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
@@ -273,24 +273,24 @@ EFI_STATUS
 EFIAPI\r
 LcdGraphicsQueryMode (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL            *This,\r
 EFIAPI\r
 LcdGraphicsQueryMode (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL            *This,\r

-       IN UINT32                                  ModeNumber,\r
-       OUT UINTN                                  *SizeOfInfo,\r
-       OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION   **Info\r
-       )\r
+  IN UINT32                                  ModeNumber,\r
+  OUT UINTN                                  *SizeOfInfo,\r
+  OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION   **Info\r
+  )\r

 {\r
 {\r

-       LCD_INSTANCE  *Instance;\r
+  LCD_INSTANCE  *Instance;\r

 \r
 \r

-       Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r
+  Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r

 \r
   if (!mDisplayInitialized) {\r
     InitializeDisplay (Instance);\r
   }\r
 \r
   // Error checking\r
 \r
   if (!mDisplayInitialized) {\r
     InitializeDisplay (Instance);\r
   }\r
 \r
   // Error checking\r

-       if ( (This == NULL) || (Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode) ) {\r
-         DEBUG((DEBUG_ERROR, "LcdGraphicsQueryMode: ERROR - For mode number %d : Invalid Parameter.\n", ModeNumber ));\r
-               return EFI_INVALID_PARAMETER;\r
-       }\r
+  if ( (This == NULL) || (Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode) ) {\r
+    DEBUG((DEBUG_ERROR, "LcdGraphicsQueryMode: ERROR - For mode number %d : Invalid Parameter.\n", ModeNumber ));\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r

 \r
   *Info = AllocateCopyPool(sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION), &Instance->ModeInfo);\r
   if (*Info == NULL) {\r
 \r
   *Info = AllocateCopyPool(sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION), &Instance->ModeInfo);\r
   if (*Info == NULL) {\r


@@ -311,12 +311,12 @@ EFI_STATUS
 EFIAPI\r
 LcdGraphicsSetMode (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL   *This,\r
 EFIAPI\r
 LcdGraphicsSetMode (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL   *This,\r

-       IN UINT32                         ModeNumber\r
-       )\r
+  IN UINT32                         ModeNumber\r
+  )\r

 {\r
 {\r

-       LCD_INSTANCE  *Instance;\r
+  LCD_INSTANCE  *Instance;\r

 \r
 \r

-       Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r
+  Instance = LCD_INSTANCE_FROM_GOP_THIS(This);\r

 \r
   if (ModeNumber >= Instance->Mode.MaxMode) {\r
     return EFI_UNSUPPORTED;\r
 \r
   if (ModeNumber >= Instance->Mode.MaxMode) {\r
     return EFI_UNSUPPORTED;\r


@@ -350,51 +350,51 @@ LcdGraphicsOutputDxeInitialize (
     goto EXIT;\r
   }\r
 \r
     goto EXIT;\r
   }\r
 \r

-       // Install the Graphics Output Protocol and the Device Path\r
-       Status = gBS->InstallMultipleProtocolInterfaces(\r
-                       &Instance->Handle,\r
-                       &gEfiGraphicsOutputProtocolGuid, &Instance->Gop,\r
-                       &gEfiDevicePathProtocolGuid,     &Instance->DevicePath,\r
-                       NULL\r
-          );\r
+  // Install the Graphics Output Protocol and the Device Path\r
+  Status = gBS->InstallMultipleProtocolInterfaces(\r
+             &Instance->Handle,\r
+             &gEfiGraphicsOutputProtocolGuid, &Instance->Gop,\r
+             &gEfiDevicePathProtocolGuid,     &Instance->DevicePath,\r
+             NULL\r
+             );\r

 \r
 \r

-       if (EFI_ERROR(Status)) {\r
-         DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the protocol. Exit Status=%r\n", Status));\r
-               goto EXIT;\r
-       }\r
+  if (EFI_ERROR(Status)) {\r
+    DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the protocol. Exit Status=%r\n", Status));\r
+    goto EXIT;\r
+  }\r

 \r
   // Register for an ExitBootServicesEvent\r
 \r
   // Register for an ExitBootServicesEvent\r

-       // When ExitBootServices starts, this function here will make sure that the graphics driver will shut down properly,\r
-       // i.e. it will free up all allocated memory and perform any necessary hardware re-configuration.\r
-       /*Status = gBS->CreateEvent (\r
-           EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
-           TPL_NOTIFY,\r
-           LcdGraphicsExitBootServicesEvent, NULL,\r
-                       &Instance->ExitBootServicesEvent\r
-                       );\r
-\r
-       if (EFI_ERROR(Status)) {\r
-         DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the ExitBootServicesEvent handler. Exit Status=%r\n", Status));\r
-               goto EXIT_ERROR_UNINSTALL_PROTOCOL;\r
-       }*/\r
-\r
-       // To get here, everything must be fine, so just exit\r
-       goto EXIT;\r
+  // When ExitBootServices starts, this function here will make sure that the graphics driver will shut down properly,\r
+  // i.e. it will free up all allocated memory and perform any necessary hardware re-configuration.\r
+  /*Status = gBS->CreateEvent (\r
+               EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+               TPL_NOTIFY,\r
+               LcdGraphicsExitBootServicesEvent, NULL,\r
+               &Instance->ExitBootServicesEvent\r
+               );\r
+\r
+  if (EFI_ERROR(Status)) {\r
+    DEBUG((DEBUG_ERROR, "GraphicsOutputDxeInitialize: Can not install the ExitBootServicesEvent handler. Exit Status=%r\n", Status));\r
+    goto EXIT_ERROR_UNINSTALL_PROTOCOL;\r
+  }*/\r
+\r
+  // To get here, everything must be fine, so just exit\r
+  goto EXIT;\r

 \r
 //EXIT_ERROR_UNINSTALL_PROTOCOL:\r
 \r
 //EXIT_ERROR_UNINSTALL_PROTOCOL:\r

-       /* The following function could return an error message,\r
-        * however, to get here something must have gone wrong already,\r
-        * so preserve the original error, i.e. don't change\r
-        * the Status variable, even it fails to uninstall the protocol.\r
-        */\r
-/*     gBS->UninstallMultipleProtocolInterfaces (\r
-           Instance->Handle,\r
-           &gEfiGraphicsOutputProtocolGuid, &Instance->Gop, // Uninstall Graphics Output protocol\r
-           &gEfiDevicePathProtocolGuid,     &Instance->DevicePath,     // Uninstall device path\r
-           NULL\r
-           );*/\r
+  /* The following function could return an error message,\r
+   * however, to get here something must have gone wrong already,\r
+   * so preserve the original error, i.e. don't change\r
+   * the Status variable, even it fails to uninstall the protocol.\r
+   */\r
+  /*  gBS->UninstallMultipleProtocolInterfaces (\r
+        Instance->Handle,\r
+        &gEfiGraphicsOutputProtocolGuid, &Instance->Gop, // Uninstall Graphics Output protocol\r
+        &gEfiDevicePathProtocolGuid,     &Instance->DevicePath,     // Uninstall device path\r
+        NULL\r
+        );*/\r

 \r
 EXIT:\r
 \r
 EXIT:\r

-       return Status;\r
+  return Status;\r

 \r
 }\r
 \r
 }\r

diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.h b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.h
index 8b27f3d5586be67f0bd18d27ee6923830ca77f6a..a1bd7afdb023c1a6ec60e76b001c930b39f58c06 100644 (file)
--- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.h
+++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.h
@@ -89,15 +89,15 @@ EFI_STATUS
 EFIAPI\r
 LcdGraphicsBlt (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL        *This,\r
 EFIAPI\r
 LcdGraphicsBlt (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL        *This,\r

-       IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *BltBuffer,     OPTIONAL\r
-       IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION   BltOperation,\r
-       IN UINTN                               SourceX,\r
-       IN UINTN                               SourceY,\r
-       IN UINTN                               DestinationX,\r
-       IN UINTN                               DestinationY,\r
-       IN UINTN                               Width,\r
-       IN UINTN                               Height,\r
-       IN UINTN                               Delta           OPTIONAL   // Number of BYTES in a row of the BltBuffer\r
+  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *BltBuffer,     OPTIONAL\r
+  IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION   BltOperation,\r
+  IN UINTN                               SourceX,\r
+  IN UINTN                               SourceY,\r
+  IN UINTN                               DestinationX,\r
+  IN UINTN                               DestinationY,\r
+  IN UINTN                               Width,\r
+  IN UINTN                               Height,\r
+  IN UINTN                               Delta           OPTIONAL   // Number of BYTES in a row of the BltBuffer\r

 );\r
 \r
 // HW registers\r
 );\r
 \r
 // HW registers\r