From 78e570b6f9cc284cbe0ad2e8cd4c4fff0be0cde2 Mon Sep 17 00:00:00 2001
From: jji4 <jji4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 30 Oct 2008 06:11:42 +0000
Subject: [PATCH] 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@6299 6f19259b-4bc3-4df7-8a09-765794883524
---
 Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c           | 1 -
 .../Nt32OemHookStatusCodeLib.c                           | 2 --
 .../Nt32OemHookStatusCodeLib.c                           | 2 --
 Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c          | 4 ----
 Nt32Pkg/ResetRuntimeDxe/reset.c                          | 2 --
 Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c                   | 9 ---------
 Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h                   | 9 ---------
 Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c               | 2 +-
 Nt32Pkg/WinNtGopDxe/WinNtGopDriver.c                     | 1 -
 Nt32Pkg/WinNtGopDxe/WinNtGopInput.c                      | 9 ---------
 Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c                     | 6 +-----
 Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c                 | 9 ---------
 Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h                 | 9 ---------
 Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c | 2 --
 Nt32Pkg/WinNtThunkDxe/WinNtThunk.c                       | 2 +-
 15 files changed, 3 insertions(+), 66 deletions(-)

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c b/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
index beafb46fb0..43533025ed 100644
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -1221,7 +1221,6 @@ Returns:
           );
 }
 
-STATIC
 EFI_STATUS
 ValidateFvHeader (
   EFI_FIRMWARE_VOLUME_HEADER            *FwVolHeader
diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index 596caa450d..7d5f4ec565 100644
--- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -40,13 +40,11 @@
 //
 // Cache of WinNtThunk protocol
 //
-STATIC
 EFI_WIN_NT_THUNK_PROTOCOL   *mWinNt;
 
 //
 // Cache of standard output handle .
 //
-STATIC
 HANDLE                      mStdOut;
 
 /**
diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index 2d715d78b9..689e05278a 100644
--- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -40,13 +40,11 @@
 //
 // Cache of WinNtThunk protocol
 //
-STATIC
 EFI_WIN_NT_THUNK_PROTOCOL   *mWinNt;
 
 //
 // Cache of standard output handle .
 //
-STATIC
 HANDLE                      mStdOut;
 
 /**
diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
index 647acb1d4f..bc4f3a3c0d 100644
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
@@ -50,7 +50,6 @@ InitializeRealTimeClock (
   IN EFI_SYSTEM_TABLE                    *SystemTable
   );
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtGetTime (
@@ -116,7 +115,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSetTime (
@@ -183,7 +181,6 @@ Returns:
   }
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtGetWakeupTime (
@@ -219,7 +216,6 @@ Returns:
   return EFI_UNSUPPORTED;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSetWakeupTime (
diff --git a/Nt32Pkg/ResetRuntimeDxe/reset.c b/Nt32Pkg/ResetRuntimeDxe/reset.c
index d5c6cc04ea..21e44fb33f 100644
--- a/Nt32Pkg/ResetRuntimeDxe/reset.c
+++ b/Nt32Pkg/ResetRuntimeDxe/reset.c
@@ -35,7 +35,6 @@ InitializeNtReset (
   IN EFI_SYSTEM_TABLE  *SystemTable
   );
 
-STATIC
 VOID
 EFIAPI
 WinNtResetSystem (
@@ -85,7 +84,6 @@ Returns:
   return Status;
 }
 
-STATIC
 VOID
 EFIAPI
 WinNtResetSystem (
diff --git a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
index 59707780d9..9dbecae24b 100644
--- a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
+++ b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
@@ -407,7 +407,6 @@ Returns:
   return Status;
 }
 
-STATIC
 CHAR16 *
 GetNextElementPastTerminator (
   IN  CHAR16  *EnvironmentVariable,
@@ -443,7 +442,6 @@ Returns:
   return Ptr;
 }
 
-STATIC
 EFI_STATUS
 WinNtBlockIoCreateMapping (
   IN EFI_WIN_NT_IO_PROTOCOL             *WinNtIo,
@@ -587,7 +585,6 @@ Returns:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 WinNtBlockIoOpenDevice (
   WIN_NT_BLOCK_IO_PRIVATE                 *Private
@@ -707,7 +704,6 @@ Done:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 WinNtBlockIoError (
   IN WIN_NT_BLOCK_IO_PRIVATE      *Private
@@ -777,7 +773,6 @@ Returns:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 WinNtBlockIoReadWriteCommon (
   IN  WIN_NT_BLOCK_IO_PRIVATE     *Private,
@@ -873,7 +868,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtBlockIoReadBlocks (
@@ -940,7 +934,6 @@ Done:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtBlockIoWriteBlocks (
@@ -1010,7 +1003,6 @@ Done:
 
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtBlockIoFlushBlocks (
@@ -1034,7 +1026,6 @@ WinNtBlockIoFlushBlocks (
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtBlockIoResetBlock (
diff --git a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h
index 5af65b11c2..4095fd1736 100644
--- a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h
+++ b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h
@@ -187,7 +187,6 @@ Returns:
 //
 // Block IO protocol member functions
 //
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtBlockIoReadBlocks (
@@ -218,7 +217,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtBlockIoWriteBlocks (
@@ -249,7 +247,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtBlockIoFlushBlocks (
@@ -272,7 +269,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtBlockIoResetBlock (
@@ -300,7 +296,6 @@ Returns:
 //
 // Private Worker functions
 //
-STATIC
 EFI_STATUS
 WinNtBlockIoCreateMapping (
   IN EFI_WIN_NT_IO_PROTOCOL             *WinNtIo,
@@ -336,7 +331,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 WinNtBlockIoReadWriteCommon (
   IN  WIN_NT_BLOCK_IO_PRIVATE *Private,
@@ -368,7 +362,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 WinNtBlockIoError (
   IN WIN_NT_BLOCK_IO_PRIVATE      *Private
@@ -390,7 +383,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 WinNtBlockIoOpenDevice (
   WIN_NT_BLOCK_IO_PRIVATE         *Private
@@ -412,7 +404,6 @@ Returns:
 --*/
 ;
 
-STATIC
 CHAR16                                    *
 GetNextElementPastTerminator (
   IN  CHAR16  *EnvironmentVariable,
diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c
index b5ac76a5c1..1fe42773fe 100644
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c
@@ -144,7 +144,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gWinNtBusDriverBinding = {
 // Table to map NT Environment variable to the GUID that should be in
 // device path.
 //
-static NT_PCD_ENTRY  mPcdEnvironment[] = {
+NT_PCD_ENTRY  mPcdEnvironment[] = {
   PcdToken(PcdWinNtConsole),       &gEfiWinNtConsoleGuid,
   PcdToken(PcdWinNtGop),           &gEfiWinNtGopGuid,
   PcdToken(PcdWinNtSerialPort),    &gEfiWinNtSerialPortGuid,
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopDriver.c b/Nt32Pkg/WinNtGopDxe/WinNtGopDriver.c
index ae29da7850..4f37707f66 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopDriver.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopDriver.c
@@ -23,7 +23,6 @@ Abstract:
 **/
 #include "WinNtGop.h"
 
-STATIC
 EFI_STATUS
 FreeNotifyList (
   IN OUT LIST_ENTRY           *ListHead
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
index f78247c23f..acf838b630 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
@@ -158,7 +158,6 @@ GopPrivateCheckQ (
   return EFI_SUCCESS;
 }
 
-STATIC
 BOOLEAN
 GopPrivateIsKeyRegistered (
   IN EFI_KEY_DATA  *RegsiteredData,
@@ -205,7 +204,6 @@ Returns:
 }
 
 
-STATIC
 VOID
 GopPrivateInvokeRegisteredFunction (
   IN GOP_PRIVATE_DATA                     *Private,
@@ -245,7 +243,6 @@ Returns:
   }    
 }
 
-STATIC
 EFI_STATUS
 GopPrivateUpdateStatusLight (
   IN GOP_PRIVATE_DATA                     *Private
@@ -277,7 +274,6 @@ Returns:
 }
 
 
-STATIC
 EFI_STATUS
 GopPrivateResetWorker (
   IN GOP_PRIVATE_DATA                     *Private
@@ -338,7 +334,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 GopPrivateReadKeyStrokeWorker (
   IN GOP_PRIVATE_DATA                   *Private,
@@ -491,7 +486,6 @@ WinNtGopSimpleTextInReset (
   @return TODO: add return values
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtGopSimpleTextInReadKeyStroke (
@@ -525,7 +519,6 @@ WinNtGopSimpleTextInReadKeyStroke (
   @return TODO: add return values
 
 **/
-STATIC
 VOID
 EFIAPI
 WinNtGopSimpleTextInWaitForKey (
@@ -570,7 +563,6 @@ WinNtGopSimpleTextInWaitForKey (
 // Simple Text Input Ex protocol functions
 //
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtGopSimpleTextInExResetEx (
@@ -598,7 +590,6 @@ WinNtGopSimpleTextInExResetEx (
   return GopPrivateResetWorker (Private);
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtGopSimpleTextInExReadKeyStrokeEx (
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
index f663f3243b..c8c7d1197e 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
@@ -27,7 +27,7 @@ Abstract:
 EFI_WIN_NT_THUNK_PROTOCOL *mWinNt;
 DWORD                     mTlsIndex         = TLS_OUT_OF_INDEXES;
 DWORD                     mTlsIndexUseCount = 0;  // lets us know when we can free mTlsIndex.
-static EFI_EVENT          mGopScreenExitBootServicesEvent;
+EFI_EVENT          mGopScreenExitBootServicesEvent;
 GOP_MODE_DATA mGopModeData[] = {
     {800, 600, 0, 0},
     {640, 480, 0, 0},
@@ -45,7 +45,6 @@ WinNtGopStartWindow (
   IN  UINT32              RefreshRate
   );
 
-STATIC
 VOID
 EFIAPI
 KillNtGopThread (
@@ -53,7 +52,6 @@ KillNtGopThread (
   IN VOID       *Context
   );
 
-STATIC
 VOID
 WinNtGopConvertParamToEfiKeyShiftState (
   IN  GOP_PRIVATE_DATA  *Private,
@@ -93,7 +91,6 @@ WinNtGopConvertParamToEfiKeyShiftState (
   }
 }
 
-STATIC
 VOID
 WinNtGopConvertParamToEfiKey (
   IN  GOP_PRIVATE_DATA  *Private,
@@ -1110,7 +1107,6 @@ WinNtGopDestructor (
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 KillNtGopThread (
diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
index ed8ee3c453..1419c5a653 100644
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
@@ -97,7 +97,6 @@ InitializeWinNtSerialIo(
   return Status;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoDriverBindingSupported (
@@ -228,7 +227,6 @@ Error:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoDriverBindingStart (
@@ -534,7 +532,6 @@ Error:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoDriverBindingStop (
@@ -662,7 +659,6 @@ Returns:
 // Serial IO Protocol member functions
 //
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoReset (
@@ -709,7 +705,6 @@ Returns:
                 );
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoSetAttributes (
@@ -975,7 +970,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoSetControl (
@@ -1071,7 +1065,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoGetControl (
@@ -1186,7 +1179,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoWrite (
@@ -1290,7 +1282,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoRead (
diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h
index a8e74bb945..a5365cbe97 100644
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h
@@ -188,7 +188,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoDriverBindingSupported (
@@ -215,7 +214,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoDriverBindingStart (
@@ -242,7 +240,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoDriverBindingStop (
@@ -271,7 +268,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoReset (
@@ -294,7 +290,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoSetAttributes (
@@ -329,7 +324,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoSetControl (
@@ -354,7 +348,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoGetControl (
@@ -379,7 +372,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoWrite (
@@ -406,7 +398,6 @@ Returns:
 --*/
 ;
 
-STATIC
 EFI_STATUS
 EFIAPI
 WinNtSerialIoRead (
diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
index 2e3588e34c..9484c3faa3 100644
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
@@ -1406,7 +1406,6 @@ Returns:
   return Status;
 }
 
-STATIC
 VOID
 WinNtSystemTimeToEfiTime (
   IN SYSTEMTIME             *SystemTime,
@@ -1908,7 +1907,6 @@ Done:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 WinNtSimpleFileSystemFileInfo (
   IN     WIN_NT_EFI_FILE_PRIVATE  *PrivateFile,
diff --git a/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c b/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
index d0b1407f4f..7cd0fceb98 100644
--- a/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
+++ b/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
@@ -48,7 +48,7 @@ Abstract:
 //
 // WinNtThunk Device Path Protocol Instance
 //
-static WIN_NT_THUNK_DEVICE_PATH mWinNtThunkDevicePath = {
+WIN_NT_THUNK_DEVICE_PATH mWinNtThunkDevicePath = {
   {
     HARDWARE_DEVICE_PATH,
     HW_VENDOR_DP,
-- 
2.39.2