Patch to remove STATIC modifier. This is on longer recommended by EFI Framework coding style. All duplicated symbols has been renamed accordingly.

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

26 files changed, 39 insertions, 101 deletions

diff --git a/DuetPkg/CpuDxe/Cpu.c b/DuetPkg/CpuDxe/Cpu.c
index 1390a89d57..d61e5c1f50 100644
--- a/DuetPkg/CpuDxe/Cpu.c
+++ b/DuetPkg/CpuDxe/Cpu.c
@@ -319,7 +319,6 @@ Returns:
 }

 

 #if CPU_EXCEPTION_DEBUG_OUTPUT

-STATIC

 VOID

 DumpExceptionDataDebugOut (

   IN EFI_EXCEPTION_TYPE   InterruptType,

@@ -530,7 +529,6 @@ DumpExceptionDataDebugOut (
 }

 #endif

 

-STATIC

 UINTN

 SPrint (

   IN OUT    CHAR16  *Buffer,

@@ -614,7 +612,6 @@ SPrint (
   return Index;

 }

 

-STATIC

 VOID

 DumpExceptionDataVgaOut (

   IN EFI_EXCEPTION_TYPE   InterruptType,

@@ -894,7 +891,6 @@ DumpExceptionDataVgaOut (
 }

 

 #if CPU_EXCEPTION_VGA_SWITCH

-STATIC

 UINT16

 SwitchVideoMode (

   UINT16    NewVideoMode

diff --git a/DuetPkg/CpuIoDxe/CpuIo.c b/DuetPkg/CpuIoDxe/CpuIo.c
index f95697130c..e946bd45cd 100644
--- a/DuetPkg/CpuIoDxe/CpuIo.c
+++ b/DuetPkg/CpuIoDxe/CpuIo.c
@@ -38,7 +38,6 @@ EFI_CPU_IO_PROTOCOL mCpuIo = {
   }

 };

 

-STATIC

 EFI_STATUS

 CpuIoMemRW (

   IN  EFI_CPU_IO_PROTOCOL_WIDTH  Width,

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 624d6763a2..2d7c437254 100644
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -669,7 +669,7 @@ PrepareHobNvStorage (
            +-------------------+

 */

 {

-  static VARIABLE_STORE_HEADER VarStoreHeader = {

+  STATIC VARIABLE_STORE_HEADER VarStoreHeader = {

     VARIABLE_STORE_SIGNATURE,

     0xffffffff,                 // will be fixed in Variable driver

     VARIABLE_STORE_FORMATTED,

@@ -678,7 +678,7 @@ PrepareHobNvStorage (
     0

   };

   

-  static EFI_FIRMWARE_VOLUME_HEADER NvStorageFvbHeader = {

+  STATIC EFI_FIRMWARE_VOLUME_HEADER NvStorageFvbHeader = {

     {

       0,

     },  // ZeroVector[16]

@@ -705,7 +705,7 @@ PrepareHobNvStorage (
     }

   };

 

-  static EFI_FV_BLOCK_MAP_ENTRY BlockMapEntryEnd = {0, 0};

+  STATIC EFI_FV_BLOCK_MAP_ENTRY BlockMapEntryEnd = {0, 0};

 

   EFI_PHYSICAL_ADDRESS StorageFvbBase;

   EFI_PHYSICAL_ADDRESS FtwFvbBase;

diff --git a/DuetPkg/EfiLdr/EfiLoader.c b/DuetPkg/EfiLdr/EfiLoader.c
index b3f8d8cc3e..88bce2f074 100644
--- a/DuetPkg/EfiLdr/EfiLoader.c
+++ b/DuetPkg/EfiLdr/EfiLoader.c
@@ -24,7 +24,6 @@ Revision History:
 #include "PeLoader.h"

 #include "TianoDecompress.h"

 

-STATIC

 VOID

 SystemHang(

   VOID

@@ -52,7 +51,7 @@ EfiLoader (
   UINTN                 BfvBase;

   EFI_MAIN_ENTRYPOINT   EfiMainEntrypoint;

   CHAR8                 PrintBuffer[256];

-  static EFILDRHANDOFF  Handoff;

+  STATIC EFILDRHANDOFF  Handoff;

 

   ClearScreen();

   

diff --git a/DuetPkg/EfiLdr/PeLoader.c b/DuetPkg/EfiLdr/PeLoader.c
index e5b6d93146..721befb32e 100644
--- a/DuetPkg/EfiLdr/PeLoader.c
+++ b/DuetPkg/EfiLdr/PeLoader.c
@@ -21,7 +21,6 @@ Revision History:
 #include "Debug.h"

 #include "Support.h"

 

-STATIC

 EFI_STATUS

 EfiLdrPeCoffLoadPeRelocate (

   IN EFILDR_LOADED_IMAGE      *Image,

@@ -31,7 +30,6 @@ EfiLdrPeCoffLoadPeRelocate (
   IN EFI_MEMORY_DESCRIPTOR    *EfiMemoryDescriptor

   );

 

-STATIC

 EFI_STATUS

 EfiLdrPeCoffImageRead (

     IN VOID                 *FHand,

@@ -40,7 +38,6 @@ EfiLdrPeCoffImageRead (
     OUT VOID                *Buffer

     );

 

-STATIC

 VOID *

 EfiLdrPeCoffImageAddress (

   IN EFILDR_LOADED_IMAGE     *Image,

@@ -404,7 +401,6 @@ PrintHeader ('M');
   return Status;

 }

 

-STATIC

 EFI_STATUS

 EfiLdrPeCoffLoadPeRelocate (

   IN EFILDR_LOADED_IMAGE      *Image,

@@ -537,7 +533,6 @@ PrintHeader ('Q');
   return EFI_SUCCESS;

 }

 

-STATIC

 EFI_STATUS

 EfiLdrPeCoffImageRead (

   IN VOID                 *FHand,

@@ -551,7 +546,6 @@ EfiLdrPeCoffImageRead (
   return EFI_SUCCESS;

 }

 

-STATIC

 VOID *

 EfiLdrPeCoffImageAddress (

   IN EFILDR_LOADED_IMAGE     *Image,

diff --git a/DuetPkg/EfiLdr/TianoDecompress.c b/DuetPkg/EfiLdr/TianoDecompress.c
index df7efbd750..6e4bba7b36 100644
--- a/DuetPkg/EfiLdr/TianoDecompress.c
+++ b/DuetPkg/EfiLdr/TianoDecompress.c
@@ -74,7 +74,6 @@ typedef struct {
   UINT8   mPBit;

 } SCRATCH_DATA;

 

-STATIC

 VOID

 FillBuf (

   IN  SCRATCH_DATA  *Sd,

@@ -124,7 +123,6 @@ Returns: (VOID)
   Sd->mBitBuf |= Sd->mSubBitBuf >> Sd->mBitCount;

 }

 

-STATIC

 UINT32

 GetBits (

   IN  SCRATCH_DATA  *Sd,

@@ -158,7 +156,6 @@ Returns:
   return OutBits;

 }

 

-STATIC

 UINT16

 MakeTable (

   IN  SCRATCH_DATA  *Sd,

@@ -288,7 +285,6 @@ Returns:
   return 0;

 }

 

-STATIC

 UINT32

 DecodeP (

   IN  SCRATCH_DATA  *Sd

@@ -342,7 +338,6 @@ Returns:
   return Pos;

 }

 

-STATIC

 UINT16

 ReadPTLen (

   IN  SCRATCH_DATA  *Sd,

@@ -419,7 +414,6 @@ Returns:
   return MakeTable (Sd, nn, Sd->mPTLen, 8, Sd->mPTTable);

 }

 

-STATIC

 VOID

 ReadCLen (

   SCRATCH_DATA  *Sd

@@ -509,7 +503,6 @@ Returns: (VOID)
   return ;

 }

 

-STATIC

 UINT16

 DecodeC (

   SCRATCH_DATA  *Sd

@@ -575,7 +568,6 @@ Returns:
   return Index2;

 }

 

-STATIC

 VOID

 Decode (

   SCRATCH_DATA  *Sd

diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index 1ec2e56d3e..653860f1b2 100644
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -35,15 +35,13 @@ VARIABLE_STORE_HEADER mStoreHeaderTemplate = {
 //

 VARIABLE_GLOBAL  *mGlobal;

 

-STATIC

 VOID

 EFIAPI

-OnVirtualAddressChange (

+OnVirtualAddressChangeFsv (

   IN EFI_EVENT        Event,

   IN VOID             *Context

   );

 

-STATIC

 VOID

 EFIAPI

 OnSimpleFileSystemInstall (

@@ -51,7 +49,6 @@ OnSimpleFileSystemInstall (
   IN VOID             *Context

   );

 

-STATIC

 BOOLEAN

 IsValidVariableHeader (

   IN  VARIABLE_HEADER   *Variable

@@ -81,7 +78,6 @@ Returns:
   return TRUE;

 }

 

-STATIC

 VARIABLE_STORE_STATUS

 GetVariableStoreStatus (

   IN VARIABLE_STORE_HEADER *VarStoreHeader

@@ -121,7 +117,6 @@ Returns:
   }

 }

 

-STATIC

 UINT8 *

 GetVariableDataPtr (

   IN  VARIABLE_HEADER   *Variable

@@ -148,7 +143,6 @@ Returns:
   return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + Variable->NameSize + GET_PAD_SIZE (Variable->NameSize));

 }

 

-STATIC

 VARIABLE_HEADER *

 GetNextVariablePtr (

   IN  VARIABLE_HEADER   *Variable

@@ -178,7 +172,6 @@ Returns:
   return (VARIABLE_HEADER *) ((UINTN) GetVariableDataPtr (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));

 }

 

-STATIC

 VARIABLE_HEADER *

 GetEndPointer (

   IN VARIABLE_STORE_HEADER       *VarStoreHeader

@@ -250,7 +243,6 @@ Returns:
   return FALSE;

 }

 

-STATIC

 EFI_STATUS

 Reclaim (

   IN  VARIABLE_STORAGE_TYPE StorageType,

@@ -374,7 +366,6 @@ Returns:
   return Status;

 }

 

-STATIC

 EFI_STATUS

 FindVariable (

   IN  CHAR16                  *VariableName,

@@ -1305,10 +1296,9 @@ Returns:
 

 

 

-STATIC

 VOID

 EFIAPI

-OnVirtualAddressChange (

+OnVirtualAddressChangeFsv (

   IN EFI_EVENT        Event,

   IN VOID             *Context

   )

diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c
index 3588f3ecbc..2334a16fd2 100644
--- a/DuetPkg/FSVariable/FileStorage.c
+++ b/DuetPkg/FSVariable/FileStorage.c
@@ -28,22 +28,19 @@ VOID             *mSFSRegistration;
 // Prototypes

 //

 

-STATIC

 VOID

 EFIAPI

-OnVirtualAddressChange (

+OnVirtualAddressChangeFs (

   IN EFI_EVENT            Event,

   IN VOID                 *Context

   );

 

-STATIC

 EFI_STATUS

 EFIAPI

 FileEraseStore(

   IN VARIABLE_STORAGE     *This

   );

 

-STATIC

 EFI_STATUS

 EFIAPI

 FileWriteStore (

@@ -53,7 +50,6 @@ FileWriteStore (
   IN VOID                 *Buffer

   );

 

-STATIC

 EFI_STATUS

 OpenStore (

   IN  EFI_DEVICE_PATH_PROTOCOL  *Device,

@@ -65,7 +61,6 @@ OpenStore (
 //

 // Implementation below:

 //

-STATIC

 VOID

 FileClose (

   IN  EFI_FILE                   *File

@@ -173,7 +168,6 @@ CheckStoreExists (
 // read the store_header, init store_header if it has not been inited (read sth. about format/heathy)

 // reclaim space using scratch memory

 

-STATIC

 VOID

 EFIAPI

 OnSimpleFileSystemInstall (

@@ -282,11 +276,10 @@ FileStorageConstructor (
   ASSERT_EFI_ERROR (Status);

 

   *VarStore       = &Dev->VarStore;

-  *GoVirtualEvent = OnVirtualAddressChange;

+  *GoVirtualEvent = OnVirtualAddressChangeFs;

   return EFI_SUCCESS;

 }

 

-STATIC

 EFI_STATUS

 EFIAPI

 FileEraseStore(

@@ -320,7 +313,6 @@ FileEraseStore(
   return Status;

 }

 

-STATIC

 EFI_STATUS

 EFIAPI

 FileWriteStore (

@@ -358,10 +350,9 @@ FileWriteStore (
   return Status;

 }

 

-STATIC

 VOID

 EFIAPI

-OnVirtualAddressChange (

+OnVirtualAddressChangeFs (

   IN EFI_EVENT            Event,

   IN VOID                 *Context

   )

@@ -375,7 +366,6 @@ OnVirtualAddressChange (
   EfiConvertPointer (0, (VOID **) &Dev->VarStore.Write);

 }

 

-STATIC

 EFI_STATUS

 OpenStore (

   IN  EFI_DEVICE_PATH_PROTOCOL  *Device,

diff --git a/DuetPkg/FSVariable/MemStorage.c b/DuetPkg/FSVariable/MemStorage.c
index ed72b898f0..63af149645 100644
--- a/DuetPkg/FSVariable/MemStorage.c
+++ b/DuetPkg/FSVariable/MemStorage.c
@@ -22,22 +22,19 @@ Revision History
 --*/

 #include "FSVariable.h"

 

-STATIC

 VOID

 EFIAPI

-OnVirtualAddressChange (

+OnVirtualAddressChangeMs (

   IN EFI_EVENT            Event,

   IN VOID                 *Context

   );

 

-STATIC

 EFI_STATUS

 EFIAPI

 MemEraseStore(

   IN VARIABLE_STORAGE   *This

   );

 

-STATIC

 EFI_STATUS

 EFIAPI

 MemWriteStore (

@@ -74,15 +71,14 @@ MemStorageConstructor (
   DEBUG ((EFI_D_ERROR, "VStorage: Size = 0x%x\n", Size));

   

   *VarStore       = &Dev->VarStore;

-  *GoVirtualEvent = OnVirtualAddressChange;

+  *GoVirtualEvent = OnVirtualAddressChangeMs;

 

   return EFI_SUCCESS;

 }

 

-STATIC

 VOID

 EFIAPI

-OnVirtualAddressChange (

+OnVirtualAddressChangeMs (

   IN EFI_EVENT            Event,

   IN VOID                 *Context

   )

@@ -96,7 +92,6 @@ OnVirtualAddressChange (
   EfiConvertPointer (0, (VOID**)&Dev->VarStore.Write);

 }

 

-STATIC

 EFI_STATUS

 EFIAPI

 MemEraseStore(

@@ -111,7 +106,6 @@ MemEraseStore(
 }

 

 

-STATIC

 EFI_STATUS

 EFIAPI

 MemWriteStore (

diff --git a/DuetPkg/FvbRuntimeService/FWBlockService.c b/DuetPkg/FvbRuntimeService/FWBlockService.c
index b0ac93f3f5..faca5ea422 100644
--- a/DuetPkg/FvbRuntimeService/FWBlockService.c
+++ b/DuetPkg/FvbRuntimeService/FWBlockService.c
@@ -1272,7 +1272,6 @@ Returns:
           );

 }

 

-STATIC

 EFI_STATUS

 ValidateFvHeader (

   EFI_FIRMWARE_VOLUME_HEADER            *FwVolHeader

@@ -1405,7 +1404,6 @@ GetFvbHeader (
   return EFI_SUCCESS;

 }

 

-STATIC

 VOID

 EFIAPI

 OnSimpleFileSystemInstall (

@@ -1501,7 +1499,6 @@ OnSimpleFileSystemInstall (
   }

 }

 

-STATIC

 VOID

 FvbInstallSfsNotify (

   VOID

diff --git a/DuetPkg/IsaAcpiDxe/ComponentName.c b/DuetPkg/IsaAcpiDxe/ComponentName.c
index 01084223d0..9b88dcf86d 100644
--- a/DuetPkg/IsaAcpiDxe/ComponentName.c
+++ b/DuetPkg/IsaAcpiDxe/ComponentName.c
@@ -58,7 +58,7 @@ EFI_COMPONENT_NAME_PROTOCOL  gPcatIsaAcpiComponentName = {
 };

 

 

-static EFI_UNICODE_STRING_TABLE mPcatIsaAcpiDriverNameTable[] = {

+EFI_UNICODE_STRING_TABLE mPcatIsaAcpiDriverNameTable[] = {

   {

     "eng;en",

     L"PC-AT ISA Device Enumeration Driver"

diff --git a/DuetPkg/IsaAcpiDxe/IsaAcpi.c b/DuetPkg/IsaAcpiDxe/IsaAcpi.c
index e3792a7818..5eba8591b6 100644
--- a/DuetPkg/IsaAcpiDxe/IsaAcpi.c
+++ b/DuetPkg/IsaAcpiDxe/IsaAcpi.c
@@ -31,7 +31,7 @@ Revision History
 //

 // COM 1 UART Controller

 //

-static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom1DeviceResources[] = {

+EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom1DeviceResources[] = {

   {EfiIsaAcpiResourceIo,        0, 0x3f8, 0x3ff},

   {EfiIsaAcpiResourceInterrupt, 0, 4,     0},

   {EfiIsaAcpiResourceEndOfList, 0, 0,     0}

@@ -40,7 +40,7 @@ static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom1DeviceResources[] = {
 //

 // COM 2 UART Controller

 //

-static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom2DeviceResources[] = {

+EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom2DeviceResources[] = {

   {EfiIsaAcpiResourceIo,        0, 0x2f8, 0x2ff},

   {EfiIsaAcpiResourceInterrupt, 0, 3,     0},

   {EfiIsaAcpiResourceEndOfList, 0, 0,     0}

@@ -49,7 +49,7 @@ static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiCom2DeviceResources[] = {
 //

 // PS/2 Keyboard Controller

 //

-static EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2KeyboardDeviceResources[] = {

+EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2KeyboardDeviceResources[] = {

   {EfiIsaAcpiResourceIo,        0, 0x60, 0x64},

   {EfiIsaAcpiResourceInterrupt, 0, 1,     0},

   {EfiIsaAcpiResourceEndOfList, 0, 0,     0}

@@ -58,7 +58,7 @@ static EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2KeyboardDeviceResources[] = {
 //

 // PS/2 Mouse Controller

 //

-static EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2MouseDeviceResources[] = {

+EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2MouseDeviceResources[] = {

   {EfiIsaAcpiResourceIo,        0, 0x60, 0x64},

   {EfiIsaAcpiResourceInterrupt, 0, 12,     0},

   {EfiIsaAcpiResourceEndOfList, 0, 0,     0}

@@ -67,7 +67,7 @@ static EFI_ISA_ACPI_RESOURCE  mPcatIsaAcpiPs2MouseDeviceResources[] = {
 //

 // Floppy Disk Controller

 //

-static EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiFloppyResources[] = {

+EFI_ISA_ACPI_RESOURCE mPcatIsaAcpiFloppyResources[] = {

   {EfiIsaAcpiResourceIo,        0, 0x3f0, 0x3f7},

   {EfiIsaAcpiResourceInterrupt, 0, 6,     0},

   {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},

diff --git a/DuetPkg/Library/DuetTimerLib/X86TimerLib.c b/DuetPkg/Library/DuetTimerLib/X86TimerLib.c
index 263ce9a2ec..9c8d46fe70 100644
--- 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

 

 **/

-STATIC

 UINTN

 InternalX86GetApicBase (

   VOID

@@ -59,7 +58,6 @@ InternalX86GetApicBase (
   @return The frequency of the timer in Hz.

 

 **/

-STATIC

 UINT32

 InternalX86GetTimerFrequency (

   IN      UINTN                     ApicBase

@@ -80,7 +78,6 @@ InternalX86GetTimerFrequency (
   @return The tick counter read.

 

 **/

-STATIC

 INT32

 InternalX86GetTimerTick (

   IN      UINTN                     ApicBase

@@ -99,7 +96,6 @@ InternalX86GetTimerTick (
   @param  Delay     A period of time to delay in ticks.

 

 **/

-STATIC

 VOID

 InternalX86Delay (

   IN      UINTN                     ApicBase,

diff --git a/DuetPkg/PcRtc/Ia32/RealTimeClock.c b/DuetPkg/PcRtc/Ia32/RealTimeClock.c
index dc2a79b948..0a43ab667d 100644
--- a/DuetPkg/PcRtc/Ia32/RealTimeClock.c
+++ b/DuetPkg/PcRtc/Ia32/RealTimeClock.c
@@ -17,7 +17,7 @@ Abstract:
 --*/

 #include "RealTimeClock.h"

 

-static PC_RTC_MODULE_GLOBALS  mModuleGlobal;

+PC_RTC_MODULE_GLOBALS  mModuleGlobal;

 

 EFI_STATUS

 EFIAPI

diff --git a/DuetPkg/PcRtc/Ipf/IpfPcRtc.c b/DuetPkg/PcRtc/Ipf/IpfPcRtc.c
index ef2260b214..7b4064326a 100644
--- a/DuetPkg/PcRtc/Ipf/IpfPcRtc.c
+++ b/DuetPkg/PcRtc/Ipf/IpfPcRtc.c
@@ -25,7 +25,7 @@ Abstract:
 //

 // Don't use directly after virtual address have been registered.

 //

-static PC_RTC_MODULE_GLOBALS  mModuleGlobal;

+PC_RTC_MODULE_GLOBALS  mModuleGlobal;

 

 SAL_RETURN_REGS

 PcRtcEsalServicesClassCommonEntry (

diff --git a/DuetPkg/PcRtc/X64/RealTimeClock.c b/DuetPkg/PcRtc/X64/RealTimeClock.c
index 4f4410eb21..63abe0b7d0 100644
--- a/DuetPkg/PcRtc/X64/RealTimeClock.c
+++ b/DuetPkg/PcRtc/X64/RealTimeClock.c
@@ -18,7 +18,7 @@ Abstract:
 

 #include "RealTimeClock.h"

 

-static PC_RTC_MODULE_GLOBALS  mModuleGlobal;

+PC_RTC_MODULE_GLOBALS  mModuleGlobal;

 

 EFI_STATUS

 EFIAPI

diff --git a/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c b/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c
index 48b0dcee2c..647e571d3c 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c
@@ -55,7 +55,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPciBusComponentName2
 };

 

 

-STATIC EFI_UNICODE_STRING_TABLE mPciBusDriverNameTable[] = {

+EFI_UNICODE_STRING_TABLE mPciBusDriverNameTable[] = {

   { "eng;en", L"PCI Bus Driver" },

   { NULL, NULL }

 };

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.c b/DuetPkg/PciBusNoEnumerationDxe/PciBus.c
index d50becdb9d..214e3994f6 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.c
@@ -74,6 +74,9 @@ EFI_DRIVER_BINDING_PROTOCOL                   gPciBusDriverBinding = {
 };

 

 BOOLEAN gFullEnumeration;

+

+UINT64 gAllOne    = 0xFFFFFFFFFFFFFFFFULL;

+UINT64 gAllZero   = 0;

  

 //

 // PCI Bus Driver Support Functions

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
index fe974bee33..420c868bbe 100644
--- 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;

 

 extern BOOLEAN                     gFullEnumeration;

-static UINT64                      gAllOne = 0xFFFFFFFFFFFFFFFFULL;

-static UINT64                      gAllZero   = 0;

+extern UINT64                      gAllOne;

+extern UINT64                      gAllZero;

 

 #include "PciIo.h"

 #include "PciCommand.h"

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
index 1a0937fe7e..03fc0944a7 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
@@ -267,7 +267,7 @@ PciIoSetBarAttributes(
 //

 // Pci Io Protocol Interface

 //

-static EFI_PCI_IO_PROTOCOL  PciIoInterface = {

+EFI_PCI_IO_PROTOCOL  PciIoInterface = {

   PciIoPollMem,

   PciIoPollIo,

   {

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
index d14a0d56da..7629384bab 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
@@ -31,13 +31,12 @@ typedef struct {
   UINT8       Func;

 } EFI_PCI_ROM_IMAGE_MAPPING;

 

-static UINTN                      mNumberOfPciRomImages     = 0;

-static UINTN                      mMaxNumberOfPciRomImages  = 0;

-static EFI_PCI_ROM_IMAGE_MAPPING  *mRomImageTable           = NULL;

+UINTN                      mNumberOfPciRomImages     = 0;

+UINTN                      mMaxNumberOfPciRomImages  = 0;

+EFI_PCI_ROM_IMAGE_MAPPING  *mRomImageTable           = NULL;

 

-static CHAR16 mHexDigit[17] = L"0123456789ABCDEF";

+CHAR16 mHexDigit[17] = L"0123456789ABCDEF";

 

-static

 VOID

 PciRomAddImageMapping (

   IN EFI_HANDLE  ImageHandle,

@@ -77,7 +76,6 @@ PciRomAddImageMapping (
   mNumberOfPciRomImages++;

 }

 

-static

 VOID

 HexToString (

   CHAR16  *String,

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
index d697390fa9..92dd1c3d24 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
@@ -22,8 +22,8 @@ Revision History
 

 #include "PcatPciRootBridge.h"

 

-static BOOLEAN                  mPciOptionRomTableInstalled = FALSE;

-static EFI_PCI_OPTION_ROM_TABLE mPciOptionRomTable          = {0, NULL};

+BOOLEAN                  mPciOptionRomTableInstalled = FALSE;

+EFI_PCI_OPTION_ROM_TABLE mPciOptionRomTable          = {0, NULL};

 

 EFI_STATUS

 EFIAPI

@@ -210,7 +210,6 @@ PcatRootBridgeIoPciRW (
   return EFI_SUCCESS;

 }

 

-static

 VOID

 ScanPciBus(

   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,

@@ -299,7 +298,6 @@ ScanPciBus(
   }

 }

 

-static

 VOID

 CheckForRom (

   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,

@@ -525,7 +523,6 @@ CheckForRom (
   IoDev->Pci.Write (IoDev, EfiPciWidthUint32, Address, sizeof(PciHeader)/sizeof(UINT32), &PciHeader);

 }

 

-static

 VOID

 SaveCommandRegister (

   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,

@@ -563,7 +560,6 @@ SaveCommandRegister (
   IoDev->Pci.Write (IoDev, EfiPciWidthUint16, Address, 1, &Command);

 }

 

-static

 VOID

 RestoreCommandRegister (

   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
index 9979d47c4e..f6d8c80fc0 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
@@ -46,8 +46,8 @@ Revision History
 //

 // Local variables for performing SAL Proc calls

 //

-static PLABEL         mSalProcPlabel;

-static CALL_SAL_PROC  mGlobalSalProc;

+PLABEL         mSalProcPlabel;

+CALL_SAL_PROC  mGlobalSalProc;

 

 EFI_STATUS

 PcatRootBridgeIoIoRead (

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeDevicePath.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeDevicePath.c
index ab1b5d8c56..4b7a0e8265 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeDevicePath.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeDevicePath.c
@@ -31,7 +31,7 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;

 } EFI_PCI_ROOT_BRIDGE_DEVICE_PATH;

 

-static EFI_PCI_ROOT_BRIDGE_DEVICE_PATH mEfiPciRootBridgeDevicePath = {

+EFI_PCI_ROOT_BRIDGE_DEVICE_PATH mEfiPciRootBridgeDevicePath = {

   {

     ACPI_DEVICE_PATH,

     ACPI_DP,

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
index 84abcf603a..ed2aea7dc0 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
@@ -189,7 +189,6 @@ PcatRootBridgeIoConfiguration (
 //

 // Private Function Prototypes

 //

-STATIC 

 EFI_STATUS

 EFIAPI

 PcatRootBridgeIoMemRW (

@@ -979,7 +978,6 @@ PcatRootBridgeIoConfiguration (
 // Internal function

 //

 

-STATIC 

 EFI_STATUS

 EFIAPI

 PcatRootBridgeIoMemRW (

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
index 0a786f823d..f670dc6bd9 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
@@ -22,8 +22,8 @@ Revision History
 

 #include "PcatPciRootBridge.h"

 

-static BOOLEAN                  mPciOptionRomTableInstalled = FALSE;

-static EFI_PCI_OPTION_ROM_TABLE mPciOptionRomTable          = {0, NULL};

+BOOLEAN                  mPciOptionRomTableInstalled = FALSE;

+EFI_PCI_OPTION_ROM_TABLE mPciOptionRomTable          = {0, NULL};

 

 EFI_STATUS

 PcatRootBridgeIoIoRead (

@@ -208,7 +208,6 @@ PcatRootBridgeIoPciRW (
   return EFI_SUCCESS;

 }

 

-static

 VOID

 ScanPciBus(

   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,

@@ -297,7 +296,6 @@ ScanPciBus(
   }

 }

 

-static

 VOID

 CheckForRom (

   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,

@@ -523,7 +521,6 @@ CheckForRom (
   IoDev->Pci.Write (IoDev, EfiPciWidthUint32, Address, sizeof(PciHeader)/sizeof(UINT32), &PciHeader);

 }

 

-static

 VOID

 SaveCommandRegister (

   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,

@@ -561,7 +558,6 @@ SaveCommandRegister (
   IoDev->Pci.Write (IoDev, EfiPciWidthUint16, Address, 1, &Command);

 }

 

-static

 VOID

 RestoreCommandRegister (

   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *IoDev,