Re: [edk2-devel] [PATCH 02/35] EmbeddedPkg: add missing EFIAPI calling convention specifiers
On Tue, Sep 17, 2019 at 09:49:02PM +0200, Laszlo Ersek wrote: > 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). Hmm, I'm nearly 100% sure I have tested that in the past, but it certainly doesn't work with my GCC8 compiler. > No functional changes. > > Cc: Ard Biesheuvel > Cc: Leif Lindholm > Signed-off-by: Laszlo Ersek > --- > > Notes: > build-tested only Well, EFIAPI is either a no-op or required for proper functionality to begin with, so... Reviewed-by: Leif Lindholm > EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h| 32 > +++- > EmbeddedPkg/GdbStub/GdbStubInternal.h | 9 ++ > EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c | 1 + > EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c | 1 + > EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c | 8 + > EmbeddedPkg/MetronomeDxe/Metronome.c| 1 + > 6 files changed, 44 insertions(+), 8 deletions(-) > > diff --git a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h > b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h > index e3db0821c38f..20636574c271 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_EVENTEvent 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/GdbStub/GdbStubInternal.h > b/EmbeddedPkg/GdbStub/GdbStubInternal.h > index b8346d7a545f..b08159302cfa 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 ( >INEFI_SYSTEM_CONTEXT SystemContext >); > @@ -364,6 +367,7 @@ ReadGeneralRegisters ( > @param InBufferThis is the input buffer received from gdb > server > **/ > VOID > +EFIAPI > WriteNthRegister ( >INEFI_SYSTEM_CONTEXT SystemContext, >INCHAR8 *InBuffer > @@ -377,6 +381,7 @@ WriteNthRegister ( > **/ > > VOID > +EFIAPI > WriteGeneralRegisters ( >INEFI_SYSTEM_CONTEXT SystemContext, >INCHAR8 *InBuffer > @@ -391,6 +396,7 @@ WriteGeneralRegisters ( >
[edk2-devel] [PATCH 02/35] 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 --- Notes: build-tested only EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h| 32 +++- EmbeddedPkg/GdbStub/GdbStubInternal.h | 9 ++ EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c | 1 + EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c | 1 + EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c | 8 + EmbeddedPkg/MetronomeDxe/Metronome.c| 1 + 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SataSiI3132.h index e3db0821c38f..20636574c271 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_EVENTEvent 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/GdbStub/GdbStubInternal.h b/EmbeddedPkg/GdbStub/GdbStubInternal.h index b8346d7a545f..b08159302cfa 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 ( INEFI_SYSTEM_CONTEXT SystemContext ); @@ -364,6 +367,7 @@ ReadGeneralRegisters ( @param InBufferThis is the input buffer received from gdb server **/ VOID +EFIAPI WriteNthRegister ( INEFI_SYSTEM_CONTEXT SystemContext, INCHAR8 *InBuffer @@ -377,6 +381,7 @@ WriteNthRegister ( **/ VOID +EFIAPI WriteGeneralRegisters ( INEFI_SYSTEM_CONTEXT SystemContext, INCHAR8 *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
