From 7609c0472838debe6c7cc7b053e3f5ed710465fd Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 17 Sep 2019 13:05:09 +0200 Subject: 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 Cc: Leif Lindholm Signed-off-by: Laszlo Ersek Reviewed-by: Leif Lindholm --- .../Drivers/ConsolePrefDxe/ConsolePrefDxe.c | 1 + EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c | 1 + EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h | 32 ++++++++++++++++------ .../Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c | 8 ++++++ EmbeddedPkg/GdbStub/GdbStubInternal.h | 9 ++++++ EmbeddedPkg/MetronomeDxe/Metronome.c | 1 + 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c index c250844eda..08bba1bbf1 100644 --- a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c +++ b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c @@ -174,6 +174,7 @@ RemoveSpcrTable ( STATIC VOID +EFIAPI OnReadyToBoot ( IN EFI_EVENT Event, IN VOID *Context diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c index a0fca4d6a3..2138f7576b 100644 --- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c +++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c @@ -34,6 +34,7 @@ LAN9118_DEVICE_PATH Lan9118PathTemplate = { ** */ EFI_STATUS +EFIAPI Lan9118DxeEntry ( IN EFI_HANDLE Handle, IN EFI_SYSTEM_TABLE *SystemTable diff --git a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h index e3db0821c3..20636574c2 100644 --- a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h +++ b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h @@ -205,7 +205,9 @@ SataSiI3132DriverBindingStop ( IN EFI_HANDLE *ChildHandleBuffer ); -EFI_STATUS SiI3132AtaPassThruCommand ( +EFI_STATUS +EFIAPI +SiI3132AtaPassThruCommand ( IN SATA_SI3132_INSTANCE *pSataSiI3132Instance, IN SATA_SI3132_PORT *pSataPort, IN UINT16 PortMultiplierPort, @@ -216,7 +218,9 @@ EFI_STATUS SiI3132AtaPassThruCommand ( /** * EFI ATA Pass Thru Protocol */ -EFI_STATUS SiI3132AtaPassThru ( +EFI_STATUS +EFIAPI +SiI3132AtaPassThru ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, IN UINT16 PortMultiplierPort, @@ -224,37 +228,49 @@ EFI_STATUS SiI3132AtaPassThru ( IN EFI_EVENT Event OPTIONAL ); -EFI_STATUS SiI3132GetNextPort ( +EFI_STATUS +EFIAPI +SiI3132GetNextPort ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN OUT UINT16 *Port ); -EFI_STATUS SiI3132GetNextDevice ( +EFI_STATUS +EFIAPI +SiI3132GetNextDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, IN OUT UINT16 *PortMultiplierPort ); -EFI_STATUS SiI3132BuildDevicePath ( +EFI_STATUS +EFIAPI +SiI3132BuildDevicePath ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, IN UINT16 PortMultiplierPort, IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath ); -EFI_STATUS SiI3132GetDevice ( +EFI_STATUS +EFIAPI +SiI3132GetDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN EFI_DEVICE_PATH_PROTOCOL *DevicePath, OUT UINT16 *Port, OUT UINT16 *PortMultiplierPort ); -EFI_STATUS SiI3132ResetPort ( +EFI_STATUS +EFIAPI +SiI3132ResetPort ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port ); -EFI_STATUS SiI3132ResetDevice ( +EFI_STATUS +EFIAPI +SiI3132ResetDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, IN UINT16 PortMultiplierPort diff --git a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c index f6a723adfb..0e2905c1eb 100644 --- a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c +++ b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c @@ -39,6 +39,7 @@ GetSataDevice ( } EFI_STATUS +EFIAPI SiI3132AtaPassThruCommand ( IN SATA_SI3132_INSTANCE *SataSiI3132Instance, IN SATA_SI3132_PORT *SataPort, @@ -310,6 +311,7 @@ SiI3132AtaPassThruCommand ( **/ EFI_STATUS +EFIAPI SiI3132AtaPassThru ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, @@ -371,6 +373,7 @@ SiI3132AtaPassThru ( **/ EFI_STATUS +EFIAPI SiI3132GetNextPort ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN OUT UINT16 *Port @@ -442,6 +445,7 @@ SiI3132GetNextPort ( **/ EFI_STATUS +EFIAPI SiI3132GetNextDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, @@ -523,6 +527,7 @@ SiI3132GetNextDevice ( **/ EFI_STATUS +EFIAPI SiI3132BuildDevicePath ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, @@ -601,6 +606,7 @@ SiI3132BuildDevicePath ( port number does not exist. **/ EFI_STATUS +EFIAPI SiI3132GetDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN EFI_DEVICE_PATH_PROTOCOL *DevicePath, @@ -717,6 +723,7 @@ SiI3132HwResetPort ( **/ EFI_STATUS +EFIAPI SiI3132ResetPort ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port @@ -772,6 +779,7 @@ SiI3132ResetPort ( **/ EFI_STATUS +EFIAPI SiI3132ResetDevice ( IN EFI_ATA_PASS_THRU_PROTOCOL *This, IN UINT16 Port, diff --git a/EmbeddedPkg/GdbStub/GdbStubInternal.h b/EmbeddedPkg/GdbStub/GdbStubInternal.h index b8346d7a54..b08159302c 100644 --- a/EmbeddedPkg/GdbStub/GdbStubInternal.h +++ b/EmbeddedPkg/GdbStub/GdbStubInternal.h @@ -323,6 +323,7 @@ SendError ( Send 'OK' when the function is done executing successfully. **/ VOID +EFIAPI SendSuccess ( VOID ); @@ -332,6 +333,7 @@ SendSuccess ( Send empty packet to specify that particular command/functionality is not supported. **/ VOID +EFIAPI SendNotSupported ( VOID ); @@ -353,6 +355,7 @@ ReadNthRegister ( @param SystemContext Register content at time of the exception **/ VOID +EFIAPI ReadGeneralRegisters ( IN EFI_SYSTEM_CONTEXT SystemContext ); @@ -364,6 +367,7 @@ ReadGeneralRegisters ( @param InBuffer This is the input buffer received from gdb server **/ VOID +EFIAPI WriteNthRegister ( IN EFI_SYSTEM_CONTEXT SystemContext, IN CHAR8 *InBuffer @@ -377,6 +381,7 @@ WriteNthRegister ( **/ VOID +EFIAPI WriteGeneralRegisters ( IN EFI_SYSTEM_CONTEXT SystemContext, IN CHAR8 *InBuffer @@ -391,6 +396,7 @@ WriteGeneralRegisters ( @param *PacketData Pointer to Payload data for the packet **/ VOID +EFIAPI ReadFromMemory ( IN CHAR8 *PacketData ); @@ -404,6 +410,7 @@ ReadFromMemory ( @param PacketData Pointer to Payload data for the packet **/ VOID +EFIAPI WriteToMemory ( IN CHAR8 *PacketData ); @@ -418,6 +425,7 @@ WriteToMemory ( **/ VOID +EFIAPI ContinueAtAddress ( IN EFI_SYSTEM_CONTEXT SystemContext, IN CHAR8 *PacketData @@ -432,6 +440,7 @@ ContinueAtAddress ( @param PacketData Pointer to Payload data for the packet **/ VOID +EFIAPI SingleStep ( IN EFI_SYSTEM_CONTEXT SystemContext, IN CHAR8 *PacketData diff --git a/EmbeddedPkg/MetronomeDxe/Metronome.c b/EmbeddedPkg/MetronomeDxe/Metronome.c index 5793321695..13db25168f 100644 --- a/EmbeddedPkg/MetronomeDxe/Metronome.c +++ b/EmbeddedPkg/MetronomeDxe/Metronome.c @@ -110,6 +110,7 @@ EFI_HANDLE gMetronomeHandle = NULL; **/ EFI_STATUS +EFIAPI MetronomeInitialize ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable -- cgit v1.2.3