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

MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Decode.c

@@ -1390,7 +1390,6 @@ badcdb:
   @return None
 
 **/
-STATIC
 UINT8
 ChkSum (
   IN  VOID   *Buffer,

MdeModulePkg/Bus/Pci/UndiRuntimeDxe/E100b.c

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "Undi32.h"
 
-static UINT8 basic_config_cmd[22] = {
+UINT8 basic_config_cmd[22] = {
                     22,        0x08,
                     0,           0,
                     0, (UINT8)0x80,
@@ -255,7 +255,6 @@ OutLong (
   @return TODO: add return values
 
 **/
-STATIC
 UINTN
 MapIt (
   IN NIC_DATA_INSTANCE *AdapterInfo,
@@ -318,7 +317,6 @@ MapIt (
   @return TODO: add return values
 
 **/
-STATIC
 VOID
 UnMapIt (
   IN NIC_DATA_INSTANCE *AdapterInfo,
@@ -357,7 +355,6 @@ UnMapIt (
 
 **/
 // TODO:    MicroSeconds - add argument and description to function comment
-STATIC
 VOID
 DelayIt (
   IN NIC_DATA_INSTANCE *AdapterInfo,
@@ -381,7 +378,6 @@ DelayIt (
 
 **/
 // TODO:    flag - add argument and description to function comment
-STATIC
 VOID
 BlockIt (
   IN NIC_DATA_INSTANCE *AdapterInfo,
@@ -404,7 +400,6 @@ BlockIt (
   @return TODO: add return values
 
 **/
-STATIC
 UINT8
 Load_Base_Regs (
   NIC_DATA_INSTANCE *AdapterInfo
@@ -449,7 +444,6 @@ Load_Base_Regs (
   @return TODO: add return values
 
 **/
-STATIC
 UINT8
 IssueCB (
   NIC_DATA_INSTANCE *AdapterInfo,
@@ -509,7 +503,6 @@ IssueCB (
   @return TODO: add return values
 
 **/
-STATIC
 UINT8
 Configure (
   NIC_DATA_INSTANCE *AdapterInfo
@@ -636,7 +629,6 @@ E100bSetupIAAddr (
 
 
 **/
-STATIC
 VOID
 StopRU (
   IN NIC_DATA_INSTANCE *AdapterInfo
@@ -673,7 +665,6 @@ StopRU (
   @retval -1                              Already Started
 
 **/
-STATIC
 INT8
 StartRU (
   NIC_DATA_INSTANCE *AdapterInfo
@@ -1766,7 +1757,6 @@ Recycle_RFD (
 #define EE_READ_CMD   6 // 110b
 #define EE_ERASE_CMD  (7 << 6)
 
-STATIC
 VOID
 shift_bits_out (
   IN NIC_DATA_INSTANCE *AdapterInfo,
@@ -1834,7 +1824,6 @@ Returns:
   @return TODO: add return values
 
 **/
-STATIC
 UINT16
 shift_bits_in (
   IN NIC_DATA_INSTANCE *AdapterInfo
@@ -1885,7 +1874,6 @@ shift_bits_in (
   @retval FALSE                           if it fails to get the exclusive access
 
 **/
-STATIC
 BOOLEAN
 E100bSetEepromLockOut (
   IN NIC_DATA_INSTANCE  *AdapterInfo
@@ -1932,7 +1920,6 @@ E100bSetEepromLockOut (
   @return None
 
 **/
-STATIC
 VOID
 E100bReSetEepromLockOut (
   IN NIC_DATA_INSTANCE  *AdapterInfo
@@ -3353,7 +3340,6 @@ CommandWaitForCompletion (
   @return TODO: add return values
 
 **/
-STATIC
 INT8
 SoftwareReset (
   NIC_DATA_INSTANCE *AdapterInfo

MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c

@@ -50,11 +50,10 @@ EFI_DRIVER_BINDING_PROTOCOL gSCSIBusDriverBinding = {
 // structure in the SCSIBusDriverBindingStop(). Then we can
 // Close all opened protocols and release this structure.
 //
-STATIC EFI_GUID  mScsiBusProtocolGuid = EFI_SCSI_BUS_PROTOCOL_GUID;
+EFI_GUID  mScsiBusProtocolGuid = EFI_SCSI_BUS_PROTOCOL_GUID;
 
-STATIC VOID  *WorkingBuffer;
+VOID  *WorkingBuffer;
 
-STATIC
 EFI_STATUS
 EFIAPI
 ScsiioToPassThruPacket (
@@ -63,14 +62,12 @@ ScsiioToPassThruPacket (
   );
 
 
-STATIC
 EFI_STATUS
 EFIAPI
 PassThruToScsiioPacket (
   IN     EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *ScsiPacket,
   IN OUT EFI_SCSI_IO_SCSI_REQUEST_PACKET         *Packet
   );
-STATIC
 VOID
 EFIAPI
 NotifyFunction (
@@ -1201,7 +1198,6 @@ Returns:
 }
 
 
-STATIC
 EFI_STATUS
 EFIAPI
 ScsiioToPassThruPacket (
@@ -1255,7 +1251,6 @@ Returns:
 }
 
 
-STATIC
 EFI_STATUS
 EFIAPI
 PassThruToScsiioPacket (
@@ -1302,7 +1297,6 @@ Returns:
 
 
 
-STATIC
 VOID
 EFIAPI
 NotifyFunction (

MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c

@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Use a shor form Usb class Device Path, which could match any usb device, in WantedUsbIoDPList to indicate all Usb devices
 // are wanted Usb devices
 //
-STATIC USB_CLASS_FORMAT_DEVICE_PATH mAllUsbClassDevicePath = {
+USB_CLASS_FORMAT_DEVICE_PATH mAllUsbClassDevicePath = {
   {
     {
       MESSAGING_DEVICE_PATH,

MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c

@@ -20,7 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Static English keyboard layout
 // Format:<efi key>, <unicode without shift>, <unicode with shift>, <Modifier>, <AffectedAttribute>
 //
-STATIC
 UINT8 KeyboardLayoutTable[USB_KEYCODE_MAX_MAKE + 8][5] = {
   {EfiKeyC1,         'a',      'A',   EFI_NULL_MODIFIER,   EFI_AFFECTED_BY_STANDARD_SHIFT | EFI_AFFECTED_BY_CAPS_LOCK},   // 0x04
   {EfiKeyB5,         'b',      'B',   EFI_NULL_MODIFIER,   EFI_AFFECTED_BY_STANDARD_SHIFT | EFI_AFFECTED_BY_CAPS_LOCK},   // 0x05
@@ -168,7 +167,6 @@ LoadDefaultKeyboardLayout (
 //
 // EFI_KEY to USB Scan Code convertion table
 //
-STATIC
 UINT8 UsbScanCodeConvertionTable[] = {
   0xe0,  //  EfiKeyLCtrl
   0xe3,  //  EfiKeyA0
@@ -280,7 +278,6 @@ UINT8 UsbScanCodeConvertionTable[] = {
 //
 // Keyboard Layout Modifier to EFI Scan Code convertion table
 //
-STATIC
 UINT8 EfiScanCodeConvertionTable[] = {
   SCAN_NULL,       // EFI_NULL_MODIFIER
   SCAN_NULL,       // EFI_LEFT_CONTROL_MODIFIER
@@ -321,7 +318,7 @@ UINT8 EfiScanCodeConvertionTable[] = {
 EFI_GUID  mKeyboardLayoutEventGuid = EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID;
 
 
-STATIC KB_MODIFIER  KB_Mod[8] = {
+KB_MODIFIER  KB_Mod[8] = {
   { MOD_CONTROL_L,  0xe0 }, // 11100000
   { MOD_CONTROL_R,  0xe4 }, // 11100100
   { MOD_SHIFT_L,    0xe1 }, // 11100001

MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c

@@ -17,7 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "UsbMassImpl.h"
 
-STATIC
 USB_MASS_TRANSPORT *mUsbMassTransport[] = {
   &mUsbCbi0Transport,
   &mUsbCbi1Transport,

MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c

@@ -77,19 +77,16 @@ EFI_DRIVER_BINDING_PROTOCOL gUsbMouseAbsolutePointerDriverBinding = {
 //
 // helper functions
 //
-STATIC
 BOOLEAN
 IsUsbMouseAbsolutePointer (
   IN  EFI_USB_IO_PROTOCOL     *UsbIo
   );
 
-STATIC
 EFI_STATUS
 InitializeUsbMouseAbsolutePointerDevice (
   IN  USB_MOUSE_ABSOLUTE_POINTER_DEV           *UsbMouseAbsolutePointerDev
   );
 
-STATIC
 VOID
 EFIAPI
 UsbMouseAbsolutePointerWaitForInput (
@@ -100,7 +97,6 @@ UsbMouseAbsolutePointerWaitForInput (
 //
 // Mouse interrupt handler
 //
-STATIC
 EFI_STATUS
 EFIAPI
 OnMouseAbsolutePointerInterruptComplete (
@@ -113,7 +109,6 @@ OnMouseAbsolutePointerInterruptComplete (
 //
 // Mouse simulate TouchPad, Using AbsolutePointer Protocol
 //
-STATIC
 EFI_STATUS
 EFIAPI
 GetMouseAbsolutePointerState (
@@ -121,7 +116,6 @@ GetMouseAbsolutePointerState (
   OUT  EFI_ABSOLUTE_POINTER_STATE     *MouseAbsolutePointerState
   );
 
-STATIC
 EFI_STATUS
 EFIAPI
 UsbMouseAbsolutePointerReset (
@@ -638,7 +632,6 @@ IsUsbMouseAbsolutePointer (
                                 memory
 
 **/
-STATIC
 EFI_STATUS
 InitializeUsbMouseAbsolutePointerDevice (
   IN  USB_MOUSE_ABSOLUTE_POINTER_DEV           *UsbMouseAbsolutePointerDev
@@ -775,7 +768,6 @@ InitializeUsbMouseAbsolutePointerDevice (
   @return EFI_DEVICE_ERROR
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 OnMouseAbsolutePointerInterruptComplete (
@@ -860,7 +852,6 @@ OnMouseAbsolutePointerInterruptComplete (
   @return EFI_NOT_READY
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 GetMouseAbsolutePointerState (
@@ -909,7 +900,6 @@ GetMouseAbsolutePointerState (
   @return EFI_SUCCESS
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 UsbMouseAbsolutePointerReset (
@@ -945,7 +935,6 @@ UsbMouseAbsolutePointerReset (
  VOID
 
 **/
-STATIC
 VOID
 EFIAPI
 UsbMouseAbsolutePointerWaitForInput (

MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/mousehid.c

@@ -36,7 +36,6 @@ Abstract:
   @return Position
 
 **/
-STATIC
 UINT8 *
 GetNextItem (
   IN  UINT8    *StartPos,
@@ -136,7 +135,6 @@ GetNextItem (
   @return HidItem Data
 
 **/
-STATIC
 UINT32
 GetItemData (
   IN  HID_ITEM *HidItem
@@ -169,7 +167,6 @@ GetItemData (
 
 
 **/
-STATIC
 VOID
 ParseLocalItem (
   IN  USB_MOUSE_ABSOLUTE_POINTER_DEV   *UsbMouseAbsolutePointer,
@@ -216,7 +213,6 @@ ParseLocalItem (
   }
 }
 
-STATIC
 VOID
 ParseGlobalItem (
   IN  USB_MOUSE_ABSOLUTE_POINTER_DEV   *UsbMouseAbsolutePointer,
@@ -257,7 +253,6 @@ ParseGlobalItem (
   @return VOID
 
 **/
-STATIC
 VOID
 ParseMainItem (
   IN  USB_MOUSE_ABSOLUTE_POINTER_DEV   *UsbMouseAbsolutePointer,
@@ -280,7 +275,6 @@ ParseMainItem (
   @return VOID
 
 **/
-STATIC
 VOID
 ParseHidItem (
   IN  USB_MOUSE_ABSOLUTE_POINTER_DEV   *UsbMouseAbsolutePointer,

MdeModulePkg/Core/Pei/FwVol/FwVol.c

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <PeiMain.h>
 
-STATIC EFI_PEI_NOTIFY_DESCRIPTOR mNotifyOnFvInfoList = {
+EFI_PEI_NOTIFY_DESCRIPTOR mNotifyOnFvInfoList = {
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEfiPeiFirmwareVolumeInfoPpiGuid,
   FirmwareVolmeInfoPpiNotifyCallback 

MdeModulePkg/Core/Pei/Image/Image.c

@@ -38,12 +38,12 @@ PeiLoadImageLoadImageWrapper (
   OUT    UINT32                       *AuthenticationState
   );
 
-STATIC EFI_PEI_LOAD_FILE_PPI   mPeiLoadImagePpi = {
+EFI_PEI_LOAD_FILE_PPI   mPeiLoadImagePpi = {
   PeiLoadImageLoadImageWrapper
 };
 
 
-STATIC EFI_PEI_PPI_DESCRIPTOR     gPpiLoadFilePpiList = {
+EFI_PEI_PPI_DESCRIPTOR     gPpiLoadFilePpiList = {
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEfiPeiLoadFilePpiGuid,
   &mPeiLoadImagePpi

MdeModulePkg/Core/Pei/PeiMain/PeiMain.c

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <PeiMain.h>
 
-STATIC EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {
+EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEfiPeiMemoryDiscoveredPpiGuid,
   NULL
@@ -23,7 +23,7 @@ STATIC EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {
 ///
 /// Pei service instance
 ///
-STATIC EFI_PEI_SERVICES  gPs = {
+EFI_PEI_SERVICES  gPs = {
   {
     PEI_SERVICES_SIGNATURE,
     PEI_SERVICES_REVISION,

MdeModulePkg/Core/Pei/Security/Security.c

@@ -33,7 +33,7 @@ SecurityPpiNotifyCallback (
   IN VOID                       *Ppi
   );
 
-STATIC EFI_PEI_NOTIFY_DESCRIPTOR mNotifyList = {
+EFI_PEI_NOTIFY_DESCRIPTOR mNotifyList = {
    EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
    &gEfiPeiSecurity2PpiGuid,
    SecurityPpiNotifyCallback

MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c

@@ -54,7 +54,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_OUT_OF_RESOURCES    There are not enough resources to record the measurement.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 StartGauge (
@@ -88,7 +87,6 @@ StartGauge (
   @retval EFI_NOT_FOUND           The specified measurement record could not be found.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EndGauge (
@@ -116,7 +114,6 @@ EndGauge (
   @retval EFI_INVALIDE_PARAMETER  GaugeDataEntry is NULL.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 GetGauge (
@@ -127,8 +124,8 @@ GetGauge (
 //
 // Definition for global variables.
 //
-STATIC GAUGE_DATA_HEADER    *mGaugeData;
+GAUGE_DATA_HEADER    *mGaugeData;
-STATIC UINT32               mMaxGaugeRecords;
+UINT32               mMaxGaugeRecords;
 
 EFI_HANDLE           mHandle = NULL;
 PERFORMANCE_PROTOCOL mPerformanceInterface = {
@@ -156,7 +153,6 @@ PERFORMANCE_PROTOCOL mPerformanceInterface = {
   @retval The index of gauge entry in the array.
 
 **/
-STATIC
 UINT32
 InternalSearchForGaugeEntry (
   IN CONST VOID                 *Handle,  OPTIONAL
@@ -214,7 +210,6 @@ InternalSearchForGaugeEntry (
   @retval EFI_OUT_OF_RESOURCES    There are not enough resources to record the measurement.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 StartGauge (
@@ -297,7 +292,6 @@ StartGauge (
   @retval EFI_NOT_FOUND           The specified measurement record could not be found.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EndGauge (
@@ -342,7 +336,6 @@ EndGauge (
   @retval EFI_INVALIDE_PARAMETER  GaugeDataEntry is NULL.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 GetGauge (
@@ -379,7 +372,6 @@ GetGauge (
   to DXE performance data structures.
 
 **/
-STATIC
 VOID
 InternalGetPeiPerformance (
   VOID

MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c

@@ -58,7 +58,7 @@ EFI_IP4_CONFIG_DATA  mIpIoDefaultIpConfigData = {
   0
 };
 
-STATIC ICMP_ERROR_INFO  mIcmpErrMap[10] = {
+ICMP_ERROR_INFO  mIcmpErrMap[10] = {
   {FALSE, TRUE},
   {FALSE, TRUE},
   {TRUE, TRUE},
@@ -71,14 +71,12 @@ STATIC ICMP_ERROR_INFO  mIcmpErrMap[10] = {
   {FALSE, TRUE}
 };
 
-STATIC
 VOID
 EFIAPI
 IpIoTransmitHandlerDpc (
   IN VOID      *Context
   );
 
-STATIC
 VOID
 EFIAPI
 IpIoTransmitHandler (
@@ -101,7 +99,6 @@ IpIoTransmitHandler (
   @retval other                 The required operation failed.
 
 **/
-STATIC
 EFI_STATUS
 IpIoCreateIpChildOpenProtocol (
   IN  EFI_HANDLE  ControllerHandle,
@@ -164,7 +161,6 @@ IpIoCreateIpChildOpenProtocol (
   @retval other                 The required operation failed.
 
 **/
-STATIC
 EFI_STATUS
 IpIoCloseProtocolDestroyIpChild (
   IN EFI_HANDLE  ControllerHandle,
@@ -209,7 +205,6 @@ IpIoCloseProtocolDestroyIpChild (
   @retval EFI_ABORTED           This type of ICMP packet is not supported.
 
 **/
-STATIC
 EFI_STATUS
 IpIoIcmpHandler (
   IN IP_IO                *IpIo,
@@ -341,7 +336,6 @@ IpIoIcmpHandler (
   @return None.
 
 **/
-STATIC
 VOID
 IpIoExtFree (
   IN VOID  *Event
@@ -366,7 +360,6 @@ IpIoExtFree (
   @return resource limit occurred.
 
 **/
-STATIC
 IP_IO_SEND_ENTRY *
 IpIoCreateSndEntry (
   IN IP_IO             *IpIo,
@@ -502,7 +495,6 @@ ReleaseSndEntry:
   @return None.
 
 **/
-STATIC
 VOID
 IpIoDestroySndEntry (
   IN IP_IO_SEND_ENTRY  *SndEntry
@@ -535,7 +527,6 @@ IpIoDestroySndEntry (
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 IpIoTransmitHandlerDpc (
@@ -571,7 +562,6 @@ IpIoTransmitHandlerDpc (
 
 **/
 
-STATIC
 VOID
 EFIAPI
 IpIoTransmitHandler (
@@ -594,7 +584,6 @@ IpIoTransmitHandler (
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 IpIoDummyHandlerDpc (
@@ -631,7 +620,6 @@ IpIoDummyHandlerDpc (
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 IpIoDummyHandler (
@@ -655,7 +643,6 @@ IpIoDummyHandler (
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 IpIoListenHandlerDpc (
@@ -757,7 +744,6 @@ Resume:
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 IpIoListenHandler (

MdeModulePkg/Library/DxeNetLib/DxeNetLib.c

@@ -486,7 +486,6 @@ NetMapGetCount (
   @return The allocated item or NULL
 
 **/
-STATIC
 NET_MAP_ITEM *
 NetMapAllocItem (
   IN NET_MAP                *Map
@@ -609,7 +608,6 @@ NetMapInsertTail (
   @return TRUE if the item is in the netmap, otherwise FALSE.
 
 **/
-STATIC
 BOOLEAN
 NetItemInMap (
   IN NET_MAP                *Map,
@@ -1116,7 +1114,6 @@ NetLibGetMacString (
   @retval FALSE          If the default address is acquired from DHCP.
 
 **/
-STATIC
 BOOLEAN
 NetLibDefaultAddressIsStatic (
   IN EFI_HANDLE  Controller

MdeModulePkg/Library/DxeNetLib/NetBuffer.c

@@ -41,7 +41,6 @@ Abstract:
                                 allocation failed due to resource limit.
 
 **/
-STATIC
 NET_BUF *
 NetbufAllocStruct (
   IN UINT32                 BlockNum,
@@ -152,7 +151,6 @@ FreeNBuf:
   @return None.
 
 **/
-STATIC
 VOID
 NetbufFreeVector (
   IN NET_VECTOR             *Vector
@@ -415,7 +413,6 @@ NetbufGetByte (
   @return None.
 
 **/
-STATIC
 VOID
 NetbufSetBlock (
   IN NET_BUF                *Nbuf,
@@ -458,7 +455,6 @@ NetbufSetBlock (
   @return None.
 
 **/
-STATIC
 VOID
 NetbufSetBlockOp (
   IN NET_BUF                *Nbuf,
@@ -492,7 +488,6 @@ NetbufSetBlockOp (
   @return NONE
 
 **/
-STATIC
 VOID
 NetbufGetFragmentFree (
   IN VOID                   *Arg
@@ -1120,7 +1115,6 @@ NetbufAllocSpace (
   @return None.
 
 **/
-STATIC
 VOID
 NetblockTrim (
   IN NET_BLOCK_OP           *BlockOp,

MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c

@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/PcdLib.h>
 
-STATIC PERFORMANCE_PROTOCOL    *mPerformance = NULL;
+PERFORMANCE_PROTOCOL    *mPerformance = NULL;
 
 /**
   The constructor function caches the pointer to Performance protocol.
@@ -34,7 +34,6 @@ STATIC PERFORMANCE_PROTOCOL    *mPerformance = NULL;
   @retval Other           Performance protocol is not located to log performance.
 
 **/
-STATIC
 EFI_STATUS
 GetPerformanceProtocol (
   VOID

MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c

@@ -20,7 +20,7 @@ Abstract:
 
 #include "PlatDriOver.h"
 
-STATIC LIST_ENTRY   mDevicePathStack = INITIALIZE_LIST_HEAD_VARIABLE (mDevicePathStack);
+LIST_ENTRY   mDevicePathStack = INITIALIZE_LIST_HEAD_VARIABLE (mDevicePathStack);
 
 
 /**

MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c

@@ -32,14 +32,12 @@ Abstract:
 #include <Library/MemoryAllocationLib.h>
 #include <Library/BaseMemoryLib.h>
 
-STATIC
 VOID
 EFIAPI
 UdpIoOnDgramSentDpc (
   IN VOID                   *Context
   );
 
-STATIC
 VOID
 EFIAPI
 UdpIoOnDgramSent (
@@ -47,7 +45,6 @@ UdpIoOnDgramSent (
   IN VOID                   *Context
   );
 
-STATIC
 VOID
 EFIAPI
 UdpIoOnDgramRcvd (
@@ -69,7 +66,6 @@ UdpIoOnDgramRcvd (
   @return The wrapped transmission request or NULL if failed to allocate resources.
 
 **/
-STATIC
 UDP_TX_TOKEN *
 UdpIoWrapTx (
   IN UDP_IO_PORT            *UdpIo,
@@ -355,7 +351,6 @@ FREE_MEM:
   @return None
 
 **/
-STATIC
 VOID
 UdpIoCancelDgrams (
   IN UDP_IO_PORT            *UdpIo,
@@ -476,7 +471,6 @@ UdpIoCleanPort (
   @return None
 
 **/
-STATIC
 VOID
 EFIAPI
 UdpIoOnDgramSentDpc (
@@ -503,7 +497,6 @@ UdpIoOnDgramSentDpc (
   @return None
 
 **/
-STATIC
 VOID
 EFIAPI
 UdpIoOnDgramSent (
@@ -579,7 +572,6 @@ UdpIoSendDatagram (
   @return TRUE if the packet is to be cancelled, otherwise FALSE.
 
 **/
-STATIC
 BOOLEAN
 UdpIoCancelSingleDgram (
   IN UDP_TX_TOKEN           *Token,
@@ -626,7 +618,6 @@ UdpIoCancelSentDatagram (
   @return None
 
 **/
-STATIC
 VOID
 UdpIoRecycleDgram (
   IN VOID                   *Context
@@ -649,7 +640,6 @@ UdpIoRecycleDgram (
   @return None
 
 **/
-STATIC
 VOID
 EFIAPI
 UdpIoOnDgramRcvdDpc (
@@ -730,7 +720,6 @@ UdpIoOnDgramRcvdDpc (
   @return None
 
 **/
-STATIC
 VOID
 EFIAPI
 UdpIoOnDgramRcvd (

MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c

@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PrintLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 
-static EFI_PRINT2_PROTOCOL  *gPrintProtocol = NULL;
+EFI_PRINT2_PROTOCOL  *gPrintProtocol = NULL;
 
 EFI_STATUS
 EFIAPI

MdeModulePkg/Library/GenericBdsLib/Performance.c

@@ -16,8 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "InternalBdsLib.h"
 
-STATIC PERF_HEADER               mPerfHeader;
+PERF_HEADER               mPerfHeader;
-STATIC PERF_DATA                 mPerfData;
+PERF_DATA                 mPerfData;
 
 /**
   Get the short verion of PDB file name to be

MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c

@@ -43,7 +43,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval The index of log entry in the array.
 
 **/
-STATIC
 PEI_PERFORMANCE_LOG_HEADER *
 InternalGetPerformanceHobLog (
   VOID
@@ -91,7 +90,6 @@ InternalGetPerformanceHobLog (
   @retval The index of log entry in the array.
 
 **/
-STATIC
 UINT32
 InternalSearchForLogEntry (
   IN PEI_PERFORMANCE_LOG_HEADER *PeiPerformanceLog,

MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c

@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Template for Text In Splitter
 //
-STATIC TEXT_IN_SPLITTER_PRIVATE_DATA  mConIn = {
+TEXT_IN_SPLITTER_PRIVATE_DATA  mConIn = {
   TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE,
   (EFI_HANDLE) NULL,
   {
@@ -139,7 +139,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_GRAPHICS_OUTPUT_PROTOCOL mGraphicsOutputProtoc
 //
 // Template for Text Out Splitter
 //
-STATIC TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
+TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
   TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE,
   (EFI_HANDLE) NULL,
   {
@@ -206,7 +206,7 @@ STATIC TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
 //
 // Template for Standard Error Text Out Splitter
 //
-STATIC TEXT_OUT_SPLITTER_PRIVATE_DATA mStdErr = {
+TEXT_OUT_SPLITTER_PRIVATE_DATA mStdErr = {
   TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE,
   (EFI_HANDLE) NULL,
   {

MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c

@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "ConSplitter.h"
 
 
-STATIC CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
+CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
 
 
 /**

MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c

@@ -94,7 +94,7 @@ CheckModeSupported (
 //
 // Graphics Console Devcie Private Data template
 //
-STATIC GRAPHICS_CONSOLE_DEV    mGraphicsConsoleDevTemplate = {
+GRAPHICS_CONSOLE_DEV    mGraphicsConsoleDevTemplate = {
   GRAPHICS_CONSOLE_DEV_SIGNATURE,
   (EFI_GRAPHICS_OUTPUT_PROTOCOL *) NULL,
   (EFI_UGA_DRAW_PROTOCOL *) NULL,
@@ -132,11 +132,11 @@ EFI_HII_DATABASE_PROTOCOL   *mHiiDatabase;
 EFI_HII_FONT_PROTOCOL       *mHiiFont;
 BOOLEAN                     mFirstAccessFlag = TRUE;
 
-STATIC EFI_GUID             mFontPackageListGuid = {0xf5f219d3, 0x7006, 0x4648, 0xac, 0x8d, 0xd6, 0x1d, 0xfb, 0x7b, 0xc6, 0xad};
+EFI_GUID             mFontPackageListGuid = {0xf5f219d3, 0x7006, 0x4648, 0xac, 0x8d, 0xd6, 0x1d, 0xfb, 0x7b, 0xc6, 0xad};
 
-STATIC CHAR16               mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
+CHAR16               mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
 
-STATIC EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mEfiColors[16] = {
+EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mEfiColors[16] = {
   //
   // B     G     R
   //
@@ -158,13 +158,13 @@ STATIC EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mEfiColors[16] = {
   {0xff, 0xff, 0xff, 0x00}  // WHITE
 };
 
-STATIC EFI_NARROW_GLYPH     mCursorGlyph = {
+EFI_NARROW_GLYPH     mCursorGlyph = {
   0x0000,
   0x00,
   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF }
 };
 
-STATIC CHAR16       SpaceStr[] = { NARROW_CHAR, ' ', 0 };
+CHAR16       SpaceStr[] = { NARROW_CHAR, ' ', 0 };
 
 EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding = {
   GraphicsConsoleControllerDriverSupported,

MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c

@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // ASCII. The ASCII mapping we just made up.
 //
 //
-STATIC UNICODE_TO_CHAR  UnicodeToPcAnsiOrAscii[] = {
+UNICODE_TO_CHAR  UnicodeToPcAnsiOrAscii[] = {
   { BOXDRAW_HORIZONTAL,                 0xc4, L'-' },
   { BOXDRAW_VERTICAL,                   0xb3, L'|' },
   { BOXDRAW_DOWN_RIGHT,                 0xda, L'/' },
@@ -78,10 +78,10 @@ STATIC UNICODE_TO_CHAR  UnicodeToPcAnsiOrAscii[] = {
   { 0x0000,                             0x00, L'\0' }
 };
 
-STATIC CHAR16 mSetModeString[]            = { ESC, '[', '=', '3', 'h', 0 };
+CHAR16 mSetModeString[]            = { ESC, '[', '=', '3', 'h', 0 };
-STATIC CHAR16 mSetAttributeString[]       = { ESC, '[', '0', 'm', ESC, '[', '4', '0', 'm', ESC, '[', '4', '0', 'm', 0 };
+CHAR16 mSetAttributeString[]       = { ESC, '[', '0', 'm', ESC, '[', '4', '0', 'm', ESC, '[', '4', '0', 'm', 0 };
-STATIC CHAR16 mClearScreenString[]        = { ESC, '[', '2', 'J', 0 };
+CHAR16 mClearScreenString[]        = { ESC, '[', '2', 'J', 0 };
-STATIC CHAR16 mSetCursorPositionString[]  = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 };
+CHAR16 mSetCursorPositionString[]  = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 };
 
 //
 // Body of the ConOut functions

MdeModulePkg/Universal/DebugPortDxe/DebugPort.c

@@ -21,7 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Misc. functions local to this module..
 //
-STATIC
 VOID
 GetDebugPortVariable (
   DEBUGPORT_DEVICE            *DebugPortDevice

MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.c

@@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 IDT_ENTRY   *IdtEntryTable  = NULL;
 DESCRIPTOR  NullDesc        = 0;
 
-STATIC
 EFI_STATUS
 CreateEntryStub (
   IN EFI_EXCEPTION_TYPE     ExceptionType,
@@ -74,7 +73,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 HookEntry (
   IN EFI_EXCEPTION_TYPE            ExceptionType,
@@ -120,7 +118,6 @@ Returns:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 UnhookEntry (
   IN EFI_EXCEPTION_TYPE           ExceptionType

MdeModulePkg/Universal/DebugSupportDxe/Ipf/plDebugSupport.c

@@ -33,7 +33,6 @@ typedef struct {
   VOID (*RegisteredCallback) ();
 } IVT_ENTRY;
 
-STATIC
 EFI_STATUS
 ManageIvtEntryTable (
   IN  EFI_EXCEPTION_TYPE                ExceptionType,
@@ -41,7 +40,6 @@ ManageIvtEntryTable (
   IN  VOID                  (*NewCallback) ()
   );
 
-STATIC
 VOID
 HookEntry (
   IN  EFI_EXCEPTION_TYPE                ExceptionType,
@@ -49,25 +47,21 @@ HookEntry (
   IN  VOID                  (*NewCallback) ()
   );
 
-STATIC
 VOID
 UnhookEntry (
   IN  EFI_EXCEPTION_TYPE    ExceptionType
   );
 
-STATIC
 VOID
 ChainExternalInterrupt (
   IN  VOID                  (*NewCallback) ()
   );
 
-STATIC
 VOID
 UnchainExternalInterrupt (
   VOID
   );
 
-STATIC
 VOID
 GetHandlerEntryPoint (
   UINTN                     HandlerIndex,
@@ -162,7 +156,7 @@ Returns:
   
 --*/
 {
-  static BOOLEAN  InHandler = FALSE;
+  STATIC BOOLEAN  InHandler = FALSE;
 
   DEBUG_CODE_BEGIN ();
     if (InHandler) {
@@ -195,7 +189,6 @@ Returns:
   InHandler = FALSE;
 }
 
-STATIC
 VOID
 GetHandlerEntryPoint (
   UINTN   HandlerIndex,
@@ -238,7 +231,6 @@ Returns:
   *EntryPoint = (VOID *) TempPtr;
 }
 
-STATIC
 EFI_STATUS
 ManageIvtEntryTable (
   IN  EFI_EXCEPTION_TYPE                                         ExceptionType,
@@ -321,7 +313,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 VOID
 HookEntry (
   IN  EFI_EXCEPTION_TYPE  ExceptionType,
@@ -376,7 +367,6 @@ Returns:
   IvtEntryTable[ExceptionType].RegisteredCallback = NewCallback;
 }
 
-STATIC
 VOID
 UnhookEntry (
   IN  EFI_EXCEPTION_TYPE  ExceptionType
@@ -414,7 +404,6 @@ Returns:
   InstructionCacheFlush (B0Ptr, 5);
 }
 
-STATIC
 VOID
 ChainExternalInterrupt (
   IN  VOID  (*NewCallback) ()
@@ -442,7 +431,6 @@ Returns:
   InstructionCacheFlush (Start, 0x400);
 }
 
-STATIC
 VOID
 UnchainExternalInterrupt (
   VOID

MdeModulePkg/Universal/DebugSupportDxe/X64/plDebugSupport.c

@@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 IDT_ENTRY   *IdtEntryTable  = NULL;
 DESCRIPTOR  NullDesc        = {0, 0};
 
-STATIC
 EFI_STATUS
 CreateEntryStub (
   IN EFI_EXCEPTION_TYPE     ExceptionType,
@@ -72,7 +71,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 HookEntry (
   IN EFI_EXCEPTION_TYPE            ExceptionType,
@@ -119,7 +117,6 @@ Returns:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 UnhookEntry (
   IN EFI_EXCEPTION_TYPE           ExceptionType

MdeModulePkg/Universal/HiiDatabaseDxe/Database.c

@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Global variables
 //
-STATIC EFI_GUID mHiiDatabaseNotifyGuid = HII_DATABASE_NOTIFY_GUID;
+EFI_GUID mHiiDatabaseNotifyGuid = HII_DATABASE_NOTIFY_GUID;
 
 
 /**

MdeModulePkg/Universal/HiiDatabaseDxe/Font.c

@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "HiiDatabase.h"
 
-STATIC EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mEfiColors[16] = {
+EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mEfiColors[16] = {
   //
   // B     G     R
   //

MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c

@@ -30,9 +30,9 @@ Revision History
 // Global variables
 //
 EFI_EVENT gHiiKeyboardLayoutChanged;
-STATIC EFI_GUID gHiiSetKbdLayoutEventGuid = EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID;
+EFI_GUID gHiiSetKbdLayoutEventGuid = EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID;
 
-STATIC HII_DATABASE_PRIVATE_DATA mPrivate = {
+HII_DATABASE_PRIVATE_DATA mPrivate = {
   HII_DATABASE_PRIVATE_DATA_SIGNATURE,
   {
     (LIST_ENTRY *) NULL,

MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c

@@ -15,9 +15,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <BaseMemoryTest.h>
 #include <Library/PeiServicesLib.h>
 
-static PEI_BASE_MEMORY_TEST_PPI mPeiBaseMemoryTestPpi = { BaseMemoryTest };
+PEI_BASE_MEMORY_TEST_PPI mPeiBaseMemoryTestPpi = { BaseMemoryTest };
 
-static EFI_PEI_PPI_DESCRIPTOR   PpiListPeiBaseMemoryTest = {
+EFI_PEI_PPI_DESCRIPTOR   PpiListPeiBaseMemoryTest = {
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gPeiBaseMemoryTestPpiGuid,
   &mPeiBaseMemoryTestPpi

MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c

@@ -27,7 +27,7 @@ Abstract:
 // to validate a dhcp message. Refere the comments of the
 // DHCP_OPTION_FORMAT structure.
 //
-STATIC DHCP_OPTION_FORMAT DhcpOptionFormats[] = {
+DHCP_OPTION_FORMAT DhcpOptionFormats[] = {
   {DHCP_TAG_NETMASK,        DHCP_OPTION_IP,     1, 1  , TRUE},
   {DHCP_TAG_TIME_OFFSET,    DHCP_OPTION_INT32,  1, 1  , FALSE},
   {DHCP_TAG_ROUTER,         DHCP_OPTION_IP,     1, -1 , TRUE},

MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c

@@ -42,7 +42,6 @@ LIST_ENTRY      mIScsiConfigFormList = {
   @retval None.
 
 **/
-STATIC
 VOID
 IScsiIpToStr (
   IN  EFI_IPv4_ADDRESS  *Ip,
@@ -218,7 +217,6 @@ IScsiUpdateDeviceList (
   @retval The iSCSI configuration form entry found.
 
 **/
-STATIC
 ISCSI_CONFIG_FORM_ENTRY *
 IScsiGetConfigFormEntryByIndex (
   IN UINT32 Index
@@ -253,7 +251,6 @@ IScsiGetConfigFormEntryByIndex (
   @retval None.
 
 **/
-STATIC
 VOID
 IScsiConvertDeviceConfigDataToIfrNvData (
   IN ISCSI_CONFIG_FORM_ENTRY  *ConfigFormEntry,

MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c

@@ -40,7 +40,6 @@ Abstract:
   @retval EFI_INVALID_PARAMETER The RootPath is mal-formatted.
 
 **/
-STATIC
 EFI_STATUS
 IScsiDhcpExtractRootPath (
   IN CHAR8                        *RootPath,
@@ -204,7 +203,6 @@ ON_EXIT:
                            in the Dhcp4Event.
 
 **/
-STATIC
 EFI_STATUS
 IScsiDhcpSelectOffer (
   IN  EFI_DHCP4_PROTOCOL  * This,

MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c

@@ -30,7 +30,6 @@ Abstract:
   @retval None.
 
 **/
-STATIC
 VOID
 IScsiInitIbfTableHeader (
   IN EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER  *Header
@@ -61,7 +60,6 @@ IScsiInitIbfTableHeader (
   @retval None.
 
 **/
-STATIC
 VOID
 IScsiInitControlSection (
   IN EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER  *Table,
@@ -106,7 +104,6 @@ IScsiInitControlSection (
   @retval None.
 
 **/
-STATIC
 VOID
 IScsiAddHeapItem (
   IN OUT UINT8  **Heap,
@@ -135,7 +132,6 @@ IScsiAddHeapItem (
   @retval None.
 
 **/
-STATIC
 VOID
 IScsiFillInitiatorSection (
   IN     EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER  *Table,
@@ -197,7 +193,6 @@ IScsiFillInitiatorSection (
   @retval None.
 
 **/
-STATIC
 VOID
 IScsiMapV4ToV6Addr (
   IN  EFI_IPv4_ADDRESS *V4,
@@ -225,7 +220,6 @@ IScsiMapV4ToV6Addr (
   @retval UINT16          The composited representation of the NIC PCI location.
 
 **/
-STATIC
 UINT16
 IScsiGetNICPciLocation (
   IN EFI_HANDLE  Controller
@@ -279,7 +273,6 @@ IScsiGetNICPciLocation (
   @retval EFI_MAC_ADDRESS * The mac address.
 
 **/
-STATIC
 EFI_MAC_ADDRESS *
 IScsiGetMacAddress (
   IN EFI_HANDLE  Controller
@@ -312,7 +305,6 @@ IScsiGetMacAddress (
   @retval None.
 
 **/
-STATIC
 VOID
 IScsiFillNICAndTargetSections (
   IN     EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER  *Table,

MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c

@@ -22,7 +22,7 @@ Abstract:
 
 #include "IScsiImpl.h"
 
-STATIC CONST CHAR8  IScsiHexString[] = "0123456789ABCDEFabcdef";
+CONST CHAR8  IScsiHexString[] = "0123456789ABCDEFabcdef";
 
 /**
   Removes (trims) specified leading and trailing characters from a string.
@@ -35,7 +35,6 @@ STATIC CONST CHAR8  IScsiHexString[] = "0123456789ABCDEFabcdef";
   @retval NONE.
 
 **/
-static
 VOID
 StrTrim (
   IN OUT CHAR16   *str,

MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c

@@ -21,7 +21,7 @@ Abstract:
 
 #include "IScsiImpl.h"
 
-static UINT32 mDataSegPad = 0;
+UINT32 mDataSegPad = 0;
 
 /**
   Attach the iSCSI connection to the iSCSI session. 

MdeModulePkg/Universal/Network/IScsiDxe/Md5.c

@@ -22,21 +22,21 @@ Abstract:
 
 #include "Md5.h"
 
-STATIC CONST UINT32  MD5_K[][2] = {
+CONST UINT32  MD5_K[][2] = {
   { 0, 1 },
   { 1, 5 },
   { 5, 3 },
   { 0, 7 }
 };
 
-STATIC CONST UINT32  MD5_S[][4] = {
+CONST UINT32  MD5_S[][4] = {
   { 7, 22, 17, 12 },
   { 5, 20, 14, 9 },
   { 4, 23, 16 ,11 },
   { 6, 21, 15, 10 },
 };
 
-STATIC CONST UINT32  MD5_T[] = {
+CONST UINT32  MD5_T[] = {
   0xD76AA478, 0xE8C7B756, 0x242070DB, 0xC1BDCEEE,
   0xF57C0FAF, 0x4787C62A, 0xA8304613, 0xFD469501,
   0x698098D8, 0x8B44F7AF, 0xFFFF5BB1, 0x895CD7BE,
@@ -55,7 +55,7 @@ STATIC CONST UINT32  MD5_T[] = {
   0xF7537E82, 0xBD3AF235, 0x2AD7D2BB, 0xEB86D391
 };
 
-STATIC CONST UINT8 Md5HashPadding[] =
+CONST UINT8 Md5HashPadding[] =
 {
   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -116,7 +116,7 @@ UINT32
   IN UINT32  C
   );
 
-STATIC CONST MD5_TRANSFORM_FUNC MD5_F[] = {
+CONST MD5_TRANSFORM_FUNC MD5_F[] = {
   TF1,
   TF2,
   TF3,
@@ -131,7 +131,6 @@ STATIC CONST MD5_TRANSFORM_FUNC MD5_F[] = {
   @retval NONE.
 
 **/
-STATIC
 VOID
 MD5Transform (
   IN MD5_CTX  *Md5Ctx
@@ -188,7 +187,6 @@ MD5Transform (
 
   @retval NONE.
 **/
-STATIC
 VOID
 MD5UpdateBlock (
   IN MD5_CTX      *Md5Ctx,

MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c

@@ -121,7 +121,6 @@ Ip4DriverBindingSupported (
   return Status;
 }
 
-STATIC
 EFI_STATUS
 Ip4CleanService (
   IN IP4_SERVICE            *IpSb
@@ -141,7 +140,6 @@ Ip4CleanService (
   @retval EFI_SUCCESS            A new IP4 service binding private is created.
 
 **/
-STATIC
 EFI_STATUS
 Ip4CreateService (
   IN  EFI_HANDLE            Controller,

MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c

@@ -99,7 +99,6 @@ mIp4SupportedIcmp [23] = {
   @retval EFI_SUCCESS            Successfully updated the route caches
 
 **/
-STATIC
 EFI_STATUS
 Ip4ProcessIcmpRedirect (
   IN IP4_SERVICE            *IpSb,
@@ -176,7 +175,6 @@ Ip4ProcessIcmpRedirect (
   @retval EFI_SUCCESS            The ICMP error is processed successfully.
 
 **/
-STATIC
 EFI_STATUS
 Ip4ProcessIcmpError (
   IN IP4_SERVICE            *IpSb,

MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c

@@ -27,16 +27,14 @@ Abstract:
 // Mac address with all zero, used to determine whethter the ARP
 // resolve succeeded. Failed ARP requests zero the MAC address buffer.
 //
-STATIC EFI_MAC_ADDRESS  mZeroMacAddress;
+EFI_MAC_ADDRESS  mZeroMacAddress;
 
-STATIC
 VOID
 EFIAPI
 Ip4OnFrameSentDpc (
   IN VOID                   *Context
   );
 
-STATIC
 VOID
 EFIAPI
 Ip4OnFrameSent (
@@ -44,14 +42,12 @@ Ip4OnFrameSent (
   IN VOID                   *Context
   );
 
-STATIC
 VOID
 EFIAPI
 Ip4OnArpResolvedDpc (
   IN VOID                   *Context
   );
 
-STATIC
 VOID
 EFIAPI
 Ip4OnArpResolved (
@@ -59,14 +55,12 @@ Ip4OnArpResolved (
   IN VOID                   *Context
   );
 
-STATIC
 VOID
 EFIAPI
 Ip4OnFrameReceivedDpc (
   IN VOID                   *Context
   );
 
-STATIC
 VOID
 EFIAPI
 Ip4OnFrameReceived (
@@ -74,7 +68,6 @@ Ip4OnFrameReceived (
   IN VOID                   *Context
   );
 
-STATIC
 VOID
 Ip4CancelFrameArp (
   IN IP4_ARP_QUE            *ArpQue,
@@ -98,7 +91,6 @@ Ip4CancelFrameArp (
   @return The wrapped token if succeed or NULL
 
 **/
-STATIC
 IP4_LINK_TX_TOKEN *
 Ip4WrapLinkTxToken (
   IN IP4_INTERFACE          *Interface,
@@ -175,7 +167,6 @@ Ip4WrapLinkTxToken (
   @return NONE
 
 **/
-STATIC
 VOID
 Ip4FreeLinkTxToken (
   IN IP4_LINK_TX_TOKEN      *Token
@@ -198,7 +189,6 @@ Ip4FreeLinkTxToken (
   @return Point to newly created IP4_ARP_QUE if succeed, otherwise NULL.
 
 **/
-STATIC
 IP4_ARP_QUE *
 Ip4CreateArpQue (
   IN IP4_INTERFACE          *Interface,
@@ -250,7 +240,6 @@ Ip4CreateArpQue (
   @return NONE
 
 **/
-STATIC
 VOID
 Ip4FreeArpQue (
   IN IP4_ARP_QUE            *ArpQue,
@@ -281,7 +270,6 @@ Ip4FreeArpQue (
   @return Point to created IP4_LINK_RX_TOKEN if succeed, otherwise NULL.
 
 **/
-STATIC
 IP4_LINK_RX_TOKEN *
 Ip4CreateLinkRxToken (
   IN IP4_INTERFACE          *Interface,
@@ -335,7 +323,6 @@ Ip4CreateLinkRxToken (
   @return NONE
 
 **/
-STATIC
 VOID
 Ip4FreeFrameRxToken (
   IN IP4_LINK_RX_TOKEN      *Token
@@ -362,7 +349,6 @@ Ip4FreeFrameRxToken (
   @return NONE
 
 **/
-STATIC
 VOID
 Ip4CancelFrameArp (
   IN IP4_ARP_QUE            *ArpQue,
@@ -638,7 +624,6 @@ ON_ERROR:
   @retval FALSE                 The frame doesn't belong to this instance.
 
 **/
-STATIC
 BOOLEAN
 Ip4CancelInstanceFrame (
   IN IP4_LINK_TX_TOKEN *Frame,
@@ -766,7 +751,6 @@ Ip4FreeInterface (
   @return None
 
 **/
-STATIC
 VOID
 EFIAPI
 Ip4OnArpResolvedDpc (
@@ -831,7 +815,6 @@ Ip4OnArpResolvedDpc (
   Ip4FreeArpQue (ArpQue, EFI_SUCCESS);
 }
 
-STATIC
 VOID
 EFIAPI
 Ip4OnArpResolved (
@@ -872,7 +855,6 @@ Returns:
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 Ip4OnFrameSentDpc (
@@ -897,7 +879,6 @@ Ip4OnFrameSentDpc (
   Ip4FreeLinkTxToken (Token);
 }
 
-STATIC
 VOID
 EFIAPI
 Ip4OnFrameSent (
@@ -1088,7 +1069,6 @@ ON_ERROR:
   @return None.
 
 **/
-STATIC
 VOID
 Ip4RecycleFrame (
   IN VOID                   *Context
@@ -1117,7 +1097,6 @@ Ip4RecycleFrame (
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 Ip4OnFrameReceivedDpc (
@@ -1175,7 +1154,6 @@ Ip4OnFrameReceivedDpc (
   Token->CallBack (Token->IpInstance, Packet, EFI_SUCCESS, Flag, Token->Context);
 }
 
-STATIC
 VOID
 EFIAPI
 Ip4OnFrameReceived (

MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c

@@ -36,7 +36,6 @@ Abstract:
   @retval Others                 Failed to retrieve the IP4 route table.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiIp4GetModeData (
@@ -821,7 +820,6 @@ Ip4StationAddressValid (
   @retval EFI_SUCCESS            The instance is configured.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiIp4Configure (
@@ -1050,7 +1048,6 @@ Ip4Groups (
   @retval Otherwise              It failed to change the setting.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiIp4Groups (
@@ -1112,7 +1109,6 @@ ON_EXIT:
   @retval Others                 Failed to modify the route table
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiIp4Routes (
@@ -1204,7 +1200,6 @@ ON_EXIT:
                                  context.
 
 **/
-STATIC
 EFI_STATUS
 Ip4TokenExist (
   IN NET_MAP                *Map,
@@ -1237,7 +1232,6 @@ Ip4TokenExist (
   @retval EFI_SUCCESS            The token is OK
 
 **/
-STATIC
 EFI_STATUS
 Ip4TxTokenValid (
   IN EFI_IP4_COMPLETION_TOKEN   *Token,
@@ -1365,7 +1359,6 @@ Ip4TxTokenValid (
   @return None
 
 **/
-STATIC
 VOID
 Ip4FreeTxToken (
   IN VOID                   *Context
@@ -1411,7 +1404,6 @@ Ip4FreeTxToken (
   @return None
 
 **/
-STATIC
 VOID
 Ip4OnPacketSent (
   IP4_PROTOCOL              *Ip4Instance,
@@ -1458,7 +1450,6 @@ Ip4OnPacketSent (
                                  for transmission.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiIp4Transmit (
@@ -1644,7 +1635,6 @@ ON_EXIT:
   @retval EFI_SUCCESS            The receive request has been issued.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiIp4Receive (
@@ -1722,7 +1712,6 @@ ON_EXIT:
   @retval EFI_ABORTED            The user's Token (Token != NULL) is cancelled.
 
 **/
-STATIC
 EFI_STATUS
 Ip4CancelTxTokens (
   IN NET_MAP                *Map,
@@ -1778,7 +1767,6 @@ Ip4CancelTxTokens (
                                  cancelled.
 
 **/
-STATIC
 EFI_STATUS
 Ip4CancelRxTokens (
   IN NET_MAP                *Map,
@@ -1901,7 +1889,6 @@ Ip4Cancel (
   @retval EFI_SUCCESS            The Token is cancelled.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiIp4Cancel (
@@ -1949,7 +1936,6 @@ ON_EXIT:
   @retval EFI_NOT_STARTED        The IP4 child hasn't been configured.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiIp4Poll (

MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c

@@ -37,7 +37,6 @@ Abstract:
   @return the point to just created reassemble entry.
 
 **/
-STATIC
 IP4_ASSEMBLE_ENTRY *
 Ip4CreateAssembleEntry (
   IN IP4_ADDR               Dst,
@@ -80,7 +79,6 @@ Ip4CreateAssembleEntry (
   @return None
 
 **/
-STATIC
 VOID
 Ip4FreeAssembleEntry (
   IN IP4_ASSEMBLE_ENTRY     *Assemble
@@ -164,7 +162,6 @@ Ip4CleanAssembleTable (
   @return None
 
 **/
-STATIC
 VOID
 Ip4TrimPacket (
   IN NET_BUF                *Packet,
@@ -208,7 +205,6 @@ Ip4TrimPacket (
   @return None
 
 **/
-STATIC
 VOID
 Ip4OnFreeFragments (
   IN VOID                   *Arg
@@ -231,7 +227,6 @@ Ip4OnFreeFragments (
   @return packet if all the fragments of the packet have arrived.
 
 **/
-STATIC
 NET_BUF *
 Ip4Reassemble (
   IN IP4_ASSEMBLE_TABLE     *Table,
@@ -795,7 +790,6 @@ Ip4InstanceEnquePacket (
   @return None
 
 **/
-STATIC
 VOID
 EFIAPI
 Ip4OnRecyclePacket (

MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c

@@ -421,7 +421,6 @@ ON_ERROR:
   @retval FALSE                This is unrelated packet.
 
 **/
-STATIC
 BOOLEAN
 Ip4CancelPacketFragments (
   IP4_LINK_TX_TOKEN   *Frame,

MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c

@@ -34,7 +34,6 @@ Abstract:
   @return route entry.
 
 **/
-STATIC
 IP4_ROUTE_ENTRY *
 Ip4CreateRouteEntry (
   IN IP4_ADDR               Dest,
@@ -70,7 +69,6 @@ Ip4CreateRouteEntry (
   @return NONE
 
 **/
-STATIC
 VOID
 Ip4FreeRouteEntry (
   IN IP4_ROUTE_ENTRY    *RtEntry
@@ -97,7 +95,6 @@ Ip4FreeRouteEntry (
   @return to the created route cache entry.
 
 **/
-STATIC
 IP4_ROUTE_CACHE_ENTRY *
 Ip4CreateRouteCacheEntry (
   IN IP4_ADDR               Dst,
@@ -292,7 +289,6 @@ Ip4FreeRouteTable (
   @return None
 
 **/
-STATIC
 VOID
 Ip4PurgeRouteCache (
   IN IP4_ROUTE_CACHE        *RtCache,
@@ -482,7 +478,6 @@ Ip4FindRouteCache (
   @return most specific route to the Dst.
 
 **/
-STATIC
 IP4_ROUTE_ENTRY *
 Ip4FindRouteEntry (
   IN IP4_ROUTE_TABLE        *RtTable,

MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c

@@ -52,26 +52,22 @@ EFI_MANAGED_NETWORK_CONFIG_DATA mMnpDefaultConfigData = {
   FALSE
 };
 
-STATIC
 EFI_STATUS
 MnpAddFreeNbuf (
   IN MNP_SERVICE_DATA  *MnpServiceData,
   IN UINTN             Count
   );
 
-STATIC
 EFI_STATUS
 MnpStartSnp (
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *Snp
   );
 
-STATIC
 EFI_STATUS
 MnpStopSnp (
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *Snp
   );
 
-STATIC
 EFI_STATUS
 MnpStart (
   IN MNP_SERVICE_DATA  *MnpServiceData,
@@ -79,19 +75,16 @@ MnpStart (
   IN BOOLEAN           EnableSystemPoll
   );
 
-STATIC
 EFI_STATUS
 MnpStop (
   IN MNP_SERVICE_DATA  *MnpServiceData
   );
 
-STATIC
 EFI_STATUS
 MnpConfigReceiveFilters (
   IN MNP_SERVICE_DATA  *MnpServiceData
   );
 
-STATIC
 EFI_STATUS
 MnpGroupOpAddCtrlBlk (
   IN MNP_INSTANCE_DATA        *Instance,
@@ -101,7 +94,6 @@ MnpGroupOpAddCtrlBlk (
   IN UINT32                   HwAddressSize
   );
 
-STATIC
 BOOLEAN
 MnpGroupOpDelCtrlBlk (
   IN MNP_INSTANCE_DATA        *Instance,
@@ -121,7 +113,6 @@ MnpGroupOpDelCtrlBlk (
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate a NET_BUF structure.
 
 **/
-STATIC
 EFI_STATUS
 MnpAddFreeNbuf (
   IN MNP_SERVICE_DATA  *MnpServiceData,
@@ -679,7 +670,6 @@ MnpCancelTokens (
   @retval Other                 Some error occurs.
 
 **/
-STATIC
 EFI_STATUS
 MnpStartSnp (
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *Snp
@@ -714,7 +704,6 @@ MnpStartSnp (
   @retval Other                 Some error occurs.
 
 **/
-STATIC
 EFI_STATUS
 MnpStopSnp (
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *Snp
@@ -754,7 +743,6 @@ MnpStopSnp (
   @retval Other                 Some error occurs.
 
 **/
-STATIC
 EFI_STATUS
 MnpStart (
   IN MNP_SERVICE_DATA  *MnpServiceData,
@@ -843,7 +831,6 @@ ErrorExit:
   @retval Other                 Some error occurs.
 
 **/
-STATIC
 EFI_STATUS
 MnpStop (
   IN MNP_SERVICE_DATA  *MnpServiceData
@@ -1087,7 +1074,6 @@ MnpConfigureInstance (
                                 of memory resource.
 
 **/
-STATIC
 EFI_STATUS
 MnpConfigReceiveFilters (
   IN MNP_SERVICE_DATA  *MnpServiceData
@@ -1249,7 +1235,6 @@ MnpConfigReceiveFilters (
   @retval EFI_OUT_OF_RESOURCE   Failed due to lack of memory resources.
 
 **/
-STATIC
 EFI_STATUS
 MnpGroupOpAddCtrlBlk (
   IN MNP_INSTANCE_DATA        *Instance,
@@ -1315,7 +1300,6 @@ MnpGroupOpAddCtrlBlk (
   @return The group address controlled by the control block is no longer used or not.
 
 **/
-STATIC
 BOOLEAN
 MnpGroupOpDelCtrlBlk (
   IN MNP_INSTANCE_DATA        *Instance,

MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c

@@ -405,7 +405,6 @@ MnpInstanceDeliverPacket (
   @return None.
 
 **/
-STATIC
 VOID
 MnpDeliverPacket (
   IN MNP_SERVICE_DATA  *MnpServiceData
@@ -488,7 +487,6 @@ MnpRecycleRxData (
   @return None.
 
 **/
-STATIC
 VOID
 MnpQueueRcvdPacket (
   IN MNP_INSTANCE_DATA  *Instance,
@@ -550,7 +548,6 @@ MnpQueueRcvdPacket (
   @return The received packet matches the instance's receive filters or not.
 
 **/
-STATIC
 BOOLEAN
 MnpMatchPacket (
   IN MNP_INSTANCE_DATA                 *Instance,
@@ -632,7 +629,6 @@ MnpMatchPacket (
   @return None.
 
 **/
-STATIC
 VOID
 MnpAnalysePacket (
   IN  MNP_SERVICE_DATA                  *MnpServiceData,
@@ -729,7 +725,6 @@ MnpAnalysePacket (
   @return Pointer to a MNP_RXDATA_WRAP which wraps the RxData.
 
 **/
-STATIC
 MNP_RXDATA_WRAP *
 MnpWrapRxData (
   IN MNP_INSTANCE_DATA                 *Instance,
@@ -787,7 +782,6 @@ MnpWrapRxData (
   @return None.
 
 **/
-STATIC
 VOID
 MnpEnqueuePacket (
   IN MNP_SERVICE_DATA   *MnpServiceData,

MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c

@@ -22,7 +22,6 @@ Abstract:
 
 #include "Mtftp4Impl.h"
 
-STATIC
 EFI_STATUS
 EFIAPI
 EfiMtftp4ReadFile (
@@ -41,7 +40,6 @@ EfiMtftp4ReadFile (
   @retval EFI_SUCCESS            The operation parameter is saved in ModeData
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiMtftp4GetModeData (
@@ -158,7 +156,6 @@ Mtftp4CleanOperation (
   @retval EFI_SUCCESS            The instance is configured for operation.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiMtftp4Configure (
@@ -251,7 +248,6 @@ EfiMtftp4Configure (
   @retval EFI_ABORTED            Abort the ReadFile operation and return.
 
 **/
-STATIC
 EFI_STATUS
 Mtftp4GetInfoCheckPacket (
   IN EFI_MTFTP4_PROTOCOL    *This,
@@ -322,7 +318,6 @@ Mtftp4GetInfoCheckPacket (
   @retval Others                 Failed to get the information.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiMtftp4GetInfo (
@@ -399,7 +394,6 @@ EfiMtftp4GetInfo (
   @retval EFI_SUCCESS            The packet is parsed.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiMtftp4ParseOptions (
@@ -444,7 +438,6 @@ EfiMtftp4ParseOptions (
   @return TRUE if the override data is valid, otherwise FALSE.
 
 **/
-STATIC
 BOOLEAN
 Mtftp4OverrideValid (
   IN MTFTP4_PROTOCOL          *Instance,
@@ -547,7 +540,6 @@ Mtftp4GetMapping (
                                  session to unicast receive.
 
 **/
-STATIC
 EFI_STATUS
 Mtftp4ConfigUnicastPort (
   IN UDP_IO_PORT            *UdpIo,
@@ -613,7 +605,6 @@ Mtftp4ConfigUnicastPort (
   @retval EFI_SUCCESS            The operation is successfully started.
 
 **/
-STATIC
 EFI_STATUS
 Mtftp4Start (
   IN EFI_MTFTP4_PROTOCOL    *This,
@@ -801,7 +792,6 @@ ON_ERROR:
   @retval Others                 Some error happened.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiMtftp4ReadFile (
@@ -825,7 +815,6 @@ EfiMtftp4ReadFile (
   @retval Others                 Some error happened.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiMtftp4WriteFile (
@@ -850,7 +839,6 @@ EfiMtftp4WriteFile (
   @retval Others                 Some error happened.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiMtftp4ReadDirectory (
@@ -872,7 +860,6 @@ EfiMtftp4ReadDirectory (
   @retval EFI_DEVICE_ERROR       The MTFTP session has been destoried.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 EfiMtftp4Poll (

MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c

@@ -44,7 +44,6 @@ CHAR8 *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS] = {
   @retval EFI_SUCCESS            The packet has been parsed into the Options array.
 
 **/
-STATIC
 EFI_STATUS
 Mtftp4FillOptions (
   IN  EFI_MTFTP4_PACKET     *Packet,
@@ -260,7 +259,6 @@ NetStringToU32 (
   @retval EFI_SUCCESS            The IP is parsed into the Ip
 
 **/
-STATIC
 EFI_STATUS
 NetStringToIp (
   IN  UINT8                 *Str,
@@ -317,7 +315,6 @@ NetStringToIp (
   @retval EFI_SUCCESS            The multicast value is parsed into the Option
 
 **/
-STATIC
 EFI_STATUS
 Mtftp4ExtractMcast (
   IN UINT8                  *Value,

MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c

@@ -371,7 +371,6 @@ Mtftp4RrqOackValid (
   @retval Others                Failed to configure the UDP child.
 
 **/
-STATIC
 EFI_STATUS
 Mtftp4RrqConfigMcastPort (
   IN UDP_IO_PORT            *McastIo,

MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c

@@ -33,7 +33,6 @@ Abstract:
   @return NULL if failed to allocate memory, otherwise the created block range.
 
 **/
-STATIC
 MTFTP4_BLOCK_RANGE *
 Mtftp4AllocateRange (
   IN UINT16                 Start,
@@ -372,7 +371,6 @@ Mtftp4SendError (
   @return None
 
 **/
-STATIC
 VOID
 Mtftp4OnPacketSent (
   NET_BUF                   *Packet,

MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c

@@ -345,7 +345,6 @@ UpdateChecksum (
   @retval 1                    Callbacks are not active on the handle
 
 **/
-STATIC
 BOOLEAN
 SetMakeCallback (
   IN PXE_BASECODE_DEVICE *Private

MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_arp.c

@@ -23,10 +23,10 @@ Abstract:
 // Definitions for ARP
 // Per RFC 826
 //
-STATIC ARP_HEADER ArpHeader;
+ARP_HEADER ArpHeader;
 
 #pragma pack(1)
-STATIC struct {
+struct {
   UINT8       MediaHeader[14];
   ARP_HEADER  ArpHeader;
   UINT8       ArpData[64];
@@ -307,7 +307,6 @@ GetHwAddr (
   @return other := ARP request could not be sent
 
 **/
-STATIC
 EFI_STATUS
 SendRequest (
   IN PXE_BASECODE_DEVICE  *Private,

MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c

@@ -22,12 +22,12 @@ Abstract:
 
 #include "PxeArch.h"
 
-STATIC EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort        = DHCP_SERVER_PORT;
+EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort        = DHCP_SERVER_PORT;
-STATIC EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort        = DHCP_CLIENT_PORT;
+EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort        = DHCP_CLIENT_PORT;
-STATIC EFI_PXE_BASE_CODE_UDP_PORT PseudoDhcpServerPort  = PXE_DISCOVERY_PORT;
+EFI_PXE_BASE_CODE_UDP_PORT PseudoDhcpServerPort  = PXE_DISCOVERY_PORT;
 #define PSEUDO_DHCP_CLIENT_PORT PseudoDhcpServerPort
-STATIC EFI_IP_ADDRESS             BroadcastIP       = {{0xffffffff}};
+EFI_IP_ADDRESS             BroadcastIP       = {{0xffffffff}};
-STATIC EFI_IP_ADDRESS             DefaultSubnetMask = {{0xffffff00}};
+EFI_IP_ADDRESS             DefaultSubnetMask = {{0xffffff00}};
 
 typedef union {
   DHCPV4_OP_STRUCT          *OpPtr;
@@ -50,7 +50,7 @@ typedef union {
 // option structure for DHCPREQUEST at end of DISCOVER options
 // and for DHCPDECLINE
 //
-STATIC const struct requestopendstr {
+const struct requestopendstr {
   DHCPV4_OP_REQUESTED_IP  OpReqIP;
   DHCPV4_OP_SERVER_IP     DhcServerIpPtr;
   UINT8                   End[1];
@@ -87,7 +87,7 @@ PXE_OP_BOOT_ITEM                DefaultBootItem = {
 //
 // PXE discovery control default structure
 //
-STATIC PXE_OP_DISCOVERY_CONTROL DefaultDisCtl = {
+PXE_OP_DISCOVERY_CONTROL DefaultDisCtl = {
   { VEND_PXE_DISCOVERY_CONTROL, DHCPV4_OPTION_LENGTH(PXE_OP_DISCOVERY_CONTROL) },
   0
 };
@@ -120,7 +120,7 @@ typedef struct {            // discoveropendstr {
 // common option beginning for all our DHCP messages except
 // DHCPDECLINE and DHCPRELEASE
 //
-STATIC struct optionsstr {
+struct optionsstr {
   UINT8                       DhcpCookie[4];
   DHCPV4_OP_MESSAGE_TYPE      DhcpMessageType;
   DHCPV4_OP_MAX_MESSAGE_SIZE  DhcpMaxMessageSize;
@@ -246,7 +246,7 @@ struct opreleasestr {
 // value 0 -> not of interest, else value is index into PXE OPTION array
 // option values from 1 to MAX_OUR_PXE_OPT
 //
-STATIC UINT8  ourPXEopts[MAX_OUR_PXE_OPT] = {
+UINT8  ourPXEopts[MAX_OUR_PXE_OPT] = {
   VEND_PXE_MTFTP_IP_IX,             // multicast IP address of bootfile for MTFTP listen
   VEND_PXE_MTFTP_CPORT_IX,          // UDP Port to monitor for MTFTP responses - Intel order
   VEND_PXE_MTFTP_SPORT_IX,          // Server UDP Port for MTFTP open - Intel order
@@ -327,7 +327,7 @@ STATIC UINT8  ourPXEopts[MAX_OUR_PXE_OPT] = {
 // value 0 -> not of interest, else value is index into OPTION array
 // option values from 1 to MAX_OUR_OPT
 //
-STATIC UINT8  OurDhcpOptions[MAX_OUR_OPT] = {
+UINT8  OurDhcpOptions[MAX_OUR_OPT] = {
   OP_SUBNET_MASK_IX,                      // OP_SUBNET_MASK   1   // data is the subnet mask
   OP_TIME_OFFSET_IX,                      // OP_TIME_OFFSET   2   // data is the time offset of subnet to UTC in seconds
   OP_ROUTER_LIST_IX,                      // OP_ROUTER_LIST   3   // list of routers on subnet
@@ -527,7 +527,6 @@ PxeBcLibGetSmbiosSystemGuidAndSerialNumber (
 //
 // add router list to list
 //
-STATIC
 VOID
 Ip4AddRouterList (
   PXE_BASECODE_DEVICE *Private,
@@ -553,7 +552,6 @@ Ip4AddRouterList (
 //
 // send ARP for our IP - fail if someone has it
 //
-STATIC
 BOOLEAN
 SetStationIP (
   PXE_BASECODE_DEVICE *Private
@@ -613,7 +611,6 @@ SetStationIP (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 VOID
 AddRouters (
   PXE_BASECODE_DEVICE *Private,
@@ -627,7 +624,6 @@ AddRouters (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 EFI_STATUS
 DoUdpWrite (
   PXE_BASECODE_DEVICE         *Private,
@@ -665,7 +661,6 @@ typedef struct {
   UINT8 x[4];
 } C4Str;
 
-STATIC
 VOID
 InitDhcpv4TxBuf (
   PXE_BASECODE_DEVICE *Private
@@ -741,7 +736,6 @@ InitDhcpv4TxBuf (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 UINT32
 DecodePxeOptions (
   DHCP_RECEIVE_BUFFER *RxBufPtr,
@@ -789,7 +783,6 @@ DecodePxeOptions (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 VOID
 DecodeOptions (
   DHCP_RECEIVE_BUFFER *RxBufPtr,
@@ -897,7 +890,6 @@ Parse (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 VOID
 CopyParseRxBuf (
   PXE_BASECODE_DEVICE *Private,
@@ -919,7 +911,6 @@ CopyParseRxBuf (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 VOID
 CopyProxyRxBuf (
   PXE_BASECODE_DEVICE *Private,
@@ -931,7 +922,6 @@ CopyProxyRxBuf (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 VOID
 CopyParse (
   PXE_BASECODE_DEVICE       *Private,
@@ -1401,7 +1391,6 @@ GetOffers (
 //
 // send DHCPDECLINE
 //
-STATIC
 VOID
 DeclineOffer (
   PXE_BASECODE_DEVICE *Private
@@ -1447,7 +1436,6 @@ DeclineOffer (
 //
 // send DHCPRELEASE
 //
-STATIC
 BOOLEAN
 Release (
   PXE_BASECODE_DEVICE *Private
@@ -1498,7 +1486,6 @@ Release (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 BOOLEAN
 GetBINLAck (
   PXE_BASECODE_DEVICE *Private,
@@ -1583,7 +1570,6 @@ GetBINLAck (
 // make sure we can get BINL
 // send DHCPREQUEST to PXE server
 //
-STATIC
 BOOLEAN
 TryBINL (
   PXE_BASECODE_DEVICE *Private,
@@ -1672,7 +1658,6 @@ TryBINL (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 BOOLEAN
 TryFinishBINL (
   PXE_BASECODE_DEVICE *Private,
@@ -1687,7 +1672,6 @@ TryFinishBINL (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 BOOLEAN
 TryFinishProxyBINL (
   PXE_BASECODE_DEVICE *Private
@@ -1709,7 +1693,6 @@ TryFinishProxyBINL (
 //
 // try to finish DORA - send DHCP request, wait for ACK, check with ARP
 //
-STATIC
 BOOLEAN
 TryFinishDORA (
   PXE_BASECODE_DEVICE *Private,
@@ -1848,7 +1831,6 @@ TryFinishDORA (
 //
 // try a DHCP server of appropriate type
 //
-STATIC
 BOOLEAN
 TryDHCPFinishDORA (
   PXE_BASECODE_DEVICE *Private,
@@ -1878,7 +1860,6 @@ TryDHCPFinishDORA (
 //
 // try a DHCP only server and a proxy of appropriate type
 //
-STATIC
 BOOLEAN
 TryProxyFinishDORA (
   PXE_BASECODE_DEVICE *Private,
@@ -1919,7 +1900,6 @@ TryProxyFinishDORA (
 //
 // getting to the bottom of the barrel
 //
-STATIC
 BOOLEAN
 TryAnyWithBootfileFinishDORA (
   PXE_BASECODE_DEVICE *Private
@@ -1970,7 +1950,6 @@ TryAnyWithBootfileFinishDORA (
 
 /* DoDhcpDora()
  */
-STATIC
 EFI_STATUS
 DoDhcpDora (
   PXE_BASECODE_DEVICE *Private,
@@ -2390,7 +2369,6 @@ BcDhcp (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 BOOLEAN
 VerifyCredentialOption (
   UINT8 *tx,
@@ -2728,7 +2706,6 @@ DoDiscover (
 
 
 **/
-STATIC
 EFI_STATUS
 Discover (
   PXE_BASECODE_DEVICE                 *Private,

MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_igmp.c

@@ -21,11 +21,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Definitions for internet group management protocol version 2 message
 // structure Per RFC 2236, November 1997
 //
-STATIC UINT8      RouterAlertOption[4]  = { 0x80 | 20, 4, 0, 0 };
+UINT8      RouterAlertOption[4]  = { 0x80 | 20, 4, 0, 0 };
-STATIC IPV4_ADDR  AllRoutersGroup       = { { 224, 0, 0, 2 } };
+IPV4_ADDR  AllRoutersGroup       = { { 224, 0, 0, 2 } };
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 VOID
 ClearGroupTimer (
   PXE_BASECODE_DEVICE *Private,
@@ -54,7 +53,6 @@ ClearGroupTimer (
 
 
 **/
-STATIC
 VOID
 SetGroupTimer (
   PXE_BASECODE_DEVICE *Private,
@@ -107,7 +105,6 @@ SetGroupTimer (
 
 
 **/
-STATIC
 VOID
 SendIgmpMessage (
   PXE_BASECODE_DEVICE *Private,
@@ -143,7 +140,6 @@ SendIgmpMessage (
 
 
 **/
-STATIC
 VOID
 ReportIgmp (
   PXE_BASECODE_DEVICE *Private,
@@ -208,7 +204,6 @@ IgmpCheckTimers (
   @return other := Group ID#
 
 **/
-STATIC
 INTN
 FindMulticastGroup (
   PXE_BASECODE_DEVICE *Private,

MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_ip.c

@@ -119,7 +119,6 @@ IpAddRouter (
 //
 // return router ip to use for DestIp (0 if none)
 //
-STATIC
 EFI_IP_ADDRESS *
 GetRouterIp (
   PXE_BASECODE_DEVICE *Private,
@@ -471,7 +470,6 @@ Ip4Send (
 //
 // return true if dst IP in receive header matched with what's enabled
 //
-STATIC
 BOOLEAN
 IPgood (
   PXE_BASECODE_DEVICE *Private,

MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c

@@ -77,7 +77,6 @@ Swap64 (
   @return other :=
 
 **/
-STATIC
 EFI_STATUS
 TftpUdpRead (
   PXE_BASECODE_DEVICE         *Private,
@@ -167,7 +166,6 @@ TftpUdpRead (
 
 
 **/
-STATIC
 VOID
 SendError (
   PXE_BASECODE_DEVICE         *Private,
@@ -207,7 +205,6 @@ SendError (
 
 
 **/
-STATIC
 EFI_STATUS
 SendAckAndGetData (
   PXE_BASECODE_DEVICE         *Private,
@@ -336,7 +333,6 @@ SendAckAndGetData (
 
 
 **/
-STATIC
 EFI_STATUS
 LockStepReceive (
   PXE_BASECODE_DEVICE         *Private,
@@ -478,12 +474,12 @@ LockStepReceive (
 //
 // some literals
 //
-STATIC UINT8                      Mode[]          = MODE_BINARY;
+UINT8                      Mode[]          = MODE_BINARY;
-STATIC UINT8                      BlockSizeOp[]   = OP_BLKSIZE;
+UINT8                      BlockSizeOp[]   = OP_BLKSIZE;
-STATIC UINT8                      TsizeOp[]       = OP_TFRSIZE;
+UINT8                      TsizeOp[]       = OP_TFRSIZE;
-STATIC UINT8                      OverwriteOp[]   = OP_OVERWRITE;
+UINT8                      OverwriteOp[]   = OP_OVERWRITE;
-STATIC UINT8                      BigBlkNumOp[]   = OP_BIGBLKNUM;
+UINT8                      BigBlkNumOp[]   = OP_BIGBLKNUM;
-STATIC EFI_PXE_BASE_CODE_UDP_PORT TftpRequestPort = TFTP_OPEN_PORT;
+EFI_PXE_BASE_CODE_UDP_PORT TftpRequestPort = TFTP_OPEN_PORT;
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
@@ -492,7 +488,6 @@ STATIC EFI_PXE_BASE_CODE_UDP_PORT TftpRequestPort = TFTP_OPEN_PORT;
   @return Pointer to value field if option found or NULL if not found.
 
 **/
-STATIC
 UINT8 *
 FindOption (
   UINT8 *OptionPtr,
@@ -521,7 +516,6 @@ FindOption (
 #define TSIZEOP     2 // transfer size
 #define OVERWRITEOP 4 // overwrite
 #define BIGBLKNUMOP 8 // big block numbers
-STATIC
 EFI_STATUS
 TftpRwReq (
   UINT16                      Req,
@@ -616,7 +610,6 @@ TftpRwReq (
 
 
 **/
-STATIC
 EFI_STATUS
 TftpRwReqwResp (
   UINT16                      Req,
@@ -738,7 +731,6 @@ TftpRwReqwResp (
 
 
 **/
-STATIC
 EFI_STATUS
 MtftpListen (
   PXE_BASECODE_DEVICE           *Private,
@@ -873,7 +865,6 @@ MtftpListen (
   @retval GOTUNI  returns NO_DATA go will go to TFTP session)
 
 **/
-STATIC
 EFI_STATUS
 MtftpOpen (
   PXE_BASECODE_DEVICE                                               * Private,
@@ -1069,7 +1060,6 @@ MtftpOpen (
 
 
 **/
-STATIC
 EFI_STATUS
 MtftpDownload (
   PXE_BASECODE_DEVICE           *Private,
@@ -1247,7 +1237,6 @@ MtftpDownload (
 
 
 **/
-STATIC
 EFI_STATUS
 TftpInfo (
   PXE_BASECODE_DEVICE         *Private,
@@ -1410,7 +1399,6 @@ TftpInfo (
 
 
 **/
-STATIC
 EFI_STATUS
 TftpDownload (
   PXE_BASECODE_DEVICE         *Private,
@@ -1578,7 +1566,6 @@ TftpDownload (
 
 
 **/
-STATIC
 EFI_STATUS
 TftpUpload (
   PXE_BASECODE_DEVICE *Private,

MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c

@@ -58,7 +58,6 @@ typedef union {
                                                       -
 
 **/
-STATIC
 EFI_PXE_BASE_CODE_CALLBACK_STATUS
 EFIAPI
 bc_callback (
@@ -149,7 +148,7 @@ bc_callback (
   return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;
 }
 
-STATIC EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  _bc_callback = {
+EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  _bc_callback = {
   EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION,
   &bc_callback
 };
@@ -163,7 +162,6 @@ STATIC EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL  _bc_callback = {
   @return None
 
 **/
-STATIC
 VOID
 PrintIpv4 (
   UINT8 *Ptr
@@ -183,7 +181,6 @@ PrintIpv4 (
   @return None
 
 **/
-STATIC
 VOID
 ShowMyInfo (
   IN PXE_BASECODE_DEVICE *Private
@@ -257,7 +254,6 @@ ShowMyInfo (
   @retval LOCAL_BOOT
 
 **/
-STATIC
 EFI_STATUS
 DoPrompt (
   PXE_BASECODE_DEVICE *Private,
@@ -447,7 +443,6 @@ DoPrompt (
   @return None
 
 **/
-STATIC
 VOID
 PrintMenuItem (
   PXE_BOOT_MENU_ENTRY *MenuItemPtr
@@ -475,7 +470,6 @@ PrintMenuItem (
   @retval LOCAL_BOOT
 
 **/
-STATIC
 EFI_STATUS
 DoMenu (
   PXE_BASECODE_DEVICE *Private,
@@ -765,7 +759,6 @@ DoMenu (
   @return Value from DHCP option
 
 **/
-STATIC
 UINT16
 GetValue (
   DHCPV4_OP_STRUCT *OpPtr
@@ -789,7 +782,6 @@ GetValue (
   @return Pointer to opcode, may be NULL
 
 **/
-STATIC
 UINT8 *
 _PxeBcFindOpt (
   UINT8 *BufferPtr,
@@ -837,7 +829,6 @@ _PxeBcFindOpt (
   @return Pointer to option in packet
 
 **/
-STATIC
 UINT8 *
 PxeBcFindDhcpOpt (
   EFI_PXE_BASE_CODE_PACKET  *PacketPtr,
@@ -937,7 +928,6 @@ PxeBcFindDhcpOpt (
   @return EFI_PROTOCOL_ERROR -
 
 **/
-STATIC
 EFI_STATUS
 DownloadFile (
   IN PXE_BASECODE_DEVICE  *Private,
@@ -1178,7 +1168,6 @@ DownloadFile (
   @retval EFI_NOT_READY
 
 **/
-STATIC
 EFI_STATUS
 LoadfileStart (
   IN PXE_BASECODE_DEVICE  *Private,

MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4InitSelect.c

@@ -30,7 +30,6 @@ Abstract:
 /**
 
 **/
-STATIC
 INTN
 offer_verify (
   IN PXE_DHCP4_PRIVATE_DATA *Private,
@@ -146,9 +145,8 @@ offer_verify (
 /**
 
 **/
-STATIC
 INTN
-acknak_verify (
+acknak_verify_initselect (
   IN PXE_DHCP4_PRIVATE_DATA *Private,
   IN DHCP4_PACKET           *tx_pkt,
   IN DHCP4_PACKET           *rx_pkt,
@@ -717,7 +715,7 @@ PxeDhcp4Select (
                 NULL,
                 &request,
                 &acknak,
-                &acknak_verify,
+                &acknak_verify_initselect,
                 seconds_timeout
                 );
 

MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4RenewRebind.c

@@ -31,9 +31,8 @@ Abstract:
   @return 1 = accept, stop waiting
 
 **/
-STATIC
 INTN
-acknak_verify (
+acknak_verify_renewrebind (
   IN PXE_DHCP4_PRIVATE_DATA *Private,
   IN DHCP4_PACKET           *tx_pkt,
   IN DHCP4_PACKET           *rx_pkt,
@@ -171,7 +170,6 @@ acknak_verify (
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-STATIC
 EFI_STATUS
 EFIAPI
 renew_rebind (
@@ -338,7 +336,7 @@ renew_rebind (
                 &subnet_mask,
                 &Request,
                 &AckNak,
-                &acknak_verify,
+                &acknak_verify_renewrebind,
                 seconds_timeout
                 );
 

MdeModulePkg/Universal/Network/SnpDxe/Callback.c

@@ -22,8 +22,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // them in the snp structure because we will not know which snp structure
 // in the callback context!
 //
-STATIC BOOLEAN              mInitializeLock = TRUE;
+BOOLEAN              mInitializeLock = TRUE;
-STATIC EFI_LOCK             mLock;
+EFI_LOCK             mLock;
 
 //
 // End Global variables

MdeModulePkg/Universal/Network/SnpDxe/Get_status.c

@@ -20,7 +20,6 @@ Revision history:
 
 #include "Snp.h"
 
-STATIC
 /**
   this routine calls undi to get the status of the interrupts, get the list of
   transmit buffers that completed transmitting!

MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c

@@ -30,7 +30,6 @@ Revision history:
 
 
 **/
-STATIC
 EFI_STATUS
 pxe_ip2mac (
   IN SNP_DRIVER          *snp,

MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c

@@ -31,7 +31,6 @@ Revision history:
 
 
 **/
-STATIC
 EFI_STATUS
 pxe_nvdata_read (
   IN SNP_DRIVER *snp,

MdeModulePkg/Universal/Network/SnpDxe/Receive.c

@@ -39,7 +39,6 @@ Revision history:
 
 
 **/
-STATIC
 EFI_STATUS
 pxe_receive (
   SNP_DRIVER      *snp,

MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c

@@ -33,7 +33,6 @@ Revision history:
 
 
 **/
-STATIC
 EFI_STATUS
 pxe_rcvfilter_enable (
   SNP_DRIVER      *snp,
@@ -121,7 +120,6 @@ pxe_rcvfilter_enable (
 
 
 **/
-STATIC
 EFI_STATUS
 pxe_rcvfilter_disable (
   SNP_DRIVER *snp,
@@ -195,7 +193,6 @@ pxe_rcvfilter_disable (
 
 
 **/
-STATIC
 EFI_STATUS
 pxe_rcvfilter_read (
   SNP_DRIVER *snp

MdeModulePkg/Universal/Network/SnpDxe/Reset.c

@@ -30,7 +30,6 @@ Revision history:
   @return other for failed calls
 
 **/
-STATIC
 EFI_STATUS
 pxe_reset (
   SNP_DRIVER *snp

MdeModulePkg/Universal/Network/SnpDxe/Snp.c

@@ -242,7 +242,6 @@ del_v2p (
   return EFI_NOT_FOUND;
 }
 
-STATIC
 EFI_STATUS
 issue_hwundi_command (
   UINT64 cdb
@@ -280,7 +279,6 @@ Returns:
   @return If ptr is NULL or len is zero, zero is returned.
 
 **/
-STATIC
 UINT8
 calc_8bit_cksum (
   VOID  *ptr,

MdeModulePkg/Universal/Network/SnpDxe/Station_address.c

@@ -103,7 +103,6 @@ pxe_get_stn_addr (
 
 
 **/
-STATIC
 EFI_STATUS
 pxe_set_stn_addr (
   SNP_DRIVER      *snp,

MdeModulePkg/Universal/Network/SnpDxe/Transmit.c

@@ -38,7 +38,6 @@ Revision history:
   @retval Other               error return from undi call.
 
 **/
-STATIC
 EFI_STATUS
 pxe_fillheader (
   SNP_DRIVER      *snp,
@@ -151,7 +150,6 @@ pxe_fillheader (
   @retval Other               error return from undi call.
 
 **/
-STATIC
 EFI_STATUS
 pxe_transmit (
   SNP_DRIVER *snp,

MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c

@@ -20,7 +20,6 @@ Abstract:
 
 #include "SockImpl.h"
 
-STATIC
 UINT32
 SockTcpDataToRcv (
   IN  SOCK_BUFFER   *SockBuffer,
@@ -28,7 +27,6 @@ SockTcpDataToRcv (
   IN  UINT32        BufLen
   );
 
-STATIC
 VOID
 SockProcessSndToken (
   IN SOCKET *Sock
@@ -56,7 +54,6 @@ SockFreeFoo (
   @return The length of the data can be retreived.
 
 **/
-STATIC
 UINT32
 SockTcpDataToRcv (
   IN  SOCK_BUFFER    *SockBuffer,
@@ -312,7 +309,6 @@ SockProcessTcpSndData (
   @return None.
 
 **/
-STATIC
 VOID
 SockFlushPendingToken (
   IN SOCKET         *Sock,
@@ -350,7 +346,6 @@ SockFlushPendingToken (
   @return None.
 
 **/
-STATIC
 VOID
 SockWakeConnToken (
   IN SOCKET *Sock
@@ -378,7 +373,6 @@ SockWakeConnToken (
   @return None.
 
 **/
-STATIC
 VOID
 SockWakeListenToken (
   IN SOCKET *Sock
@@ -425,7 +419,6 @@ SockWakeListenToken (
   @return None.
 
 **/
-STATIC
 VOID
 SockWakeRcvToken (
   IN SOCKET *Sock
@@ -472,7 +465,6 @@ SockWakeRcvToken (
   @return None.
 
 **/
-STATIC
 VOID
 SockProcessSndToken (
   IN SOCKET *Sock

MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c

@@ -32,7 +32,6 @@ Abstract:
                                FALSE, the specific Event is not in the List.
 
 **/
-STATIC
 BOOLEAN
 SockTokenExistedInList (
   IN LIST_ENTRY     *List,

MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c

@@ -23,7 +23,6 @@ Abstract:
 #define TCP_COMP_VAL(Min, Max, Default, Val) \
   ((((Val) <= (Max)) && ((Val) >= (Min))) ? (Val) : (Default))
 
-STATIC
 EFI_STATUS
 Tcp4Route (
   IN TCP_CB           *Tcb,
@@ -84,7 +83,6 @@ Returns:
                                  instance hasn't been started.
 
 **/
-STATIC
 EFI_STATUS
 Tcp4GetMode (
   IN TCP_CB         *Tcb,
@@ -167,7 +165,6 @@ Tcp4GetMode (
   @retval EFI_OUT_OF_RESOURCES   No port can be allocated.
 
 **/
-STATIC
 EFI_STATUS
 Tcp4Bind (
   IN EFI_TCP4_ACCESS_POINT *AP
@@ -230,7 +227,6 @@ Tcp4Bind (
   @retval EFI_SUCCESS            The operation is completed successfully.
 
 **/
-STATIC
 VOID
 Tcp4FlushPcb (
   IN TCP_CB *Tcb
@@ -264,7 +260,6 @@ Tcp4FlushPcb (
   NetbufFreeList (&Tcb->RcvQue);
 }
 
-STATIC
 EFI_STATUS
 Tcp4AttachPcb (
   IN SOCKET  *Sk
@@ -307,7 +302,6 @@ Tcp4AttachPcb (
   return EFI_SUCCESS;
 }
 
-STATIC
 VOID
 Tcp4DetachPcb (
   IN SOCKET  *Sk
@@ -344,7 +338,6 @@ Tcp4DetachPcb (
   @retval EFI_OUT_OF_RESOURCES   Failed due to resource limit.
 
 **/
-STATIC
 EFI_STATUS
 Tcp4ConfigurePcb (
   IN SOCKET               *Sk,

MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c

@@ -84,7 +84,6 @@ EFI_SERVICE_BINDING_PROTOCOL mTcp4ServiceBinding = {
   @retval other                  The timer is not created.
 
 **/
-STATIC
 EFI_STATUS
 Tcp4CreateTimer (
   VOID
@@ -130,7 +129,6 @@ Tcp4CreateTimer (
   @return None.
 
 **/
-STATIC
 VOID
 Tcp4DestroyTimer (
   VOID

MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c

@@ -274,7 +274,6 @@ TcpComputeRtt (
   @return 0, the data is successfully trimmed.
 
 **/
-STATIC
 INTN
 TcpTrimSegment (
   IN NET_BUF   *Nbuf,

MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c

@@ -35,7 +35,6 @@ Abstract:
   @retval EFI_INVALID_PARAMETER    The integrity check is failed.
 
 **/
-STATIC
 EFI_STATUS
 Tcp4ChkDataBuf (
   IN UINT32                 DataLen,

MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c

@@ -186,7 +186,6 @@ TcpInitTcbPeer (
   @return Pointer to the TCP_CB with the least number of wildcard, if NULL no match is found.
 
 **/
-STATIC
 TCP_CB *
 TcpLocateListenTcb (
   IN TCP_PEER *Local,

MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c

@@ -22,7 +22,6 @@ Abstract:
 
 #include "Tcp4Main.h"
 
-STATIC
 UINT16
 TcpGetUint16 (
   IN UINT8 *Buf
@@ -44,7 +43,6 @@ TcpGetUint16 (
 //   CopyMem (Buf, &Data, sizeof (UINT16));
 // }
 
-STATIC
 UINT32
 TcpGetUint32 (
   IN UINT8 *Buf
@@ -55,7 +53,6 @@ TcpGetUint32 (
   return NTOHL (Value);
 }
 
-STATIC
 VOID
 TcpPutUint32 (
   IN UINT8  *Buf,

MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c

@@ -22,7 +22,7 @@ Abstract:
 
 #include "Tcp4Main.h"
 
-STATIC UINT8  mTcpOutFlag[] = {
+UINT8  mTcpOutFlag[] = {
   0,                          // TCP_CLOSED
   0,                          // TCP_LISTEN
   TCP_FLG_SYN,                // TCP_SYN_SENT
@@ -122,7 +122,6 @@ TcpRcvWinNow (
   @return The value of the local receive window size used to fill the outing segment.
 
 **/
-STATIC
 UINT16
 TcpComputeWnd (
   IN TCP_CB  *Tcb,
@@ -295,7 +294,6 @@ SetPersistTimer:
   @retval other   Error condition occurred.
 
 **/
-STATIC
 INTN
 TcpTransmitSegment (
   IN TCP_CB  *Tcb,

MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c

@@ -24,37 +24,31 @@ Abstract:
 
 UINT32    mTcpTick = 1000;
 
-STATIC
 VOID
 TcpConnectTimeout (
   IN TCP_CB *Tcb
   );
 
-STATIC
 VOID
 TcpRexmitTimeout (
   IN TCP_CB *Tcb
   );
 
-STATIC
 VOID
 TcpProbeTimeout (
   IN TCP_CB *Tcb
   );
 
-STATIC
 VOID
 TcpKeepaliveTimeout (
   IN TCP_CB *Tcb
   );
 
-STATIC
 VOID
 TcpFinwait2Timeout (
   IN TCP_CB *Tcb
   );
 
-STATIC
 VOID
 Tcp2MSLTimeout (
   IN TCP_CB *Tcb
@@ -98,7 +92,6 @@ TcpClose (
   @return None.
 
 **/
-STATIC
 VOID
 TcpConnectTimeout (
   IN TCP_CB *Tcb
@@ -133,7 +126,6 @@ TcpConnectTimeout (
   @return None.
 
 **/
-STATIC
 VOID
 TcpRexmitTimeout (
   IN TCP_CB *Tcb
@@ -188,7 +180,6 @@ TcpRexmitTimeout (
   @return None.
 
 **/
-STATIC
 VOID
 TcpProbeTimeout (
   IN TCP_CB *Tcb
@@ -219,7 +210,6 @@ TcpProbeTimeout (
   @return None.
 
 **/
-STATIC
 VOID
 TcpKeepaliveTimeout (
   IN TCP_CB *Tcb
@@ -253,7 +243,6 @@ TcpKeepaliveTimeout (
   @return None.
 
 **/
-STATIC
 VOID
 TcpFinwait2Timeout (
   IN TCP_CB *Tcb
@@ -274,7 +263,6 @@ TcpFinwait2Timeout (
   @return None.
 
 **/
-STATIC
 VOID
 Tcp2MSLTimeout (
   IN TCP_CB *Tcb
@@ -297,7 +285,6 @@ Tcp2MSLTimeout (
   @return None.
 
 **/
-STATIC
 VOID
 TcpUpdateTimer (
   IN TCP_CB *Tcb

MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c

@@ -25,7 +25,6 @@ Abstract:
 
 UINT16  mUdp4RandomPort;
 
-STATIC
 VOID
 EFIAPI
 Udp4CheckTimeout (
@@ -33,7 +32,6 @@ Udp4CheckTimeout (
   IN VOID       *Context
   );
 
-STATIC
 BOOLEAN
 Udp4FindInstanceByPort (
   IN LIST_ENTRY        *InstanceList,
@@ -41,7 +39,6 @@ Udp4FindInstanceByPort (
   IN UINT16            Port
   );
 
-STATIC
 VOID
 Udp4DgramSent (
   IN EFI_STATUS  Status,
@@ -50,7 +47,6 @@ Udp4DgramSent (
   IN VOID        *NotifyData
   );
 
-STATIC
 VOID
 Udp4DgramRcvd (
   IN EFI_STATUS            Status,
@@ -60,7 +56,6 @@ Udp4DgramRcvd (
   IN VOID                  *Context
   );
 
-STATIC
 EFI_STATUS
 Udp4CancelTokens (
   IN NET_MAP       *Map,
@@ -68,14 +63,12 @@ Udp4CancelTokens (
   IN VOID          *Arg OPTIONAL
   );
 
-STATIC
 BOOLEAN
 Udp4MatchDgram (
   IN UDP4_INSTANCE_DATA     *Instance,
   IN EFI_UDP4_SESSION_DATA  *Udp4Session
   );
 
-STATIC
 VOID
 EFIAPI
 Udp4RecycleRxDataWrap (
@@ -83,7 +76,6 @@ Udp4RecycleRxDataWrap (
   IN VOID       *Context
   );
 
-STATIC
 UDP4_RXDATA_WRAP *
 Udp4WrapRxData (
   IN UDP4_INSTANCE_DATA     *Instance,
@@ -91,7 +83,6 @@ Udp4WrapRxData (
   IN EFI_UDP4_RECEIVE_DATA  *RxData
   );
 
-STATIC
 UINTN
 Udp4EnqueueDgram (
   IN UDP4_SERVICE_DATA      *Udp4Service,
@@ -99,13 +90,11 @@ Udp4EnqueueDgram (
   IN EFI_UDP4_RECEIVE_DATA  *RxData
   );
 
-STATIC
 VOID
 Udp4DeliverDgram (
   IN UDP4_SERVICE_DATA  *Udp4Service
   );
 
-STATIC
 VOID
 Udp4Demultiplex (
   IN UDP4_SERVICE_DATA     *Udp4Service,
@@ -113,7 +102,6 @@ Udp4Demultiplex (
   IN NET_BUF               *Packet
   );
 
-STATIC
 VOID
 Udp4IcmpHandler (
   IN UDP4_SERVICE_DATA     *Udp4Service,
@@ -122,7 +110,6 @@ Udp4IcmpHandler (
   IN NET_BUF               *Packet
   );
 
-STATIC
 VOID
 Udp4SendPortUnreach (
   IN IP_IO                 *IpIo,
@@ -270,7 +257,6 @@ Udp4CleanService (
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 Udp4CheckTimeout (
@@ -397,7 +383,6 @@ Udp4CleanInstance (
   @return Is the specified <Address, Port> pair found or not.
 
 **/
-STATIC
 BOOLEAN
 Udp4FindInstanceByPort (
   IN LIST_ENTRY        *InstanceList,
@@ -870,7 +855,6 @@ Udp4RemoveToken (
   @return None.
 
 **/
-STATIC
 VOID
 Udp4DgramSent (
   IN EFI_STATUS  Status,
@@ -910,7 +894,6 @@ Udp4DgramSent (
   @return None.
 
 **/
-STATIC
 VOID
 Udp4DgramRcvd (
   IN EFI_STATUS            Status,
@@ -1008,7 +991,6 @@ Udp4LeaveGroup (
                                  cancelled.
 
 **/
-STATIC
 EFI_STATUS
 Udp4CancelTokens (
   IN NET_MAP       *Map,
@@ -1146,7 +1128,6 @@ Udp4InstanceCancelToken (
   @return The udp datagram matches the receiving requirments of the Instance or not.
 
 **/
-STATIC
 BOOLEAN
 Udp4MatchDgram (
   IN UDP4_INSTANCE_DATA     *Instance,
@@ -1220,7 +1201,6 @@ Udp4MatchDgram (
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 Udp4RecycleRxDataWrap (
@@ -1263,7 +1243,6 @@ Udp4RecycleRxDataWrap (
   @return Pointer to the structure wrapping the RxData and the Packet.
 
 **/
-STATIC
 UDP4_RXDATA_WRAP *
 Udp4WrapRxData (
   IN UDP4_INSTANCE_DATA     *Instance,
@@ -1321,7 +1300,6 @@ Udp4WrapRxData (
   @return The times this datagram is enqueued.
 
 **/
-STATIC
 UINTN
 Udp4EnqueueDgram (
   IN UDP4_SERVICE_DATA      *Udp4Service,
@@ -1441,7 +1419,6 @@ Udp4InstanceDeliverDgram (
   @return None.
 
 **/
-STATIC
 VOID
 Udp4DeliverDgram (
   IN UDP4_SERVICE_DATA  *Udp4Service
@@ -1480,7 +1457,6 @@ Udp4DeliverDgram (
   @return None.
 
 **/
-STATIC
 VOID
 Udp4Demultiplex (
   IN UDP4_SERVICE_DATA     *Udp4Service,
@@ -1572,7 +1548,6 @@ Udp4Demultiplex (
   @return None.
 
 **/
-STATIC
 VOID
 Udp4SendPortUnreach (
   IN IP_IO                 *IpIo,
@@ -1675,7 +1650,6 @@ Udp4SendPortUnreach (
   @return None.
 
 **/
-STATIC
 VOID
 Udp4IcmpHandler (
   IN UDP4_SERVICE_DATA     *Udp4Service,

MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c

@@ -32,7 +32,6 @@ Abstract:
   @retval others                  If error occurs when updating arp cache
 
 **/
-STATIC
 EFI_STATUS
 UpdateArpCache (
   IN EFI_PXE_BASE_CODE_PROTOCOL     * This
@@ -74,7 +73,6 @@ UpdateArpCache (
   @param  Context            Context of the timer event
 
 **/
-STATIC
 VOID
 EFIAPI
 ArpCacheUpdateTimeout (
@@ -92,7 +90,6 @@ ArpCacheUpdateTimeout (
   @param  Context
 
 **/
-STATIC
 BOOLEAN
 FindInArpCache (
   EFI_PXE_BASE_CODE_MODE    *PxeBcMode,
@@ -121,7 +118,6 @@ FindInArpCache (
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 IcmpErrorListenHandlerDpc (
@@ -208,7 +204,6 @@ Resume:
   @return None.
 
 **/
-STATIC
 VOID
 EFIAPI
 IcmpErrorListenHandler (
@@ -1232,7 +1227,6 @@ ON_EXIT:
   @retval FLASE              The UDP package doesn't matches IP filters
 
 **/
-STATIC
 BOOLEAN
 CheckIpByFilter (
   EFI_PXE_BASE_CODE_MODE    *PxeBcMode,

MdeModulePkg/Universal/PCD/Dxe/Pcd.c

@@ -23,7 +23,7 @@ Module Name: Pcd.c
 // host all distinct TokenSpace guid in both
 // PEI ExMap and DXE ExMap.
 //
-STATIC EFI_GUID *TmpTokenSpaceBuffer[PEI_EXMAPPING_TABLE_SIZE + DXE_EXMAPPING_TABLE_SIZE] = { 0 };
+EFI_GUID *TmpTokenSpaceBuffer[PEI_EXMAPPING_TABLE_SIZE + DXE_EXMAPPING_TABLE_SIZE] = { 0 };
 
 ///
 /// PCD database lock.
@@ -73,7 +73,7 @@ PCD_PROTOCOL mPcdInstance = {
 //
 // Static global to reduce the code size
 //
-STATIC EFI_HANDLE mNewHandle = NULL;
+EFI_HANDLE mNewHandle = NULL;
 
 /**
   Main entry for PCD DXE driver.

MdeModulePkg/Universal/PCD/Pei/Pcd.c

@@ -54,7 +54,7 @@ PCD_PPI mPcdPpiInstance = {
   PeiPcdGetNextTokenSpace
 };
 
-STATIC EFI_PEI_PPI_DESCRIPTOR  mPpiPCD = {
+EFI_PEI_PPI_DESCRIPTOR  mPpiPCD = {
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gPcdPpiGuid,
   &mPcdPpiInstance

MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/Ia32/Ia32PcRtc.c

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "PcRtc.h"
 
-static PC_RTC_MODULE_GLOBALS  mModuleGlobal;
+PC_RTC_MODULE_GLOBALS  mModuleGlobal;
 
 EFI_STATUS
 EFIAPI

MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.c

@@ -14,21 +14,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "PcRtc.h"
 
-STATIC
 INTN
 CompareHMS (
   IN EFI_TIME   *From,
   IN EFI_TIME   *To
   );
 
-STATIC
 BOOLEAN
 IsWithinOneDay (
   IN EFI_TIME   *From,
   IN EFI_TIME   *To
   );
 
-STATIC
 UINT8
 RtcRead (
   IN  UINT8 Address
@@ -53,7 +50,6 @@ Returns:
   return IoRead8 (PCAT_RTC_DATA_REGISTER);
 }
 
-STATIC
 VOID
 RtcWrite (
   IN  UINT8   Address,
@@ -1034,7 +1030,6 @@ Returns:
   }
 }
 
-STATIC
 INTN
 CompareHMS (
   IN EFI_TIME   *From,
@@ -1071,7 +1066,6 @@ Returns:
   }
 }
 
-STATIC
 BOOLEAN
 IsWithinOneDay (
   IN EFI_TIME  *From,

MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c

@@ -32,7 +32,6 @@
    @return The PCI address with PCI_LIB_ADDRESS format.
 
 **/
-STATIC
 UINTN
 PciCfgAddressConvert (
   EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *Address

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;
+EFI_HANDLE    *mDevicePathHandleBuffer;
-STATIC  EFI_HANDLE    *mDriverImageHandleBuffer;
+EFI_HANDLE    *mDriverImageHandleBuffer;
 
-STATIC UINTN         mSelectedCtrIndex;
+UINTN         mSelectedCtrIndex;
-STATIC EFI_STRING_ID mControllerToken[MAX_CHOICE_NUM];
+EFI_STRING_ID mControllerToken[MAX_CHOICE_NUM];
 
-STATIC UINTN                        mDriverImageHandleCount;
+UINTN                        mDriverImageHandleCount;
-STATIC EFI_STRING_ID                mDriverImageToken[MAX_CHOICE_NUM];
+EFI_STRING_ID                mDriverImageToken[MAX_CHOICE_NUM];
-STATIC EFI_STRING_ID                mDriverImageFilePathToken[MAX_CHOICE_NUM];
+EFI_STRING_ID                mDriverImageFilePathToken[MAX_CHOICE_NUM];
-STATIC EFI_LOADED_IMAGE_PROTOCOL    *mDriverImageProtocol[MAX_CHOICE_NUM];
+EFI_LOADED_IMAGE_PROTOCOL    *mDriverImageProtocol[MAX_CHOICE_NUM];
-STATIC EFI_DEVICE_PATH_PROTOCOL     *mControllerDevicePathProtocol[MAX_CHOICE_NUM];
+EFI_DEVICE_PATH_PROTOCOL     *mControllerDevicePathProtocol[MAX_CHOICE_NUM];
-STATIC UINTN                        mSelectedDriverImageNum;
+UINTN                        mSelectedDriverImageNum;
-STATIC UINTN                        mLastSavedDriverImageNum;
+UINTN                        mLastSavedDriverImageNum;
-STATIC CHAR8                        mLanguage[RFC_3066_ENTRY_SIZE];
+CHAR8                        mLanguage[RFC_3066_ENTRY_SIZE];
-STATIC UINT16                       mCurrentPage;
+UINT16                       mCurrentPage;
 
 /**
   The driver Entry Point. The funciton will export a disk device class formset and

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);
+LIST_ENTRY      mMappingDataBase = INITIALIZE_LIST_HEAD_VARIABLE (mMappingDataBase);
-STATIC  BOOLEAN         mEnvironmentVariableRead = FALSE;
+BOOLEAN         mEnvironmentVariableRead = FALSE;
-STATIC  EFI_HANDLE      mCallerImageHandle;
+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 (

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/DebugLib.h>
-#include <Library/UefiDriverEntryPoint.h>
+#include <Library/UefiDriverEntryPoint.h>
-#include <Library/BaseLib.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 (

MdeModulePkg/Universal/SetupBrowserDxe/Ui.c

@@ -1019,7 +1019,7 @@ GetWidth (
 }
 
 
-STATIC BOOLEAN GetLineByWidthFinished = FALSE;
+BOOLEAN GetLineByWidthFinished = FALSE;
 
 /**
   Will copy LineWidth amount of a string in the OutputString buffer and return the

MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c

@@ -26,7 +26,6 @@ ESAL_VARIABLE_GLOBAL  *mVariableModuleGlobal;
 // when EfiAcquireLock in UefiLib can handle the
 // the call in UEFI Runtimer driver in RT phase.
 //
-STATIC
 VOID
 AcquireLockOnlyAtBootTime (
   IN EFI_LOCK  *Lock
@@ -42,7 +41,6 @@ AcquireLockOnlyAtBootTime (
 // when EfiAcquireLock in UefiLib can handle the
 // the call in UEFI Runtimer driver in RT phase.
 //
-STATIC
 VOID
 ReleaseLockOnlyAtBootTime (
   IN EFI_LOCK  *Lock
@@ -53,7 +51,6 @@ ReleaseLockOnlyAtBootTime (
   }
 }
 
-STATIC
 UINT8 *
 GetVariableDataPtr (
   IN  VARIABLE_HEADER   *Variable
@@ -83,7 +80,6 @@ Returns:
   return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + Variable->NameSize + GET_PAD_SIZE (Variable->NameSize));
 }
 
-STATIC
 VARIABLE_HEADER *
 GetNextVariablePtr (
   IN  VARIABLE_HEADER   *Variable
@@ -123,7 +119,6 @@ Returns:
   return VarHeader;
 }
 
-STATIC
 VARIABLE_HEADER *
 GetEndPointer (
   IN VARIABLE_STORE_HEADER       *VolHeader
@@ -150,7 +145,6 @@ Returns:
   return (VARIABLE_HEADER *) ((UINTN) VolHeader + VolHeader->Size);
 }
 
-STATIC
 EFI_STATUS
 FindVariable (
   IN  CHAR16                  *VariableName,
@@ -796,7 +790,6 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
 EFI_STATUS
 InitializeVariableStore (
   OUT EFI_PHYSICAL_ADDRESS  *VariableBase,

MdeModulePkg/Universal/Variable/Pei/Variable.c

@@ -21,12 +21,12 @@ Module Name:
 //
 // Module globals
 //
-static EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariablePpi = {
+EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariablePpi = {
   PeiGetVariable,
   PeiGetNextVariableName
 };
 
-static EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {
+EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gEfiPeiReadOnlyVariable2PpiGuid,
   &mVariablePpi
@@ -117,7 +117,6 @@ Returns:
   return (VARIABLE_HEADER *) HEADER_ALIGN ((UINTN) VarStoreHeader + VarStoreHeader->Size);
 }
 
-STATIC
 BOOLEAN
 EFIAPI
 IsValidVariableHeader (
@@ -298,7 +297,6 @@ Returns:
 }
 
 
-STATIC
 VARIABLE_STORE_STATUS
 EFIAPI
 GetVariableStoreStatus (
@@ -342,7 +340,6 @@ Returns:
   }
 }
 
-STATIC
 EFI_STATUS
 CompareWithValidVariable (
   IN  VARIABLE_HEADER               *Variable,
@@ -399,7 +396,6 @@ Returns:
   return EFI_NOT_FOUND;
 }
 
-STATIC
 EFI_STATUS
 EFIAPI
 FindVariable (

MdeModulePkg/Universal/Variable/RuntimeDxe/reclaim.c

@@ -79,7 +79,6 @@ GetFvbHandleByAddress (
   return Status;
 }
 
-STATIC
 EFI_STATUS
 GetLbaAndOffsetByAddress (
   IN  EFI_PHYSICAL_ADDRESS   Address,