Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / EdkModulePkg / Core / Dxe / Gcd / gcd.c

diff --git a/EdkModulePkg/Core/Dxe/Gcd/gcd.c b/EdkModulePkg/Core/Dxe/Gcd/gcd.c
index 0735bf00b9bb5e041b028a9836c6d5c56b6d0b80..181cb1a317b511ac8c44c79631c5526015d7c400 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Gcd/gcd.c
+++ b/EdkModulePkg/Core/Dxe/Gcd/gcd.c
@@ -61,7 +61,7 @@ EFI_GCD_MAP_ENTRY mGcdMemorySpaceMapEntryTemplate = {
   0,\r
   0,\r
   EfiGcdMemoryTypeNonExistent,\r
-  0,\r
+  (EFI_GCD_IO_TYPE) 0,\r
   NULL,\r
   NULL\r
 };\r
@@ -73,7 +73,7 @@ EFI_GCD_MAP_ENTRY mGcdIoSpaceMapEntryTemplate = {
   0,\r
   0,\r
   0,\r
-  0,\r
+  (EFI_GCD_MEMORY_TYPE) 0,\r
   EfiGcdIoTypeNonExistent,\r
   NULL,\r
   NULL\r
@@ -136,7 +136,7 @@ Returns:
 }\r
 \r
 \r
-\r
+STATIC\r
 VOID\r
 CoreAcquireGcdIoLock (\r
   VOID\r
@@ -157,7 +157,7 @@ Returns:
   CoreAcquireLock (&mGcdIoSpaceLock);\r
 }\r
 \r
-\r
+STATIC\r
 VOID\r
 CoreReleaseGcdIoLock (\r
   VOID\r
@@ -183,6 +183,7 @@ Returns:
 //\r
 // GCD Initialization Worker Functions\r
 //\r
+STATIC\r
 UINT64\r
 AlignValue (\r
   IN UINT64   Value,\r
@@ -217,6 +218,7 @@ Returns:
   return Value & (~AlignmentMask);\r
 }\r
 \r
+STATIC\r
 UINT64\r
 PageAlignAddress (\r
   IN UINT64 Value\r
@@ -240,6 +242,7 @@ Returns:
   return AlignValue (Value, EFI_PAGE_SHIFT, TRUE);\r
 }\r
 \r
+STATIC\r
 UINT64\r
 PageAlignLength (\r
   IN UINT64 Value\r
@@ -266,6 +269,7 @@ Returns:
 //\r
 // GCD Memory Space Worker Functions\r
 //\r
+STATIC\r
 EFI_STATUS\r
 CoreAllocateGcdMapEntry (\r
   IN OUT EFI_GCD_MAP_ENTRY  **TopEntry,\r
@@ -303,6 +307,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 CoreInsertGcdMapEntry (\r
   IN LIST_ENTRY           *Link,\r
@@ -359,6 +364,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 CoreMergeGcdMapEntry (\r
   IN LIST_ENTRY      *Link,\r
@@ -440,6 +446,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 CoreCleanupGcdMapEntry (\r
   IN EFI_GCD_MAP_ENTRY  *TopEntry,\r
@@ -491,6 +498,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 CoreSearchGcdMapEntry (\r
   IN  EFI_PHYSICAL_ADDRESS  BaseAddress,\r
@@ -551,6 +559,7 @@ Returns:
   return EFI_NOT_FOUND;\r
 }\r
 \r
+STATIC\r
 UINTN\r
 CoreCountGcdMapEntry (\r
   IN LIST_ENTRY  *Map\r
@@ -584,7 +593,7 @@ Returns:
 }\r
 \r
 \r
-\r
+STATIC\r
 UINT64\r
 ConverToCpuArchAttributes (\r
   UINT64 Attributes\r
@@ -629,7 +638,7 @@ Returns:
 \r
 }\r
 \r
-\r
+STATIC\r
 EFI_STATUS\r
 CoreConvertSpace (\r
   IN UINTN                 Operation,\r
@@ -897,6 +906,7 @@ Done:
   return Status;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 CoreAllocateSpaceCheckEntry (\r
   IN UINTN                Operation,\r
@@ -950,6 +960,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 CoreAllocateSpace (\r
   IN     UINTN                  Operation,\r
@@ -1218,7 +1229,7 @@ Done:
   return Status;\r
 }\r
 \r
-\r
+STATIC\r
 EFI_STATUS\r
 CoreInternalAddMemorySpace (\r
   IN EFI_GCD_MEMORY_TYPE   GcdMemoryType,\r
@@ -1257,7 +1268,7 @@ Returns:
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  return CoreConvertSpace (GCD_ADD_MEMORY_OPERATION, GcdMemoryType, 0, BaseAddress, Length, Capabilities, 0);\r
+  return CoreConvertSpace (GCD_ADD_MEMORY_OPERATION, GcdMemoryType, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, Capabilities, 0);\r
 }\r
 \r
 //\r
@@ -1310,7 +1321,7 @@ Returns:
            GCD_ALLOCATE_MEMORY_OPERATION, \r
            GcdAllocateType, \r
            GcdMemoryType, \r
-           0, \r
+           (EFI_GCD_IO_TYPE) 0, \r
            Alignment, \r
            Length, \r
            BaseAddress, \r
@@ -1427,7 +1438,7 @@ Returns:
 \r
 --*/\r
 {\r
-  return CoreConvertSpace (GCD_FREE_MEMORY_OPERATION, 0, 0, BaseAddress, Length, 0, 0);\r
+  return CoreConvertSpace (GCD_FREE_MEMORY_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, 0, 0);\r
 }\r
 \r
 EFI_STATUS\r
@@ -1454,9 +1465,10 @@ Returns:
 \r
 --*/\r
 {\r
-  return CoreConvertSpace (GCD_REMOVE_MEMORY_OPERATION, 0, 0, BaseAddress, Length, 0, 0);\r
+  return CoreConvertSpace (GCD_REMOVE_MEMORY_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, 0, 0);\r
 }\r
 \r
+STATIC\r
 VOID\r
 BuildMemoryDescriptor (\r
   IN OUT EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *Descriptor,\r
@@ -1574,7 +1586,7 @@ Returns:
 \r
 --*/\r
 {\r
-  return CoreConvertSpace (GCD_SET_ATTRIBUTES_MEMORY_OPERATION, 0, 0, BaseAddress, Length, 0, Attributes);\r
+  return CoreConvertSpace (GCD_SET_ATTRIBUTES_MEMORY_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, 0, Attributes);\r
 }\r
 \r
 EFI_STATUS\r
@@ -1687,7 +1699,7 @@ Returns:
   if (GcdIoType <= EfiGcdIoTypeNonExistent || GcdIoType >= EfiGcdIoTypeMaximum) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
-  return CoreConvertSpace (GCD_ADD_IO_OPERATION, 0, GcdIoType, BaseAddress, Length, 0, 0);\r
+  return CoreConvertSpace (GCD_ADD_IO_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, GcdIoType, BaseAddress, Length, 0, 0);\r
 }\r
 \r
 EFI_STATUS\r
@@ -1736,7 +1748,7 @@ Returns:
   return CoreAllocateSpace (\r
            GCD_ALLOCATE_IO_OPERATION, \r
            GcdAllocateType, \r
-           0, \r
+           (EFI_GCD_MEMORY_TYPE) 0, \r
            GcdIoType, \r
            Alignment, \r
            Length, \r
@@ -1770,7 +1782,7 @@ Returns:
 \r
 --*/\r
 {\r
-  return CoreConvertSpace (GCD_FREE_IO_OPERATION, 0, 0, BaseAddress, Length, 0, 0);\r
+  return CoreConvertSpace (GCD_FREE_IO_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, 0, 0);\r
 }\r
 \r
 EFI_STATUS\r
@@ -1797,9 +1809,10 @@ Returns:
 \r
 --*/\r
 {\r
-  return CoreConvertSpace (GCD_REMOVE_IO_OPERATION, 0, 0, BaseAddress, Length, 0, 0);\r
+  return CoreConvertSpace (GCD_REMOVE_IO_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, 0, 0);\r
 }\r
 \r
+STATIC\r
 VOID\r
 BuildIoDescriptor (\r
   IN EFI_GCD_IO_SPACE_DESCRIPTOR  *Descriptor,\r
@@ -1964,6 +1977,7 @@ Done:
   return Status;\r
 }  \r
 \r
+STATIC\r
 UINT64\r
 CoreConvertResourceDescriptorHobAttributesToCapabilities (\r
   EFI_GCD_MEMORY_TYPE  GcdMemoryType,\r