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
This commit is contained in:
jji4
2008-10-30 06:11:42 +00:00
parent 819d148893
commit 78e570b6f9
15 changed files with 3 additions and 66 deletions

View File

@@ -1221,7 +1221,6 @@ Returns:
); );
} }
STATIC
EFI_STATUS EFI_STATUS
ValidateFvHeader ( ValidateFvHeader (
EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader

View File

@@ -40,13 +40,11 @@
// //
// Cache of WinNtThunk protocol // Cache of WinNtThunk protocol
// //
STATIC
EFI_WIN_NT_THUNK_PROTOCOL *mWinNt; EFI_WIN_NT_THUNK_PROTOCOL *mWinNt;
// //
// Cache of standard output handle . // Cache of standard output handle .
// //
STATIC
HANDLE mStdOut; HANDLE mStdOut;
/** /**

View File

@@ -40,13 +40,11 @@
// //
// Cache of WinNtThunk protocol // Cache of WinNtThunk protocol
// //
STATIC
EFI_WIN_NT_THUNK_PROTOCOL *mWinNt; EFI_WIN_NT_THUNK_PROTOCOL *mWinNt;
// //
// Cache of standard output handle . // Cache of standard output handle .
// //
STATIC
HANDLE mStdOut; HANDLE mStdOut;
/** /**

View File

@@ -50,7 +50,6 @@ InitializeRealTimeClock (
IN EFI_SYSTEM_TABLE *SystemTable IN EFI_SYSTEM_TABLE *SystemTable
); );
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtGetTime ( WinNtGetTime (
@@ -116,7 +115,6 @@ Returns:
return EFI_SUCCESS; return EFI_SUCCESS;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSetTime ( WinNtSetTime (
@@ -183,7 +181,6 @@ Returns:
} }
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtGetWakeupTime ( WinNtGetWakeupTime (
@@ -219,7 +216,6 @@ Returns:
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSetWakeupTime ( WinNtSetWakeupTime (

View File

@@ -35,7 +35,6 @@ InitializeNtReset (
IN EFI_SYSTEM_TABLE *SystemTable IN EFI_SYSTEM_TABLE *SystemTable
); );
STATIC
VOID VOID
EFIAPI EFIAPI
WinNtResetSystem ( WinNtResetSystem (
@@ -85,7 +84,6 @@ Returns:
return Status; return Status;
} }
STATIC
VOID VOID
EFIAPI EFIAPI
WinNtResetSystem ( WinNtResetSystem (

View File

@@ -407,7 +407,6 @@ Returns:
return Status; return Status;
} }
STATIC
CHAR16 * CHAR16 *
GetNextElementPastTerminator ( GetNextElementPastTerminator (
IN CHAR16 *EnvironmentVariable, IN CHAR16 *EnvironmentVariable,
@@ -443,7 +442,6 @@ Returns:
return Ptr; return Ptr;
} }
STATIC
EFI_STATUS EFI_STATUS
WinNtBlockIoCreateMapping ( WinNtBlockIoCreateMapping (
IN EFI_WIN_NT_IO_PROTOCOL *WinNtIo, IN EFI_WIN_NT_IO_PROTOCOL *WinNtIo,
@@ -587,7 +585,6 @@ Returns:
return Status; return Status;
} }
STATIC
EFI_STATUS EFI_STATUS
WinNtBlockIoOpenDevice ( WinNtBlockIoOpenDevice (
WIN_NT_BLOCK_IO_PRIVATE *Private WIN_NT_BLOCK_IO_PRIVATE *Private
@@ -707,7 +704,6 @@ Done:
return Status; return Status;
} }
STATIC
EFI_STATUS EFI_STATUS
WinNtBlockIoError ( WinNtBlockIoError (
IN WIN_NT_BLOCK_IO_PRIVATE *Private IN WIN_NT_BLOCK_IO_PRIVATE *Private
@@ -777,7 +773,6 @@ Returns:
return Status; return Status;
} }
STATIC
EFI_STATUS EFI_STATUS
WinNtBlockIoReadWriteCommon ( WinNtBlockIoReadWriteCommon (
IN WIN_NT_BLOCK_IO_PRIVATE *Private, IN WIN_NT_BLOCK_IO_PRIVATE *Private,
@@ -873,7 +868,6 @@ Returns:
return EFI_SUCCESS; return EFI_SUCCESS;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtBlockIoReadBlocks ( WinNtBlockIoReadBlocks (
@@ -940,7 +934,6 @@ Done:
return Status; return Status;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtBlockIoWriteBlocks ( WinNtBlockIoWriteBlocks (
@@ -1010,7 +1003,6 @@ Done:
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtBlockIoFlushBlocks ( WinNtBlockIoFlushBlocks (
@@ -1034,7 +1026,6 @@ WinNtBlockIoFlushBlocks (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtBlockIoResetBlock ( WinNtBlockIoResetBlock (

View File

@@ -187,7 +187,6 @@ Returns:
// //
// Block IO protocol member functions // Block IO protocol member functions
// //
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtBlockIoReadBlocks ( WinNtBlockIoReadBlocks (
@@ -218,7 +217,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtBlockIoWriteBlocks ( WinNtBlockIoWriteBlocks (
@@ -249,7 +247,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtBlockIoFlushBlocks ( WinNtBlockIoFlushBlocks (
@@ -272,7 +269,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtBlockIoResetBlock ( WinNtBlockIoResetBlock (
@@ -300,7 +296,6 @@ Returns:
// //
// Private Worker functions // Private Worker functions
// //
STATIC
EFI_STATUS EFI_STATUS
WinNtBlockIoCreateMapping ( WinNtBlockIoCreateMapping (
IN EFI_WIN_NT_IO_PROTOCOL *WinNtIo, IN EFI_WIN_NT_IO_PROTOCOL *WinNtIo,
@@ -336,7 +331,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
WinNtBlockIoReadWriteCommon ( WinNtBlockIoReadWriteCommon (
IN WIN_NT_BLOCK_IO_PRIVATE *Private, IN WIN_NT_BLOCK_IO_PRIVATE *Private,
@@ -368,7 +362,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
WinNtBlockIoError ( WinNtBlockIoError (
IN WIN_NT_BLOCK_IO_PRIVATE *Private IN WIN_NT_BLOCK_IO_PRIVATE *Private
@@ -390,7 +383,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
WinNtBlockIoOpenDevice ( WinNtBlockIoOpenDevice (
WIN_NT_BLOCK_IO_PRIVATE *Private WIN_NT_BLOCK_IO_PRIVATE *Private
@@ -412,7 +404,6 @@ Returns:
--*/ --*/
; ;
STATIC
CHAR16 * CHAR16 *
GetNextElementPastTerminator ( GetNextElementPastTerminator (
IN CHAR16 *EnvironmentVariable, IN CHAR16 *EnvironmentVariable,

View File

@@ -144,7 +144,7 @@ EFI_DRIVER_BINDING_PROTOCOL gWinNtBusDriverBinding = {
// Table to map NT Environment variable to the GUID that should be in // Table to map NT Environment variable to the GUID that should be in
// device path. // device path.
// //
static NT_PCD_ENTRY mPcdEnvironment[] = { NT_PCD_ENTRY mPcdEnvironment[] = {
PcdToken(PcdWinNtConsole), &gEfiWinNtConsoleGuid, PcdToken(PcdWinNtConsole), &gEfiWinNtConsoleGuid,
PcdToken(PcdWinNtGop), &gEfiWinNtGopGuid, PcdToken(PcdWinNtGop), &gEfiWinNtGopGuid,
PcdToken(PcdWinNtSerialPort), &gEfiWinNtSerialPortGuid, PcdToken(PcdWinNtSerialPort), &gEfiWinNtSerialPortGuid,

View File

@@ -23,7 +23,6 @@ Abstract:
**/ **/
#include "WinNtGop.h" #include "WinNtGop.h"
STATIC
EFI_STATUS EFI_STATUS
FreeNotifyList ( FreeNotifyList (
IN OUT LIST_ENTRY *ListHead IN OUT LIST_ENTRY *ListHead

View File

@@ -158,7 +158,6 @@ GopPrivateCheckQ (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
STATIC
BOOLEAN BOOLEAN
GopPrivateIsKeyRegistered ( GopPrivateIsKeyRegistered (
IN EFI_KEY_DATA *RegsiteredData, IN EFI_KEY_DATA *RegsiteredData,
@@ -205,7 +204,6 @@ Returns:
} }
STATIC
VOID VOID
GopPrivateInvokeRegisteredFunction ( GopPrivateInvokeRegisteredFunction (
IN GOP_PRIVATE_DATA *Private, IN GOP_PRIVATE_DATA *Private,
@@ -245,7 +243,6 @@ Returns:
} }
} }
STATIC
EFI_STATUS EFI_STATUS
GopPrivateUpdateStatusLight ( GopPrivateUpdateStatusLight (
IN GOP_PRIVATE_DATA *Private IN GOP_PRIVATE_DATA *Private
@@ -277,7 +274,6 @@ Returns:
} }
STATIC
EFI_STATUS EFI_STATUS
GopPrivateResetWorker ( GopPrivateResetWorker (
IN GOP_PRIVATE_DATA *Private IN GOP_PRIVATE_DATA *Private
@@ -338,7 +334,6 @@ Returns:
return EFI_SUCCESS; return EFI_SUCCESS;
} }
STATIC
EFI_STATUS EFI_STATUS
GopPrivateReadKeyStrokeWorker ( GopPrivateReadKeyStrokeWorker (
IN GOP_PRIVATE_DATA *Private, IN GOP_PRIVATE_DATA *Private,
@@ -491,7 +486,6 @@ WinNtGopSimpleTextInReset (
@return TODO: add return values @return TODO: add return values
**/ **/
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtGopSimpleTextInReadKeyStroke ( WinNtGopSimpleTextInReadKeyStroke (
@@ -525,7 +519,6 @@ WinNtGopSimpleTextInReadKeyStroke (
@return TODO: add return values @return TODO: add return values
**/ **/
STATIC
VOID VOID
EFIAPI EFIAPI
WinNtGopSimpleTextInWaitForKey ( WinNtGopSimpleTextInWaitForKey (
@@ -570,7 +563,6 @@ WinNtGopSimpleTextInWaitForKey (
// Simple Text Input Ex protocol functions // Simple Text Input Ex protocol functions
// //
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtGopSimpleTextInExResetEx ( WinNtGopSimpleTextInExResetEx (
@@ -598,7 +590,6 @@ WinNtGopSimpleTextInExResetEx (
return GopPrivateResetWorker (Private); return GopPrivateResetWorker (Private);
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtGopSimpleTextInExReadKeyStrokeEx ( WinNtGopSimpleTextInExReadKeyStrokeEx (

View File

@@ -27,7 +27,7 @@ Abstract:
EFI_WIN_NT_THUNK_PROTOCOL *mWinNt; EFI_WIN_NT_THUNK_PROTOCOL *mWinNt;
DWORD mTlsIndex = TLS_OUT_OF_INDEXES; DWORD mTlsIndex = TLS_OUT_OF_INDEXES;
DWORD mTlsIndexUseCount = 0; // lets us know when we can free mTlsIndex. DWORD mTlsIndexUseCount = 0; // lets us know when we can free mTlsIndex.
static EFI_EVENT mGopScreenExitBootServicesEvent; EFI_EVENT mGopScreenExitBootServicesEvent;
GOP_MODE_DATA mGopModeData[] = { GOP_MODE_DATA mGopModeData[] = {
{800, 600, 0, 0}, {800, 600, 0, 0},
{640, 480, 0, 0}, {640, 480, 0, 0},
@@ -45,7 +45,6 @@ WinNtGopStartWindow (
IN UINT32 RefreshRate IN UINT32 RefreshRate
); );
STATIC
VOID VOID
EFIAPI EFIAPI
KillNtGopThread ( KillNtGopThread (
@@ -53,7 +52,6 @@ KillNtGopThread (
IN VOID *Context IN VOID *Context
); );
STATIC
VOID VOID
WinNtGopConvertParamToEfiKeyShiftState ( WinNtGopConvertParamToEfiKeyShiftState (
IN GOP_PRIVATE_DATA *Private, IN GOP_PRIVATE_DATA *Private,
@@ -93,7 +91,6 @@ WinNtGopConvertParamToEfiKeyShiftState (
} }
} }
STATIC
VOID VOID
WinNtGopConvertParamToEfiKey ( WinNtGopConvertParamToEfiKey (
IN GOP_PRIVATE_DATA *Private, IN GOP_PRIVATE_DATA *Private,
@@ -1110,7 +1107,6 @@ WinNtGopDestructor (
@return None. @return None.
**/ **/
STATIC
VOID VOID
EFIAPI EFIAPI
KillNtGopThread ( KillNtGopThread (

View File

@@ -97,7 +97,6 @@ InitializeWinNtSerialIo(
return Status; return Status;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoDriverBindingSupported ( WinNtSerialIoDriverBindingSupported (
@@ -228,7 +227,6 @@ Error:
return Status; return Status;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoDriverBindingStart ( WinNtSerialIoDriverBindingStart (
@@ -534,7 +532,6 @@ Error:
return Status; return Status;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoDriverBindingStop ( WinNtSerialIoDriverBindingStop (
@@ -662,7 +659,6 @@ Returns:
// Serial IO Protocol member functions // Serial IO Protocol member functions
// //
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoReset ( WinNtSerialIoReset (
@@ -709,7 +705,6 @@ Returns:
); );
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoSetAttributes ( WinNtSerialIoSetAttributes (
@@ -975,7 +970,6 @@ Returns:
return EFI_SUCCESS; return EFI_SUCCESS;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoSetControl ( WinNtSerialIoSetControl (
@@ -1071,7 +1065,6 @@ Returns:
return EFI_SUCCESS; return EFI_SUCCESS;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoGetControl ( WinNtSerialIoGetControl (
@@ -1186,7 +1179,6 @@ Returns:
return EFI_SUCCESS; return EFI_SUCCESS;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoWrite ( WinNtSerialIoWrite (
@@ -1290,7 +1282,6 @@ Returns:
return EFI_SUCCESS; return EFI_SUCCESS;
} }
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoRead ( WinNtSerialIoRead (

View File

@@ -188,7 +188,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoDriverBindingSupported ( WinNtSerialIoDriverBindingSupported (
@@ -215,7 +214,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoDriverBindingStart ( WinNtSerialIoDriverBindingStart (
@@ -242,7 +240,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoDriverBindingStop ( WinNtSerialIoDriverBindingStop (
@@ -271,7 +268,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoReset ( WinNtSerialIoReset (
@@ -294,7 +290,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoSetAttributes ( WinNtSerialIoSetAttributes (
@@ -329,7 +324,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoSetControl ( WinNtSerialIoSetControl (
@@ -354,7 +348,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoGetControl ( WinNtSerialIoGetControl (
@@ -379,7 +372,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoWrite ( WinNtSerialIoWrite (
@@ -406,7 +398,6 @@ Returns:
--*/ --*/
; ;
STATIC
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
WinNtSerialIoRead ( WinNtSerialIoRead (

View File

@@ -1406,7 +1406,6 @@ Returns:
return Status; return Status;
} }
STATIC
VOID VOID
WinNtSystemTimeToEfiTime ( WinNtSystemTimeToEfiTime (
IN SYSTEMTIME *SystemTime, IN SYSTEMTIME *SystemTime,
@@ -1908,7 +1907,6 @@ Done:
return Status; return Status;
} }
STATIC
EFI_STATUS EFI_STATUS
WinNtSimpleFileSystemFileInfo ( WinNtSimpleFileSystemFileInfo (
IN WIN_NT_EFI_FILE_PRIVATE *PrivateFile, IN WIN_NT_EFI_FILE_PRIVATE *PrivateFile,

View File

@@ -48,7 +48,7 @@ Abstract:
// //
// WinNtThunk Device Path Protocol Instance // WinNtThunk Device Path Protocol Instance
// //
static WIN_NT_THUNK_DEVICE_PATH mWinNtThunkDevicePath = { WIN_NT_THUNK_DEVICE_PATH mWinNtThunkDevicePath = {
{ {
HARDWARE_DEVICE_PATH, HARDWARE_DEVICE_PATH,
HW_VENDOR_DP, HW_VENDOR_DP,