Patch to remove STATIC modifier. This is on longer recommended by EFI Framework codin...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6301 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
index 41db3c288d842e424b6205aff3d28ffcc39752ef..840b0da2f1915e87191fc68f499236e7ba8fb254 100644 (file)
--- a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -1213,7 +1213,6 @@ Returns:
           );\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 ValidateFvHeader (\r
   EFI_FIRMWARE_VOLUME_HEADER            *FwVolHeader\r

diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index 4435d16a8dcd500880711920266297cce5ff04ea..f09bf93c63e91f9580ef7988f700903e58777291 100644 (file)
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -28,13 +28,11 @@
 //\r
 // Cache of UnixThunk protocol \r
 //\r
-STATIC\r
 EFI_UNIX_THUNK_PROTOCOL   *mUnix;\r
 \r
 //\r
 // Cache of standard output handle . \r
 //\r
-STATIC\r
 int                      mStdOut;\r
 \r
 /**\r

diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index 8d661bcfca1c5370903a48848afef164ae89adf6..ab06814b11d2356fe81ce7148eeb76c5882c8bd0 100644 (file)
--- 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 672d9b210a4e7613c3c9b9d060d69628502012cc..b94e1f1776524ec88e641e593b6b46a18c0f520e 100644 (file)
--- a/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
+++ b/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
@@ -52,7 +52,6 @@ InitializeRealTimeClock (
   IN EFI_SYSTEM_TABLE                    *SystemTable\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixGetTime (\r
@@ -101,7 +100,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSetTime (\r
@@ -143,7 +141,6 @@ Returns:
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixGetWakeupTime (\r
@@ -179,7 +176,6 @@ Returns:
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSetWakeupTime (\r
@@ -308,7 +304,7 @@ Returns:
 --*/\r
 {\r
 \r
-  static const INTN  DayOfMonth[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };\r
+  STATIC const INTN  DayOfMonth[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };\r
 \r
   if (Time->Day < 1 ||\r
       Time->Day > DayOfMonth[Time->Month - 1] ||\r

diff --git a/UnixPkg/ResetRuntimeDxe/Reset.c b/UnixPkg/ResetRuntimeDxe/Reset.c
index ddec272c0de8abcac08dc0b952381e117c7fd760..72c6c09aa11f5b3c0f5185500c88c1c6eaed5d8e 100644 (file)
--- a/UnixPkg/ResetRuntimeDxe/Reset.c
+++ b/UnixPkg/ResetRuntimeDxe/Reset.c
@@ -38,8 +38,7 @@ InitializeUnixReset (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   );\r
 \r
-STATIC\r
-VOID
+VOID\r
 EFIAPI\r
 UnixResetSystem (\r
   IN EFI_RESET_TYPE   ResetType,\r
@@ -87,8 +86,7 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
-VOID
+VOID\r
 EFIAPI\r
 UnixResetSystem (\r
   IN EFI_RESET_TYPE   ResetType,\r

diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index 7ac729833ea66bb0e9b4abf1d834a38b5fdc1659..599859e58e67983d8c6252b54d547fe9ba1d8120 100644 (file)
--- 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 dee18c292fdb5e883a294003f857d5ba30ae1b89..a3c152dac324653f10479bc82a1dd4982eb1f02b 100644 (file)
--- 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 622cfb55bdfbc08c3c9c044bf0bd8f1d361c6cc9..905cd80d27efe5ee0a31917b22a9dd2dc66b2fe9 100644 (file)
--- 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 19085fd88a7c592a79070ebc46cad2927335b027..71ceb62cb8f8264812dd1466b3994f400fecf55d 100644 (file)
--- a/UnixPkg/UnixBlockIoDxe/ComponentName.c
+++ b/UnixPkg/UnixBlockIoDxe/ComponentName.c
@@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL     gUnixBlockIoComponentName = {
   "eng"\r
 };\r
 \r
-static EFI_UNICODE_STRING_TABLE mUnixBlockIoDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mUnixBlockIoDriverNameTable[] = {\r
   { "eng", L"Unix Block I/O Driver" },\r
   { NULL , NULL }\r
 };\r

diff --git a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
index d92ab7251cbe6b418983b3eb458f05a8c4957782..a483a876dcdda9ea5250da332d7b7dfcf42a0b6c 100644 (file)
--- a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
+++ b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
@@ -67,7 +67,6 @@ Abstract:
 //\r
 // Block IO protocol member functions\r
 //\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixBlockIoReadBlocks (\r
@@ -98,7 +97,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixBlockIoWriteBlocks (\r
@@ -129,7 +127,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixBlockIoFlushBlocks (\r
@@ -152,7 +149,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixBlockIoResetBlock (\r
@@ -180,7 +176,6 @@ Returns:
 //\r
 // Private Worker functions\r
 //\r
-STATIC\r
 EFI_STATUS\r
 UnixBlockIoCreateMapping (\r
   IN EFI_UNIX_IO_PROTOCOL             *UnixIo,\r
@@ -215,7 +210,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixBlockIoReadWriteCommon (\r
   IN  UNIX_BLOCK_IO_PRIVATE *Private,\r
@@ -247,7 +241,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixBlockIoError (\r
   IN UNIX_BLOCK_IO_PRIVATE      *Private\r
@@ -269,7 +262,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixBlockIoOpenDevice (\r
   UNIX_BLOCK_IO_PRIVATE         *Private\r
@@ -291,7 +283,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 CHAR16                                    *\r
 GetNextElementPastTerminator (\r
   IN  CHAR16  *EnvironmentVariable,\r
@@ -596,7 +587,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 CHAR16 *\r
 GetNextElementPastTerminator (\r
   IN  CHAR16  *EnvironmentVariable,\r
@@ -632,7 +622,6 @@ Returns:
   return Ptr;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixBlockIoCreateMapping (\r
   IN EFI_UNIX_IO_PROTOCOL             *UnixIo,\r
@@ -747,7 +736,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixBlockIoOpenDevice (\r
   UNIX_BLOCK_IO_PRIVATE                 *Private\r
@@ -855,7 +843,6 @@ Done:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixBlockIoError (\r
   IN UNIX_BLOCK_IO_PRIVATE      *Private\r
@@ -930,7 +917,6 @@ Returns:
 #endif\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixBlockIoReadWriteCommon (\r
   IN  UNIX_BLOCK_IO_PRIVATE     *Private,\r
@@ -1026,7 +1012,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixBlockIoReadBlocks (\r
@@ -1092,7 +1077,6 @@ Done:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixBlockIoWriteBlocks (\r
@@ -1160,7 +1144,6 @@ Done:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixBlockIoFlushBlocks (\r
@@ -1184,7 +1167,6 @@ UnixBlockIoFlushBlocks (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixBlockIoResetBlock (\r

diff --git a/UnixPkg/UnixBusDriverDxe/ComponentName.c b/UnixPkg/UnixBusDriverDxe/ComponentName.c
index 7ea1eacc1a3ce35d7073bd1f31e0ff5cfa1cdec4..886023ab5a62ec51046547db1420ace1e2936acd 100644 (file)
--- a/UnixPkg/UnixBusDriverDxe/ComponentName.c
+++ b/UnixPkg/UnixBusDriverDxe/ComponentName.c
@@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL     gUnixBusDriverComponentName = {
   "eng"\r
 };\r
 \r
-static EFI_UNICODE_STRING_TABLE mUnixBusDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mUnixBusDriverNameTable[] = {\r
   { "eng", L"Unix Bus Driver" },\r
   { NULL , NULL }\r
 };\r

diff --git a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
index b6b2ac6b77559c54a0e080832c1d28f5cb1f097a..64f0245fc751249fac2e8b69270fb3f6d0f2356f 100644 (file)
--- a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
+++ b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
@@ -95,7 +95,7 @@ EFI_UNIX_UGA            - Builds UGA Windows of Width and Height
 //\r
 // Define GUID for the Unix Bus Driver\r
 //\r
-static EFI_GUID gUnixBusDriverGuid = {\r
+EFI_GUID gUnixBusDriverGuid = {\r
   0x419f582, 0x625, 0x4531, {0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc}\r
 };\r
 \r
@@ -117,7 +117,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gUnixBusDriverBinding = {
 // Table to map UNIX Environment variable to the GUID that should be in\r
 // device path.\r
 //\r
-static UNIX_PCD_ENTRY  mPcdEnvironment[] = {\r
+UNIX_PCD_ENTRY  mPcdEnvironment[] = {\r
   {PcdToken(PcdUnixConsole),       &gEfiUnixConsoleGuid},\r
   {PcdToken(PcdUnixUga),           &gEfiUnixUgaGuid},\r
   {PcdToken(PcdUnixFileSystem),    &gEfiUnixFileSystemGuid},\r

diff --git a/UnixPkg/UnixConsoleDxe/ComponentName.c b/UnixPkg/UnixConsoleDxe/ComponentName.c
index e73ba7bed0502d10cf454b1d3667d12d2d5d7a41..cd5a1bfaf014791822e15e22af6789692c5dc185 100644 (file)
--- a/UnixPkg/UnixConsoleDxe/ComponentName.c
+++ b/UnixPkg/UnixConsoleDxe/ComponentName.c
@@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL     gUnixConsoleComponentName = {
   "eng"\r
 };\r
 \r
-static EFI_UNICODE_STRING_TABLE mUnixConsoleDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mUnixConsoleDriverNameTable[] = {\r
   { "eng", L"Unix Text Console Driver" },\r
   { NULL , NULL }\r
 };\r

diff --git a/UnixPkg/UnixConsoleDxe/Console.h b/UnixPkg/UnixConsoleDxe/Console.h
index f673c0b64240cf857522caf141593ff84f7d6f52..9f95fe8eba0aa392aa25fc9eae76264963f40e59 100644 (file)
--- a/UnixPkg/UnixConsoleDxe/Console.h
+++ b/UnixPkg/UnixConsoleDxe/Console.h
@@ -99,7 +99,6 @@ typedef struct {
 // Simple Text Out protocol member functions\r
 //\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutReset (\r
@@ -124,7 +123,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutOutputString (\r
@@ -149,7 +147,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutTestString (\r
@@ -174,7 +171,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutQueryMode (\r
@@ -227,7 +223,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetAttribute (\r
@@ -252,7 +247,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutClearScreen (\r
@@ -275,7 +269,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetCursorPosition (\r
@@ -302,7 +295,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutEnableCursor (\r
@@ -377,7 +369,6 @@ Returns:
 //\r
 // Simple Text In protocol member functions.\r
 //\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextInReset (\r
@@ -402,7 +393,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextInReadKeyStroke (\r
@@ -427,7 +417,6 @@ Returns:
 --*/\r
 ;\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 UnixSimpleTextInWaitForKey (\r

diff --git a/UnixPkg/UnixConsoleDxe/ConsoleIn.c b/UnixPkg/UnixConsoleDxe/ConsoleIn.c
index f315eaabf1975b470158718fb61cb335dd46524d..821ff2c805772cec830f3b9bbf01dcc87f655526 100644 (file)
--- a/UnixPkg/UnixConsoleDxe/ConsoleIn.c
+++ b/UnixPkg/UnixConsoleDxe/ConsoleIn.c
@@ -32,7 +32,6 @@ Abstract:
 //\r
 // Private worker functions\r
 //\r
-STATIC\r
 EFI_STATUS\r
 UnixSimpleTextInCheckKey (\r
   UNIX_SIMPLE_TEXT_PRIVATE_DATA  *Private\r
@@ -67,7 +66,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixConvertInputRecordToEfiKey (\r
   IN  char c,
@@ -100,7 +98,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextInReadKeyStroke (\r
@@ -143,7 +140,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 UnixSimpleTextInWaitForKey (\r
@@ -177,7 +173,6 @@ Returns:
   }\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixSimpleTextInCheckKey (\r
   UNIX_SIMPLE_TEXT_PRIVATE_DATA   *Private\r

diff --git a/UnixPkg/UnixConsoleDxe/ConsoleOut.c b/UnixPkg/UnixConsoleDxe/ConsoleOut.c
index 416db945aa8db60405d69a64be39fdb859d7ff15..693cf60d01ccf3b76543cb85fb460a3a4aedb553 100644 (file)
--- a/UnixPkg/UnixConsoleDxe/ConsoleOut.c
+++ b/UnixPkg/UnixConsoleDxe/ConsoleOut.c
@@ -27,28 +27,24 @@ Abstract:
 //\r
 \r
 #if 0
-STATIC\r
 VOID\r
 UnixSimpleTextOutScrollScreen (\r
   IN OUT  UNIX_SIMPLE_TEXT_PRIVATE_DATA *Console\r
   );\r
 \r
 #endif
-STATIC\r
 VOID\r
 UnixSimpleTextOutPutChar (\r
   IN OUT  UNIX_SIMPLE_TEXT_PRIVATE_DATA     *Console,\r
   IN      CHAR16                              Char\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetAttribute (\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   *This,\r
   IN UINTN                          Attribute\r
   );\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetMode (\r
@@ -62,7 +58,7 @@ UnixSimpleTextOutSetMode (
 #define MAX_SIMPLE_TEXT_OUT_MODE  \\r
         (sizeof(mUnixSimpleTextOutSupportedModes)/sizeof(UNIX_SIMPLE_TEXT_OUT_MODE))\r
 \r
-STATIC UNIX_SIMPLE_TEXT_OUT_MODE  mUnixSimpleTextOutSupportedModes[] = {\r
+UNIX_SIMPLE_TEXT_OUT_MODE  mUnixSimpleTextOutSupportedModes[] = {\r
   { 80, 25 },         \r
 #if 0
   { 80, 50 },         \r
@@ -72,7 +68,6 @@ STATIC UNIX_SIMPLE_TEXT_OUT_MODE  mUnixSimpleTextOutSupportedModes[] = {
 #endif
 };\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutReset (\r
@@ -106,7 +101,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutOutputString (\r
@@ -170,7 +164,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 VOID\r
 UnixSimpleTextOutPutChar (\r
   IN OUT  UNIX_SIMPLE_TEXT_PRIVATE_DATA   *Console,\r
@@ -198,7 +191,6 @@ Returns:
 }\r
 \r
 #if 0
-STATIC\r
 VOID\r
 UnixSimpleTextOutScrollScreen (\r
   IN OUT  UNIX_SIMPLE_TEXT_PRIVATE_DATA *Console\r
@@ -223,7 +215,6 @@ Returns:
 #endif
 
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutTestString (\r
@@ -258,7 +249,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutQueryMode (\r
@@ -301,7 +291,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetMode (\r
@@ -342,7 +331,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetAttribute (\r
@@ -378,7 +366,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutClearScreen (\r
@@ -429,7 +416,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetCursorPosition (\r
@@ -488,7 +474,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutEnableCursor (\r

diff --git a/UnixPkg/UnixSerialIoDxe/ComponentName.c b/UnixPkg/UnixSerialIoDxe/ComponentName.c
index 2b7cb92c6487719238cfd73dc83c2d6fe1a38ed4..d450daac4718e21fff0c230f91331e313794b841 100644 (file)
--- a/UnixPkg/UnixSerialIoDxe/ComponentName.c
+++ b/UnixPkg/UnixSerialIoDxe/ComponentName.c
@@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL     gUnixSerialIoComponentName = {
   "eng"\r
 };\r
 \r
-static EFI_UNICODE_STRING_TABLE mUnixSerialIoDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mUnixSerialIoDriverNameTable[] = {\r
   { "eng", L"Unix Serial I/O Driver" },\r
   { NULL , NULL }\r
 };\r

diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
index 9f550f25c0ed23ac296c23e3f029f886c8224e05..fa4e3aad362651fc3b27a8bf2dd7df64da80558a 100644 (file)
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
@@ -57,7 +57,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUnixSerialIoDriverBinding = {
   NULL\r
 };\r
 \r
-STATIC\r
 UINTN\r
 ConvertBaud2Unix (\r
   UINT64 BaudRate\r
@@ -133,7 +132,6 @@ ConvertBaud2Unix (
   return -1;\r
 }\r
 \r
-STATIC\r
 UINTN\r
 ConvertByteSize2Unix (\r
   UINT8 DataBit\r
@@ -154,7 +152,6 @@ ConvertByteSize2Unix (
   return -1;\r
 }\r
 \r
-STATIC\r
 VOID\r
 ConvertParity2Unix (\r
   struct termios    *Options,\r
@@ -184,7 +181,6 @@ ConvertParity2Unix (
   }\r
 }\r
 \r
-STATIC \r
 VOID\r
 ConvertStopBit2Unix (\r
   struct termios      *Options,\r

diff --git a/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c b/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c
index 347326dcb86bb2fc9130ce578af8f21b615be0ae..3234b075ca5360e90fee1327d3088c194f593da8 100644 (file)
--- a/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c
+++ b/UnixPkg/UnixSimpleFileSystemDxe/ComponentName.c
@@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL     gUnixSimpleFileSystemComponentName = {
   "eng"\r
 };\r
 \r
-static EFI_UNICODE_STRING_TABLE mUnixSimpleFileSystemDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mUnixSimpleFileSystemDriverNameTable[] = {\r
   {\r
     "eng",\r
     L"Unix Simple File System Driver"\r

diff --git a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
index 84ba962739df47a6a7c5369d9250fe6924644f7f..9d9325c105ecb7666da8a6f88d0c0cbe0cf88628 100644 (file)
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
@@ -1078,7 +1078,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 VOID\r
 UnixSystemTimeToEfiTime (\r
   EFI_UNIX_THUNK_PROTOCOL        *UnixThunk,\r
@@ -1120,7 +1119,6 @@ Returns:
   }\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 UnixSimpleFileSystemFileInfo (\r
   UNIX_EFI_FILE_PRIVATE          *PrivateFile,\r

diff --git a/UnixPkg/UnixThunkDxe/UnixThunk.c b/UnixPkg/UnixThunkDxe/UnixThunk.c
index df3512ca45ae782e61aac9e79d3627021ce10974..bfcc811fb08dbf3b0cb30103cad9ac8aac621af9 100644 (file)
--- a/UnixPkg/UnixThunkDxe/UnixThunk.c
+++ b/UnixPkg/UnixThunkDxe/UnixThunk.c
@@ -40,7 +40,7 @@ Abstract:
 //\r
 // WinNtThunk Device Path Protocol Instance\r
 //\r
-static UNIX_THUNK_DEVICE_PATH mUnixThunkDevicePath = {\r
+UNIX_THUNK_DEVICE_PATH mUnixThunkDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r

diff --git a/UnixPkg/UnixUgaDxe/ComponentName.c b/UnixPkg/UnixUgaDxe/ComponentName.c
index 5c50d5689c034a4c3c2edac90ef93efb39d0aa69..282c5939abe22a47dedf1fd58c0a514af1ddab5f 100644 (file)
--- a/UnixPkg/UnixUgaDxe/ComponentName.c
+++ b/UnixPkg/UnixUgaDxe/ComponentName.c
@@ -49,7 +49,7 @@ EFI_COMPONENT_NAME_PROTOCOL     gUnixUgaComponentName = {
   "eng"\r
 };\r
 \r
-static EFI_UNICODE_STRING_TABLE mUnixUgaDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE mUnixUgaDriverNameTable[] = {\r
   { "eng", L"Unix Universal Graphics Adapter Driver" },\r
   { NULL , NULL }\r
 };\r

diff --git a/UnixPkg/UnixUgaDxe/UnixUgaInput.c b/UnixPkg/UnixUgaDxe/UnixUgaInput.c
index 29e605c16fdb0e170eccbc09da55d5af24308736..6758d2f4ecfd86e23aafbf96ba08572fe506f2e3 100644 (file)
--- 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 d9118aa00f455d1a48ae2cd5108d902fb9a37731..38bc0233f5fe9577c3686d94c501fbd963246034 100644 (file)
--- 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 (