From 819d1488930d30b30bb467fcb3bf0f05b28d675e Mon Sep 17 00:00:00 2001 From: jji4 Date: Thu, 30 Oct 2008 06:08:09 +0000 Subject: 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 --- IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c | 4 +--- .../Bus/Isa/IsaFloppyDxe/IsaFloppyBlock.c | 1 - .../Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c | 22 ++-------------------- .../Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c | 3 --- .../Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c | 2 -- IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c | 2 -- .../Bus/Pci/IdeBusDxe/DriverConfiguration.c | 1 - .../Bus/Pci/PciBusDxe/PciEnumeratorSupport.c | 1 - IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c | 4 +--- IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c | 6 ------ .../Bus/Pci/PciBusDxe/PciRomTable.c | 6 +++--- .../BaseReportStatusCodeLib.c | 2 -- .../ReportStatusCodeLib.c | 1 - .../Library/GraphicsLib/Graphics.c | 4 +--- .../PciIncompatibleDeviceSupportLib.c | 1 - .../PeiReportStatusCodeLib/ReportStatusCodeLib.c | 1 - .../ReportStatusCodeLib.c | 1 - .../SmmRuntimeDxeSupport.c | 8 -------- .../Universal/Console/VgaClassDxe/VgaClass.c | 14 ++------------ .../Universal/DataHubDxe/DataHub.c | 8 -------- .../Universal/DataHubStdErrDxe/DataHubStdErr.c | 1 - .../StatusCode/Dxe/DataHubStatusCodeWorker.c | 9 --------- .../Universal/StatusCode/Dxe/DxeStatusCodeCommon.c | 3 +-- .../StatusCode/Dxe/SerialStatusCodeWorker.c | 1 - .../StatusCode/Pei/MemoryStausCodeWorker.c | 1 - .../Universal/StatusCode/Pei/PeiStatusCode.c | 2 -- .../Universal/VariablePei/Variable.c | 10 +++------- 27 files changed, 14 insertions(+), 105 deletions(-) (limited to 'IntelFrameworkModulePkg') 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 diff --git a/IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/BaseReportStatusCodeLib/BaseReportStatusCodeLib.c index 973e14b07a..acfc358598 100644 --- 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. **/ -STATIC EFI_STATUS InternalReportStatusCode ( IN EFI_STATUS_CODE_TYPE Type, @@ -69,7 +68,6 @@ InternalReportStatusCode ( @return The size, in bytes, of DevicePath. **/ -STATIC UINTN InternalReportStatusCodeDevicePathSize ( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c index 7e2cc8b27a..df6e808f68 100644 --- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c +++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c @@ -75,7 +75,6 @@ InternalReportStatusCode ( @return The size, in bytes, of DevicePath. **/ -STATIC UINTN InternalReportStatusCodeDevicePathSize ( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c index 935f99566c..16374284d2 100644 --- 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 **/ -STATIC EFI_STATUS ConvertBmpToGopBlt ( IN VOID *BmpImage, @@ -569,7 +568,7 @@ DisableQuietBoot ( return ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText); } -static EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = { +EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = { { 0x00, 0x00, 0x00, 0x00 }, { 0x98, 0x00, 0x00, 0x00 }, { 0x00, 0x98, 0x00, 0x00 }, @@ -614,7 +613,6 @@ static EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = { @retval EFI_OUT_OF_RESOURCES - out of resources **/ -STATIC UINTN _IPrint ( IN EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput, diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c index 68efa8f5f8..08c95b6526 100644 --- 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. @retval returns EFI_SUCCESS if two PCI device matched. **/ -STATIC EFI_STATUS DeviceCheck ( IN EFI_PCI_DEVICE_INFO *PciDeviceInfo, diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c index f67adf9d3a..f39f36d6b6 100644 --- 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. **/ -STATIC EFI_STATUS InternalReportStatusCode ( IN EFI_STATUS_CODE_TYPE Type, diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c index eca0fdcf0f..a8b1449746 100644 --- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c +++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c @@ -77,7 +77,6 @@ InternalReportStatusCode ( @return The size, in bytes, of DevicePath. **/ -STATIC UINTN InternalReportStatusCodeDevicePathSize ( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c index 5e64c42c9e..8ecf6618ef 100644 --- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c +++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c @@ -20,24 +20,18 @@ #include #include -STATIC EFI_EVENT mVirtualAddressChangeEvent; -STATIC EFI_EVENT mExitBootServicesEvent; -STATIC EFI_STATUS_CODE_DATA *mStatusCodeData; -STATIC BOOLEAN mInSmm; EFI_SMM_BASE_PROTOCOL *mSmmBase; -STATIC EFI_RUNTIME_SERVICES *mRT; -STATIC BOOLEAN mHaveExitedBootServices = FALSE; /** @@ -80,7 +74,6 @@ InternalGetReportStatusCode ( @param[in] Event The Event that is being processed @param[in] Context Event Context **/ -STATIC VOID EFIAPI ReportStatusCodeLibVirtualAddressChange ( @@ -101,7 +94,6 @@ ReportStatusCodeLibVirtualAddressChange ( @param[in] Event The Event that is being processed @param[in] Context Event Context **/ -STATIC VOID EFIAPI ReportStatusCodeLibExitBootServices ( diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c index 71e0360da8..5b5877d905 100644 --- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c +++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c @@ -65,7 +65,7 @@ InitializeVgaClass( // // Local variables // -static CHAR16 CrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL }; +CHAR16 CrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL }; typedef struct { CHAR16 Unicode; @@ -79,7 +79,7 @@ typedef struct { // ASCII. The ASCII mapping we just made up. // // -STATIC UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = { +UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = { { BOXDRAW_HORIZONTAL, 0xc4, @@ -347,7 +347,6 @@ STATIC UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = { // // Private worker functions // -STATIC VOID SetVideoCursorPosition ( IN VGA_CLASS_DEV *VgaClassDev, @@ -356,7 +355,6 @@ SetVideoCursorPosition ( IN UINTN MaxColumn ); -STATIC VOID WriteCrtc ( IN VGA_CLASS_DEV *VgaClassDev, @@ -364,7 +362,6 @@ WriteCrtc ( IN UINT8 Data ); -STATIC BOOLEAN LibIsValidTextGraphics ( IN CHAR16 Graphic, @@ -372,13 +369,11 @@ LibIsValidTextGraphics ( OUT CHAR8 *Ascii OPTIONAL ); -STATIC BOOLEAN IsValidAscii ( IN CHAR16 Ascii ); -STATIC BOOLEAN IsValidEfiCntlChar ( IN CHAR16 c @@ -1116,7 +1111,6 @@ VgaClassSetMode ( @param MaxColumn max logic column **/ -STATIC VOID SetVideoCursorPosition ( IN VGA_CLASS_DEV *VgaClassDev, @@ -1147,7 +1141,6 @@ SetVideoCursorPosition ( @param Address address @param Data data **/ -STATIC VOID WriteCrtc ( IN VGA_CLASS_DEV *VgaClassDev, @@ -1184,7 +1177,6 @@ WriteCrtc ( @return TRUE if Gpaphic is a supported Unicode Box Drawing character. **/ -STATIC BOOLEAN LibIsValidTextGraphics ( IN CHAR16 Graphic, @@ -1225,7 +1217,6 @@ LibIsValidTextGraphics ( @param Ascii character @return whether is an ASCII char. **/ -STATIC BOOLEAN IsValidAscii ( IN CHAR16 Ascii @@ -1244,7 +1235,6 @@ IsValidAscii ( @param c character @return whether is diplaying control character. **/ -STATIC BOOLEAN IsValidEfiCntlChar ( IN CHAR16 c diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c index ac86f74edf..af68644e9c 100644 --- 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 } }; // // Worker functions private to this file // -STATIC DATA_HUB_FILTER_DRIVER * FindFilterDriverByEvent ( IN LIST_ENTRY *Head, IN EFI_EVENT Event ); -STATIC EFI_DATA_RECORD_HEADER * GetNextDataRecord ( IN LIST_ENTRY *Head, @@ -59,7 +57,6 @@ GetNextDataRecord ( @retval EFI_OUT_OF_RESOURCES - If data was not logged due to lack of system resources. **/ -STATIC EFI_STATUS EFIAPI DataHubLogData ( @@ -193,7 +190,6 @@ DataHubLogData ( @retval EFI_OUT_OF_RESOURCES - Record was not returned due to lack of system resources. **/ -STATIC EFI_STATUS EFIAPI DataHubGetNextRecord ( @@ -314,7 +310,6 @@ DataHubGetNextRecord ( system resources. **/ -STATIC EFI_STATUS EFIAPI DataHubRegisterFilterDriver ( @@ -393,7 +388,6 @@ DataHubRegisterFilterDriver ( @retval EFI_NOT_FOUND - If FilterEvent does not exist **/ -STATIC EFI_STATUS EFIAPI DataHubUnregisterFilterDriver ( @@ -441,7 +435,6 @@ DataHubUnregisterFilterDriver ( @retval NULL - If Event is not in the list **/ -STATIC DATA_HUB_FILTER_DRIVER * FindFilterDriverByEvent ( IN LIST_ENTRY *Head, @@ -479,7 +472,6 @@ FindFilterDriverByEvent ( @retval NULL - If no data record exists. **/ -STATIC EFI_DATA_RECORD_HEADER * GetNextDataRecord ( IN LIST_ENTRY *Head, diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c index 34ef690d76..7b83b91e19 100644 --- 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 @param Context - DataHub Protocol Pointer **/ -STATIC VOID EFIAPI DataHubStdErrEventHandler ( diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c index 0936c093eb..221c561bbc 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c @@ -17,18 +17,13 @@ // // Initialize FIFO to cache records. // -STATIC LIST_ENTRY mRecordsFifo = INITIALIZE_LIST_HEAD_VARIABLE (mRecordsFifo); -STATIC LIST_ENTRY mRecordsBuffer = INITIALIZE_LIST_HEAD_VARIABLE (mRecordsBuffer); -STATIC UINT32 mLogDataHubStatus = 0; -STATIC EFI_EVENT mLogDataHubEvent; // // Cache data hub protocol. // -STATIC EFI_DATA_HUB_PROTOCOL *mDataHubProtocol; @@ -41,7 +36,6 @@ EFI_DATA_HUB_PROTOCOL *mDataHubProtocol; @retval !NULL Point to buffer of record. **/ -STATIC DATA_HUB_STATUS_CODE_DATA_RECORD * AcquireRecordBuffer ( VOID @@ -97,7 +91,6 @@ AcquireRecordBuffer ( @return NULL the FIFO of record is empty. **/ -STATIC DATA_HUB_STATUS_CODE_DATA_RECORD * RetrieveRecord ( VOID @@ -131,7 +124,6 @@ RetrieveRecord ( from AcquireRecordBuffer. **/ -STATIC VOID ReleaseRecord ( DATA_HUB_STATUS_CODE_DATA_RECORD *RecordData @@ -274,7 +266,6 @@ DataHubStatusCodeReportWorker ( @param Context Context of the event. **/ -STATIC VOID EFIAPI LogDataHubEventCallBack ( diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c index eecf38db58..b1f5ebff09 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c @@ -17,7 +17,7 @@ // // Event for Exit Boot Services Callback // -STATIC EFI_EVENT mExitBootServicesEvent = NULL; +EFI_EVENT mExitBootServicesEvent = NULL; /** Report status code to all supported device. @@ -59,7 +59,6 @@ ReportDispatcher ( // // Declaration of status code protocol. // -STATIC EFI_STATUS_CODE_PROTOCOL mEfiStatusCodeProtocol = { ReportDispatcher }; diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c index fbf533950b..166e70567d 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c @@ -15,7 +15,6 @@ #include "DxeStatusCode.h" #include "DebugInfo.h" -STATIC EFI_SERIAL_IO_PROTOCOL *mSerialIoProtocol; /** diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c index 442fc064b6..c8ebabbec5 100644 --- 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. **/ -STATIC MEMORY_STATUSCODE_PACKET_HEADER * CreateMemoryStatusCodePacket ( UINT16 PacketIndex diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c index 51c127bca1..5b4553da3f 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c @@ -16,12 +16,10 @@ #include "PeiStatusCode.h" -STATIC EFI_PEI_PROGRESS_CODE_PPI mStatusCodePpi = { ReportDispatcher }; -STATIC EFI_PEI_PPI_DESCRIPTOR mStatusCodePpiDescriptor = { EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, &gEfiPeiStatusCodePpiGuid, diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c index 7d9eaf199d..0abbb9e63c 100644 --- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c +++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c @@ -19,17 +19,17 @@ Module Name: // // Module globals // -static EFI_PEI_READ_ONLY_VARIABLE_PPI mVariablePpi = { +EFI_PEI_READ_ONLY_VARIABLE_PPI mVariablePpi = { PeiGetVariable, PeiGetNextVariableName }; -static EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariable2Ppi = { +EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariable2Ppi = { PeiGetVariable2, PeiGetNextVariableName2 }; -static EFI_PEI_PPI_DESCRIPTOR mPpiListVariable[] = { +EFI_PEI_PPI_DESCRIPTOR mPpiListVariable[] = { { (EFI_PEI_PPI_DESCRIPTOR_PPI), &gEfiPeiReadOnlyVariable2PpiGuid, @@ -117,7 +117,6 @@ GetEndPointer ( @retval FALSE Variable header is not valid. **/ -STATIC BOOLEAN EFIAPI IsValidVariableHeader ( @@ -258,7 +257,6 @@ GetNextVariablePtr ( @retval EfiInvalid Variable store is invalid **/ -STATIC VARIABLE_STORE_STATUS EFIAPI GetVariableStoreStatus ( @@ -299,7 +297,6 @@ GetVariableStoreStatus ( @retval EFI_NOT_FOUND - Variable not found **/ -STATIC EFI_STATUS CompareWithValidVariable ( IN VARIABLE_HEADER *Variable, @@ -351,7 +348,6 @@ CompareWithValidVariable ( @retval EFI_INVALID_PARAMETER - Invalid variable name **/ -STATIC EFI_STATUS EFIAPI FindVariable ( -- cgit v1.2.3