1) Cleanup for GCC and ICC tool-chain.

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

diff --git a/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h
index 61614355a8ac3028a9b833e25c230227240f988c..6b102c30437c59428896bde2f0c57be8d28daf81 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h
@@ -299,7 +299,11 @@ typedef int32_t   intn_t;
 // For symbol name in GNU assembly code, an extra "_" is necessary\r
 //\r
 #if __GNUC__\r
-  #define ASM_PFX(name) _##name    \r
+  #if defined(linux)\r
+    #define ASM_PFX(name) name\r
+  #else\r
+    #define ASM_PFX(name) _##name\r
+  #endif \r
 #endif\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
index 19570c82b27a8788036755c4b3fd5629a0fa2e48..75ccf10511e97bb87397403dd7f4732e3c7ca021 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation                                                         \r
+Copyright (c) 2005 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -252,7 +252,11 @@ typedef int64_t   intn_t;
 // For symbol name in GNU assembly code, an extra "_" is necessary\r
 //\r
 #if __GNUC__\r
-  #define ASM_PFX(name) _##name    \r
+  #if defined(linux)\r
+    #define ASM_PFX(name) name\r
+  #else\r
+    #define ASM_PFX(name) _##name\r
+  #endif \r
 #endif\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib_Edk2.inf b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib_Edk2.inf
index 14e9e6b71c6777d0efd93975c18b8b7441087ca3..529f4923a03284339e794fef6ae60d2ac1ceafc7 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib_Edk2.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib_Edk2.inf
@@ -1,6 +1,6 @@
 #/*++\r
 #\r
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
+#  Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
 #  All rights reserved. This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
 #  which accompanies this distribution.  The full text of the license may be found at        \r
@@ -85,12 +85,20 @@ COMPONENT_TYPE  = LIBRARY
   Math.c\r
   \r
 [sources.x64]\r
-  x64/EfiCopyMemRep1.asm\r
-  x64/EfiSetMemRep4.asm\r
-  x64/EfiZeroMemRep4.asm\r
-#  x64/EfiCopyMem.asm\r
-#  x64/EfiSetMem.asm\r
-#  x64/EfiZeroMem.asm\r
+  x64/EfiCopyMemRep1.asm         | MSFT\r
+  x64/EfiSetMemRep4.asm     | MSFT\r
+  x64/EfiZeroMemRep4.asm    | MSFT\r
+#  x64/EfiCopyMem.asm                    | MSFT\r
+#  x64/EfiSetMem.asm        | MSFT\r
+#  x64/EfiZeroMem.asm       | MSFT\r
+\r
+  x64/EfiCopyMemRep1.asm         | INTEL\r
+  x64/EfiSetMemRep4.asm     | INTEL\r
+  x64/EfiZeroMemRep4.asm    | INTEL\r
+#  x64/EfiCopyMem.asm                    | INTEL\r
+#  x64/EfiSetMem.asm        | INTEL\r
+#  x64/EfiZeroMem.asm       | INTEL\r
+\r
   Math.c\r
 \r
 [includes.common]\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/FindFv.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/FindFv.c
index cbfad238bc2eaad1fed440d3510268cda23bba4c..99b4b1cb2186fa04ab234196fcc89c31f919468b 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/FindFv.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/FindFv.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -134,7 +134,7 @@ Returns:
   //\r
   Status = (*PeiServices)->GetHobList (\r
                             PeiServices,\r
-                            &HobStart.Raw\r
+                            (VOID **) &HobStart.Raw\r
                             );\r
 \r
   if (EFI_ERROR (Status)) {\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Hob/Hob.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Hob/Hob.c
index 9e608288e71b747e99d95e8427b18f45b1faa5f1..1e9627fb44c1ce573acf281d858cf84126c31021 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Hob/Hob.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Hob/Hob.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
+Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -62,7 +62,7 @@ Returns:
                              PeiServices,\r
                              EFI_HOB_TYPE_MEMORY_ALLOCATION,\r
                              sizeof (EFI_HOB_MEMORY_ALLOCATION_MODULE),\r
-                             &Hob\r
+                             (VOID **) &Hob\r
                              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -125,7 +125,7 @@ Returns:
                              PeiServices,\r
                              EFI_HOB_TYPE_RESOURCE_DESCRIPTOR,\r
                              sizeof (EFI_HOB_RESOURCE_DESCRIPTOR),\r
-                             &Hob\r
+                             (VOID **) &Hob\r
                              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -223,7 +223,7 @@ Returns:
              PeiServices,\r
              Guid,\r
              DataLength,\r
-             &Hob\r
+             (VOID **) &Hob\r
              );\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -276,7 +276,7 @@ Returns:
                              PeiServices,\r
                              EFI_HOB_TYPE_FV,\r
                              sizeof (EFI_HOB_FIRMWARE_VOLUME),\r
-                             &Hob\r
+                             (VOID **) &Hob\r
                              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -325,7 +325,7 @@ Returns:
                              PeiServices,\r
                              EFI_HOB_TYPE_CPU,\r
                              sizeof (EFI_HOB_CPU),\r
-                             &Hob\r
+                             (VOID **) &Hob\r
                              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -378,7 +378,7 @@ Returns:
                              PeiServices,\r
                              EFI_HOB_TYPE_MEMORY_ALLOCATION,\r
                              sizeof (EFI_HOB_MEMORY_ALLOCATION_STACK),\r
-                             &Hob\r
+                             (VOID **) &Hob\r
                              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -436,7 +436,7 @@ Returns:
                              PeiServices,\r
                              EFI_HOB_TYPE_MEMORY_ALLOCATION,\r
                              sizeof (EFI_HOB_MEMORY_ALLOCATION_BSP_STORE),\r
-                             &Hob\r
+                             (VOID **) &Hob\r
                              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -496,7 +496,7 @@ Returns:
                              PeiServices,\r
                              EFI_HOB_TYPE_MEMORY_ALLOCATION,\r
                              sizeof (EFI_HOB_MEMORY_ALLOCATION),\r
-                             &Hob\r
+                             (VOID **) &Hob\r
                              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c
index 269eb8a13dc75b9c618313df2993ee66a2abfa99..86fbbb1ecdc8a4d54e6810599736eb772bf681da 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
+Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -234,9 +234,9 @@ Returns:
   ASSERT_PEI_ERROR (PeiServices, Status);\r
 \r
   Status = PciCfg2->Modify (\r
-                      PeiServices,\r
+                      (CONST EFI_PEI_SERVICES **) PeiServices,\r
                       PciCfg2,\r
-                      Width,\r
+                      (EFI_PEI_PCI_CFG_PPI_WIDTH) Width,\r
                       Address,\r
                       &SetBits,\r
                       &ClearBits\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Perf.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Perf.c
index acae16dde2988fb6a2c7ca42952593673eb465c3..8cf18e543633da9c18628e295d29200eecd83848 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Perf.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Perf.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2005, Intel Corporation                                                         \r
+Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -114,7 +114,7 @@ Returns:
                  sizeof(PEI_PERFORMANCE_MEASURE_LOG_ENTRY)) +\r
                  sizeof(EFI_PEI_PPI_DESCRIPTOR)\r
                ),\r
-               &Hob\r
+               (VOID **) &Hob\r
                );\r
     ASSERT_PEI_ERROR(PeiServices, Status);\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/ia32/Processor.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/ia32/Processor.c
index 4010db25a25379e1250b8f13e08bb42dfd16330e..cdad7317311b1d5fc91b7b316bb7fabd62a17e93 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/ia32/Processor.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/ia32/Processor.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2005, Intel Corporation                                                         \r
+Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -29,14 +29,14 @@ EFI_STATUS
 EFIAPI\r
 TransferControlSetJump (\r
   IN EFI_PEI_TRANSFER_CONTROL_PROTOCOL  *This,\r
-  IN EFI_JUMP_BUFFER                    *Jump\r
+  IN VOID                                          *Jump\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 TransferControlLongJump (\r
   IN EFI_PEI_TRANSFER_CONTROL_PROTOCOL  *This,\r
-  IN EFI_JUMP_BUFFER                    *Jump\r
+  IN VOID                                          *Jump\r
   );\r
 \r
 EFI_STATUS\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/x64/Processor.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/x64/Processor.c
index 63cf8486c09b86e750f9aecdd0c5af0e5d03b417..bc6ef0070d8933cae6a80d7255184b55c838833a 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/x64/Processor.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/x64/Processor.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright 2005, Intel Corporation                                                         \r
+Copyright 2005 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -30,14 +30,14 @@ EFI_STATUS
 EFIAPI\r
 TransferControlSetJump (\r
   IN EFI_PEI_TRANSFER_CONTROL_PROTOCOL  *This,\r
-  IN EFI_JUMP_BUFFER                    *Jump\r
+  IN VOID                                          *Jump\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 TransferControlLongJump (\r
   IN EFI_PEI_TRANSFER_CONTROL_PROTOCOL  *This,\r
-  IN EFI_JUMP_BUFFER                    *Jump\r
+  IN VOID                                          *Jump\r
   );\r
 \r
 EFI_STATUS\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
index 66132b69390dc19d396b99ce9bdcf90117ee3d9e..61087eb742d94bbd142a3fa54f1cfeda89382aa6 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
@@ -1,6 +1,6 @@
 #/*++\r
 #\r
-# Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
+# Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
 # All rights reserved. This program and the accompanying materials                          \r
 # are licensed and made available under the terms and conditions of the BSD License         \r
 # which accompanies this distribution.  The full text of the license may be found at        \r
@@ -37,6 +37,7 @@ COMPONENT_TYPE  = LIBRARY
   ia32/Lock.c\r
   ia32/PlatformIoLib.c\r
   ia32/Fvb.c\r
+  ia32/CpuFlushCache.c\r
 \r
 [sources.x64]\r
   x64/RuntimeLib.c\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib_Edk2.inf b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib_Edk2.inf
index 40e3867f7b5937bc50bbb5bda8e5e1a728d329b0..6b9a526ab90306f16f6b964efc21128b023c0494 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib_Edk2.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib_Edk2.inf
@@ -1,6 +1,6 @@
 #/*++\r
 #\r
-# Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
+# Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
 # All rights reserved. This program and the accompanying materials                          \r
 # are licensed and made available under the terms and conditions of the BSD License         \r
 # which accompanies this distribution.  The full text of the license may be found at        \r
@@ -37,6 +37,8 @@ COMPONENT_TYPE  = LIBRARY
   ia32/Lock.c\r
   ia32/PlatformIoLib.c\r
   ia32/Fvb.c\r
+  ia32/CpuFlushCache.c         | MSFT\r
+  ia32/CpuFlushCache.asm    | INTEL\r
 \r
 [sources.x64]\r
   x64/RuntimeLib.c\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/GetImage.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/GetImage.c
index 990acffac14664ec09d4a5880aecd7ea5238cde7..a48b9a4f1469e783ae3943e3766a4ec3a0b6ff74 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/GetImage.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/GetImage.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation\r
+Copyright (c) 2006 - 2008, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -140,7 +140,7 @@ GetImageEx (
     Status = gBS->HandleProtocol (\r
                ImageHandle,\r
                &gEfiLoadedImageProtocolGuid,\r
-               &LoadedImage\r
+               (VOID **) &LoadedImage\r
                );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -152,7 +152,7 @@ GetImageEx (
                   #else\r
                     &gEfiFirmwareVolume2ProtocolGuid,\r
                   #endif\r
-                    &ImageFv\r
+                    (VOID **) &ImageFv\r
                     );\r
     if (!EFI_ERROR (Status)) {\r
       Status = GetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/CpuFlushCache.asm b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/CpuFlushCache.asm
new file mode 100644 (file)
index 0000000..ade53d6
--- /dev/null
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/CpuFlushCache.asm
@@ -0,0 +1,62 @@
+;/*++\r
+;\r
+;Copyright (c) 2008, Intel Corporation                                                         \r
+;All rights reserved. This program and the accompanying materials                          \r
+;are licensed and made available under the terms and conditions of the BSD License         \r
+;which accompanies this distribution.  The full text of the license may be found at        \r
+;http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          ;\r
+;THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+;WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+;\r
+;Module Name:\r
+;\r
+    ;CpuFlushCache.c\r
+;\r
+;Abstract:\r
+;\r
+ ;Cpu Flush Cache Function.\r
+;\r
+;--*/\r
+;---------------------------------------------------------------------------\r
+    .586p\r
+    .model  flat,C\r
+    .code\r
+\r
+;---------------------------------------------------------------------------\r
+;\r
+;//\r
+;// Cache Flush Routine.\r
+;//\r
+;EFI_STATUS\r
+;EfiCpuFlushCache (\r
+  ;IN EFI_PHYSICAL_ADDRESS          Start,\r
+;  IN UINT64                        Length\r
+  ;)\r
+;/*++\r
+;\r
+;Routine Description:\r
+;\r
+  ;Flush cache with specified range.\r
+;\r
+;Arguments:\r
+;\r
+  ;Start   - Start address\r
+;  Length  - Length in bytes\r
+;\r
+;Returns:\r
+;\r
+  ;Status code\r
+;  \r
+  ;EFI_SUCCESS - success\r
+;\r
+;--*/\r
+EfiCpuFlushCache       PROC\r
+    wbinvd\r
+       xor                     eax, eax\r
+       ret\r
+EfiCpuFlushCache       ENDP\r
+       \r
+       END\r
+       \r
+       
\ No newline at end of file

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/CpuFlushCache.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/CpuFlushCache.c
new file mode 100644 (file)
index 0000000..852ce0d
--- /dev/null
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/CpuFlushCache.c
@@ -0,0 +1,55 @@
+/*++\r
+\r
+Copyright (c) 2008, Intel Corporation                                                         \r
+All rights reserved. This program and the accompanying materials                          \r
+are licensed and made available under the terms and conditions of the BSD License         \r
+which accompanies this distribution.  The full text of the license may be found at        \r
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Module Name:\r
+\r
+    CpuFlushCache.c\r
+\r
+Abstract:\r
+\r
+ Cpu Flush Cache Function.\r
+\r
+--*/\r
+#include "Tiano.h"\r
+#include "EfiRuntimeLib.h"\r
+\r
+//\r
+// Cache Flush Routine.\r
+//\r
+EFI_STATUS\r
+EfiCpuFlushCache (\r
+  IN EFI_PHYSICAL_ADDRESS          Start,\r
+  IN UINT64                        Length\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Flush cache with specified range.\r
+\r
+Arguments:\r
+\r
+  Start   - Start address\r
+  Length  - Length in bytes\r
+\r
+Returns:\r
+\r
+  Status code\r
+  \r
+  EFI_SUCCESS - success\r
+\r
+--*/\r
+{\r
+  __asm {\r
+    wbinvd\r
+  }\r
+  return EFI_SUCCESS;\r
+}\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/Fvb.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/Fvb.c
index b8e4c7d6f7260f26975ed728f8f36f3bb0f45173..b1643b169b0fc8b395c20406f5a7a67ee2561267 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/Fvb.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/Fvb.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
+Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -215,7 +215,7 @@ Returns:
     //  We check Runtime here, because it has no reason to register\r
     //  a boot time FVB protocol.\r
     //\r
-    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, &Fvb);\r
+    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, (VOID **) &Fvb);\r
     ASSERT_EFI_ERROR (Status);\r
     if (IsMemoryRuntime (Fvb)) {\r
       //\r
@@ -228,7 +228,7 @@ Returns:
       mFvbEntry[UpdateIndex].Fvb          = Fvb;\r
       mFvbEntry[UpdateIndex].FvbExtension = NULL;\r
 \r
-      Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, &FvbExtension);\r
+      Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, (VOID **) &FvbExtension);\r
       if ((Status == EFI_SUCCESS) && IsMemoryRuntime (FvbExtension)) {\r
         mFvbEntry[UpdateIndex].FvbExtension = FvbExtension;\r
       }\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/RuntimeLib.c
index 8ea1cf06480c53125a909b420bad08ebbc69f6a7..2367e107595cfc8dc3fa3310ce194cc93a6d67e7 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/ia32/RuntimeLib.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2006, Intel Corporation                                                         \r
+Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -281,7 +281,7 @@ Returns:
   }\r
 #endif\r
 \r
-  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &gCpuIo);\r
+  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &gCpuIo);\r
   if (EFI_ERROR (Status)) {\r
     gCpuIo = NULL;\r
   }\r
@@ -412,7 +412,7 @@ Returns:
   }\r
 #endif\r
 \r
-  Status  = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &gCpuIo);\r
+  Status  = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &gCpuIo);\r
   if (EFI_ERROR (Status)) {\r
     gCpuIo = NULL;\r
   }\r
@@ -817,35 +817,3 @@ Returns:
 #endif\r
   return Status;\r
 }\r
-//\r
-// Cache Flush Routine.\r
-//\r
-EFI_STATUS\r
-EfiCpuFlushCache (\r
-  IN EFI_PHYSICAL_ADDRESS          Start,\r
-  IN UINT64                        Length\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Flush cache with specified range.\r
-\r
-Arguments:\r
-\r
-  Start   - Start address\r
-  Length  - Length in bytes\r
-\r
-Returns:\r
-\r
-  Status code\r
-  \r
-  EFI_SUCCESS - success\r
-\r
---*/\r
-{\r
-  __asm {\r
-    wbinvd\r
-  }\r
-  return EFI_SUCCESS;\r
-}\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/Fvb.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/Fvb.c
index d8cdbbab22a8e438f02005c75518869465c664f9..15073dc419cb264d8a274a6ccedb8d87f9227a40 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/Fvb.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/Fvb.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation                                                         \r
+Copyright (c) 2005 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -215,7 +215,7 @@ Returns:
     //  We check Runtime here, because it has no reason to register\r
     //  a boot time FVB protocol.\r
     //\r
-    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, &Fvb);\r
+    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, (VOID **) &Fvb);\r
     ASSERT_EFI_ERROR (Status);\r
     if (IsMemoryRuntime (Fvb)) {\r
       //\r
@@ -228,7 +228,7 @@ Returns:
       mFvbEntry[UpdateIndex].Fvb          = Fvb;\r
       mFvbEntry[UpdateIndex].FvbExtension = NULL;\r
 \r
-      Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, &FvbExtension);\r
+      Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, (VOID **) &FvbExtension);\r
       if ((Status == EFI_SUCCESS) && IsMemoryRuntime (FvbExtension)) {\r
         mFvbEntry[UpdateIndex].FvbExtension = FvbExtension;\r
       }\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/RuntimeLib.c
index be993c30a57c5624686c2cd2ff5db816a96c086c..ad653507cb604aca9ca575c034fd6dc75ecaabc1 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/x64/RuntimeLib.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2006, Intel Corporation                                                         \r
+Copyright (c) 2005 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -281,7 +281,7 @@ Returns:
   }\r
 #endif\r
 \r
-  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &gCpuIo);\r
+  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &gCpuIo);\r
   if (EFI_ERROR (Status)) {\r
     gCpuIo = NULL;\r
   }\r
@@ -412,7 +412,7 @@ Returns:
   }\r
 #endif\r
 \r
-  Status  = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &gCpuIo);\r
+  Status  = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &gCpuIo);\r
   if (EFI_ERROR (Status)) {\r
     gCpuIo = NULL;\r
   }\r

diff --git a/EdkCompatibilityPkg/Foundation/Protocol/Dpc/Dpc.h b/EdkCompatibilityPkg/Foundation/Protocol/Dpc/Dpc.h
index 315b9977118f857651d6a0482f2264e3976d0b46..3f1d068ab1b93bcda54560f746e98f16ecf3f859 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Protocol/Dpc/Dpc.h
+++ b/EdkCompatibilityPkg/Foundation/Protocol/Dpc/Dpc.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2007, Intel Corporation\r
+Copyright (c) 2007 - 2008, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -96,7 +96,7 @@ EFI_STATUS
 //\r
 // DPC Protocol structure\r
 //\r
-typedef struct _EFI_DPC_PROTOCOL {\r
+struct _EFI_DPC_PROTOCOL {\r
   EFI_DPC_QUEUE_DPC     QueueDpc;\r
   EFI_DPC_DISPATCH_DPC  DispatchDpc;\r
 };\r