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

3 files changed, 13 insertions, 22 deletions

diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index 7ac729833e..599859e58e 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 dee18c292f..a3c152dac3 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 622cfb55bd..905cd80d27 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;