From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=gSu5A7On; spf=pass (domain: linaro.org, ip: 209.85.221.66, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by groups.io with SMTP; Wed, 18 Sep 2019 10:41:42 -0700 Received: by mail-wr1-f66.google.com with SMTP id y19so331744wrd.3 for ; Wed, 18 Sep 2019 10:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=fiXlmTCKF6mk18B+P2AiEgQMzRw3ALTCvkeE1tT48GI=; b=gSu5A7OnzGkrKhMleYLAPUHGAr06AZS+Z9XKIC+WEMphDz8mpvr3SSMuA6wWHkpVIp ARKJyhmIuBg0xr8iUjBQWhQEOOvgIk9w8Vjo1l2KIlngo695WPFiB8/ta8f5z8nNtO8e MBO6bTO32k7BVUJsvhx8q4eV1DVJxEell29Lw8yMMB9kIa8TO7ntY3zUIujdPdDYM4jR DBEz9idqExNdoeYZB5PfMGCmuxeiSiw2mYLWOkWkaEVF3innqeu0BlS2LLdVkT/G3duH ZKp8aB0StNjce6sdw3cKpDU1u8M9NX7LK22sHLuY4lUhBOceNZDBl8RdhwTZVsK7uD0o SGqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=fiXlmTCKF6mk18B+P2AiEgQMzRw3ALTCvkeE1tT48GI=; b=sUP6Y4UNztmiNxC4wHGDvj6JXO4a95phQqkRsN22tmYZWF4KbFtRtctRjlTNKE3uZw PgM+mkWwqOg59wrZDtn8Lvym0Dq20V1j5EOAmIgJcir/a3mBCghAH8ebW3/lonXQl8b0 NGfWwNCY1t4VKMEqVjDgZ4tmskie8n5zKVqaYe8dPqHWu14b4WVO+nlxW6o1WRznpi7N 1T+v6huFTZr6kelnQ1nbGmJ/f+U47B5qVZCv2/hg8T+ImfukJAcbdnWunUlrhrnkqdKG w+E0kZM+ctMdbDekUFan8BK73aylBljOOQorwFqyRtwUJ79SKoplf6+4jEJAYWK/LwTD xPuQ== X-Gm-Message-State: APjAAAUqp8Yl2nIFyL9h19wMHJa8u0H/p2tRID84MDwemSfhRnbonjfK D4RgfiZAKElLpzEFbG/cp+JJ7Q== X-Google-Smtp-Source: APXvYqwwLp1sEIAixmuZb5Mgme14Nw7cX5PFnaTMOsHWMa/ngc8ZoCNisTJIW6+qS8JkiVyMY9j9sg== X-Received: by 2002:adf:e607:: with SMTP id p7mr4263551wrm.230.1568828500936; Wed, 18 Sep 2019 10:41:40 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id q19sm11857338wra.89.2019.09.18.10.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 10:41:40 -0700 (PDT) Date: Wed, 18 Sep 2019 18:41:38 +0100 From: "Leif Lindholm" To: Laszlo Ersek Cc: edk2-devel-groups-io , Ard Biesheuvel Subject: Re: [PATCH 02/35] EmbeddedPkg: add missing EFIAPI calling convention specifiers Message-ID: <20190918174138.GK28454@bivouac.eciton.net> References: <20190917194935.24322-1-lersek@redhat.com> <20190917194935.24322-3-lersek@redhat.com> MIME-Version: 1.0 In-Reply-To: <20190917194935.24322-3-lersek@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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_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/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 ( > 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/Drivers/ConsolePrefDxe/ConsolePrefDxe.c b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c > index c250844eda74..08bba1bbf111 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 a0fca4d6a335..2138f7576bec 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/SiI3132AtaPassThru.c b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c > index f6a723adfb28..0e2905c1ebb0 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/MetronomeDxe/Metronome.c b/EmbeddedPkg/MetronomeDxe/Metronome.c > index 579332169507..13db25168fac 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 > -- > 2.19.1.3.g30247aa5d201 > >