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

3 files changed, 22 insertions, 28 deletions

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
index 89f9cf60f7..7f5bb8d148 100644
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
@@ -31,25 +31,25 @@ Abstract:
 

 #include "PlatOverMngr.h"

 

-STATIC  EFI_GUID      mPlatformOverridesManagerGuid = PLAT_OVER_MNGR_GUID;

+EFI_GUID      mPlatformOverridesManagerGuid = PLAT_OVER_MNGR_GUID;

 

-STATIC  LIST_ENTRY    mMappingDataBase = INITIALIZE_LIST_HEAD_VARIABLE (mMappingDataBase);

+LIST_ENTRY    mMappingDataBase = INITIALIZE_LIST_HEAD_VARIABLE (mMappingDataBase);

 

-STATIC  EFI_HANDLE    *mDevicePathHandleBuffer;

-STATIC  EFI_HANDLE    *mDriverImageHandleBuffer;

+EFI_HANDLE    *mDevicePathHandleBuffer;

+EFI_HANDLE    *mDriverImageHandleBuffer;

 

-STATIC UINTN         mSelectedCtrIndex;

-STATIC EFI_STRING_ID mControllerToken[MAX_CHOICE_NUM];

+UINTN         mSelectedCtrIndex;

+EFI_STRING_ID mControllerToken[MAX_CHOICE_NUM];

 

-STATIC UINTN                        mDriverImageHandleCount;

-STATIC EFI_STRING_ID                mDriverImageToken[MAX_CHOICE_NUM];

-STATIC EFI_STRING_ID                mDriverImageFilePathToken[MAX_CHOICE_NUM];

-STATIC EFI_LOADED_IMAGE_PROTOCOL    *mDriverImageProtocol[MAX_CHOICE_NUM];

-STATIC EFI_DEVICE_PATH_PROTOCOL     *mControllerDevicePathProtocol[MAX_CHOICE_NUM];

-STATIC UINTN                        mSelectedDriverImageNum;

-STATIC UINTN                        mLastSavedDriverImageNum;

-STATIC CHAR8                        mLanguage[RFC_3066_ENTRY_SIZE];

-STATIC UINT16                       mCurrentPage;

+UINTN                        mDriverImageHandleCount;

+EFI_STRING_ID                mDriverImageToken[MAX_CHOICE_NUM];

+EFI_STRING_ID                mDriverImageFilePathToken[MAX_CHOICE_NUM];

+EFI_LOADED_IMAGE_PROTOCOL    *mDriverImageProtocol[MAX_CHOICE_NUM];

+EFI_DEVICE_PATH_PROTOCOL     *mControllerDevicePathProtocol[MAX_CHOICE_NUM];

+UINTN                        mSelectedDriverImageNum;

+UINTN                        mLastSavedDriverImageNum;

+CHAR8                        mLanguage[RFC_3066_ENTRY_SIZE];

+UINT16                       mCurrentPage;

 

 /**

   The driver Entry Point. The funciton will export a disk device class formset and

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.c
index 2a189138ed..75032720fd 100644
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.c
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.c
@@ -27,9 +27,9 @@ EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL gPlatformDriverOverride = {
   DriverLoaded

 };

 

-STATIC  LIST_ENTRY      mMappingDataBase = INITIALIZE_LIST_HEAD_VARIABLE (mMappingDataBase);

-STATIC  BOOLEAN         mEnvironmentVariableRead = FALSE;

-STATIC  EFI_HANDLE      mCallerImageHandle;

+LIST_ENTRY      mMappingDataBase = INITIALIZE_LIST_HEAD_VARIABLE (mMappingDataBase);

+BOOLEAN         mEnvironmentVariableRead = FALSE;

+EFI_HANDLE      mCallerImageHandle;

 

 

 EFI_STATUS

@@ -81,7 +81,6 @@ Returns:
                                  GetDriver().

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 GetDriver (

@@ -152,7 +151,6 @@ GetDriver (
 

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 GetDriverPath (

@@ -172,7 +170,6 @@ GetDriverPath (
 

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 DriverLoaded (

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h
index a9d62702cf..88e5cc3d97 100644
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h
@@ -22,13 +22,12 @@ Abstract:
 #define PLATFORM_DRI_OVERRIDE_H_
 
 #include <Uefi.h>
-

-#include <Library/DebugLib.h>

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/BaseLib.h>

+
+#include <Library/DebugLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/BaseLib.h>
 #include <Library/PlatDriOverLib.h>
 
-STATIC
 EFI_STATUS
 EFIAPI
 GetDriver (
@@ -37,7 +36,6 @@ GetDriver (
   IN OUT EFI_HANDLE                                     * DriverImageHandle
   );
 
-STATIC
 EFI_STATUS
 EFIAPI
 GetDriverPath (
@@ -46,7 +44,6 @@ GetDriverPath (
   IN OUT EFI_DEVICE_PATH_PROTOCOL                       **DriverImagePath
   );
 
-STATIC
 EFI_STATUS
 EFIAPI
 DriverLoaded (