Patch to remove STATIC modifier. This is on longer recommended by EFI Framework codin...

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

diff --git a/DuetPkg/CpuDxe/Cpu.c b/DuetPkg/CpuDxe/Cpu.c
index 1390a89d579d0739d3fcf595abd56bc6110d1162..d61e5c1f50fdcdf009c44e5a21e6c05420be1b9c 100644 (file)
--- a/DuetPkg/CpuDxe/Cpu.c
+++ b/DuetPkg/CpuDxe/Cpu.c
@@ -319,7 +319,6 @@ Returns:
 }\r
 \r
 #if CPU_EXCEPTION_DEBUG_OUTPUT\r
-STATIC\r
 VOID\r
 DumpExceptionDataDebugOut (\r
   IN EFI_EXCEPTION_TYPE   InterruptType,\r
@@ -530,7 +529,6 @@ DumpExceptionDataDebugOut (
 }\r
 #endif\r
 \r
-STATIC\r
 UINTN\r
 SPrint (\r
   IN OUT    CHAR16  *Buffer,\r
@@ -614,7 +612,6 @@ SPrint (
   return Index;\r
 }\r
 \r
-STATIC\r
 VOID\r
 DumpExceptionDataVgaOut (\r
   IN EFI_EXCEPTION_TYPE   InterruptType,\r
@@ -894,7 +891,6 @@ DumpExceptionDataVgaOut (
 }\r
 \r
 #if CPU_EXCEPTION_VGA_SWITCH\r
-STATIC\r
 UINT16\r
 SwitchVideoMode (\r
   UINT16    NewVideoMode\r

diff --git a/DuetPkg/CpuIoDxe/CpuIo.c b/DuetPkg/CpuIoDxe/CpuIo.c
index f95697130cefbde4105ed2d05f379c241f58e43e..e946bd45cd95ac6ed5128d6132bf45b4ddd93153 100644 (file)
--- a/DuetPkg/CpuIoDxe/CpuIo.c
+++ b/DuetPkg/CpuIoDxe/CpuIo.c
@@ -38,7 +38,6 @@ EFI_CPU_IO_PROTOCOL mCpuIo = {
   }\r
 };\r
 \r
-STATIC\r
 EFI_STATUS\r
 CpuIoMemRW (\r
   IN  EFI_CPU_IO_PROTOCOL_WIDTH  Width,\r

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 624d6763a20092bb532aaed5dc3701981192cc8d..2d7c437254fbfa5a4556ca9600cd2a83613fda23 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -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

diff --git a/DuetPkg/EfiLdr/EfiLoader.c b/DuetPkg/EfiLdr/EfiLoader.c
index b3f8d8cc3e51658701f100a2a7964f8c60ee1b45..88bce2f07429c3ee9edf54e5647f56282eb2b6f4 100644 (file)
--- a/DuetPkg/EfiLdr/EfiLoader.c
+++ b/DuetPkg/EfiLdr/EfiLoader.c
@@ -24,7 +24,6 @@ Revision History:
 #include "PeLoader.h"\r
 #include "TianoDecompress.h"\r
 \r
-STATIC\r
 VOID\r
 SystemHang(\r
   VOID\r
@@ -52,7 +51,7 @@ EfiLoader (
   UINTN                 BfvBase;\r
   EFI_MAIN_ENTRYPOINT   EfiMainEntrypoint;\r
   CHAR8                 PrintBuffer[256];\r
-  static EFILDRHANDOFF  Handoff;\r
+  STATIC EFILDRHANDOFF  Handoff;\r
 \r
   ClearScreen();\r
   \r

diff --git a/DuetPkg/EfiLdr/PeLoader.c b/DuetPkg/EfiLdr/PeLoader.c
index e5b6d931469e32623b95d021c1fe20b7e9c64e0d..721befb32eaf1bc43ff34cf80361dc71479d6ded 100644 (file)
--- a/DuetPkg/EfiLdr/PeLoader.c
+++ b/DuetPkg/EfiLdr/PeLoader.c
@@ -21,7 +21,6 @@ Revision History:
 #include "Debug.h"\r
 #include "Support.h"\r
 \r
-STATIC\r
 EFI_STATUS\r
 EfiLdrPeCoffLoadPeRelocate (\r
   IN EFILDR_LOADED_IMAGE      *Image,\r
@@ -31,7 +30,6 @@ EfiLdrPeCoffLoadPeRelocate (
   IN EFI_MEMORY_DESCRIPTOR    *EfiMemoryDescriptor\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EfiLdrPeCoffImageRead (\r
     IN VOID                 *FHand,\r
@@ -40,7 +38,6 @@ EfiLdrPeCoffImageRead (
     OUT VOID                *Buffer\r
     );\r
 \r
-STATIC\r
 VOID *\r
 EfiLdrPeCoffImageAddress (\r
   IN EFILDR_LOADED_IMAGE     *Image,\r
@@ -404,7 +401,6 @@ PrintHeader ('M');
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EfiLdrPeCoffLoadPeRelocate (\r
   IN EFILDR_LOADED_IMAGE      *Image,\r
@@ -537,7 +533,6 @@ PrintHeader ('Q');
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EfiLdrPeCoffImageRead (\r
   IN VOID                 *FHand,\r
@@ -551,7 +546,6 @@ EfiLdrPeCoffImageRead (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 VOID *\r
 EfiLdrPeCoffImageAddress (\r
   IN EFILDR_LOADED_IMAGE     *Image,\r

diff --git a/DuetPkg/EfiLdr/TianoDecompress.c b/DuetPkg/EfiLdr/TianoDecompress.c
index df7efbd750d8114c05a7042fcb77229e116b4891..6e4bba7b361c79ec1eab01507465170151581456 100644 (file)
--- a/DuetPkg/EfiLdr/TianoDecompress.c
+++ b/DuetPkg/EfiLdr/TianoDecompress.c
@@ -74,7 +74,6 @@ typedef struct {
   UINT8   mPBit;\r
 } SCRATCH_DATA;\r
 \r
-STATIC\r
 VOID\r
 FillBuf (\r
   IN  SCRATCH_DATA  *Sd,\r
@@ -124,7 +123,6 @@ Returns: (VOID)
   Sd->mBitBuf |= Sd->mSubBitBuf >> Sd->mBitCount;\r
 }\r
 \r
-STATIC\r
 UINT32\r
 GetBits (\r
   IN  SCRATCH_DATA  *Sd,\r
@@ -158,7 +156,6 @@ Returns:
   return OutBits;\r
 }\r
 \r
-STATIC\r
 UINT16\r
 MakeTable (\r
   IN  SCRATCH_DATA  *Sd,\r
@@ -288,7 +285,6 @@ Returns:
   return 0;\r
 }\r
 \r
-STATIC\r
 UINT32\r
 DecodeP (\r
   IN  SCRATCH_DATA  *Sd\r
@@ -342,7 +338,6 @@ Returns:
   return Pos;\r
 }\r
 \r
-STATIC\r
 UINT16\r
 ReadPTLen (\r
   IN  SCRATCH_DATA  *Sd,\r
@@ -419,7 +414,6 @@ Returns:
   return MakeTable (Sd, nn, Sd->mPTLen, 8, Sd->mPTTable);\r
 }\r
 \r
-STATIC\r
 VOID\r
 ReadCLen (\r
   SCRATCH_DATA  *Sd\r
@@ -509,7 +503,6 @@ Returns: (VOID)
   return ;\r
 }\r
 \r
-STATIC\r
 UINT16\r
 DecodeC (\r
   SCRATCH_DATA  *Sd\r
@@ -575,7 +568,6 @@ Returns:
   return Index2;\r
 }\r
 \r
-STATIC\r
 VOID\r
 Decode (\r
   SCRATCH_DATA  *Sd\r

diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index 1ec2e56d3e49d0d96a98763342481696575ec1d5..653860f1b2d4b8e1d9f16c8622f49d06eb235bb6 100644 (file)
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -35,15 +35,13 @@ VARIABLE_STORE_HEADER mStoreHeaderTemplate = {
 //\r
 VARIABLE_GLOBAL  *mGlobal;\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeFsv (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
   );\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 OnSimpleFileSystemInstall (\r
@@ -51,7 +49,6 @@ OnSimpleFileSystemInstall (
   IN VOID             *Context\r
   );\r
 \r
-STATIC\r
 BOOLEAN\r
 IsValidVariableHeader (\r
   IN  VARIABLE_HEADER   *Variable\r
@@ -81,7 +78,6 @@ Returns:
   return TRUE;\r
 }\r
 \r
-STATIC\r
 VARIABLE_STORE_STATUS\r
 GetVariableStoreStatus (\r
   IN VARIABLE_STORE_HEADER *VarStoreHeader\r
@@ -121,7 +117,6 @@ Returns:
   }\r
 }\r
 \r
-STATIC\r
 UINT8 *\r
 GetVariableDataPtr (\r
   IN  VARIABLE_HEADER   *Variable\r
@@ -148,7 +143,6 @@ Returns:
   return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + Variable->NameSize + GET_PAD_SIZE (Variable->NameSize));\r
 }\r
 \r
-STATIC\r
 VARIABLE_HEADER *\r
 GetNextVariablePtr (\r
   IN  VARIABLE_HEADER   *Variable\r
@@ -178,7 +172,6 @@ Returns:
   return (VARIABLE_HEADER *) ((UINTN) GetVariableDataPtr (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));\r
 }\r
 \r
-STATIC\r
 VARIABLE_HEADER *\r
 GetEndPointer (\r
   IN VARIABLE_STORE_HEADER       *VarStoreHeader\r
@@ -250,7 +243,6 @@ Returns:
   return FALSE;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 Reclaim (\r
   IN  VARIABLE_STORAGE_TYPE StorageType,\r
@@ -374,7 +366,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 FindVariable (\r
   IN  CHAR16                  *VariableName,\r
@@ -1305,10 +1296,9 @@ Returns:
 \r
 \r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeFsv (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
   )\r

diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c
index 3588f3ecbc81a7d71e451edfb169b7a6ba5b4915..2334a16fd2102c3f2b4a90fc703dba55898d90e1 100644 (file)
--- a/DuetPkg/FSVariable/FileStorage.c
+++ b/DuetPkg/FSVariable/FileStorage.c
@@ -28,22 +28,19 @@ VOID             *mSFSRegistration;
 // Prototypes\r
 //\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeFs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FileEraseStore(\r
   IN VARIABLE_STORAGE     *This\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FileWriteStore (\r
@@ -53,7 +50,6 @@ FileWriteStore (
   IN VOID                 *Buffer\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 OpenStore (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Device,\r
@@ -65,7 +61,6 @@ OpenStore (
 //\r
 // Implementation below:\r
 //\r
-STATIC\r
 VOID\r
 FileClose (\r
   IN  EFI_FILE                   *File\r
@@ -173,7 +168,6 @@ CheckStoreExists (
 // read the store_header, init store_header if it has not been inited (read sth. about format/heathy)\r
 // reclaim space using scratch memory\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 OnSimpleFileSystemInstall (\r
@@ -282,11 +276,10 @@ FileStorageConstructor (
   ASSERT_EFI_ERROR (Status);\r
 \r
   *VarStore       = &Dev->VarStore;\r
-  *GoVirtualEvent = OnVirtualAddressChange;\r
+  *GoVirtualEvent = OnVirtualAddressChangeFs;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FileEraseStore(\r
@@ -320,7 +313,6 @@ FileEraseStore(
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FileWriteStore (\r
@@ -358,10 +350,9 @@ FileWriteStore (
   return Status;\r
 }\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeFs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   )\r
@@ -375,7 +366,6 @@ OnVirtualAddressChange (
   EfiConvertPointer (0, (VOID **) &Dev->VarStore.Write);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 OpenStore (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Device,\r

diff --git a/DuetPkg/FSVariable/MemStorage.c b/DuetPkg/FSVariable/MemStorage.c
index ed72b898f0e658b60d815fd0f16e2375d73a4366..63af149645b7529436423aa6ffdff42a431675b1 100644 (file)
--- a/DuetPkg/FSVariable/MemStorage.c
+++ b/DuetPkg/FSVariable/MemStorage.c
@@ -22,22 +22,19 @@ Revision History
 --*/\r
 #include "FSVariable.h"\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeMs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemEraseStore(\r
   IN VARIABLE_STORAGE   *This\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemWriteStore (\r
@@ -74,15 +71,14 @@ MemStorageConstructor (
   DEBUG ((EFI_D_ERROR, "VStorage: Size = 0x%x\n", Size));\r
   \r
   *VarStore       = &Dev->VarStore;\r
-  *GoVirtualEvent = OnVirtualAddressChange;\r
+  *GoVirtualEvent = OnVirtualAddressChangeMs;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeMs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   )\r
@@ -96,7 +92,6 @@ OnVirtualAddressChange (
   EfiConvertPointer (0, (VOID**)&Dev->VarStore.Write);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemEraseStore(\r
@@ -111,7 +106,6 @@ MemEraseStore(
 }\r
 \r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemWriteStore (\r

diff --git a/DuetPkg/FvbRuntimeService/FWBlockService.c b/DuetPkg/FvbRuntimeService/FWBlockService.c
index b0ac93f3f5e45e2752d35f2bfc33aff15cc81a3b..faca5ea4227cfd1d8eea9bb0dfdfe76c83e4d3cc 100644 (file)
--- a/DuetPkg/FvbRuntimeService/FWBlockService.c
+++ b/DuetPkg/FvbRuntimeService/FWBlockService.c
@@ -1272,7 +1272,6 @@ Returns:
           );\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 ValidateFvHeader (\r
   EFI_FIRMWARE_VOLUME_HEADER            *FwVolHeader\r
@@ -1405,7 +1404,6 @@ GetFvbHeader (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 OnSimpleFileSystemInstall (\r
@@ -1501,7 +1499,6 @@ OnSimpleFileSystemInstall (
   }\r
 }\r
 \r
-STATIC\r
 VOID\r
 FvbInstallSfsNotify (\r
   VOID\r

diff --git a/DuetPkg/IsaAcpiDxe/ComponentName.c b/DuetPkg/IsaAcpiDxe/ComponentName.c
index 01084223d0635af322c067b592f0aec8aabe1409..9b88dcf86dbb8a3580fc72cd6c897e3c31bd4b8e 100644 (file)
--- a/DuetPkg/IsaAcpiDxe/ComponentName.c
+++ b/DuetPkg/IsaAcpiDxe/ComponentName.c
@@ -58,7 +58,7 @@ EFI_COMPONENT_NAME_PROTOCOL  gPcatIsaAcpiComponentName = {
 };\r
 \r
 \r
-static EFI_UNICODE_STRING_TABLE mPcatIsaAcpiDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mPcatIsaAcpiDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"PC-AT ISA Device Enumeration Driver"\r

diff --git a/DuetPkg/IsaAcpiDxe/IsaAcpi.c b/DuetPkg/IsaAcpiDxe/IsaAcpi.c
index e3792a7818943db2e9f6e7db9bf11970df375ff7..5eba8591b629fb86bc20b8aee264ae19257127a0 100644 (file)
--- a/DuetPkg/IsaAcpiDxe/IsaAcpi.c
+++ b/DuetPkg/IsaAcpiDxe/IsaAcpi.c
@@ -31,7 +31,7 @@ Revision History
 //\r
 // COM 1 UART Controller\r
 //\r
-static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom1DeviceResources[] = {\r
+EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom1DeviceResources[] = {\r
   {EfiIsaAcpiResourceIo,        0, 0x3f8, 0x3ff},\r
   {EfiIsaAcpiResourceInterrupt, 0, 4,     0},\r
   {EfiIsaAcpiResourceEndOfList, 0, 0,     0}\r
@@ -40,7 +40,7 @@ static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom1DeviceResources[] = {
 //\r
 // COM 2 UART Controller\r
 //\r
-static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom2DeviceResources[] = {\r
+EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom2DeviceResources[] = {\r
   {EfiIsaAcpiResourceIo,        0, 0x2f8, 0x2ff},\r
   {EfiIsaAcpiResourceInterrupt, 0, 3,     0},\r
   {EfiIsaAcpiResourceEndOfList, 0, 0,     0}\r
@@ -49,7 +49,7 @@ static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom2DeviceResources[] = {
 //\r
 // PS/2 Keyboard Controller\r
 //\r
-static EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2KeyboardDeviceResources[] = {\r
+EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2KeyboardDeviceResources[] = {\r
   {EfiIsaAcpiResourceIo,        0, 0x60, 0x64},\r
   {EfiIsaAcpiResourceInterrupt, 0, 1,     0},\r
   {EfiIsaAcpiResourceEndOfList, 0, 0,     0}\r
@@ -58,7 +58,7 @@ static EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2KeyboardDeviceResources[] = {
 //\r
 // PS/2 Mouse Controller\r
 //\r
-static EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2MouseDeviceResources[] = {\r
+EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2MouseDeviceResources[] = {\r
   {EfiIsaAcpiResourceIo,        0, 0x60, 0x64},\r
   {EfiIsaAcpiResourceInterrupt, 0, 12,     0},\r
   {EfiIsaAcpiResourceEndOfList, 0, 0,     0}\r
@@ -67,7 +67,7 @@ static EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2MouseDeviceResources[] = {
 //\r
 // Floppy Disk Controller\r
 //\r
-static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiFloppyResources[] = {\r
+EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiFloppyResources[] = {\r
   {EfiIsaAcpiResourceIo,        0, 0x3f0, 0x3f7},\r
   {EfiIsaAcpiResourceInterrupt, 0, 6,     0},\r
   {EfiIsaAcpiResourceDma,       EFI_ISA_IO_SLAVE_DMA_ATTRIBUTE_SPEED_COMPATIBLE | EFI_ISA_IO_SLAVE_DMA_ATTRIBUTE_WIDTH_8 | EFI_ISA_IO_SLAVE_DMA_ATTRIBUTE_SINGLE_MODE, 2,     0},\r

diff --git a/DuetPkg/Library/DuetTimerLib/X86TimerLib.c b/DuetPkg/Library/DuetTimerLib/X86TimerLib.c
index 263ce9a2ec9b49c4dec3a40e5b1a67e6b70d736c..9c8d46fe7005002faf7d689068c4c55e1624ad66 100644 (file)
--- a/DuetPkg/Library/DuetTimerLib/X86TimerLib.c
+++ b/DuetPkg/Library/DuetTimerLib/X86TimerLib.c
@@ -40,7 +40,6 @@ CONST UINT8                           mTimerLibLocalApicDivisor[] = {
   @return The base address of local APIC\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 InternalX86GetApicBase (\r
   VOID\r
@@ -59,7 +58,6 @@ InternalX86GetApicBase (
   @return The frequency of the timer in Hz.\r
 \r
 **/\r
-STATIC\r
 UINT32\r
 InternalX86GetTimerFrequency (\r
   IN      UINTN                     ApicBase\r
@@ -80,7 +78,6 @@ InternalX86GetTimerFrequency (
   @return The tick counter read.\r
 \r
 **/\r
-STATIC\r
 INT32\r
 InternalX86GetTimerTick (\r
   IN      UINTN                     ApicBase\r
@@ -99,7 +96,6 @@ InternalX86GetTimerTick (
   @param  Delay     A period of time to delay in ticks.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 InternalX86Delay (\r
   IN      UINTN                     ApicBase,\r

diff --git a/DuetPkg/PcRtc/Ia32/RealTimeClock.c b/DuetPkg/PcRtc/Ia32/RealTimeClock.c
index dc2a79b948cae52f5f2667fadd7a76df0cad75f3..0a43ab667d7467da5337d71764dbc0c0f0d8f37f 100644 (file)
--- a/DuetPkg/PcRtc/Ia32/RealTimeClock.c
+++ b/DuetPkg/PcRtc/Ia32/RealTimeClock.c
@@ -17,7 +17,7 @@ Abstract:
 --*/\r
 #include "RealTimeClock.h"\r
 \r
-static PC_RTC_MODULE_GLOBALS  mModuleGlobal;\r
+PC_RTC_MODULE_GLOBALS  mModuleGlobal;\r
 \r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/DuetPkg/PcRtc/Ipf/IpfPcRtc.c b/DuetPkg/PcRtc/Ipf/IpfPcRtc.c
index ef2260b214437dd6b817ef3c69e80bc969408c7a..7b4064326a00ea2e322db7e5271373391ce1c211 100644 (file)
--- a/DuetPkg/PcRtc/Ipf/IpfPcRtc.c
+++ b/DuetPkg/PcRtc/Ipf/IpfPcRtc.c
@@ -25,7 +25,7 @@ Abstract:
 //\r
 // Don't use directly after virtual address have been registered.\r
 //\r
-static PC_RTC_MODULE_GLOBALS  mModuleGlobal;\r
+PC_RTC_MODULE_GLOBALS  mModuleGlobal;\r
 \r
 SAL_RETURN_REGS\r
 PcRtcEsalServicesClassCommonEntry (\r

diff --git a/DuetPkg/PcRtc/X64/RealTimeClock.c b/DuetPkg/PcRtc/X64/RealTimeClock.c
index 4f4410eb21bb0aa325355ea9cb204239087f3f9f..63abe0b7d0fb4d1f205a7704c3bb4e3d62a54756 100644 (file)
--- a/DuetPkg/PcRtc/X64/RealTimeClock.c
+++ b/DuetPkg/PcRtc/X64/RealTimeClock.c
@@ -18,7 +18,7 @@ Abstract:
 \r
 #include "RealTimeClock.h"\r
 \r
-static PC_RTC_MODULE_GLOBALS  mModuleGlobal;\r
+PC_RTC_MODULE_GLOBALS  mModuleGlobal;\r
 \r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c b/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c
index 48b0dcee2c11d158dfa0be372588866cac9a6d39..647e571d3cd8d30c5d6b4f1a4c69fa752e7733e9 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c
@@ -55,7 +55,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPciBusComponentName2
 };\r
 \r
 \r
-STATIC EFI_UNICODE_STRING_TABLE mPciBusDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mPciBusDriverNameTable[] = {\r
   { "eng;en", L"PCI Bus Driver" },\r
   { NULL, NULL }\r
 };\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.c b/DuetPkg/PciBusNoEnumerationDxe/PciBus.c
index d50becdb9d3ae9776838f84f946f8863360f5c13..214e3994f69b093de578243f56c1d6c5229fcb29 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.c
@@ -74,6 +74,9 @@ EFI_DRIVER_BINDING_PROTOCOL                   gPciBusDriverBinding = {
 };\r
 \r
 BOOLEAN gFullEnumeration;\r
+\r
+UINT64 gAllOne    = 0xFFFFFFFFFFFFFFFFULL;\r
+UINT64 gAllZero   = 0;\r
  \r
 //\r
 // PCI Bus Driver Support Functions\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
index fe974bee33270f75cb686853147b015fb184188f..420c868bbea527adf4220a5b153a16c3238f1bd8 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
@@ -204,8 +204,8 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gPciBusComponentName2;
 extern EFI_DRIVER_BINDING_PROTOCOL  gPciBusDriverBinding;\r
 \r
 extern BOOLEAN                     gFullEnumeration;\r
-static UINT64                      gAllOne = 0xFFFFFFFFFFFFFFFFULL;\r
-static UINT64                      gAllZero   = 0;\r
+extern UINT64                      gAllOne;\r
+extern UINT64                      gAllZero;\r
 \r
 #include "PciIo.h"\r
 #include "PciCommand.h"\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
index 1a0937fe7e2949a417bad8957e2ab191c3ef567f..03fc0944a77f1da6bfd9762ed423c90583d844d5 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
@@ -267,7 +267,7 @@ PciIoSetBarAttributes(
 //\r
 // Pci Io Protocol Interface\r
 //\r
-static EFI_PCI_IO_PROTOCOL  PciIoInterface = {\r
+EFI_PCI_IO_PROTOCOL  PciIoInterface = {\r
   PciIoPollMem,\r
   PciIoPollIo,\r
   {\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
index d14a0d56da8c4421eb4b403368abda511f793ec1..7629384bab429c72f4b058da419ef8c991dc7acb 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
@@ -31,13 +31,12 @@ typedef struct {
   UINT8       Func;\r
 } EFI_PCI_ROM_IMAGE_MAPPING;\r
 \r
-static UINTN                      mNumberOfPciRomImages     = 0;\r
-static UINTN                      mMaxNumberOfPciRomImages  = 0;\r
-static EFI_PCI_ROM_IMAGE_MAPPING  *mRomImageTable           = NULL;\r
+UINTN                      mNumberOfPciRomImages     = 0;\r
+UINTN                      mMaxNumberOfPciRomImages  = 0;\r
+EFI_PCI_ROM_IMAGE_MAPPING  *mRomImageTable           = NULL;\r
 \r
-static CHAR16 mHexDigit[17] = L"0123456789ABCDEF";\r
+CHAR16 mHexDigit[17] = L"0123456789ABCDEF";\r
 \r
-static\r
 VOID\r
 PciRomAddImageMapping (\r
   IN EFI_HANDLE  ImageHandle,\r
@@ -77,7 +76,6 @@ PciRomAddImageMapping (
   mNumberOfPciRomImages++;\r
 }\r
 \r
-static\r
 VOID\r
 HexToString (\r
   CHAR16  *String,\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
index d697390fa9531b3fd39874a19abbf264057c40fa..92dd1c3d24cc57fd9650331b4de5da29fc116e5a 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
@@ -22,8 +22,8 @@ Revision History
 \r
 #include "PcatPciRootBridge.h"\r
 \r
-static BOOLEAN                  mPciOptionRomTableInstalled = FALSE;\r
-static EFI_PCI_OPTION_ROM_TABLE mPciOptionRomTable          = {0, NULL};\r
+BOOLEAN                  mPciOptionRomTableInstalled = FALSE;\r
+EFI_PCI_OPTION_ROM_TABLE mPciOptionRomTable          = {0, NULL};\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -210,7 +210,6 @@ PcatRootBridgeIoPciRW (
   return EFI_SUCCESS;\r
 }\r
 \r
-static\r
 VOID\r
 ScanPciBus(\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,\r
@@ -299,7 +298,6 @@ ScanPciBus(
   }\r
 }\r
 \r
-static\r
 VOID\r
 CheckForRom (\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,\r
@@ -525,7 +523,6 @@ CheckForRom (
   IoDev->Pci.Write (IoDev, EfiPciWidthUint32, Address, sizeof(PciHeader)/sizeof(UINT32), &PciHeader);\r
 }\r
 \r
-static\r
 VOID\r
 SaveCommandRegister (\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,\r
@@ -563,7 +560,6 @@ SaveCommandRegister (
   IoDev->Pci.Write (IoDev, EfiPciWidthUint16, Address, 1, &Command);\r
 }\r
 \r
-static\r
 VOID\r
 RestoreCommandRegister (\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
index 9979d47c4e0a8b7a46a6434a3c47b3650892d15f..f6d8c80fc0d76141e0b989581b38096067741be7 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
@@ -46,8 +46,8 @@ Revision History
 //\r
 // Local variables for performing SAL Proc calls\r
 //\r
-static PLABEL         mSalProcPlabel;\r
-static CALL_SAL_PROC  mGlobalSalProc;\r
+PLABEL         mSalProcPlabel;\r
+CALL_SAL_PROC  mGlobalSalProc;\r
 \r
 EFI_STATUS\r
 PcatRootBridgeIoIoRead (\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeDevicePath.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeDevicePath.c
index ab1b5d8c562970c6072b6ec027dbb927d6bfad50..4b7a0e82658374e9f3ce1c3622be4bf884e70ee8 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeDevicePath.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeDevicePath.c
@@ -31,7 +31,7 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } EFI_PCI_ROOT_BRIDGE_DEVICE_PATH;\r
 \r
-static EFI_PCI_ROOT_BRIDGE_DEVICE_PATH mEfiPciRootBridgeDevicePath = {\r
+EFI_PCI_ROOT_BRIDGE_DEVICE_PATH mEfiPciRootBridgeDevicePath = {\r
   {\r
     ACPI_DEVICE_PATH,\r
     ACPI_DP,\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
index 84abcf603a58a3ca3bd2d3b1b821ffaafdceea9f..ed2aea7dc0053803c70ca5c82e9b0f239dbb0a41 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
@@ -189,7 +189,6 @@ PcatRootBridgeIoConfiguration (
 //\r
 // Private Function Prototypes\r
 //\r
-STATIC \r
 EFI_STATUS\r
 EFIAPI\r
 PcatRootBridgeIoMemRW (\r
@@ -979,7 +978,6 @@ PcatRootBridgeIoConfiguration (
 // Internal function\r
 //\r
 \r
-STATIC \r
 EFI_STATUS\r
 EFIAPI\r
 PcatRootBridgeIoMemRW (\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
index 0a786f823d7ef4a6f80118c0122e2d030f7a8ff1..f670dc6bd932d66c74e2a80d5bff0f507e2cecd8 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
@@ -22,8 +22,8 @@ Revision History
 \r
 #include "PcatPciRootBridge.h"\r
 \r
-static BOOLEAN                  mPciOptionRomTableInstalled = FALSE;\r
-static EFI_PCI_OPTION_ROM_TABLE mPciOptionRomTable          = {0, NULL};\r
+BOOLEAN                  mPciOptionRomTableInstalled = FALSE;\r
+EFI_PCI_OPTION_ROM_TABLE mPciOptionRomTable          = {0, NULL};\r
 \r
 EFI_STATUS\r
 PcatRootBridgeIoIoRead (\r
@@ -208,7 +208,6 @@ PcatRootBridgeIoPciRW (
   return EFI_SUCCESS;\r
 }\r
 \r
-static\r
 VOID\r
 ScanPciBus(\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,\r
@@ -297,7 +296,6 @@ ScanPciBus(
   }\r
 }\r
 \r
-static\r
 VOID\r
 CheckForRom (\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,\r
@@ -523,7 +521,6 @@ CheckForRom (
   IoDev->Pci.Write (IoDev, EfiPciWidthUint32, Address, sizeof(PciHeader)/sizeof(UINT32), &PciHeader);\r
 }\r
 \r
-static\r
 VOID\r
 SaveCommandRegister (\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,\r
@@ -561,7 +558,6 @@ SaveCommandRegister (
   IoDev->Pci.Write (IoDev, EfiPciWidthUint16, Address, 1, &Command);\r
 }\r
 \r
-static\r
 VOID\r
 RestoreCommandRegister (\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,\r