diff options
24 files changed, 27 insertions, 108 deletions
diff --git a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c index 41db3c2..840b0da 100644 --- a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c +++ b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c @@ -1213,7 +1213,6 @@ Returns: );
}
-STATIC
EFI_STATUS
ValidateFvHeader (
EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader
diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c index 4435d16..f09bf93 100644 --- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c +++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c @@ -28,13 +28,11 @@ //
// Cache of UnixThunk protocol
//
-STATIC
EFI_UNIX_THUNK_PROTOCOL *mUnix;
//
// Cache of standard output handle .
//
-STATIC
int mStdOut;
/**
diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c index 8d661bc..ab06814 100644 --- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c +++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c @@ -28,13 +28,11 @@ // // Cache of UnixThunk protocol // -STATIC EFI_UNIX_THUNK_PROTOCOL *mUnix; // // Cache of standard output handle . // -STATIC int mStdOut; /** diff --git a/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c index 672d9b2..b94e1f1 100644 --- a/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c +++ b/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c @@ -52,7 +52,6 @@ InitializeRealTimeClock ( IN EFI_SYSTEM_TABLE *SystemTable
);
-STATIC
EFI_STATUS
EFIAPI
UnixGetTime (
@@ -101,7 +100,6 @@ Returns: return EFI_SUCCESS;
}
-STATIC
EFI_STATUS
EFIAPI
UnixSetTime (
@@ -143,7 +141,6 @@ Returns: return EFI_UNSUPPORTED;
}
-STATIC
EFI_STATUS
EFIAPI
UnixGetWakeupTime (
@@ -179,7 +176,6 @@ Returns: return EFI_UNSUPPORTED;
}
-STATIC
EFI_STATUS
EFIAPI
UnixSetWakeupTime (
@@ -308,7 +304,7 @@ Returns: --*/
{
- static const INTN DayOfMonth[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+ STATIC const INTN DayOfMonth[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
if (Time->Day < 1 ||
Time->Day > DayOfMonth[Time->Month - 1] ||
diff --git a/UnixPkg/ResetRuntimeDxe/Reset.c b/UnixPkg/ResetRuntimeDxe/Reset.c index ddec272..72c6c09 100644 --- a/UnixPkg/ResetRuntimeDxe/Reset.c +++ b/UnixPkg/ResetRuntimeDxe/Reset.c @@ -38,8 +38,7 @@ InitializeUnixReset ( IN EFI_SYSTEM_TABLE *SystemTable
);
-STATIC
-VOID +VOID
EFIAPI
UnixResetSystem (
IN EFI_RESET_TYPE ResetType,
@@ -87,8 +86,7 @@ Returns: return Status;
}
-STATIC
-VOID +VOID
EFIAPI
UnixResetSystem (
IN EFI_RESET_TYPE ResetType,
diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c index 7ac7298..599859e 100644 --- a/UnixPkg/Sec/SecMain.c +++ b/UnixPkg/Sec/SecMain.c @@ -133,7 +133,6 @@ SecSwitchStack ( UINT32 PermenentMemoryBase ); -STATIC EFI_PHYSICAL_ADDRESS * MapMemory ( INTN fd, @@ -141,7 +140,6 @@ MapMemory ( INTN prot, INTN flags); -STATIC EFI_STATUS MapFile ( IN CHAR8 *FileName, diff --git a/UnixPkg/Sec/UgaX11.c b/UnixPkg/Sec/UgaX11.c index dee18c2..a3c152d 100644 --- a/UnixPkg/Sec/UgaX11.c +++ b/UnixPkg/Sec/UgaX11.c @@ -66,10 +66,10 @@ typedef struct EFI_INPUT_KEY keys[NBR_KEYS]; } UGA_IO_PRIVATE; -static void +void HandleEvents(UGA_IO_PRIVATE *drv); -static void +void fill_shift_mask (struct uga_drv_shift_mask *sm, unsigned long mask) { sm->shift = 0; @@ -87,7 +87,7 @@ fill_shift_mask (struct uga_drv_shift_mask *sm, unsigned long mask) sm->csize = 8 - sm->size; } -static int +int TryCreateShmImage(UGA_IO_PRIVATE *drv) { drv->image = XShmCreateImage (drv->display, drv->visual, @@ -139,7 +139,6 @@ TryCreateShmImage(UGA_IO_PRIVATE *drv) return 1; } -static EFI_STATUS UgaClose (EFI_UNIX_UGA_IO_PROTOCOL *UgaIo) { @@ -163,7 +162,6 @@ UgaClose (EFI_UNIX_UGA_IO_PROTOCOL *UgaIo) return EFI_SUCCESS; } -static EFI_STATUS UgaSize(EFI_UNIX_UGA_IO_PROTOCOL *UgaIo, UINT32 Width, UINT32 Height) { @@ -220,7 +218,7 @@ UgaSize(EFI_UNIX_UGA_IO_PROTOCOL *UgaIo, UINT32 Width, UINT32 Height) return EFI_SUCCESS; } -static void +void handleKeyEvent(UGA_IO_PRIVATE *drv, XEvent *ev) { KeySym keysym; @@ -270,7 +268,7 @@ handleKeyEvent(UGA_IO_PRIVATE *drv, XEvent *ev) drv->key_count++; } -static void +void Redraw(UGA_IO_PRIVATE *drv, UINTN X, UINTN Y, UINTN Width, UINTN Height) { if (drv->use_shm) @@ -282,7 +280,7 @@ Redraw(UGA_IO_PRIVATE *drv, UINTN X, UINTN Y, UINTN Width, UINTN Height) XFlush(drv->display); } -static void +void HandleEvent(UGA_IO_PRIVATE *drv, XEvent *ev) { switch (ev->type) @@ -313,7 +311,7 @@ HandleEvent(UGA_IO_PRIVATE *drv, XEvent *ev) } } -static void +void HandleEvents(UGA_IO_PRIVATE *drv) { while (XPending(drv->display) != 0) @@ -325,7 +323,6 @@ HandleEvents(UGA_IO_PRIVATE *drv) } } -static unsigned long UgaPixelToColor (UGA_IO_PRIVATE *drv, EFI_UGA_PIXEL pixel) { @@ -334,7 +331,6 @@ UgaPixelToColor (UGA_IO_PRIVATE *drv, EFI_UGA_PIXEL pixel) | ((pixel.Blue >> drv->b.csize) << drv->b.shift); } -static EFI_UGA_PIXEL UgaColorToPixel (UGA_IO_PRIVATE *drv, unsigned long val) { @@ -349,7 +345,6 @@ UgaColorToPixel (UGA_IO_PRIVATE *drv, unsigned long val) return res; } -static EFI_STATUS UgaCheckKey(EFI_UNIX_UGA_IO_PROTOCOL *UgaIo) { @@ -364,7 +359,6 @@ UgaCheckKey(EFI_UNIX_UGA_IO_PROTOCOL *UgaIo) } } -static EFI_STATUS UgaGetKey(EFI_UNIX_UGA_IO_PROTOCOL *UgaIo, EFI_INPUT_KEY *key) { diff --git a/UnixPkg/Sec/UnixThunk.c b/UnixPkg/Sec/UnixThunk.c index 622cfb5..905cd80 100644 --- a/UnixPkg/Sec/UnixThunk.c +++ b/UnixPkg/Sec/UnixThunk.c @@ -34,11 +34,11 @@ Abstract: #include "SecMain.h" #include "Library/UnixLib.h" -static int settimer_initialized; -static struct timeval settimer_timeval; -static void (*settimer_callback)(UINT64 delta); +int settimer_initialized; +struct timeval settimer_timeval; +void (*settimer_callback)(UINT64 delta); -static void +void settimer_handler (int sig) { struct timeval timeval; @@ -53,7 +53,6 @@ settimer_handler (int sig) (*settimer_callback)(delta); } -static VOID SetTimer (UINT64 PeriodMs, VOID (*CallBack)(UINT64 DeltaMs)) { @@ -119,10 +118,10 @@ GetLocalTime (EFI_TIME *Time) | (tm->tm_isdst > 0 ? EFI_TIME_IN_DAYLIGHT : 0); } -static void +void TzSet (void) { - static int done = 0; + STATIC int done = 0; if (!done) { tzset (); done = 1; diff --git a/UnixPkg/UnixBlockIoDxe/ComponentName.c b/UnixPkg/UnixBlockIoDxe/ComponentName.c index 19085fd..71ceb62 100644 --- a/UnixPkg/UnixBlockIoDxe/ComponentName.c +++ b/UnixPkg/UnixBlockIoDxe/ComponentName.c @@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL gUnixBlockIoComponentName = { "eng"
};
-static EFI_UNICODE_STRING_TABLE mUnixBlockIoDriverNameTable[] = {
+EFI_UNICODE_STRING_TABLE mUnixBlockIoDriverNameTable[] = {
{ "eng", L"Unix Block I/O Driver" },
{ NULL , NULL }
};
diff --git a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c index d92ab72..a483a87 100644 --- a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c +++ b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c @@ -67,7 +67,6 @@ Abstract: //
// Block IO protocol member functions
//
-STATIC
EFI_STATUS
EFIAPI
UnixBlockIoReadBlocks (
@@ -98,7 +97,6 @@ Returns: --*/
;
-STATIC
EFI_STATUS
EFIAPI
UnixBlockIoWriteBlocks (
@@ -129,7 +127,6 @@ Returns: --*/
;
-STATIC
EFI_STATUS
EFIAPI
UnixBlockIoFlushBlocks (
@@ -152,7 +149,6 @@ Returns: --*/
;
-STATIC
EFI_STATUS
EFIAPI
UnixBlockIoResetBlock (
@@ -180,7 +176,6 @@ Returns: //
// Private Worker functions
//
-STATIC
EFI_STATUS
UnixBlockIoCreateMapping (
IN EFI_UNIX_IO_PROTOCOL *UnixIo,
@@ -215,7 +210,6 @@ Returns: --*/
;
-STATIC
EFI_STATUS
UnixBlockIoReadWriteCommon (
IN UNIX_BLOCK_IO_PRIVATE *Private,
@@ -247,7 +241,6 @@ Returns: --*/
;
-STATIC
EFI_STATUS
UnixBlockIoError (
IN UNIX_BLOCK_IO_PRIVATE *Private
@@ -269,7 +262,6 @@ Returns: --*/
;
-STATIC
EFI_STATUS
UnixBlockIoOpenDevice (
UNIX_BLOCK_IO_PRIVATE *Private
@@ -291,7 +283,6 @@ Returns: --*/
;
-STATIC
CHAR16 *
GetNextElementPastTerminator (
IN CHAR16 *EnvironmentVariable,
@@ -596,7 +587,6 @@ Returns: return Status;
}
-STATIC
CHAR16 *
GetNextElementPastTerminator (
IN CHAR16 *EnvironmentVariable,
@@ -632,7 +622,6 @@ Returns: return Ptr;
}
-STATIC
EFI_STATUS
UnixBlockIoCreateMapping (
IN EFI_UNIX_IO_PROTOCOL *UnixIo,
@@ -747,7 +736,6 @@ Returns: return Status;
}
-STATIC
EFI_STATUS
UnixBlockIoOpenDevice (
UNIX_BLOCK_IO_PRIVATE *Private
@@ -855,7 +843,6 @@ Done: return Status;
}
-STATIC
EFI_STATUS
UnixBlockIoError (
IN UNIX_BLOCK_IO_PRIVATE *Private
@@ -930,7 +917,6 @@ Returns: #endif
}
-STATIC
EFI_STATUS
UnixBlockIoReadWriteCommon (
IN UNIX_BLOCK_IO_PRIVATE *Private,
@@ -1026,7 +1012,6 @@ Returns: return EFI_SUCCESS;
}
-STATIC
EFI_STATUS
EFIAPI
UnixBlockIoReadBlocks (
@@ -1092,7 +1077,6 @@ Done: return Status;
}
-STATIC
EFI_STATUS
EFIAPI
UnixBlockIoWriteBlocks (
@@ -1160,7 +1144,6 @@ Done: return Status;
}
-STATIC
EFI_STATUS
EFIAPI
UnixBlockIoFlushBlocks (
@@ -1184,7 +1167,6 @@ UnixBlockIoFlushBlocks ( return EFI_SUCCESS;
}
-STATIC
EFI_STATUS
EFIAPI
UnixBlockIoResetBlock (
diff --git a/UnixPkg/UnixBusDriverDxe/ComponentName.c b/UnixPkg/UnixBusDriverDxe/ComponentName.c index 7ea1eac..886023a 100644 --- a/UnixPkg/UnixBusDriverDxe/ComponentName.c +++ b/UnixPkg/UnixBusDriverDxe/ComponentName.c @@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL gUnixBusDriverComponentName = { "eng"
};
-static EFI_UNICODE_STRING_TABLE mUnixBusDriverNameTable[] = {
+EFI_UNICODE_STRING_TABLE mUnixBusDriverNameTable[] = {
{ "eng", L"Unix Bus Driver" },
{ NULL , NULL }
};
diff --git a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c index b6b2ac6..64f0245 100644 --- a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c +++ b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c @@ -95,7 +95,7 @@ EFI_UNIX_UGA - Builds UGA Windows of Width and Height //
// Define GUID for the Unix Bus Driver
//
-static EFI_GUID gUnixBusDriverGuid = {
+EFI_GUID gUnixBusDriverGuid = {
0x419f582, 0x625, 0x4531, {0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc}
};
@@ -117,7 +117,7 @@ EFI_DRIVER_BINDING_PROTOCOL gUnixBusDriverBinding = { // Table to map UNIX Environment variable to the GUID that should be in
// device path.
//
-static UNIX_PCD_ENTRY mPcdEnvironment[] = {
+UNIX_PCD_ENTRY mPcdEnvironment[] = {
{PcdToken(PcdUnixConsole), &gEfiUnixConsoleGuid},
{PcdToken(PcdUnixUga), &gEfiUnixUgaGuid},
{PcdToken(PcdUnixFileSystem), &gEfiUnixFileSystemGuid},
diff --git a/UnixPkg/UnixConsoleDxe/ComponentName.c b/UnixPkg/UnixConsoleDxe/ComponentName.c index e73ba7b..cd5a1bf 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 f673c0b..9f95fe8 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 f315eaa..821ff2c 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 416db94..693cf60 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 (
diff --git a/UnixPkg/UnixSerialIoDxe/ComponentName.c b/UnixPkg/UnixSerialIoDxe/ComponentName.c index 2b7cb92..d450daa 100644 --- a/UnixPkg/UnixSerialIoDxe/ComponentName.c +++ b/UnixPkg/UnixSerialIoDxe/ComponentName.c @@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL gUnixSerialIoComponentName = { "eng"
};
-static EFI_UNICODE_STRING_TABLE mUnixSerialIoDriverNameTable[] = {
+EFI_UNICODE_STRING_TABLE mUnixSerialIoDriverNameTable[] = {
{ "eng", L"Unix Serial I/O Driver" },
{ NULL , NULL }
};
diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c index 9f550f2..fa4e3aa 100644 --- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c +++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c @@ -57,7 +57,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUnixSerialIoDriverBinding = { NULL
};
-STATIC
UINTN
ConvertBaud2Unix (
UINT64 BaudRate
@@ -133,7 +132,6 @@ ConvertBaud2Unix ( return -1;
}
-STATIC
UINTN
ConvertByteSize2Unix (
UINT8 DataBit
@@ -154,7 +152,6 @@ ConvertByteSize2Unix ( return -1;
}
-STATIC
VOID
ConvertParity2Unix (
struct termios *Options,
@@ -184,7 +181,6 @@ ConvertParity2Unix ( }
}
-STATIC
VOID
ConvertStopBit2Unix (
struct termios *Options,
diff --git a/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c b/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c index 347326d..3234b07 100644 --- a/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c +++ b/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c @@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL gUnixSimpleFileSystemComponentName = { "eng"
};
-static EFI_UNICODE_STRING_TABLE mUnixSimpleFileSystemDriverNameTable[] = {
+EFI_UNICODE_STRING_TABLE mUnixSimpleFileSystemDriverNameTable[] = {
{
"eng",
L"Unix Simple File System Driver"
diff --git a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c index 84ba962..9d9325c 100644 --- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c +++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c @@ -1078,7 +1078,6 @@ Returns: return Status;
}
-STATIC
VOID
UnixSystemTimeToEfiTime (
EFI_UNIX_THUNK_PROTOCOL *UnixThunk,
@@ -1120,7 +1119,6 @@ Returns: }
}
-STATIC
EFI_STATUS
UnixSimpleFileSystemFileInfo (
UNIX_EFI_FILE_PRIVATE *PrivateFile,
diff --git a/UnixPkg/UnixThunkDxe/UnixThunk.c b/UnixPkg/UnixThunkDxe/UnixThunk.c index df3512c..bfcc811 100644 --- a/UnixPkg/UnixThunkDxe/UnixThunk.c +++ b/UnixPkg/UnixThunkDxe/UnixThunk.c @@ -40,7 +40,7 @@ Abstract: //
// WinNtThunk Device Path Protocol Instance
//
-static UNIX_THUNK_DEVICE_PATH mUnixThunkDevicePath = {
+UNIX_THUNK_DEVICE_PATH mUnixThunkDevicePath = {
{
{
HARDWARE_DEVICE_PATH,
diff --git a/UnixPkg/UnixUgaDxe/ComponentName.c b/UnixPkg/UnixUgaDxe/ComponentName.c index 5c50d56..282c593 100644 --- a/UnixPkg/UnixUgaDxe/ComponentName.c +++ b/UnixPkg/UnixUgaDxe/ComponentName.c @@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL gUnixUgaComponentName = { "eng"
};
-static EFI_UNICODE_STRING_TABLE mUnixUgaDriverNameTable[] = {
+EFI_UNICODE_STRING_TABLE mUnixUgaDriverNameTable[] = {
{ "eng", L"Unix Universal Graphics Adapter Driver" },
{ NULL , NULL }
};
diff --git a/UnixPkg/UnixUgaDxe/UnixUgaInput.c b/UnixPkg/UnixUgaDxe/UnixUgaInput.c index 29e605c..6758d2f 100644 --- a/UnixPkg/UnixUgaDxe/UnixUgaInput.c +++ b/UnixPkg/UnixUgaDxe/UnixUgaInput.c @@ -83,7 +83,6 @@ Returns: return EFI_SUCCESS; } -STATIC EFI_STATUS EFIAPI UnixUgaSimpleTextInReadKeyStroke ( @@ -130,7 +129,6 @@ Returns: return Status; } -STATIC VOID EFIAPI UnixUgaSimpleTextInWaitForKey ( diff --git a/UnixPkg/UnixUgaDxe/UnixUgaScreen.c b/UnixPkg/UnixUgaDxe/UnixUgaScreen.c index d9118aa..38bc023 100644 --- a/UnixPkg/UnixUgaDxe/UnixUgaScreen.c +++ b/UnixPkg/UnixUgaDxe/UnixUgaScreen.c @@ -24,9 +24,8 @@ Abstract: #include "UnixUga.h" EFI_UNIX_THUNK_PROTOCOL *mUnix; -static EFI_EVENT mUgaScreenExitBootServicesEvent; +EFI_EVENT mUgaScreenExitBootServicesEvent; -STATIC EFI_STATUS UnixUgaStartWindow ( IN UGA_PRIVATE_DATA *Private, @@ -36,7 +35,6 @@ UnixUgaStartWindow ( IN UINT32 RefreshRate ); -STATIC VOID EFIAPI KillNtUgaThread ( @@ -308,7 +306,6 @@ Returns: } -STATIC EFI_STATUS UnixUgaStartWindow ( IN UGA_PRIVATE_DATA *Private, @@ -416,7 +413,6 @@ Returns: return EFI_SUCCESS; } -STATIC VOID EFIAPI KillNtUgaThread ( |