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

5 files changed, 3 insertions, 29 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