From 7492c63d423201cbabc00c343cc25269bb1254c1 Mon Sep 17 00:00:00 2001 From: jji4 Date: Thu, 30 Oct 2008 06:14:35 +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@6301 6f19259b-4bc3-4df7-8a09-765794883524 --- UnixPkg/UnixConsoleDxe/ComponentName.c | 2 +- UnixPkg/UnixConsoleDxe/Console.h | 11 ----------- UnixPkg/UnixConsoleDxe/ConsoleIn.c | 5 ----- UnixPkg/UnixConsoleDxe/ConsoleOut.c | 17 +---------------- 4 files changed, 2 insertions(+), 33 deletions(-) (limited to 'UnixPkg/UnixConsoleDxe') diff --git a/UnixPkg/UnixConsoleDxe/ComponentName.c b/UnixPkg/UnixConsoleDxe/ComponentName.c index e73ba7bed0..cd5a1bfaf0 100644 --- a/UnixPkg/UnixConsoleDxe/ComponentName.c +++ b/UnixPkg/UnixConsoleDxe/ComponentName.c @@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL gUnixConsoleComponentName = { "eng" }; -static EFI_UNICODE_STRING_TABLE mUnixConsoleDriverNameTable[] = { +EFI_UNICODE_STRING_TABLE mUnixConsoleDriverNameTable[] = { { "eng", L"Unix Text Console Driver" }, { NULL , NULL } }; diff --git a/UnixPkg/UnixConsoleDxe/Console.h b/UnixPkg/UnixConsoleDxe/Console.h index f673c0b642..9f95fe8eba 100644 --- a/UnixPkg/UnixConsoleDxe/Console.h +++ b/UnixPkg/UnixConsoleDxe/Console.h @@ -99,7 +99,6 @@ typedef struct { // Simple Text Out protocol member functions // -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutReset ( @@ -124,7 +123,6 @@ Returns: --*/ ; -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutOutputString ( @@ -149,7 +147,6 @@ Returns: --*/ ; -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutTestString ( @@ -174,7 +171,6 @@ Returns: --*/ ; -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutQueryMode ( @@ -227,7 +223,6 @@ Returns: --*/ ; -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutSetAttribute ( @@ -252,7 +247,6 @@ Returns: --*/ ; -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutClearScreen ( @@ -275,7 +269,6 @@ Returns: --*/ ; -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutSetCursorPosition ( @@ -302,7 +295,6 @@ Returns: --*/ ; -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutEnableCursor ( @@ -377,7 +369,6 @@ Returns: // // Simple Text In protocol member functions. // -STATIC EFI_STATUS EFIAPI UnixSimpleTextInReset ( @@ -402,7 +393,6 @@ Returns: --*/ ; -STATIC EFI_STATUS EFIAPI UnixSimpleTextInReadKeyStroke ( @@ -427,7 +417,6 @@ Returns: --*/ ; -STATIC VOID EFIAPI UnixSimpleTextInWaitForKey ( diff --git a/UnixPkg/UnixConsoleDxe/ConsoleIn.c b/UnixPkg/UnixConsoleDxe/ConsoleIn.c index f315eaabf1..821ff2c805 100644 --- a/UnixPkg/UnixConsoleDxe/ConsoleIn.c +++ b/UnixPkg/UnixConsoleDxe/ConsoleIn.c @@ -32,7 +32,6 @@ Abstract: // // Private worker functions // -STATIC EFI_STATUS UnixSimpleTextInCheckKey ( UNIX_SIMPLE_TEXT_PRIVATE_DATA *Private @@ -67,7 +66,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS UnixConvertInputRecordToEfiKey ( IN char c, @@ -100,7 +98,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS EFIAPI UnixSimpleTextInReadKeyStroke ( @@ -143,7 +140,6 @@ Returns: return Status; } -STATIC VOID EFIAPI UnixSimpleTextInWaitForKey ( @@ -177,7 +173,6 @@ Returns: } } -STATIC EFI_STATUS UnixSimpleTextInCheckKey ( UNIX_SIMPLE_TEXT_PRIVATE_DATA *Private diff --git a/UnixPkg/UnixConsoleDxe/ConsoleOut.c b/UnixPkg/UnixConsoleDxe/ConsoleOut.c index 416db945aa..693cf60d01 100644 --- a/UnixPkg/UnixConsoleDxe/ConsoleOut.c +++ b/UnixPkg/UnixConsoleDxe/ConsoleOut.c @@ -27,28 +27,24 @@ Abstract: // #if 0 -STATIC VOID UnixSimpleTextOutScrollScreen ( IN OUT UNIX_SIMPLE_TEXT_PRIVATE_DATA *Console ); #endif -STATIC VOID UnixSimpleTextOutPutChar ( IN OUT UNIX_SIMPLE_TEXT_PRIVATE_DATA *Console, IN CHAR16 Char ); -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutSetAttribute ( IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This, IN UINTN Attribute ); -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutSetMode ( @@ -62,7 +58,7 @@ UnixSimpleTextOutSetMode ( #define MAX_SIMPLE_TEXT_OUT_MODE \ (sizeof(mUnixSimpleTextOutSupportedModes)/sizeof(UNIX_SIMPLE_TEXT_OUT_MODE)) -STATIC UNIX_SIMPLE_TEXT_OUT_MODE mUnixSimpleTextOutSupportedModes[] = { +UNIX_SIMPLE_TEXT_OUT_MODE mUnixSimpleTextOutSupportedModes[] = { { 80, 25 }, #if 0 { 80, 50 }, @@ -72,7 +68,6 @@ STATIC UNIX_SIMPLE_TEXT_OUT_MODE mUnixSimpleTextOutSupportedModes[] = { #endif }; -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutReset ( @@ -106,7 +101,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutOutputString ( @@ -170,7 +164,6 @@ Returns: return EFI_SUCCESS; } -STATIC VOID UnixSimpleTextOutPutChar ( IN OUT UNIX_SIMPLE_TEXT_PRIVATE_DATA *Console, @@ -198,7 +191,6 @@ Returns: } #if 0 -STATIC VOID UnixSimpleTextOutScrollScreen ( IN OUT UNIX_SIMPLE_TEXT_PRIVATE_DATA *Console @@ -223,7 +215,6 @@ Returns: #endif -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutTestString ( @@ -258,7 +249,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutQueryMode ( @@ -301,7 +291,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutSetMode ( @@ -342,7 +331,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutSetAttribute ( @@ -378,7 +366,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutClearScreen ( @@ -429,7 +416,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutSetCursorPosition ( @@ -488,7 +474,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS EFIAPI UnixSimpleTextOutEnableCursor ( -- cgit v1.2.3