EmbeddedPkg: add missing EFIAPI calling convention specifiers

This patch is unrelated to the rest of the series; it just makes sure that
"EmbeddedPkg/EmbeddedPkg.dsc" builds for all platforms advertised in
SUPPORTED_ARCHITECTURES (in particular, X64).

No functional changes.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c
index c250844eda74bc1bf366494c5d2d03c67c24dd3e..08bba1bbf111a213de2354216867dbee137424aa 100644 (file)
--- a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c
+++ b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c
@@ -174,6 +174,7 @@ RemoveSpcrTable (
 \r
 STATIC\r
 VOID\r
+EFIAPI\r
 OnReadyToBoot (\r
   IN EFI_EVENT  Event,\r
   IN VOID       *Context\r

diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
index a0fca4d6a335308f241e37efe473421de1d27244..2138f7576bec371433f55ce7524508981b7dd57a 100644 (file)
--- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
+++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
@@ -34,6 +34,7 @@ LAN9118_DEVICE_PATH Lan9118PathTemplate =  {
 **\r
 */\r
 EFI_STATUS\r
+EFIAPI\r
 Lan9118DxeEntry (\r
   IN EFI_HANDLE Handle,\r
   IN EFI_SYSTEM_TABLE *SystemTable\r

diff --git a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h
index e3db0821c38f956c57625fae363970ab3eecdbf0..20636574c2715c2f33a9ec1b3c1f3d737ad0d357 100644 (file)
--- a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h
+++ b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h
@@ -205,7 +205,9 @@ SataSiI3132DriverBindingStop (
   IN EFI_HANDLE                  *ChildHandleBuffer\r
   );\r
 \r
-EFI_STATUS SiI3132AtaPassThruCommand (\r
+EFI_STATUS\r
+EFIAPI\r
+SiI3132AtaPassThruCommand (\r
   IN     SATA_SI3132_INSTANCE             *pSataSiI3132Instance,\r
   IN     SATA_SI3132_PORT                 *pSataPort,\r
   IN     UINT16                           PortMultiplierPort,\r
@@ -216,7 +218,9 @@ EFI_STATUS SiI3132AtaPassThruCommand (
 /**\r
  * EFI ATA Pass Thru Protocol\r
  */\r
-EFI_STATUS SiI3132AtaPassThru (\r
+EFI_STATUS\r
+EFIAPI\r
+SiI3132AtaPassThru (\r
   IN     EFI_ATA_PASS_THRU_PROTOCOL       *This,\r
   IN     UINT16                           Port,\r
   IN     UINT16                           PortMultiplierPort,\r
@@ -224,37 +228,49 @@ EFI_STATUS SiI3132AtaPassThru (
   IN     EFI_EVENT                        Event OPTIONAL\r
   );\r
 \r
-EFI_STATUS SiI3132GetNextPort (\r
+EFI_STATUS\r
+EFIAPI\r
+SiI3132GetNextPort (\r
   IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN OUT UINT16                 *Port\r
   );\r
 \r
-EFI_STATUS SiI3132GetNextDevice (\r
+EFI_STATUS\r
+EFIAPI\r
+SiI3132GetNextDevice (\r
   IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN UINT16                     Port,\r
   IN OUT UINT16                 *PortMultiplierPort\r
   );\r
 \r
-EFI_STATUS SiI3132BuildDevicePath (\r
+EFI_STATUS\r
+EFIAPI\r
+SiI3132BuildDevicePath (\r
   IN     EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN     UINT16                     Port,\r
   IN     UINT16                     PortMultiplierPort,\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL   **DevicePath\r
   );\r
 \r
-EFI_STATUS SiI3132GetDevice (\r
+EFI_STATUS\r
+EFIAPI\r
+SiI3132GetDevice (\r
   IN  EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN  EFI_DEVICE_PATH_PROTOCOL   *DevicePath,\r
   OUT UINT16                     *Port,\r
   OUT UINT16                     *PortMultiplierPort\r
   );\r
 \r
-EFI_STATUS SiI3132ResetPort (\r
+EFI_STATUS\r
+EFIAPI\r
+SiI3132ResetPort (\r
   IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN UINT16                     Port\r
   );\r
 \r
-EFI_STATUS SiI3132ResetDevice (\r
+EFI_STATUS\r
+EFIAPI\r
+SiI3132ResetDevice (\r
   IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN UINT16                     Port,\r
   IN UINT16                     PortMultiplierPort\r

diff --git a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
index f6a723adfb28ea8b990a09440792077937af1189..0e2905c1ebb052e78b1249d065616f3594512bd6 100644 (file)
--- a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
+++ b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
@@ -39,6 +39,7 @@ GetSataDevice (
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 SiI3132AtaPassThruCommand (\r
   IN     SATA_SI3132_INSTANCE             *SataSiI3132Instance,\r
   IN     SATA_SI3132_PORT                 *SataPort,\r
@@ -310,6 +311,7 @@ SiI3132AtaPassThruCommand (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 SiI3132AtaPassThru (\r
   IN     EFI_ATA_PASS_THRU_PROTOCOL       *This,\r
   IN     UINT16                           Port,\r
@@ -371,6 +373,7 @@ SiI3132AtaPassThru (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 SiI3132GetNextPort (\r
   IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN OUT UINT16                 *Port\r
@@ -442,6 +445,7 @@ SiI3132GetNextPort (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 SiI3132GetNextDevice (\r
   IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN UINT16                     Port,\r
@@ -523,6 +527,7 @@ SiI3132GetNextDevice (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 SiI3132BuildDevicePath (\r
   IN     EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN     UINT16                     Port,\r
@@ -601,6 +606,7 @@ SiI3132BuildDevicePath (
                                   port number does not exist.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 SiI3132GetDevice (\r
   IN  EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN  EFI_DEVICE_PATH_PROTOCOL   *DevicePath,\r
@@ -717,6 +723,7 @@ SiI3132HwResetPort (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 SiI3132ResetPort (\r
   IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN UINT16                     Port\r
@@ -772,6 +779,7 @@ SiI3132ResetPort (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 SiI3132ResetDevice (\r
   IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
   IN UINT16                     Port,\r

diff --git a/EmbeddedPkg/GdbStub/GdbStubInternal.h b/EmbeddedPkg/GdbStub/GdbStubInternal.h
index b8346d7a545f5729f9d8c855147be0377a5a8183..b08159302cfa6881cfece670c4ed4d9bee8e2c74 100644 (file)
--- a/EmbeddedPkg/GdbStub/GdbStubInternal.h
+++ b/EmbeddedPkg/GdbStub/GdbStubInternal.h
@@ -323,6 +323,7 @@ SendError (
  Send 'OK' when the function is done executing successfully.\r
  **/\r
 VOID\r
+EFIAPI\r
 SendSuccess (\r
   VOID\r
   );\r
@@ -332,6 +333,7 @@ SendSuccess (
  Send empty packet to specify that particular command/functionality is not supported.\r
  **/\r
 VOID\r
+EFIAPI\r
 SendNotSupported (\r
   VOID\r
   );\r
@@ -353,6 +355,7 @@ ReadNthRegister (
  @param     SystemContext           Register content at time of the exception\r
  **/\r
 VOID\r
+EFIAPI\r
 ReadGeneralRegisters (\r
   IN    EFI_SYSTEM_CONTEXT  SystemContext\r
   );\r
@@ -364,6 +367,7 @@ ReadGeneralRegisters (
  @param     InBuffer            This is the input buffer received from gdb server\r
  **/\r
 VOID\r
+EFIAPI\r
 WriteNthRegister (\r
   IN    EFI_SYSTEM_CONTEXT  SystemContext,\r
   IN    CHAR8               *InBuffer\r
@@ -377,6 +381,7 @@ WriteNthRegister (
  **/\r
 \r
 VOID\r
+EFIAPI\r
 WriteGeneralRegisters (\r
   IN    EFI_SYSTEM_CONTEXT  SystemContext,\r
   IN    CHAR8               *InBuffer\r
@@ -391,6 +396,7 @@ WriteGeneralRegisters (
  @param  *PacketData  Pointer to Payload data for the packet\r
  **/\r
 VOID\r
+EFIAPI\r
 ReadFromMemory (\r
   IN  CHAR8  *PacketData\r
   );\r
@@ -404,6 +410,7 @@ ReadFromMemory (
  @param   PacketData     Pointer to Payload data for the packet\r
  **/\r
 VOID\r
+EFIAPI\r
 WriteToMemory (\r
   IN CHAR8 *PacketData\r
   );\r
@@ -418,6 +425,7 @@ WriteToMemory (
  **/\r
 \r
 VOID\r
+EFIAPI\r
 ContinueAtAddress (\r
   IN  EFI_SYSTEM_CONTEXT   SystemContext,\r
   IN  CHAR8                *PacketData\r
@@ -432,6 +440,7 @@ ContinueAtAddress (
  @param PacketData      Pointer to Payload data for the packet\r
  **/\r
 VOID\r
+EFIAPI\r
 SingleStep (\r
   IN  EFI_SYSTEM_CONTEXT  SystemContext,\r
   IN  CHAR8               *PacketData\r

diff --git a/EmbeddedPkg/MetronomeDxe/Metronome.c b/EmbeddedPkg/MetronomeDxe/Metronome.c
index 579332169507cd9b08a88e0514a72c08a47287be..13db25168fac76d9f02ad6ab5bde773efd2f50a6 100644 (file)
--- a/EmbeddedPkg/MetronomeDxe/Metronome.c
+++ b/EmbeddedPkg/MetronomeDxe/Metronome.c
@@ -110,6 +110,7 @@ EFI_HANDLE  gMetronomeHandle = NULL;
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 MetronomeInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r