Change _CR() to BASE_CR() to follow naming convention

[mirror_edk2.git] / DuetPkg / DxeIpl / HobGeneration.c

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 7630b1e68a7028f83e69ce31c31255307cb39945..0158ea7884d7c0593cccf9f66358465db4e8cd30 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -1,4 +1,4 @@
-/*++\r
+/** @file\r
 \r
 Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
@@ -16,7 +16,7 @@ Abstract:
 \r
 Revision History:\r
 \r
---*/\r
+**/\r
 #include "DxeIpl.h"\r
 #include "HobGeneration.h"\r
 #include "PpisNeededByDxeCore.h"\r
@@ -547,7 +547,7 @@ Return:
     //\r
     // Process region above 4GB\r
     //\r
-    if (EfiMemoryDescriptor[Index].PhysicalStart >= 0x100000000) {\r
+    if (EfiMemoryDescriptor[Index].PhysicalStart >= 0x100000000LL) {\r
       if (EfiMemoryDescriptor[Index].Type == EfiConventionalMemory) {\r
         if (gHob->MemoryAbove4GB.PhysicalStart == 0) {\r
           gHob->MemoryAbove4GB.PhysicalStart  = EfiMemoryDescriptor[Index].PhysicalStart;\r
@@ -610,13 +610,13 @@ PrepareHobBfv (
   UINTN BfvLength\r
   )\r
 {\r
-  UINTN BfvLengthPageSize;\r
+  //UINTN BfvLengthPageSize;\r
 \r
   //\r
   // Calculate BFV location at top of the memory region.\r
   // This is like a RAM Disk. Align to page boundry.\r
   //\r
-  BfvLengthPageSize = EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (BfvLength));\r
+  //BfvLengthPageSize = EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (BfvLength));\r
  \r
   gHob->Bfv.BaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)Bfv;\r
   gHob->Bfv.Length = BfvLength;\r
@@ -669,7 +669,7 @@ PrepareHobNvStorage (
            +-------------------+\r
 */\r
 {\r
-  static VARIABLE_STORE_HEADER VarStoreHeader = {\r
+  STATIC VARIABLE_STORE_HEADER VarStoreHeader = {\r
     VARIABLE_STORE_SIGNATURE,\r
     0xffffffff,                 // will be fixed in Variable driver\r
     VARIABLE_STORE_FORMATTED,\r
@@ -678,7 +678,7 @@ PrepareHobNvStorage (
     0\r
   };\r
   \r
-  static EFI_FIRMWARE_VOLUME_HEADER NvStorageFvbHeader = {\r
+  STATIC EFI_FIRMWARE_VOLUME_HEADER NvStorageFvbHeader = {\r
     {\r
       0,\r
     },  // ZeroVector[16]\r
@@ -705,7 +705,7 @@ PrepareHobNvStorage (
     }\r
   };\r
 \r
-  static EFI_FV_BLOCK_MAP_ENTRY BlockMapEntryEnd = {0, 0};\r
+  STATIC EFI_FV_BLOCK_MAP_ENTRY BlockMapEntryEnd = {0, 0};\r
 \r
   EFI_PHYSICAL_ADDRESS StorageFvbBase;\r
   EFI_PHYSICAL_ADDRESS FtwFvbBase;\r