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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
index 2caaed3dc80d11267e92b6104a6e9d7849f3c0aa..da1aa940948f2524601be3ac1a0baacaf0e232da 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
@@ -37,7 +37,7 @@ EFI_ISA_IO_PROTOCOL IsaIoInterface = {
   NULL\r
 };\r
 \r
-static EFI_ISA_DMA_REGISTERS  DmaRegisters[8] = {\r
+EFI_ISA_DMA_REGISTERS  DmaRegisters[8] = {\r
   {\r
     0x00,\r
     0x87,\r
@@ -777,7 +777,6 @@ IsaIoCopyMem (
   @retval EFI_OUT_OF_RESOURCES  - The memory pages could not be allocated.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 IsaIoMap_OnlySupportSlaveReadWrite (\r
   IN     EFI_ISA_IO_PROTOCOL                                  *This,\r
@@ -1018,7 +1017,6 @@ IsaIoMap_OnlySupportSlaveReadWrite (
   @retval EFI_OUT_OF_RESOURCES  - The memory pages could not be allocated.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 IsaIoMap_FullSupport (\r
   IN     EFI_ISA_IO_PROTOCOL                                  *This,\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c
index 36280becadaa63d17c34445d2e2b971c8d3f93f1..5f4a9903574c473a94519da7b678466ba38ce17f 100644 (file)
--- 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\r
   @param Read  Error type: read or write?\r
 **/\r
-STATIC\r
 VOID\r
 FddReportStatus (\r
   IN  EFI_BLOCK_IO_PROTOCOL  *This,\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index bbc16bfcbfcd95ee42a124ce34758fe4bb72fa7c..b21e2bc8caf55baa2d917a38f9774438533bde88 100644 (file)
--- 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.
 //\r
 // Function declarations\r
 //\r
-STATIC\r
 UINT8\r
 KeyReadDataRegister (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r
   );\r
 \r
-STATIC\r
 VOID\r
 KeyWriteDataRegister (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
   IN UINT8                   Data\r
   );\r
 \r
-STATIC\r
 VOID\r
 KeyWriteCommandRegister (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
   IN UINT8                   Data\r
   );\r
 \r
-STATIC\r
 VOID\r
 KeyboardError (\r
   IN KEYBOARD_CONSOLE_IN_DEV*ConsoleIn,\r
   IN CHAR16                 *ErrMsg // should be a unicode string\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 GetScancodeBufHead (\r
   KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,\r
@@ -53,7 +48,6 @@ GetScancodeBufHead (
   OUT UINT8                *Buf\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 PopScancodeBufHead (\r
   KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,\r
@@ -61,28 +55,25 @@ PopScancodeBufHead (
   OUT UINT8                *Buf\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 KeyboardWrite (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
   IN UINT8                   Data\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 KeyboardCommand (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
   IN UINT8                   Data\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 KeyboardWaitForValue (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
   IN UINT8                   Value\r
   );\r
 \r
-STATIC struct {\r
+struct {\r
   UINT8  ScanCode;\r
   UINT16  EfiScanCode;\r
   CHAR16  UnicodeChar;\r
@@ -630,7 +621,7 @@ ConvertKeyboardScanCodeToEfiKey[] = {
 //\r
 // The WaitForValue time out\r
 //\r
-STATIC UINTN  mWaitForValueTimeOut = KEYBOARD_WAITFORVALUE_TIMEOUT;\r
+UINTN  mWaitForValueTimeOut = KEYBOARD_WAITFORVALUE_TIMEOUT;\r
 \r
 /**\r
   Read data register \r
@@ -640,7 +631,6 @@ STATIC UINTN  mWaitForValueTimeOut = KEYBOARD_WAITFORVALUE_TIMEOUT;
   @return return the value \r
 \r
 **/\r
-STATIC\r
 UINT8\r
 KeyReadDataRegister (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r
@@ -673,7 +663,6 @@ KeyReadDataRegister (
   @param Data      value wanted to be written\r
 \r
 **/\r
-STATIC\r
 VOID\r
 KeyWriteDataRegister (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
@@ -742,7 +731,6 @@ KeyReadStatusRegister (
 \r
 **/\r
 \r
-STATIC\r
 VOID\r
 KeyWriteCommandRegister (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
@@ -773,7 +761,6 @@ KeyWriteCommandRegister (
   @param ErrMsg    Unicode string of error message\r
   \r
 **/\r
-STATIC\r
 VOID\r
 KeyboardError (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
@@ -909,7 +896,6 @@ KeyboardTimerHandler (
   @retval EFI_SUCCESS success to scan the keyboard code\r
   @retval EFI_NOT_READY invalid parameter\r
 **/\r
-STATIC\r
 EFI_STATUS\r
 GetScancodeBufHead (\r
   KEYBOARD_CONSOLE_IN_DEV    *ConsoleIn,\r
@@ -962,7 +948,6 @@ GetScancodeBufHead (
   @retval EFI_SUCCESS success to scan the keyboard code\r
   @retval EFI_NOT_READY invalid parameter\r
 **/\r
-STATIC\r
 EFI_STATUS\r
 PopScancodeBufHead (\r
   KEYBOARD_CONSOLE_IN_DEV   *ConsoleIn,\r
@@ -1058,7 +1043,6 @@ KeyboardRead (
   @retval EFI_SUCCESS - GC_TODO: Add description for return value\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 KeyboardWrite (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
@@ -1104,7 +1088,6 @@ KeyboardWrite (
   @retval EFI_SUCCESS Success to issue keyboard command\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 KeyboardCommand (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
@@ -1169,7 +1152,6 @@ KeyboardCommand (
   @retval EFI_SUCCESS Success to get specific value in given time.\r
   \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 KeyboardWaitForValue (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
index b22c659c7353956da7737bb13dab5812ffa96827..fc613cac4feab00a5e2219311855e32931aa3cd9 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
@@ -55,7 +55,6 @@ KeyboardCheckForKey (
   @retval FALSE             - Match failed. \r
   \r
 **/\r
-STATIC\r
 BOOLEAN\r
 IsKeyRegistered (\r
   IN EFI_KEY_DATA  *RegsiteredData,\r
@@ -79,7 +78,6 @@ IsKeyRegistered (
     @retval EFI_INVALID_PARAMETER - KeyData is NULL.                        \r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 KeyboardReadKeyStrokeWorker (\r
   IN  KEYBOARD_CONSOLE_IN_DEV           *ConsoleInDev,\r
@@ -354,7 +352,6 @@ KeyboardCheckForKey (
   @retval FLASE             - Match failed. \r
   \r
 **/\r
-STATIC\r
 BOOLEAN\r
 IsKeyRegistered (\r
   IN EFI_KEY_DATA  *RegsiteredData,\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index 0d4a87db91c0449d1210adeafe94c18cedb0854a..b09193cee18a767b3f381d9c40a18a34ad767007 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
@@ -44,7 +44,6 @@ KbdControllerDriverStop (
   IN  EFI_HANDLE                     *ChildHandleBuffer\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 KbdFreeNotifyList (\r
   IN OUT LIST_ENTRY           *ListHead\r
@@ -514,7 +513,6 @@ KbdControllerDriverStop (
   \r
   @param ListHead  Pointer to list head\r
 **/\r
-STATIC\r
 EFI_STATUS\r
 KbdFreeNotifyList (\r
   IN OUT LIST_ENTRY           *ListHead\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
index c157c39e1f72809eeda6fba70cca8212c539d0bb..e7ddcb980ef1633951ffb79554ea6610520823e2 100644 (file)
--- 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.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 LS120GetMediaStatus (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
@@ -121,7 +120,6 @@ LS120GetMediaStatus (
   If command failed.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 LS120EnableMediaStatus (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
index a6d3b567a07e4973ff0e362d1b0aba8a3e9e2e98..79385b80842621bbfca0164d59878f9e76d9fd1f 100644 (file)
--- 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\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 GetResponse (\r
   VOID\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index 825aae5437decdd34e5ef5dd9b06c07246dae270..2dceb002ed1353be7168b69db5f645ff76d723ef 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -878,7 +878,6 @@ GetFastBackToBackSupport (
   \r
   @retval EFI_SUCCESS Success Operation.\r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ProcessOptionRomLight (\r
   IN PCI_IO_DEVICE                      *PciIoDevice\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c
index ddf2ea8f12e007eae60f17f9471866ea33cef4a3..6530899c8db3a3249d3a06c50eae8b8c1f7230bc 100644 (file)
--- 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.
 //\r
 // Internal use only\r
 //\r
-STATIC\r
 EFI_STATUS\r
 ReportErrorStatusCode (\r
   IN PCI_IO_DEVICE               *PciIoDevice,\r
@@ -32,7 +31,7 @@ ReportErrorStatusCode (
 //\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
@@ -67,7 +66,6 @@ static EFI_PCI_IO_PROTOCOL  PciIoInterface = {
   @param PciIoDevice Pci device instance\r
   @param Code        status code\r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ReportErrorStatusCode (\r
   IN PCI_IO_DEVICE               *PciIoDevice,\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c
index 085681bdba7c4741e0960c1c021856b1277122fd..0a6b0d07e5f1876f789bc816e7cdbe60737079ba 100644 (file)
--- 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.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ReadConfigData (\r
   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,  OPTIONAL\r
@@ -2166,7 +2165,6 @@ ReadConfigData (
   @retval EFI_SUCCESS         The data has been updated.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 UpdateConfigData (\r
   IN       EFI_PCI_DEVICE_INFO                    *PciDeviceInfo,\r
@@ -2242,7 +2240,6 @@ UpdateConfigData (
    @retval EFI_OUT_OF_RESOURCES   The request could not be completed due to a lack of resources.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 WriteConfigData (\r
   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,  OPTIONAL\r
@@ -2417,7 +2414,6 @@ WriteConfigData (
   @retval EFI_SUCCESS         Pci device device information has been abstracted.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 GetPciDeviceDeviceInfo (\r
   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,  OPTIONAL\r
@@ -2523,7 +2519,6 @@ GetPciDeviceDeviceInfo (
   @retval EFI_OUT_OF_RESOURCES   The request could not be completed due to a lack of resources.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 PciIncompatibilityCheckRead (\r
   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,   OPTIONAL\r
@@ -2590,7 +2585,6 @@ PciIncompatibilityCheckRead (
   @retval EFI_OUT_OF_RESOURCES   The request could not be completed due to a lack of resources.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 PciIncompatibilityCheckWrite (\r
   IN       EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *PciRootBridgeIo,   OPTIONAL\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
index 50f2cd1a96f2bd53b7af86c0a29a6494cd1d8f2f..339b33c8a13be692d5dd78446de2dcc2ff7782f2 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
@@ -25,9 +25,9 @@ typedef struct {
   UINT64      RomLength;\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
 /**\r
   Add the Rom Image to internal database for later PCI light enumeration\r

diff --git a/IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.c
index 973e14b07a0cb42b0dfe9217b64d75ec7c30b004..acfc358598a776c8d6503a24007dab9f74359096 100644 (file)
--- a/IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.c
@@ -47,7 +47,6 @@
   @retval  EFI_UNSUPPORTED       Status Code Protocol is not available.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 InternalReportStatusCode (\r
   IN EFI_STATUS_CODE_TYPE     Type,\r
@@ -69,7 +68,6 @@ InternalReportStatusCode (
   @return  The size, in bytes, of DevicePath.\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 InternalReportStatusCodeDevicePathSize (\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r

diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
index 7e2cc8b27a82b2679274d4db84936db9c8184dec..df6e808f68c272fea42104fe56303d54bfd8ee22 100644 (file)
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
@@ -75,7 +75,6 @@ InternalReportStatusCode (
   @return  The size, in bytes, of DevicePath.\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 InternalReportStatusCodeDevicePathSize (\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
index 935f99566cca2840a093cd09ddd85fcc6c0584b2..16374284d2b81434632b6a8e268b0fbe891c54e8 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
@@ -141,7 +141,6 @@ GetGraphicsBitMapFromFV (
   @retval EFI_OUT_OF_RESOURCES  - No enough buffer to allocate\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ConvertBmpToGopBlt (\r
   IN  VOID      *BmpImage,\r
@@ -569,7 +568,7 @@ DisableQuietBoot (
   return ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText);\r
 }\r
 \r
-static EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {\r
+EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {\r
   { 0x00, 0x00, 0x00, 0x00 },\r
   { 0x98, 0x00, 0x00, 0x00 },\r
   { 0x00, 0x98, 0x00, 0x00 },\r
@@ -614,7 +613,6 @@ static EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {
   @retval EFI_OUT_OF_RESOURCES    -  out of resources\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 _IPrint (\r
   IN EFI_GRAPHICS_OUTPUT_PROTOCOL     *GraphicsOutput,\r

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
index 68efa8f5f8b528e571cfa7a8a66d2ecdf9236b44..08c95b65261394bc3cb5f61e2b59d11f78ebff2e 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
@@ -22,7 +22,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @retval returns EFI_SUCCESS if two PCI device matched.\r
 **/\r
-STATIC\r
 EFI_STATUS\r
 DeviceCheck (\r
   IN  EFI_PCI_DEVICE_INFO      *PciDeviceInfo,\r

diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index f67adf9d3ac50ca56974f988bb27cfec97a9acf6..f39f36d6b6455700bbcff8ff94862c9fa0ec15b4 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -55,7 +55,6 @@
   @retval  EFI_UNSUPPORTED       Status Code Protocol is not available.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 InternalReportStatusCode (\r
   IN EFI_STATUS_CODE_TYPE     Type,\r

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
index eca0fdcf0ff3ede95c0ac1afb511eecd3f1df69f..a8b144974635985f082cbda28777eac773ee71ea 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
@@ -77,7 +77,6 @@ InternalReportStatusCode (
   @return  The size, in bytes, of DevicePath.\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 InternalReportStatusCodeDevicePathSize (\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
index 5e64c42c9ea43ef922073c73ddf8b795551f1022..8ecf6618ef128de4d5d8ba2b1e30922e9b65159b 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
@@ -20,24 +20,18 @@
 #include <Library/OemHookStatusCodeLib.h>\r
 #include <Protocol/SmmBase.h>\r
 \r
-STATIC \r
 EFI_EVENT             mVirtualAddressChangeEvent;\r
 \r
-STATIC \r
 EFI_EVENT             mExitBootServicesEvent;\r
 \r
-STATIC\r
 EFI_STATUS_CODE_DATA  *mStatusCodeData;\r
 \r
-STATIC\r
 BOOLEAN               mInSmm;\r
 \r
 EFI_SMM_BASE_PROTOCOL *mSmmBase;\r
 \r
-STATIC\r
 EFI_RUNTIME_SERVICES  *mRT;\r
 \r
-STATIC\r
 BOOLEAN               mHaveExitedBootServices = FALSE;\r
 \r
 /**\r
@@ -80,7 +74,6 @@ InternalGetReportStatusCode (
   @param[in]    Event   The Event that is being processed\r
   @param[in]    Context Event Context\r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 ReportStatusCodeLibVirtualAddressChange (\r
@@ -101,7 +94,6 @@ ReportStatusCodeLibVirtualAddressChange (
   @param[in]    Event   The Event that is being processed\r
   @param[in]    Context Event Context\r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 ReportStatusCodeLibExitBootServices (\r

diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c
index 71e0360da8561b7a15f2969f37ef3ac3f57c5093..5b5877d90541935b1793c9f3654a004bf7e8715a 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c
+++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c
@@ -65,7 +65,7 @@ InitializeVgaClass(
 //\r
 // Local variables\r
 //\r
-static CHAR16               CrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r
+CHAR16               CrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r
 \r
 typedef struct {\r
   CHAR16  Unicode;\r
@@ -79,7 +79,7 @@ typedef struct {
 // ASCII. The ASCII mapping we just made up.\r
 //\r
 //\r
-STATIC UNICODE_TO_CHAR  UnicodeToPcAnsiOrAscii[] = {\r
+UNICODE_TO_CHAR  UnicodeToPcAnsiOrAscii[] = {\r
   {\r
     BOXDRAW_HORIZONTAL,\r
     0xc4,\r
@@ -347,7 +347,6 @@ STATIC UNICODE_TO_CHAR  UnicodeToPcAnsiOrAscii[] = {
 //\r
 // Private worker functions\r
 //\r
-STATIC\r
 VOID\r
 SetVideoCursorPosition (\r
   IN  VGA_CLASS_DEV  *VgaClassDev,\r
@@ -356,7 +355,6 @@ SetVideoCursorPosition (
   IN  UINTN          MaxColumn\r
   );\r
 \r
-STATIC\r
 VOID\r
 WriteCrtc (\r
   IN  VGA_CLASS_DEV  *VgaClassDev,\r
@@ -364,7 +362,6 @@ WriteCrtc (
   IN  UINT8          Data\r
   );\r
 \r
-STATIC\r
 BOOLEAN\r
 LibIsValidTextGraphics (\r
   IN  CHAR16  Graphic,\r
@@ -372,13 +369,11 @@ LibIsValidTextGraphics (
   OUT CHAR8   *Ascii OPTIONAL\r
   );\r
 \r
-STATIC\r
 BOOLEAN\r
 IsValidAscii (\r
   IN  CHAR16  Ascii\r
   );\r
 \r
-STATIC\r
 BOOLEAN\r
 IsValidEfiCntlChar (\r
   IN  CHAR16  c\r
@@ -1116,7 +1111,6 @@ VgaClassSetMode (
   @param MaxColumn   max logic column\r
   \r
 **/\r
-STATIC\r
 VOID\r
 SetVideoCursorPosition (\r
   IN  VGA_CLASS_DEV  *VgaClassDev,\r
@@ -1147,7 +1141,6 @@ SetVideoCursorPosition (
   @param Address      address\r
   @param Data         data\r
 **/\r
-STATIC\r
 VOID\r
 WriteCrtc (\r
   IN  VGA_CLASS_DEV  *VgaClassDev,\r
@@ -1184,7 +1177,6 @@ WriteCrtc (
   @return TRUE if Gpaphic is a supported Unicode Box Drawing character.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 LibIsValidTextGraphics (\r
   IN  CHAR16  Graphic,\r
@@ -1225,7 +1217,6 @@ LibIsValidTextGraphics (
   @param Ascii character\r
   @return whether is an ASCII char.\r
 **/\r
-STATIC\r
 BOOLEAN\r
 IsValidAscii (\r
   IN  CHAR16  Ascii\r
@@ -1244,7 +1235,6 @@ IsValidAscii (
   @param c character\r
   @return whether is diplaying control character.\r
 **/\r
-STATIC\r
 BOOLEAN\r
 IsValidEfiCntlChar (\r
   IN  CHAR16  c\r

diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
index ac86f74edfc4cd31d50e4955e335c7215f2b9538..af68644e9c02c94033679ebc4229a5fb345c0775 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
@@ -29,14 +29,12 @@ CONST EFI_GUID gZeroGuid  = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
 //\r
 // Worker functions private to this file\r
 //\r
-STATIC\r
 DATA_HUB_FILTER_DRIVER  *\r
 FindFilterDriverByEvent (\r
   IN  LIST_ENTRY      *Head,\r
   IN  EFI_EVENT       Event\r
   );\r
 \r
-STATIC\r
 EFI_DATA_RECORD_HEADER  *\r
 GetNextDataRecord (\r
   IN  LIST_ENTRY          *Head,\r
@@ -59,7 +57,6 @@ GetNextDataRecord (
   @retval EFI_OUT_OF_RESOURCES  - If data was not logged due to lack of system \r
                                   resources.\r
 **/\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 DataHubLogData (\r
@@ -193,7 +190,6 @@ DataHubLogData (
   @retval EFI_OUT_OF_RESOURCES    - Record was not returned due to lack of system resources.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 DataHubGetNextRecord (\r
@@ -314,7 +310,6 @@ DataHubGetNextRecord (
                             system resources.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 DataHubRegisterFilterDriver (\r
@@ -393,7 +388,6 @@ DataHubRegisterFilterDriver (
   @retval EFI_NOT_FOUND - If FilterEvent does not exist\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 DataHubUnregisterFilterDriver (\r
@@ -441,7 +435,6 @@ DataHubUnregisterFilterDriver (
   @retval NULL - If Event is not in the list\r
 \r
 **/\r
-STATIC\r
 DATA_HUB_FILTER_DRIVER *\r
 FindFilterDriverByEvent (\r
   IN  LIST_ENTRY      *Head,\r
@@ -479,7 +472,6 @@ FindFilterDriverByEvent (
   @retval NULL - If no data record exists.\r
 \r
 **/\r
-STATIC\r
 EFI_DATA_RECORD_HEADER *\r
 GetNextDataRecord (\r
   IN  LIST_ENTRY          *Head,\r

diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
index 34ef690d76d8cf617f192b112cd4d45accd1c9b8..7b83b91e19842d73b6d3dad6c442b25909e90915 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
@@ -38,7 +38,6 @@ EFI_EVENT             mDataHubStdErrEvent;
   @param Event    - The event that occured, not used\r
   @param Context  - DataHub Protocol Pointer\r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 DataHubStdErrEventHandler (\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
index 0936c093eba2a2fa0f26581370e6c5483e0f7496..221c561bbc57e73d9988c10bc1664db968612fc1 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
@@ -17,18 +17,13 @@
 //\r
 // Initialize FIFO to cache records.\r
 //\r
-STATIC\r
 LIST_ENTRY                mRecordsFifo          = INITIALIZE_LIST_HEAD_VARIABLE (mRecordsFifo);\r
-STATIC\r
 LIST_ENTRY                mRecordsBuffer        = INITIALIZE_LIST_HEAD_VARIABLE (mRecordsBuffer);\r
-STATIC\r
 UINT32                    mLogDataHubStatus     = 0;\r
-STATIC\r
 EFI_EVENT                 mLogDataHubEvent;\r
 //\r
 // Cache data hub protocol.\r
 //\r
-STATIC\r
 EFI_DATA_HUB_PROTOCOL     *mDataHubProtocol;\r
 \r
 \r
@@ -41,7 +36,6 @@ EFI_DATA_HUB_PROTOCOL     *mDataHubProtocol;
   @retval  !NULL  Point to buffer of record.\r
 \r
 **/\r
-STATIC\r
 DATA_HUB_STATUS_CODE_DATA_RECORD *\r
 AcquireRecordBuffer (\r
   VOID\r
@@ -97,7 +91,6 @@ AcquireRecordBuffer (
   @return   NULL    the FIFO of record is empty.\r
 \r
 **/\r
-STATIC\r
 DATA_HUB_STATUS_CODE_DATA_RECORD *\r
 RetrieveRecord (\r
   VOID\r
@@ -131,7 +124,6 @@ RetrieveRecord (
                      from AcquireRecordBuffer.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 ReleaseRecord (\r
   DATA_HUB_STATUS_CODE_DATA_RECORD  *RecordData\r
@@ -274,7 +266,6 @@ DataHubStatusCodeReportWorker (
   @param  Context     Context of the event.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 LogDataHubEventCallBack (\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
index eecf38db585e5e6bc34382b0e9e86809052af714..b1f5ebff090a54801b227dff6d8381c43acf61a3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
@@ -17,7 +17,7 @@
 //\r
 // Event for Exit Boot Services Callback\r
 //\r
-STATIC EFI_EVENT mExitBootServicesEvent = NULL;\r
+EFI_EVENT mExitBootServicesEvent = NULL;\r
 \r
 /**\r
   Report status code to all supported device.\r
@@ -59,7 +59,6 @@ ReportDispatcher (
 //\r
 // Declaration of status code protocol.\r
 //\r
-STATIC\r
 EFI_STATUS_CODE_PROTOCOL  mEfiStatusCodeProtocol  = {\r
   ReportDispatcher\r
 };\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
index fbf533950be82c162c783d3b65ca466034f44751..166e70567dfce15827e13aef9af0eaf3e5f90611 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
@@ -15,7 +15,6 @@
 #include "DxeStatusCode.h"\r
 #include "DebugInfo.h"\r
 \r
-STATIC\r
 EFI_SERIAL_IO_PROTOCOL *mSerialIoProtocol;\r
 \r
 /**\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c
index 442fc064b6ccf572b28a580911ffe3c61bb862bd..c8ebabbec574eb484ca069e2b49ad2e09b537648 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c
@@ -25,7 +25,6 @@
   @return                 Always return pointer of memory status code packet.\r
 \r
 **/\r
-STATIC\r
 MEMORY_STATUSCODE_PACKET_HEADER *\r
 CreateMemoryStatusCodePacket (\r
   UINT16 PacketIndex\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index 51c127bca165d3a7c2c2c041ec8f38374c44873c..5b4553da3f40544894134fe94493513259588281 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -16,12 +16,10 @@
 \r
 #include "PeiStatusCode.h"\r
 \r
-STATIC\r
 EFI_PEI_PROGRESS_CODE_PPI     mStatusCodePpi           = {\r
   ReportDispatcher\r
   };\r
 \r
-STATIC\r
 EFI_PEI_PPI_DESCRIPTOR        mStatusCodePpiDescriptor = {\r
   EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
   &gEfiPeiStatusCodePpiGuid,\r

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index 7d9eaf199dfa8d512a3690d3bb55aa6db501e225..0abbb9e63ccd246bec46a324e2c5dd26486a8740 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -19,17 +19,17 @@ Module Name:
 //\r
 // Module globals\r
 //\r
-static EFI_PEI_READ_ONLY_VARIABLE_PPI mVariablePpi = {\r
+EFI_PEI_READ_ONLY_VARIABLE_PPI mVariablePpi = {\r
   PeiGetVariable,\r
   PeiGetNextVariableName\r
 };\r
 \r
-static EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariable2Ppi = {\r
+EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariable2Ppi = {\r
   PeiGetVariable2,\r
   PeiGetNextVariableName2\r
 };\r
 \r
-static EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable[] = {\r
+EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable[] = {\r
   {\r
     (EFI_PEI_PPI_DESCRIPTOR_PPI),\r
     &gEfiPeiReadOnlyVariable2PpiGuid,\r
@@ -117,7 +117,6 @@ GetEndPointer (
   @retval FALSE           Variable header is not valid.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 EFIAPI\r
 IsValidVariableHeader (\r
@@ -258,7 +257,6 @@ GetNextVariablePtr (
   @retval EfiInvalid    Variable store is invalid\r
 \r
 **/\r
-STATIC\r
 VARIABLE_STORE_STATUS\r
 EFIAPI\r
 GetVariableStoreStatus (\r
@@ -299,7 +297,6 @@ GetVariableStoreStatus (
   @retval EFI_NOT_FOUND  - Variable not found\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 CompareWithValidVariable (\r
   IN  VARIABLE_HEADER               *Variable,\r
@@ -351,7 +348,6 @@ CompareWithValidVariable (
   @retval EFI_INVALID_PARAMETER  - Invalid variable name\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FindVariable (\r