Fixed GCC 4.4 build issues due to EFIAPI not being used when required.

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

35 files changed, 94 insertions, 7 deletions

diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/MdeModulePkg/Include/Library/IpIoLib.h
index b1cbacb593..537915b882 100644
--- a/MdeModulePkg/Include/Library/IpIoLib.h
+++ b/MdeModulePkg/Include/Library/IpIoLib.h
@@ -181,7 +181,7 @@ typedef struct _EFI_NET_SESSION_DATA {
 **/

 typedef

 VOID

-(*PKT_RCVD_NOTIFY) (

+(EFIAPI *PKT_RCVD_NOTIFY) (

   IN EFI_STATUS           Status, 

   IN UINT8                IcmpErr,

   IN EFI_NET_SESSION_DATA *NetSession,

@@ -201,7 +201,7 @@ VOID
 **/

 typedef

 VOID

-(*PKT_SENT_NOTIFY) (

+(EFIAPI *PKT_SENT_NOTIFY) (

   IN EFI_STATUS  Status,

   IN VOID        *Context,

   IN VOID        *Sender,

diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index 71680a42b2..7f8cb15b0a 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -286,6 +286,7 @@ typedef struct {
 

 **/

 CHAR8 *

+EFIAPI

 NetDebugASPrint (

   IN CHAR8                  *Format,

   ...

@@ -309,6 +310,7 @@ NetDebugASPrint (
                                 than the mNetDebugLevelMax. Or, it has been sent out.

 **/

 EFI_STATUS

+EFIAPI

 NetDebugOutput (

   IN UINT32                    Level,

   IN UINT8                     *Module,

@@ -400,6 +402,7 @@ NetIp4IsUnicast (
 

 **/

 BOOLEAN

+EFIAPI

 NetIp6IsValidUnicast (

   IN EFI_IPv6_ADDRESS       *Ip6

   );

@@ -415,6 +418,7 @@ NetIp6IsValidUnicast (
 

 **/

 BOOLEAN

+EFIAPI

 NetIp6IsUnspecifiedAddr (

   IN EFI_IPv6_ADDRESS       *Ip6

   );

@@ -429,6 +433,7 @@ NetIp6IsUnspecifiedAddr (
 

 **/

 BOOLEAN

+EFIAPI

 NetIp6IsLinkLocalAddr (

   IN EFI_IPv6_ADDRESS *Ip6

   );

@@ -445,6 +450,7 @@ NetIp6IsLinkLocalAddr (
 

 **/

 BOOLEAN

+EFIAPI

 NetIp6IsNetEqual (

   EFI_IPv6_ADDRESS *Ip1,

   EFI_IPv6_ADDRESS *Ip2,

@@ -464,6 +470,7 @@ NetIp6IsNetEqual (
 

 **/

 EFI_IPv6_ADDRESS *

+EFIAPI

 Ip6Swap128 (

   EFI_IPv6_ADDRESS *Ip6

   );

@@ -888,7 +895,7 @@ NetMapRemoveTail (
 

 typedef

 EFI_STATUS

-(*NET_MAP_CALLBACK) (

+(EFIAPI *NET_MAP_CALLBACK) (

   IN NET_MAP                *Map,

   IN NET_MAP_ITEM           *Item,

   IN VOID                   *Arg

@@ -1241,6 +1248,7 @@ NetLibDefaultUnload (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibAsciiStrToIp4 (

   IN CONST CHAR8                 *String,

   OUT      EFI_IPv4_ADDRESS      *Ip4Address

@@ -1258,6 +1266,7 @@ NetLibAsciiStrToIp4 (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibAsciiStrToIp6 (

   IN CONST CHAR8                 *String,

   OUT      EFI_IPv6_ADDRESS      *Ip6Address

@@ -1275,6 +1284,7 @@ NetLibAsciiStrToIp6 (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibStrToIp4 (

   IN CONST CHAR16                *String,

   OUT      EFI_IPv4_ADDRESS      *Ip4Address

@@ -1293,6 +1303,7 @@ NetLibStrToIp4 (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibStrToIp6 (

   IN CONST CHAR16                *String,

   OUT      EFI_IPv6_ADDRESS      *Ip6Address

@@ -1313,6 +1324,7 @@ NetLibStrToIp6 (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibStrToIp6andPrefix (

   IN CONST CHAR16                *String,

   OUT      EFI_IPv6_ADDRESS      *Ip6Address,

@@ -1343,7 +1355,7 @@ typedef struct {
   UINT8               *Bulk;      // The block's Data

 } NET_BLOCK;

 

-typedef VOID (*NET_VECTOR_EXT_FREE) (VOID *Arg);

+typedef VOID (EFIAPI *NET_VECTOR_EXT_FREE) (VOID *Arg);

 

 //

 //NET_VECTOR contains several blocks to hold all packet's

@@ -1983,6 +1995,7 @@ NetPseudoHeadChecksum (
 

 **/

 UINT16

+EFIAPI

 NetIp6PseudoHeadChecksum (

   IN EFI_IPv6_ADDRESS       *Src,

   IN EFI_IPv6_ADDRESS       *Dst,

diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/MdeModulePkg/Include/Library/UdpIoLib.h
index 03618f61bb..f0254177fe 100644
--- a/MdeModulePkg/Include/Library/UdpIoLib.h
+++ b/MdeModulePkg/Include/Library/UdpIoLib.h
@@ -60,7 +60,7 @@ typedef struct {
 **/

 typedef

 VOID

-(*UDP_IO_CALLBACK) (

+(EFIAPI *UDP_IO_CALLBACK) (

   IN NET_BUF                *Packet,

   IN UDP_END_POINT          *EndPoint,

   IN EFI_STATUS             IoStatus,

@@ -173,7 +173,7 @@ struct _UDP_IO {
 **/

 typedef

 EFI_STATUS

-(*UDP_IO_CONFIG) (

+(EFIAPI *UDP_IO_CONFIG) (

   IN UDP_IO                 *UdpIo,

   IN VOID                   *Context

   );

@@ -190,7 +190,7 @@ EFI_STATUS
 **/

 typedef

 BOOLEAN

-(*UDP_IO_TO_CANCEL) (

+(EFIAPI *UDP_IO_TO_CANCEL) (

   IN UDP_TX_TOKEN           *Token,

   IN VOID                   *Context

   );

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index d5fddb678f..887fb3084b 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -587,6 +587,7 @@ IpIoIcmpHandler (
 

 **/

 VOID

+EFIAPI

 IpIoExtFree (

   IN VOID  *Event

   )

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 034031d09f..bc34f8ff0d 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -443,6 +443,7 @@ SyslogBuildPacket (
 

 **/

 CHAR8 *

+EFIAPI

 NetDebugASPrint (

   IN CHAR8                  *Format,

   ...

@@ -482,6 +483,7 @@ NetDebugASPrint (
                                 than the mNetDebugLevelMax. Or, it has been sent out.

 **/

 EFI_STATUS

+EFIAPI

 NetDebugOutput (

   IN UINT32                    Level,

   IN UINT8                     *Module,

@@ -676,6 +678,7 @@ NetIp4IsUnicast (
 

 **/

 BOOLEAN

+EFIAPI

 NetIp6IsValidUnicast (

   IN EFI_IPv6_ADDRESS       *Ip6

   )

@@ -712,6 +715,7 @@ NetIp6IsValidUnicast (
 

 **/

 BOOLEAN

+EFIAPI

 NetIp6IsUnspecifiedAddr (

   IN EFI_IPv6_ADDRESS       *Ip6

   )

@@ -737,6 +741,7 @@ NetIp6IsUnspecifiedAddr (
 

 **/

 BOOLEAN

+EFIAPI

 NetIp6IsLinkLocalAddr (

   IN EFI_IPv6_ADDRESS *Ip6

   )

@@ -774,6 +779,7 @@ NetIp6IsLinkLocalAddr (
 

 **/

 BOOLEAN

+EFIAPI

 NetIp6IsNetEqual (

   EFI_IPv6_ADDRESS *Ip1,

   EFI_IPv6_ADDRESS *Ip2,

@@ -823,6 +829,7 @@ NetIp6IsNetEqual (
 

 **/

 EFI_IPv6_ADDRESS *

+EFIAPI

 Ip6Swap128 (

   EFI_IPv6_ADDRESS *Ip6

   )

@@ -2630,6 +2637,7 @@ NetLibGetNicHandle (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibAsciiStrToIp4 (

   IN CONST CHAR8                 *String,

   OUT      EFI_IPv4_ADDRESS      *Ip4Address

@@ -2696,6 +2704,7 @@ NetLibAsciiStrToIp4 (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibAsciiStrToIp6 (

   IN CONST CHAR8                 *String,

   OUT      EFI_IPv6_ADDRESS      *Ip6Address

@@ -2839,6 +2848,7 @@ NetLibAsciiStrToIp6 (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibStrToIp4 (

   IN CONST CHAR16                *String,

   OUT      EFI_IPv4_ADDRESS      *Ip4Address

@@ -2879,6 +2889,7 @@ NetLibStrToIp4 (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibStrToIp6 (

   IN CONST CHAR16                *String,

   OUT      EFI_IPv6_ADDRESS      *Ip6Address

@@ -2920,6 +2931,7 @@ NetLibStrToIp6 (
 

 **/

 EFI_STATUS

+EFIAPI

 NetLibStrToIp6andPrefix (

   IN CONST CHAR16                *String,

   OUT      EFI_IPv6_ADDRESS      *Ip6Address,

diff --git a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
index 139735e2cb..f29ef96331 100644
--- a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
+++ b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
@@ -497,6 +497,7 @@ NetbufSetBlockOp (
 

 **/

 VOID

+EFIAPI

 NetbufGetFragmentFree (

   IN VOID                   *Arg

   )

@@ -1817,6 +1818,7 @@ NetPseudoHeadChecksum (
 

 **/

 UINT16

+EFIAPI

 NetIp6PseudoHeadChecksum (

   IN EFI_IPv6_ADDRESS       *Src,

   IN EFI_IPv6_ADDRESS       *Dst,

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index afcde8199a..a27f03aab9 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
@@ -130,6 +130,7 @@ UdpIoOnDgramSent (
 

 **/

 VOID

+EFIAPI

 UdpIoRecycleDgram (

   IN VOID                   *Context

   )

@@ -970,6 +971,7 @@ UdpIoSendDatagram (
   @retval FALSE             The packet is not to be cancelled.

 **/

 BOOLEAN

+EFIAPI

 UdpIoCancelSingleDgram (

   IN UDP_TX_TOKEN           *Token,

   IN VOID                   *Context

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
index 3136652f98..8e335eef12 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
@@ -114,6 +114,7 @@ Dhcp4DriverBindingSupported (
 

 **/

 EFI_STATUS

+EFIAPI

 DhcpConfigUdpIo (

   IN UDP_IO                 *UdpIo,

   IN VOID                   *Context

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
index f470844ee4..8beab59f2b 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
@@ -1174,6 +1174,7 @@ EfiDhcp4Build (
   @retval other         Other error occurs.

 **/

 EFI_STATUS

+EFIAPI

 Dhcp4InstanceConfigUdpIo (

   IN UDP_IO       *UdpIo,

   IN VOID         *Context

@@ -1251,6 +1252,7 @@ Dhcp4InstanceCreateUdpIo (
 

 **/

 VOID

+EFIAPI

 DhcpDummyExtFree (

   IN VOID                   *Arg

   )

@@ -1270,6 +1272,7 @@ DhcpDummyExtFree (
 

 **/

 VOID

+EFIAPI

 PxeDhcpInput (

   NET_BUF                   *UdpPacket,

   UDP_END_POINT             *EndPoint,

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
index 2af4888d5c..56b03a8a59 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
@@ -313,6 +313,7 @@ DhcpComputeLease (
 

 **/

 EFI_STATUS

+EFIAPI

 DhcpConfigLeaseIoPort (

   IN UDP_IO                 *UdpIo,

   IN VOID                   *Context

@@ -947,6 +948,7 @@ ON_EXIT:
 

 **/

 VOID

+EFIAPI

 DhcpInput (

   NET_BUF                   *UdpPacket,

   UDP_END_POINT             *EndPoint,

@@ -1100,6 +1102,7 @@ RESTART:
 

 **/

 VOID

+EFIAPI

 DhcpReleasePacket (

   IN VOID                   *Arg

   )

@@ -1118,6 +1121,7 @@ DhcpReleasePacket (
 

 **/

 VOID

+EFIAPI

 DhcpOnPacketSent (

   NET_BUF                   *Packet,

   UDP_END_POINT             *EndPoint,

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
index ce1a80ba74..faa5d43546 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
@@ -140,6 +140,7 @@ DhcpOnTimerTick (
 

 **/

 VOID

+EFIAPI

 DhcpInput (

   NET_BUF                   *UdpPacket,

   UDP_END_POINT             *EndPoint,

@@ -183,6 +184,7 @@ DhcpCleanLease (
 

 **/

 VOID

+EFIAPI

 DhcpOnPacketSent (

   NET_BUF                   *Packet,

   UDP_END_POINT             *EndPoint,

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 2261bc17f0..23bda43358 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -880,6 +880,7 @@ IScsiUpdateTargetAddress (
   @param[in]  Arg The opaque parameter.

 **/

 VOID

+EFIAPI

 IScsiFreeNbufList (

   VOID *Arg

   )

@@ -896,6 +897,7 @@ IScsiFreeNbufList (
   @param[in]   Arg  The opaque parameter.

 **/

 VOID

+EFIAPI

 IScsiNbufExtFree (

   VOID *Arg

   )

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
index e11565e301..a3d620ad40 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
@@ -809,6 +809,7 @@ IScsiUpdateTargetAddress (
   @param[in]  Arg The opaque parameter.

 **/

 VOID

+EFIAPI

 IScsiFreeNbufList (

   VOID *Arg

   );

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index 3c575d58e6..914b0e1d1b 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -1088,6 +1088,7 @@ ON_ERROR:
 

 **/

 VOID

+EFIAPI

 Ip4RecycleFrame (

   IN VOID                   *Context

   )

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 06358f06ef..86648d579c 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -1599,6 +1599,7 @@ ON_EXIT:
 

 **/

 EFI_STATUS

+EFIAPI

 Ip4TokenExist (

   IN NET_MAP                *Map,

   IN NET_MAP_ITEM           *Item,

@@ -1756,6 +1757,7 @@ Ip4TxTokenValid (
 

 **/

 VOID

+EFIAPI

 Ip4FreeTxToken (

   IN VOID                   *Context

   )

@@ -2144,6 +2146,7 @@ ON_EXIT:
 

 **/

 EFI_STATUS

+EFIAPI

 Ip4CancelTxTokens (

   IN NET_MAP                *Map,

   IN NET_MAP_ITEM           *Item,

@@ -2199,6 +2202,7 @@ Ip4CancelTxTokens (
 

 **/

 EFI_STATUS

+EFIAPI

 Ip4CancelRxTokens (

   IN NET_MAP                *Map,

   IN NET_MAP_ITEM           *Item,

@@ -2441,6 +2445,7 @@ EfiIp4Poll (
 

 **/

 EFI_STATUS

+EFIAPI

 Ip4SentPacketTicking (

   IN NET_MAP                *Map,

   IN NET_MAP_ITEM           *Item,

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
index 43d6765add..0bd90bc1df 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
@@ -345,6 +345,7 @@ Ip4TimerTicking (
 

 **/

 EFI_STATUS

+EFIAPI

 Ip4SentPacketTicking (

   IN NET_MAP                *Map,

   IN NET_MAP_ITEM           *Item,

@@ -373,6 +374,7 @@ Ip4SentPacketTicking (
 

 **/

 VOID

+EFIAPI

 Ip4FreeTxToken (

   IN VOID                   *Context

   );

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 1eaed05264..24d2f29d38 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -188,6 +188,7 @@ Ip4TrimPacket (
 

 **/

 VOID

+EFIAPI

 Ip4OnFreeFragments (

   IN VOID                   *Arg

   )

@@ -437,6 +438,7 @@ DROP:
 

 **/

 VOID

+EFIAPI

 Ip4IpSecFree (

   IN VOID                   *Arg

   )

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
index 115185afe2..7e475cd133 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
@@ -822,6 +822,7 @@ MnpInitializeInstanceData (
 

 **/

 EFI_STATUS

+EFIAPI

 MnpTokenExist (

   IN NET_MAP         *Map,

   IN NET_MAP_ITEM    *Item,

@@ -861,6 +862,7 @@ MnpTokenExist (
 

 **/

 EFI_STATUS

+EFIAPI

 MnpCancelTokens (

   IN OUT NET_MAP         *Map,

   IN OUT NET_MAP_ITEM    *Item,

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
index 54a61c3961..240c9cfbb7 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
@@ -234,6 +234,7 @@ MnpInitializeInstanceData (
 

 **/

 EFI_STATUS

+EFIAPI

 MnpTokenExist (

   IN NET_MAP         *Map,

   IN NET_MAP_ITEM    *Item,

@@ -256,6 +257,7 @@ MnpTokenExist (
 

 **/

 EFI_STATUS

+EFIAPI

 MnpCancelTokens (

   IN OUT NET_MAP         *Map,

   IN OUT NET_MAP_ITEM    *Item,

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index b920e8b21a..06aab8da12 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
@@ -114,6 +114,7 @@ Mtftp4DriverBindingSupported (
 

 **/

 EFI_STATUS

+EFIAPI

 Mtftp4ConfigNullUdp (

   IN UDP_IO                 *UdpIo,

   IN VOID                   *Context

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
index 4a15aeb970..34fb6a0b6b 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
@@ -26,6 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 **/

 VOID

+EFIAPI

 Mtftp4RrqInput (

   IN NET_BUF                *UdpPacket,

   IN UDP_END_POINT          *EndPoint,

@@ -379,6 +380,7 @@ Mtftp4RrqOackValid (
 

 **/

 EFI_STATUS

+EFIAPI

 Mtftp4RrqConfigMcastPort (

   IN UDP_IO                 *McastIo,

   IN VOID                   *Context

@@ -605,6 +607,7 @@ Mtftp4RrqHandleOack (
 

 **/

 VOID

+EFIAPI

 Mtftp4RrqInput (

   IN NET_BUF                *UdpPacket,

   IN UDP_END_POINT          *EndPoint,

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index 0e7f98e33a..e7f6291e03 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
@@ -365,6 +365,7 @@ Mtftp4SendError (
 

 **/

 VOID

+EFIAPI

 Mtftp4OnPacketSent (

   IN NET_BUF                   *Packet,

   IN UDP_END_POINT             *EndPoint,

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index 00309f4451..9e91ebf124 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -335,6 +335,7 @@ Mtftp4WrqHandleOack (
                                 MTFTP session.

 **/

 VOID

+EFIAPI

 Mtftp4WrqInput (

   IN NET_BUF                *UdpPacket,

   IN UDP_END_POINT          *EndPoint,

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
index d36ab2748b..d69ef81575 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
@@ -52,6 +52,7 @@ SockProcessSndToken (
   

 **/

 VOID

+EFIAPI

 SockFreeFoo (

   IN EFI_EVENT Event

   )

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h
index 004f1cbec4..0c86f26048 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h
@@ -38,6 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   

 **/

 VOID

+EFIAPI

 SockFreeFoo (

   IN EFI_EVENT Event

   );

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
index c744870d57..d2a8d8c5f3 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
@@ -76,6 +76,7 @@ typedef struct _TCP4_PROTO_DATA {
 

 **/

 VOID

+EFIAPI

 Tcp4RxCallback (

   IN EFI_STATUS                       Status,

   IN UINT8                            IcmpErr,

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Io.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Io.c
index 3adf356e0b..9a53037462 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Io.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Io.c
@@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 **/

 VOID

+EFIAPI

 Tcp4RxCallback (

   IN EFI_STATUS                       Status,

   IN UINT8                            IcmpErr,

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
index ff3b43ecf1..de9ee2caca 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
@@ -64,6 +64,7 @@ Udp4FindInstanceByPort (
 

 **/

 VOID

+EFIAPI

 Udp4DgramSent (

   IN EFI_STATUS  Status,

   IN VOID        *Context,

@@ -84,6 +85,7 @@ Udp4DgramSent (
 

 **/

 VOID

+EFIAPI

 Udp4DgramRcvd (

   IN EFI_STATUS            Status,

   IN UINT8                 IcmpError,

@@ -109,6 +111,7 @@ Udp4DgramRcvd (
 

 **/

 EFI_STATUS

+EFIAPI

 Udp4CancelTokens (

   IN NET_MAP       *Map,

   IN NET_MAP_ITEM  *Item,

@@ -890,6 +893,7 @@ Udp4ValidateTxToken (
 

 **/

 EFI_STATUS

+EFIAPI

 Udp4TokenExist (

   IN NET_MAP       *Map,

   IN NET_MAP_ITEM  *Item,

@@ -990,6 +994,7 @@ Udp4RemoveToken (
 

 **/

 VOID

+EFIAPI

 Udp4DgramSent (

   IN EFI_STATUS  Status,

   IN VOID        *Context,

@@ -1027,6 +1032,7 @@ Udp4DgramSent (
 

 **/

 VOID

+EFIAPI

 Udp4DgramRcvd (

   IN EFI_STATUS            Status,

   IN UINT8                 IcmpError,

@@ -1074,6 +1080,7 @@ Udp4DgramRcvd (
 

 **/

 EFI_STATUS

+EFIAPI

 Udp4LeaveGroup (

   IN OUT NET_MAP       *Map,

   IN     NET_MAP_ITEM  *Item,

@@ -1125,6 +1132,7 @@ Udp4LeaveGroup (
 

 **/

 EFI_STATUS

+EFIAPI

 Udp4CancelTokens (

   IN NET_MAP       *Map,

   IN NET_MAP_ITEM  *Item,

@@ -1881,6 +1889,7 @@ Udp4ReportIcmpError (
 

 **/

 VOID

+EFIAPI

 Udp4NetVectorExtFree (

   VOID  *Context

   )

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
index 8720cf71ee..9a8c02abd4 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
@@ -562,6 +562,7 @@ Udp4ValidateTxToken (
 

 **/

 EFI_STATUS

+EFIAPI

 Udp4TokenExist (

   IN NET_MAP       *Map,

   IN NET_MAP_ITEM  *Item,

@@ -615,6 +616,7 @@ Udp4RemoveToken (
 

 **/

 EFI_STATUS

+EFIAPI

 Udp4LeaveGroup (

   IN OUT NET_MAP       *Map,

   IN     NET_MAP_ITEM  *Item,

@@ -679,6 +681,7 @@ Udp4ReportIcmpError (
 

 **/

 VOID

+EFIAPI

 Udp4NetVectorExtFree (

   VOID  *Context

   );

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
index 2d8fcadf56..1aaa80c31a 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
@@ -64,6 +64,7 @@ RtMemoryStatusCodeInitializeWorker (
 

 **/

 EFI_STATUS

+EFIAPI

 RtMemoryStatusCodeReportWorker (

   IN EFI_STATUS_CODE_TYPE               CodeType,

   IN EFI_STATUS_CODE_VALUE              Value,

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
index 879eec3bc7..5fb6470d88 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
@@ -34,6 +34,7 @@
 

 **/

 EFI_STATUS

+EFIAPI

 SerialStatusCodeReportWorker (

   IN EFI_STATUS_CODE_TYPE     CodeType,

   IN EFI_STATUS_CODE_VALUE    Value,

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
index 9986f1140f..690fe1c29e 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
@@ -77,6 +77,7 @@ EfiSerialStatusCodeInitializeWorker (
 

 **/

 EFI_STATUS

+EFIAPI

 SerialStatusCodeReportWorker (

   IN EFI_STATUS_CODE_TYPE     CodeType,

   IN EFI_STATUS_CODE_VALUE    Value,

@@ -115,6 +116,7 @@ RtMemoryStatusCodeInitializeWorker (
 

 **/

 EFI_STATUS

+EFIAPI

 RtMemoryStatusCodeReportWorker (

   IN EFI_STATUS_CODE_TYPE               CodeType,

   IN EFI_STATUS_CODE_VALUE              Value,

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
index 57ebe56181..33752b6fdd 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
@@ -57,6 +57,7 @@ MemoryStatusCodeInitializeWorker (
 

 **/

 EFI_STATUS

+EFIAPI

 MemoryStatusCodeReportWorker (

   IN EFI_STATUS_CODE_TYPE               CodeType,

   IN EFI_STATUS_CODE_VALUE              Value,

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
index 3b408a2410..908eb3f0f8 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
@@ -34,6 +34,7 @@
 

 **/

 EFI_STATUS

+EFIAPI

 SerialStatusCodeReportWorker (

   IN EFI_STATUS_CODE_TYPE     CodeType,

   IN EFI_STATUS_CODE_VALUE    Value,

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h
index 325452769c..30060179b8 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h
@@ -74,6 +74,7 @@ EfiSerialStatusCodeInitializeWorker (
 

 **/

 EFI_STATUS

+EFIAPI

 SerialStatusCodeReportWorker (

   IN EFI_STATUS_CODE_TYPE     CodeType,

   IN EFI_STATUS_CODE_VALUE    Value,

@@ -112,6 +113,7 @@ MemoryStatusCodeInitializeWorker (
 

 **/

 EFI_STATUS

+EFIAPI

 MemoryStatusCodeReportWorker (

   IN EFI_STATUS_CODE_TYPE               CodeType,

   IN EFI_STATUS_CODE_VALUE              Value,