Fix various 'EFIAPI' inconsistencies found while building MdeModulePkg.

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

26 files changed, 53 insertions, 31 deletions

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
index 0c5195e318..4b1cc7399f 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
@@ -883,6 +883,7 @@ EhcUpdateAsyncRequest (
 

 **/

 VOID

+EFIAPI

 EhcMonitorAsyncRequests (

   IN EFI_EVENT            Event,

   IN VOID                 *Context

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h
index 6a1bf0b86f..ca4d421606 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h
@@ -171,6 +171,7 @@ EhciDelAllAsyncIntTransfers (
 

 **/

 VOID

+EFIAPI

 EhcMonitorAsyncRequests (

   IN EFI_EVENT            Event,

   IN VOID                 *Context

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
index 6ad55338c1..671a54205a 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
@@ -2,7 +2,7 @@
 

   The EHCI register operation routines.

 

-Copyright (c) 2007 - 2008, Intel Corporation

+Copyright (c) 2007 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -928,6 +928,7 @@ UhciFreeAllAsyncReq (
 

 **/

 VOID

+EFIAPI

 UhciMonitorAsyncReqList (

   IN EFI_EVENT            Event,

   IN VOID                 *Context

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
index 804f28a7e8..17f0ea2abe 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
@@ -2,7 +2,7 @@
 

   The definition for EHCI register operation routines.

 

-Copyright (c) 2007, Intel Corporation

+Copyright (c) 2007, 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -271,6 +271,7 @@ UhciFreeAllAsyncReq (
 

 **/

 VOID

+EFIAPI

 UhciMonitorAsyncReqList (

   IN EFI_EVENT            Event,

   IN VOID                 *Context

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index 5bdf8b5442..f20d933f03 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -2,7 +2,7 @@
 

     Unified interface for RootHub and Hub.

 

-Copyright (c) 2007, Intel Corporation

+Copyright (c) 2007, 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -516,6 +516,7 @@ UsbIsHubInterface (
 

 **/

 EFI_STATUS

+EFIAPI

 UsbOnHubInterrupt (

   IN  VOID                *Data,

   IN  UINTN               DataLength,

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 149592857d..916bc0d82d 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -2,7 +2,7 @@
   Master header file for DxeIpl PEIM. All source files in this module should

   include this file for common definitions.

 

-Copyright (c) 2006 - 2008, Intel Corporation. <BR>

+Copyright (c) 2006 - 2009, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -105,6 +105,7 @@ DxeIplFindDxeCore (
 

 **/

 EFI_STATUS

+EFIAPI

 PeiImageRead (

   IN     VOID    *FileHandle,

   IN     UINTN   FileOffset,

@@ -224,6 +225,7 @@ UpdateStackHob (
 

 **/

 EFI_STATUS

+EFIAPI

 CustomGuidedSectionExtract (

   IN CONST  EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI *This,

   IN CONST  VOID                                  *InputSection,

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index f5a384f602..fc485b9d24 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -2,7 +2,7 @@
   Last PEIM.

   Responsibility of this module is to load the DXE Core from a Firmware Volume.

 

-Copyright (c) 2006 - 2008, Intel Corporation. <BR>

+Copyright (c) 2006 - 2009, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -454,6 +454,7 @@ PeiLoadFile (
 

 **/

 EFI_STATUS

+EFIAPI

 CustomGuidedSectionExtract (

   IN CONST  EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI *This,

   IN CONST  VOID                                  *InputSection,

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c
index 78abff094c..9eca493c52 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c
@@ -1,7 +1,7 @@
 /** @file

   This module loads an image to memory for IA32 Cpu architecture.

 

-Copyright (c) 2006 - 2008, Intel Corporation. <BR>

+Copyright (c) 2006 - 2009, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 **/

 EFI_STATUS

+EFIAPI

 PeiImageRead (

   IN     VOID    *FileHandle,

   IN     UINTN   FileOffset,

diff --git a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c
index 9e6d3382f7..8f83c6c4f2 100644
--- a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c
+++ b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c
@@ -2,7 +2,7 @@
 Utility functions which helps in opcode creation, HII configuration string manipulations, 

 pop up window creations, setup browser persistence data set and get.

 

-Copyright (c) 2007- 2008, Intel Corporation

+Copyright (c) 2007- 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -1053,6 +1053,7 @@ ConstructConfigHdr (
 

 **/

 BOOLEAN

+EFIAPI

 IsConfigHdrMatch (

   IN EFI_STRING                ConfigString,

   IN EFI_GUID                  *StorageGuid, OPTIONAL

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
index f7d7485c56..6714da783a 100755
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
@@ -166,6 +166,7 @@ AcpiPlatformChecksum (
 

 **/

 EFI_STATUS

+EFIAPI

 AcpiPlatformEntryPoint (

   IN EFI_HANDLE         ImageHandle,

   IN EFI_SYSTEM_TABLE   *SystemTable

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c
index 976e0e9713..bf668b5a97 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c
@@ -1,7 +1,7 @@
 /** @file

   Top level C file for debug support driver.  Contains initialization function.

 

-Copyright (c) 2006 - 2008, Intel Corporation. <BR>

+Copyright (c) 2006 - 2009, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -38,6 +38,7 @@ EFI_DEBUG_SUPPORT_PROTOCOL  mDebugSupportProtocolInterface = {
 

 **/

 EFI_STATUS

+EFIAPI

 InitializeDebugSupportDriver (

   IN EFI_HANDLE               ImageHandle,

   IN EFI_SYSTEM_TABLE         *SystemTable

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h
index 1af8a89833..4628117b09 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h
@@ -1,7 +1,7 @@
 /** @file

   Generic debug support macros, typedefs and prototypes for IA32/x64.

 

-Copyright (c) 2006 - 2008, Intel Corporation                                                         

+Copyright (c) 2006 - 2009, Intel Corporation                                                         

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -42,7 +42,7 @@ typedef struct {
   DEBUG_PROC                OrigVector;

   IA32_IDT_GATE_DESCRIPTOR  NewDesc;

   DEBUG_PROC                StubEntry;

-  VOID (*RegisteredCallback) ();

+  VOID (EFIAPI *RegisteredCallback) ();

 } IDT_ENTRY;

 

 extern UINT8                     InterruptEntryStub[];

@@ -258,7 +258,7 @@ GetInterruptHandleFromIdt (
 **/

 EFI_STATUS

 ManageIdtEntryTable (

-  VOID               (*NewCallback)(),

+  VOID               (EFIAPI *NewCallback)(),

   EFI_EXCEPTION_TYPE ExceptionType

   );

 

@@ -277,7 +277,7 @@ ManageIdtEntryTable (
 VOID

 HookEntry (

   IN EFI_EXCEPTION_TYPE            ExceptionType,

-  IN VOID                         (*NewCallback) ()

+  IN VOID                         (EFIAPI *NewCallback) ()

   );

 

 /**

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
index ed38d06cae..b9a57142ee 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
@@ -1,7 +1,7 @@
 /** @file

   IA32/x64 generic functions to support Debug Support protocol.

 

-Copyright (c) 2006 - 2008, Intel Corporation

+Copyright (c) 2006 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -78,7 +78,7 @@ WriteIdtGateDescriptor (
 VOID

 HookEntry (

   IN EFI_EXCEPTION_TYPE            ExceptionType,

-  IN VOID                         (*NewCallback) ()

+  IN VOID                         (EFIAPI *NewCallback) ()

   )

 {

   BOOLEAN     OldIntFlagState;

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
index b7c182f580..ab8d9a94f1 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
@@ -1,7 +1,7 @@
 /** @file

   IA32 specific functions to support Debug Support protocol.

 

-Copyright (c) 2008, Intel Corporation

+Copyright (c) 2008 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -107,7 +107,7 @@ CreateEntryStub (
 **/

 EFI_STATUS

 ManageIdtEntryTable (

-  VOID               (*NewCallback)(),

+  VOID               (EFIAPI *NewCallback)(),

   EFI_EXCEPTION_TYPE ExceptionType

   )

 {

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
index 1a0aeb1901..4d13ca3833 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
@@ -1,7 +1,7 @@
 /** @file

   X64 specific functions to support Debug Support protocol.

 

-Copyright (c) 2008, Intel Corporation

+Copyright (c) 2008 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -108,7 +108,7 @@ CreateEntryStub (
 **/

 EFI_STATUS

 ManageIdtEntryTable (

-  VOID               (*NewCallback)(),

+  VOID               (EFIAPI *NewCallback)(),

   EFI_EXCEPTION_TYPE ExceptionType

   )

 {

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index 707af552be..dfb3209ea4 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -1,7 +1,7 @@
 /** @file

   iSCSI DHCP related configuration routines.

 

-Copyright (c) 2004 - 2007, Intel Corporation.<BR>

+Copyright (c) 2004 - 2007, 2009, Intel Corporation.<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -184,6 +184,7 @@ ON_EXIT:
   @retval Others           Other errors as indicated.

 **/

 EFI_STATUS

+EFIAPI

 IScsiDhcpSelectOffer (

   IN  EFI_DHCP4_PROTOCOL  * This,

   IN  VOID                *Context,

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
index 1f8fa92bb1..7fcd6b851e 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
@@ -1,7 +1,7 @@
 /** @file

   The driver binding for IP4 CONFIG protocol.

 

-Copyright (c) 2006 - 2008, Intel Corporation.<BR>

+Copyright (c) 2006 - 2009, Intel Corporation.<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at<BR>

@@ -72,6 +72,7 @@ EfiIp4ConfigUnload (
 

 **/

 EFI_STATUS

+EFIAPI

 Ip4ConfigDriverEntryPoint (

   IN EFI_HANDLE             ImageHandle,

   IN EFI_SYSTEM_TABLE       *SystemTable

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 531bd74042..ea463edc55 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -1,7 +1,7 @@
 /** @file

   Interface routine for Mtftp4.

   

-Copyright (c) 2006 - 2007, Intel Corporation<BR>

+Copyright (c) 2006 - 2007, 2009, Intel Corporation<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -103,6 +103,7 @@ Mtftp4CleanOperation (
 

 **/

 EFI_STATUS

+EFIAPI

 Mtftp4GetInfoCheckPacket (

   IN EFI_MTFTP4_PROTOCOL    *This,

   IN EFI_MTFTP4_TOKEN       *Token,

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index 59bd95f13a..920506b246 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -1,7 +1,7 @@
 /** @file

   Support for PxeBc dhcp functions.

   

-Copyright (c) 2007 - 2008, Intel Corporation.<BR>                                                         

+Copyright (c) 2007 - 2009, Intel Corporation.<BR>                                                         

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -766,6 +766,7 @@ PxeBcSelectOffer (
 

 **/

 EFI_STATUS

+EFIAPI

 PxeBcDhcpCallBack (

   IN EFI_DHCP4_PROTOCOL                * This,

   IN VOID                              *Context,

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
index 0abfb62e67..6ad03a8cd9 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
@@ -1,7 +1,7 @@
 /** @file

   Dhcp and Discover routines for PxeBc.

 

-Copyright (c) 2007, Intel Corporation.<BR>

+Copyright (c) 2007, 2009, Intel Corporation.<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -373,6 +373,7 @@ PxeBcCheckSelectedOffer (
 

 **/

 EFI_STATUS

+EFIAPI

 PxeBcDhcpCallBack (

   IN EFI_DHCP4_PROTOCOL                * This,

   IN VOID                              *Context,

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
index 77c3077b5e..102f68586a 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
@@ -1,7 +1,7 @@
 /** @file

   The driver binding for UEFI PXEBC protocol.

   

-Copyright (c) 2007 - 2008, Intel Corporation.<BR>

+Copyright (c) 2007 - 2009, Intel Corporation.<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -37,6 +37,7 @@ EFI_DRIVER_BINDING_PROTOCOL gPxeBcDriverBinding = {
 

 **/

 EFI_STATUS

+EFIAPI

 PxeBcDriverEntryPoint (

   IN EFI_HANDLE             ImageHandle,

   IN EFI_SYSTEM_TABLE       *SystemTable

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
index 928b99a820..e81d069503 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
@@ -1,7 +1,7 @@
 /** @file

   PxeBc MTFTP functions.

   

-Copyright (c) 2007, Intel Corporation.<BR>

+Copyright (c) 2007, 2009, Intel Corporation.<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -43,6 +43,7 @@ CHAR8 *mMtftpOptions[PXE_MTFTP_OPTION_MAXIMUM_INDEX] = {
 

 **/

 EFI_STATUS

+EFIAPI

 PxeBcCheckPacket (

   IN EFI_MTFTP4_PROTOCOL        *This,

   IN EFI_MTFTP4_TOKEN           *Token,

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
index f30898730e..9327f62067 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
@@ -1,7 +1,7 @@
 /** @file

   Support routines for PxeBc.

   

-Copyright (c) 2007 - 2008, Intel Corporation.<BR>                                                         

+Copyright (c) 2007 - 2009, Intel Corporation.<BR>                                                         

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -146,6 +146,7 @@ GetSmbiosSystemGuidAndSerialNumber (
 

 **/

 VOID

+EFIAPI

 PxeBcCommonNotify (

   IN EFI_EVENT           Event,

   IN VOID                *Context

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
index 82a0030d67..deca161bb1 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
@@ -1,6 +1,6 @@
 /** @file

   Support routines for PxeBc.

-Copyright (c) 2007 - 2008, Intel Corporation.<BR>                                                         

+Copyright (c) 2007 - 2009, Intel Corporation.<BR>                                                         

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -42,6 +42,7 @@ GetSmbiosSystemGuidAndSerialNumber (
 

 **/

 VOID

+EFIAPI

 PxeBcCommonNotify (

   IN EFI_EVENT           Event,

   IN VOID                *Context

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 0671558b57..2d0e1721c8 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1,7 +1,7 @@
 /** @file

 Utility functions for UI presentation.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -818,6 +818,7 @@ UpdateKeyHelp (
 

 **/

 EFI_STATUS

+EFIAPI

 FormUpdateNotify (

   IN UINT8                              PackageType,

   IN CONST EFI_GUID                     *PackageGuid,

diff --git a/MdePkg/Include/Protocol/DebugSupport.h b/MdePkg/Include/Protocol/DebugSupport.h
index 0eb4eee7b3..deb9c29016 100644
--- a/MdePkg/Include/Protocol/DebugSupport.h
+++ b/MdePkg/Include/Protocol/DebugSupport.h
@@ -5,7 +5,7 @@
   The DebugSupport protocol is used by source level debuggers to abstract the

   processor and handle context save and restore operations.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -495,7 +495,7 @@ typedef union {
 **/

 typedef

 VOID

-(*EFI_EXCEPTION_CALLBACK)(

+(EFIAPI *EFI_EXCEPTION_CALLBACK)(

   IN     EFI_EXCEPTION_TYPE               ExceptionType,

   IN OUT EFI_SYSTEM_CONTEXT               SystemContext

   );

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

 typedef

 VOID

-(*EFI_PERIODIC_CALLBACK)(

+(EFIAPI *EFI_PERIODIC_CALLBACK)(

   IN OUT EFI_SYSTEM_CONTEXT               SystemContext

   );