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@6298 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 6 insertions, 43 deletions

diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c
index 71e0360da8..5b5877d905 100644
--- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c
+++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.c
@@ -65,7 +65,7 @@ InitializeVgaClass(
 //

 // Local variables

 //

-static CHAR16               CrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };

+CHAR16               CrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };

 

 typedef struct {

   CHAR16  Unicode;

@@ -79,7 +79,7 @@ typedef struct {
 // ASCII. The ASCII mapping we just made up.

 //

 //

-STATIC UNICODE_TO_CHAR  UnicodeToPcAnsiOrAscii[] = {

+UNICODE_TO_CHAR  UnicodeToPcAnsiOrAscii[] = {

   {

     BOXDRAW_HORIZONTAL,

     0xc4,

@@ -347,7 +347,6 @@ STATIC UNICODE_TO_CHAR  UnicodeToPcAnsiOrAscii[] = {
 //

 // Private worker functions

 //

-STATIC

 VOID

 SetVideoCursorPosition (

   IN  VGA_CLASS_DEV  *VgaClassDev,

@@ -356,7 +355,6 @@ SetVideoCursorPosition (
   IN  UINTN          MaxColumn

   );

 

-STATIC

 VOID

 WriteCrtc (

   IN  VGA_CLASS_DEV  *VgaClassDev,

@@ -364,7 +362,6 @@ WriteCrtc (
   IN  UINT8          Data

   );

 

-STATIC

 BOOLEAN

 LibIsValidTextGraphics (

   IN  CHAR16  Graphic,

@@ -372,13 +369,11 @@ LibIsValidTextGraphics (
   OUT CHAR8   *Ascii OPTIONAL

   );

 

-STATIC

 BOOLEAN

 IsValidAscii (

   IN  CHAR16  Ascii

   );

 

-STATIC

 BOOLEAN

 IsValidEfiCntlChar (

   IN  CHAR16  c

@@ -1116,7 +1111,6 @@ VgaClassSetMode (
   @param MaxColumn   max logic column

   

 **/

-STATIC

 VOID

 SetVideoCursorPosition (

   IN  VGA_CLASS_DEV  *VgaClassDev,

@@ -1147,7 +1141,6 @@ SetVideoCursorPosition (
   @param Address      address

   @param Data         data

 **/

-STATIC

 VOID

 WriteCrtc (

   IN  VGA_CLASS_DEV  *VgaClassDev,

@@ -1184,7 +1177,6 @@ WriteCrtc (
   @return TRUE if Gpaphic is a supported Unicode Box Drawing character.

 

 **/

-STATIC

 BOOLEAN

 LibIsValidTextGraphics (

   IN  CHAR16  Graphic,

@@ -1225,7 +1217,6 @@ LibIsValidTextGraphics (
   @param Ascii character

   @return whether is an ASCII char.

 **/

-STATIC

 BOOLEAN

 IsValidAscii (

   IN  CHAR16  Ascii

@@ -1244,7 +1235,6 @@ IsValidAscii (
   @param c character

   @return whether is diplaying control character.

 **/

-STATIC

 BOOLEAN

 IsValidEfiCntlChar (

   IN  CHAR16  c

diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
index ac86f74edf..af68644e9c 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.c
@@ -29,14 +29,12 @@ CONST EFI_GUID gZeroGuid  = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
 //

 // Worker functions private to this file

 //

-STATIC

 DATA_HUB_FILTER_DRIVER  *

 FindFilterDriverByEvent (

   IN  LIST_ENTRY      *Head,

   IN  EFI_EVENT       Event

   );

 

-STATIC

 EFI_DATA_RECORD_HEADER  *

 GetNextDataRecord (

   IN  LIST_ENTRY          *Head,

@@ -59,7 +57,6 @@ GetNextDataRecord (
   @retval EFI_OUT_OF_RESOURCES  - If data was not logged due to lack of system 

                                   resources.

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 DataHubLogData (

@@ -193,7 +190,6 @@ DataHubLogData (
   @retval EFI_OUT_OF_RESOURCES    - Record was not returned due to lack of system resources.

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 DataHubGetNextRecord (

@@ -314,7 +310,6 @@ DataHubGetNextRecord (
                             system resources.

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 DataHubRegisterFilterDriver (

@@ -393,7 +388,6 @@ DataHubRegisterFilterDriver (
   @retval EFI_NOT_FOUND - If FilterEvent does not exist

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 DataHubUnregisterFilterDriver (

@@ -441,7 +435,6 @@ DataHubUnregisterFilterDriver (
   @retval NULL - If Event is not in the list

 

 **/

-STATIC

 DATA_HUB_FILTER_DRIVER *

 FindFilterDriverByEvent (

   IN  LIST_ENTRY      *Head,

@@ -479,7 +472,6 @@ FindFilterDriverByEvent (
   @retval NULL - If no data record exists.

 

 **/

-STATIC

 EFI_DATA_RECORD_HEADER *

 GetNextDataRecord (

   IN  LIST_ENTRY          *Head,

diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
index 34ef690d76..7b83b91e19 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
@@ -38,7 +38,6 @@ EFI_EVENT             mDataHubStdErrEvent;
   @param Event    - The event that occured, not used

   @param Context  - DataHub Protocol Pointer

 **/

-STATIC

 VOID

 EFIAPI

 DataHubStdErrEventHandler (

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
index 0936c093eb..221c561bbc 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
@@ -17,18 +17,13 @@
 //

 // Initialize FIFO to cache records.

 //

-STATIC

 LIST_ENTRY                mRecordsFifo          = INITIALIZE_LIST_HEAD_VARIABLE (mRecordsFifo);

-STATIC

 LIST_ENTRY                mRecordsBuffer        = INITIALIZE_LIST_HEAD_VARIABLE (mRecordsBuffer);

-STATIC

 UINT32                    mLogDataHubStatus     = 0;

-STATIC

 EFI_EVENT                 mLogDataHubEvent;

 //

 // Cache data hub protocol.

 //

-STATIC

 EFI_DATA_HUB_PROTOCOL     *mDataHubProtocol;

 

 

@@ -41,7 +36,6 @@ EFI_DATA_HUB_PROTOCOL     *mDataHubProtocol;
   @retval  !NULL  Point to buffer of record.

 

 **/

-STATIC

 DATA_HUB_STATUS_CODE_DATA_RECORD *

 AcquireRecordBuffer (

   VOID

@@ -97,7 +91,6 @@ AcquireRecordBuffer (
   @return   NULL    the FIFO of record is empty.

 

 **/

-STATIC

 DATA_HUB_STATUS_CODE_DATA_RECORD *

 RetrieveRecord (

   VOID

@@ -131,7 +124,6 @@ RetrieveRecord (
                      from AcquireRecordBuffer.

 

 **/

-STATIC

 VOID

 ReleaseRecord (

   DATA_HUB_STATUS_CODE_DATA_RECORD  *RecordData

@@ -274,7 +266,6 @@ DataHubStatusCodeReportWorker (
   @param  Context     Context of the event.

 

 **/

-STATIC

 VOID

 EFIAPI

 LogDataHubEventCallBack (

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
index eecf38db58..b1f5ebff09 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
@@ -17,7 +17,7 @@
 //

 // Event for Exit Boot Services Callback

 //

-STATIC EFI_EVENT mExitBootServicesEvent = NULL;

+EFI_EVENT mExitBootServicesEvent = NULL;

 

 /**

   Report status code to all supported device.

@@ -59,7 +59,6 @@ ReportDispatcher (
 //

 // Declaration of status code protocol.

 //

-STATIC

 EFI_STATUS_CODE_PROTOCOL  mEfiStatusCodeProtocol  = {

   ReportDispatcher

 };

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
index fbf533950b..166e70567d 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
@@ -15,7 +15,6 @@
 #include "DxeStatusCode.h"

 #include "DebugInfo.h"

 

-STATIC

 EFI_SERIAL_IO_PROTOCOL *mSerialIoProtocol;

 

 /**

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c
index 442fc064b6..c8ebabbec5 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c
@@ -25,7 +25,6 @@
   @return                 Always return pointer of memory status code packet.

 

 **/

-STATIC

 MEMORY_STATUSCODE_PACKET_HEADER *

 CreateMemoryStatusCodePacket (

   UINT16 PacketIndex

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index 51c127bca1..5b4553da3f 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -16,12 +16,10 @@
 

 #include "PeiStatusCode.h"

 

-STATIC

 EFI_PEI_PROGRESS_CODE_PPI     mStatusCodePpi           = {

   ReportDispatcher

   };

 

-STATIC

 EFI_PEI_PPI_DESCRIPTOR        mStatusCodePpiDescriptor = {

   EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,

   &gEfiPeiStatusCodePpiGuid,

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index 7d9eaf199d..0abbb9e63c 100644
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -19,17 +19,17 @@ Module Name:
 //

 // Module globals

 //

-static EFI_PEI_READ_ONLY_VARIABLE_PPI mVariablePpi = {

+EFI_PEI_READ_ONLY_VARIABLE_PPI mVariablePpi = {

   PeiGetVariable,

   PeiGetNextVariableName

 };

 

-static EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariable2Ppi = {

+EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariable2Ppi = {

   PeiGetVariable2,

   PeiGetNextVariableName2

 };

 

-static EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable[] = {

+EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable[] = {

   {

     (EFI_PEI_PPI_DESCRIPTOR_PPI),

     &gEfiPeiReadOnlyVariable2PpiGuid,

@@ -117,7 +117,6 @@ GetEndPointer (
   @retval FALSE           Variable header is not valid.

 

 **/

-STATIC

 BOOLEAN

 EFIAPI

 IsValidVariableHeader (

@@ -258,7 +257,6 @@ GetNextVariablePtr (
   @retval EfiInvalid    Variable store is invalid

 

 **/

-STATIC

 VARIABLE_STORE_STATUS

 EFIAPI

 GetVariableStoreStatus (

@@ -299,7 +297,6 @@ GetVariableStoreStatus (
   @retval EFI_NOT_FOUND  - Variable not found

 

 **/

-STATIC

 EFI_STATUS

 CompareWithValidVariable (

   IN  VARIABLE_HEADER               *Variable,

@@ -351,7 +348,6 @@ CompareWithValidVariable (
   @retval EFI_INVALID_PARAMETER  - Invalid variable name

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 FindVariable (