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@6298 6f19259b-4bc3-4df7-8a09-765794883524

11 files changed, 7 insertions, 45 deletions

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
index 2caaed3dc8..da1aa94094 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
@@ -37,7 +37,7 @@ EFI_ISA_IO_PROTOCOL IsaIoInterface = {
   NULL

 };

 

-static EFI_ISA_DMA_REGISTERS  DmaRegisters[8] = {

+EFI_ISA_DMA_REGISTERS  DmaRegisters[8] = {

   {

     0x00,

     0x87,

@@ -777,7 +777,6 @@ IsaIoCopyMem (
   @retval EFI_OUT_OF_RESOURCES  - The memory pages could not be allocated.

 

 **/

-STATIC

 EFI_STATUS

 IsaIoMap_OnlySupportSlaveReadWrite (

   IN     EFI_ISA_IO_PROTOCOL                                  *This,

@@ -1018,7 +1017,6 @@ IsaIoMap_OnlySupportSlaveReadWrite (
   @retval EFI_OUT_OF_RESOURCES  - The memory pages could not be allocated.

 

 **/

-STATIC

 EFI_STATUS

 IsaIoMap_FullSupport (

   IN     EFI_ISA_IO_PROTOCOL                                  *This,

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c
index 36280becad..5f4a990357 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c
@@ -83,7 +83,6 @@ FddFlushBlocks (
   @param This  Pointer of FDC_BLK_IO_DEV instance

   @param Read  Error type: read or write?

 **/

-STATIC

 VOID

 FddReportStatus (

   IN  EFI_BLOCK_IO_PROTOCOL  *This,

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index bbc16bfcbf..b21e2bc8ca 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
@@ -18,34 +18,29 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // Function declarations

 //

-STATIC

 UINT8

 KeyReadDataRegister (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn

   );

 

-STATIC

 VOID

 KeyWriteDataRegister (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

   IN UINT8                   Data

   );

 

-STATIC

 VOID

 KeyWriteCommandRegister (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

   IN UINT8                   Data

   );

 

-STATIC

 VOID

 KeyboardError (

   IN KEYBOARD_CONSOLE_IN_DEV*ConsoleIn,

   IN CHAR16                 *ErrMsg // should be a unicode string

   );

 

-STATIC

 EFI_STATUS

 GetScancodeBufHead (

   KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,

@@ -53,7 +48,6 @@ GetScancodeBufHead (
   OUT UINT8                *Buf

   );

 

-STATIC

 EFI_STATUS

 PopScancodeBufHead (

   KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,

@@ -61,28 +55,25 @@ PopScancodeBufHead (
   OUT UINT8                *Buf

   );

 

-STATIC

 EFI_STATUS

 KeyboardWrite (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

   IN UINT8                   Data

   );

 

-STATIC

 EFI_STATUS

 KeyboardCommand (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

   IN UINT8                   Data

   );

 

-STATIC

 EFI_STATUS

 KeyboardWaitForValue (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

   IN UINT8                   Value

   );

 

-STATIC struct {

+struct {

   UINT8  ScanCode;

   UINT16  EfiScanCode;

   CHAR16  UnicodeChar;

@@ -630,7 +621,7 @@ ConvertKeyboardScanCodeToEfiKey[] = {
 //

 // The WaitForValue time out

 //

-STATIC UINTN  mWaitForValueTimeOut = KEYBOARD_WAITFORVALUE_TIMEOUT;

+UINTN  mWaitForValueTimeOut = KEYBOARD_WAITFORVALUE_TIMEOUT;

 

 /**

   Read data register 

@@ -640,7 +631,6 @@ STATIC UINTN  mWaitForValueTimeOut = KEYBOARD_WAITFORVALUE_TIMEOUT;
   @return return the value 

 

 **/

-STATIC

 UINT8

 KeyReadDataRegister (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn

@@ -673,7 +663,6 @@ KeyReadDataRegister (
   @param Data      value wanted to be written

 

 **/

-STATIC

 VOID

 KeyWriteDataRegister (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

@@ -742,7 +731,6 @@ KeyReadStatusRegister (
 

 **/

 

-STATIC

 VOID

 KeyWriteCommandRegister (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

@@ -773,7 +761,6 @@ KeyWriteCommandRegister (
   @param ErrMsg    Unicode string of error message

   

 **/

-STATIC

 VOID

 KeyboardError (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

@@ -909,7 +896,6 @@ KeyboardTimerHandler (
   @retval EFI_SUCCESS success to scan the keyboard code

   @retval EFI_NOT_READY invalid parameter

 **/

-STATIC

 EFI_STATUS

 GetScancodeBufHead (

   KEYBOARD_CONSOLE_IN_DEV    *ConsoleIn,

@@ -962,7 +948,6 @@ GetScancodeBufHead (
   @retval EFI_SUCCESS success to scan the keyboard code

   @retval EFI_NOT_READY invalid parameter

 **/

-STATIC

 EFI_STATUS

 PopScancodeBufHead (

   KEYBOARD_CONSOLE_IN_DEV   *ConsoleIn,

@@ -1058,7 +1043,6 @@ KeyboardRead (
   @retval EFI_SUCCESS - GC_TODO: Add description for return value

 

 **/

-STATIC

 EFI_STATUS

 KeyboardWrite (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

@@ -1104,7 +1088,6 @@ KeyboardWrite (
   @retval EFI_SUCCESS Success to issue keyboard command

 

 **/

-STATIC

 EFI_STATUS

 KeyboardCommand (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

@@ -1169,7 +1152,6 @@ KeyboardCommand (
   @retval EFI_SUCCESS Success to get specific value in given time.

   

 **/

-STATIC

 EFI_STATUS

 KeyboardWaitForValue (

   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
index b22c659c73..fc613cac4f 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
@@ -55,7 +55,6 @@ KeyboardCheckForKey (
   @retval FALSE             - Match failed. 

   

 **/

-STATIC

 BOOLEAN

 IsKeyRegistered (

   IN EFI_KEY_DATA  *RegsiteredData,

@@ -79,7 +78,6 @@ IsKeyRegistered (
     @retval EFI_INVALID_PARAMETER - KeyData is NULL.                        

 

 **/

-STATIC

 EFI_STATUS

 KeyboardReadKeyStrokeWorker (

   IN  KEYBOARD_CONSOLE_IN_DEV           *ConsoleInDev,

@@ -354,7 +352,6 @@ KeyboardCheckForKey (
   @retval FLASE             - Match failed. 

   

 **/

-STATIC

 BOOLEAN

 IsKeyRegistered (

   IN EFI_KEY_DATA  *RegsiteredData,

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index 0d4a87db91..b09193cee1 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
@@ -44,7 +44,6 @@ KbdControllerDriverStop (
   IN  EFI_HANDLE                     *ChildHandleBuffer

   );

 

-STATIC

 EFI_STATUS

 KbdFreeNotifyList (

   IN OUT LIST_ENTRY           *ListHead

@@ -514,7 +513,6 @@ KbdControllerDriverStop (
   

   @param ListHead  Pointer to list head

 **/

-STATIC

 EFI_STATUS

 KbdFreeNotifyList (

   IN OUT LIST_ENTRY           *ListHead

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
index c157c39e1f..e7ddcb980e 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
@@ -40,7 +40,6 @@
   (means enable media status notification) is called.

 

 **/

-STATIC

 EFI_STATUS

 LS120GetMediaStatus (

   IN  IDE_BLK_IO_DEV  *IdeDev

@@ -121,7 +120,6 @@ LS120GetMediaStatus (
   If command failed.

 

 **/

-STATIC

 EFI_STATUS

 LS120EnableMediaStatus (

   IN  IDE_BLK_IO_DEV  *IdeDev,

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
index a6d3b567a0..79385b8084 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
@@ -38,7 +38,6 @@ EFI_DRIVER_CONFIGURATION_PROTOCOL gIDEBusDriverConfiguration = {
   @retval  EFI_NOT_FOUND TODO: Add description for return value

 

 **/

-STATIC

 EFI_STATUS

 GetResponse (

   VOID

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index 825aae5437..2dceb002ed 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -878,7 +878,6 @@ GetFastBackToBackSupport (
   

   @retval EFI_SUCCESS Success Operation.

 **/

-STATIC

 EFI_STATUS

 ProcessOptionRomLight (

   IN PCI_IO_DEVICE                      *PciIoDevice

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c
index ddf2ea8f12..6530899c8d 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c
@@ -18,7 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // Internal use only

 //

-STATIC

 EFI_STATUS

 ReportErrorStatusCode (

   IN PCI_IO_DEVICE               *PciIoDevice,

@@ -32,7 +31,7 @@ ReportErrorStatusCode (
 //

 // Pci Io Protocol Interface

 //

-static EFI_PCI_IO_PROTOCOL  PciIoInterface = {

+EFI_PCI_IO_PROTOCOL  PciIoInterface = {

   PciIoPollMem,

   PciIoPollIo,

   {

@@ -67,7 +66,6 @@ static EFI_PCI_IO_PROTOCOL  PciIoInterface = {
   @param PciIoDevice Pci device instance

   @param Code        status code

 **/

-STATIC

 EFI_STATUS

 ReportErrorStatusCode (

   IN PCI_IO_DEVICE               *PciIoDevice,

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c
index 085681bdba..0a6b0d07e5 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c
@@ -2009,7 +2009,6 @@ PciHostBridgeEnumerator (
    @retval EFI_OUT_OF_RESOURCES   The request could not be completed due to a lack of resources.

 

 **/

-STATIC

 EFI_STATUS

 ReadConfigData (

   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,  OPTIONAL

@@ -2166,7 +2165,6 @@ ReadConfigData (
   @retval EFI_SUCCESS         The data has been updated.

 

 **/

-STATIC

 EFI_STATUS

 UpdateConfigData (

   IN       EFI_PCI_DEVICE_INFO                    *PciDeviceInfo,

@@ -2242,7 +2240,6 @@ UpdateConfigData (
    @retval EFI_OUT_OF_RESOURCES   The request could not be completed due to a lack of resources.

 

 **/

-STATIC

 EFI_STATUS

 WriteConfigData (

   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,  OPTIONAL

@@ -2417,7 +2414,6 @@ WriteConfigData (
   @retval EFI_SUCCESS         Pci device device information has been abstracted.

 

 **/

-STATIC

 EFI_STATUS

 GetPciDeviceDeviceInfo (

   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,  OPTIONAL

@@ -2523,7 +2519,6 @@ GetPciDeviceDeviceInfo (
   @retval EFI_OUT_OF_RESOURCES   The request could not be completed due to a lack of resources.

 

 **/

-STATIC

 EFI_STATUS

 PciIncompatibilityCheckRead (

   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,   OPTIONAL

@@ -2590,7 +2585,6 @@ PciIncompatibilityCheckRead (
   @retval EFI_OUT_OF_RESOURCES   The request could not be completed due to a lack of resources.

 

 **/

-STATIC

 EFI_STATUS

 PciIncompatibilityCheckWrite (

   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,   OPTIONAL

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
index 50f2cd1a96..339b33c8a1 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
@@ -25,9 +25,9 @@ typedef struct {
   UINT64      RomLength;

 } 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;

 

 /**

   Add the Rom Image to internal database for later PCI light enumeration