| Message ID | 20181115023353.20159-17-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | IntelUndiPkg/XGigUndiDxe: fix GCC / ARM build issues | expand |
Reviewed-by: Ryszard Knop <ryszard.knop@linux.intel.com> On Wed, 2018-11-14 at 18:33 -0800, ard.biesheuvela wrote: > When building for the X64 target using GCC, correct use of the > EFIAPI modifiers is essential to ensure that the correct calling > convention is used. So add the missing ones where appropriate. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel at linaro.org> > --- > IntelUndiPkg/XGigUndiDxe/AdapterInformation.c | 3 +++ > IntelUndiPkg/XGigUndiDxe/ComponentName.c | 2 ++ > IntelUndiPkg/XGigUndiDxe/ComponentName.h | 1 + > IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c | 1 + > IntelUndiPkg/XGigUndiDxe/DriverHealth.c | 2 ++ > IntelUndiPkg/XGigUndiDxe/StartStop.c | 2 ++ > 6 files changed, 11 insertions(+) > > diff --git a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c > b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c > index 26556e284381..b25ed7c4f022 100644 > --- a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c > +++ b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c > @@ -123,6 +123,7 @@ GetIpv6SupportInformationBlock ( > **/ > STATIC > EFI_STATUS > +EFIAPI > GetInformation ( > IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, > IN EFI_GUID * InformationType, > @@ -188,6 +189,7 @@ GetInformation ( > **/ > STATIC > EFI_STATUS > +EFIAPI > SetInformation ( > IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, > IN EFI_GUID * InformationType, > @@ -234,6 +236,7 @@ SetInformation ( > **/ > STATIC > EFI_STATUS > +EFIAPI > GetSupportedTypes ( > IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, > OUT EFI_GUID ** InfoTypesBuffer, > diff --git a/IntelUndiPkg/XGigUndiDxe/ComponentName.c > b/IntelUndiPkg/XGigUndiDxe/ComponentName.c > index 2972c28bda4e..eee59d7c14f4 100644 > --- a/IntelUndiPkg/XGigUndiDxe/ComponentName.c > +++ b/IntelUndiPkg/XGigUndiDxe/ComponentName.c > @@ -116,6 +116,7 @@ ComponentNameInitializeControllerName ( > language specified by Language. > **/ > EFI_STATUS > +EFIAPI > ComponentNameGetDriverName ( > IN EFI_COMPONENT_NAME_PROTOCOL *This, > IN CHAR8 * Language, > @@ -186,6 +187,7 @@ ComponentNameGetDriverName ( > language specified by Language. > **/ > EFI_STATUS > +EFIAPI > ComponentNameGetControllerName ( > IN EFI_COMPONENT_NAME_PROTOCOL > * This, > IN EFI_HANDLE Co > ntrollerHandle, > diff --git a/IntelUndiPkg/XGigUndiDxe/ComponentName.h > b/IntelUndiPkg/XGigUndiDxe/ComponentName.h > index f63d58b8a18c..4f62e48379ed 100644 > --- a/IntelUndiPkg/XGigUndiDxe/ComponentName.h > +++ b/IntelUndiPkg/XGigUndiDxe/ComponentName.h > @@ -67,6 +67,7 @@ ComponentNameInitializeControllerName ( > language specified by Language. > **/ > EFI_STATUS > +EFIAPI > ComponentNameGetDriverName ( > IN EFI_COMPONENT_NAME_PROTOCOL *This, > IN CHAR8 * Language, > diff --git a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c > b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c > index 2f9c66771910..77b7a954698b 100644 > --- a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c > +++ b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c > @@ -370,6 +370,7 @@ XgbeUndiPhyLoopback ( > ChildHandle did not pass > the diagnostic. > **/ > EFI_STATUS > +EFIAPI > XgbeUndiDriverDiagnosticsRunDiagnostics ( > IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL > * This, > IN > EFI_HANDLE C > ontrollerHandle, > diff --git a/IntelUndiPkg/XGigUndiDxe/DriverHealth.c > b/IntelUndiPkg/XGigUndiDxe/DriverHealth.c > index df6cfdf8a123..4b173bc8d8a9 100644 > --- a/IntelUndiPkg/XGigUndiDxe/DriverHealth.c > +++ b/IntelUndiPkg/XGigUndiDxe/DriverHealth.c > @@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF SUCH DAMAGE. > @retval !EFI_SUCCESS Failure to retrieve health status > **/ > EFI_STATUS > +EFIAPI > GetHealthStatus ( > IN EFI_DRIVER_HEALTH_PROTOCOL * This, > IN EFI_HANDLE ControllerHandle, OPTIONAL > @@ -145,6 +146,7 @@ GetHealthStatus ( > @retval EFI_UNSUPPORTED This function is unsupported > **/ > EFI_STATUS > +EFIAPI > Repair ( > IN EFI_DRIVER_HEALTH_PROTOCOL *This, > IN EFI_HANDLE ControllerHandle, > diff --git a/IntelUndiPkg/XGigUndiDxe/StartStop.c > b/IntelUndiPkg/XGigUndiDxe/StartStop.c > index 156e927a35c6..c881c811aefb 100644 > --- a/IntelUndiPkg/XGigUndiDxe/StartStop.c > +++ b/IntelUndiPkg/XGigUndiDxe/StartStop.c > @@ -38,6 +38,7 @@ EFI_GUID gEfiStartStopProtocolGuid = > EFI_DRIVER_STOP_PROTOCOL_GUID; > @retval EFI_SUCCESS Driver is stopped successfully > **/ > EFI_STATUS > +EFIAPI > StopDriver ( > IN EFI_DRIVER_STOP_PROTOCOL *This > ) > @@ -63,6 +64,7 @@ StopDriver ( > @retval EFI_DEVICE_ERROR Failed to initialize hardware > **/ > EFI_STATUS > +EFIAPI > StartDriver ( > IN EFI_DRIVER_STOP_PROTOCOL *This > ) _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c index 26556e284381..b25ed7c4f022 100644 --- a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c +++ b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c @@ -123,6 +123,7 @@ GetIpv6SupportInformationBlock ( **/ STATIC EFI_STATUS +EFIAPI GetInformation ( IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, IN EFI_GUID * InformationType, @@ -188,6 +189,7 @@ GetInformation ( **/ STATIC EFI_STATUS +EFIAPI SetInformation ( IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, IN EFI_GUID * InformationType, @@ -234,6 +236,7 @@ SetInformation ( **/ STATIC EFI_STATUS +EFIAPI GetSupportedTypes ( IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, OUT EFI_GUID ** InfoTypesBuffer, diff --git a/IntelUndiPkg/XGigUndiDxe/ComponentName.c b/IntelUndiPkg/XGigUndiDxe/ComponentName.c index 2972c28bda4e..eee59d7c14f4 100644 --- a/IntelUndiPkg/XGigUndiDxe/ComponentName.c +++ b/IntelUndiPkg/XGigUndiDxe/ComponentName.c @@ -116,6 +116,7 @@ ComponentNameInitializeControllerName ( language specified by Language. **/ EFI_STATUS +EFIAPI ComponentNameGetDriverName ( IN EFI_COMPONENT_NAME_PROTOCOL *This, IN CHAR8 * Language, @@ -186,6 +187,7 @@ ComponentNameGetDriverName ( language specified by Language. **/ EFI_STATUS +EFIAPI ComponentNameGetControllerName ( IN EFI_COMPONENT_NAME_PROTOCOL * This, IN EFI_HANDLE ControllerHandle, diff --git a/IntelUndiPkg/XGigUndiDxe/ComponentName.h b/IntelUndiPkg/XGigUndiDxe/ComponentName.h index f63d58b8a18c..4f62e48379ed 100644 --- a/IntelUndiPkg/XGigUndiDxe/ComponentName.h +++ b/IntelUndiPkg/XGigUndiDxe/ComponentName.h @@ -67,6 +67,7 @@ ComponentNameInitializeControllerName ( language specified by Language. **/ EFI_STATUS +EFIAPI ComponentNameGetDriverName ( IN EFI_COMPONENT_NAME_PROTOCOL *This, IN CHAR8 * Language, diff --git a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c index 2f9c66771910..77b7a954698b 100644 --- a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c +++ b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c @@ -370,6 +370,7 @@ XgbeUndiPhyLoopback ( ChildHandle did not pass the diagnostic. **/ EFI_STATUS +EFIAPI XgbeUndiDriverDiagnosticsRunDiagnostics ( IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL * This, IN EFI_HANDLE ControllerHandle, diff --git a/IntelUndiPkg/XGigUndiDxe/DriverHealth.c b/IntelUndiPkg/XGigUndiDxe/DriverHealth.c index df6cfdf8a123..4b173bc8d8a9 100644 --- a/IntelUndiPkg/XGigUndiDxe/DriverHealth.c +++ b/IntelUndiPkg/XGigUndiDxe/DriverHealth.c @@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @retval !EFI_SUCCESS Failure to retrieve health status **/ EFI_STATUS +EFIAPI GetHealthStatus ( IN EFI_DRIVER_HEALTH_PROTOCOL * This, IN EFI_HANDLE ControllerHandle, OPTIONAL @@ -145,6 +146,7 @@ GetHealthStatus ( @retval EFI_UNSUPPORTED This function is unsupported **/ EFI_STATUS +EFIAPI Repair ( IN EFI_DRIVER_HEALTH_PROTOCOL *This, IN EFI_HANDLE ControllerHandle, diff --git a/IntelUndiPkg/XGigUndiDxe/StartStop.c b/IntelUndiPkg/XGigUndiDxe/StartStop.c index 156e927a35c6..c881c811aefb 100644 --- a/IntelUndiPkg/XGigUndiDxe/StartStop.c +++ b/IntelUndiPkg/XGigUndiDxe/StartStop.c @@ -38,6 +38,7 @@ EFI_GUID gEfiStartStopProtocolGuid = EFI_DRIVER_STOP_PROTOCOL_GUID; @retval EFI_SUCCESS Driver is stopped successfully **/ EFI_STATUS +EFIAPI StopDriver ( IN EFI_DRIVER_STOP_PROTOCOL *This ) @@ -63,6 +64,7 @@ StopDriver ( @retval EFI_DEVICE_ERROR Failed to initialize hardware **/ EFI_STATUS +EFIAPI StartDriver ( IN EFI_DRIVER_STOP_PROTOCOL *This )
When building for the X64 target using GCC, correct use of the EFIAPI modifiers is essential to ensure that the correct calling convention is used. So add the missing ones where appropriate. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- IntelUndiPkg/XGigUndiDxe/AdapterInformation.c | 3 +++ IntelUndiPkg/XGigUndiDxe/ComponentName.c | 2 ++ IntelUndiPkg/XGigUndiDxe/ComponentName.h | 1 + IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c | 1 + IntelUndiPkg/XGigUndiDxe/DriverHealth.c | 2 ++ IntelUndiPkg/XGigUndiDxe/StartStop.c | 2 ++ 6 files changed, 11 insertions(+) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel