OptionRomPkg: Fix calling convention issue for UndiRuntiumeDxe driver.

[edk2] [Patch] OptionRomPkg: Fix calling convention issue for UndiRuntiumeDxe driver.

Posted by Fu Siyuan 7 years, 6 months ago

Add "EFIAPI" to UNDI command entry point function according to UEFI calling
convention.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
---
 OptionRomPkg/UndiRuntimeDxe/Decode.c | 3 ++-
 OptionRomPkg/UndiRuntimeDxe/Undi32.h | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OptionRomPkg/UndiRuntimeDxe/Decode.c b/OptionRomPkg/UndiRuntimeDxe/Decode.c
index 5f85347..cff6942 100644
--- a/OptionRomPkg/UndiRuntimeDxe/Decode.c
+++ b/OptionRomPkg/UndiRuntimeDxe/Decode.c
@@ -1,7 +1,7 @@
 /** @file
   Provides the basic UNID functions.
 
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -1276,6 +1276,7 @@ UNDI_Receive (
 **/
 // TODO:    cdb - add argument and description to function comment
 VOID
+EFIAPI
 UNDI_APIEntry_new (
   IN  UINT64 cdb
   )
diff --git a/OptionRomPkg/UndiRuntimeDxe/Undi32.h b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
index 18341dd..00b48f6 100644
--- a/OptionRomPkg/UndiRuntimeDxe/Undi32.h
+++ b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
@@ -1,7 +1,7 @@
 /** @file
   EFI internal structures for the EFI UNDI driver.
 
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -338,7 +338,7 @@ UNDI_Receive (
   IN  NIC_DATA_INSTANCE *AdapterInfo
   );
 
-VOID UNDI_APIEntry_new(UINT64);
+VOID EFIAPI UNDI_APIEntry_new(UINT64);
 VOID UNDI_APIEntry_Common(UINT64);
 
 PXE_IPV4 convert_mcip(PXE_MAC_ADDR *);
-- 
2.7.4.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] OptionRomPkg: Fix calling convention issue for UndiRuntiumeDxe driver.

Posted by Wu, Jiaxin 7 years, 6 months ago

Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>

Thanks,
Jiaxin

> -----Original Message-----
> From: Fu, Siyuan
> Sent: Friday, April 21, 2017 9:33 AM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [Patch] OptionRomPkg: Fix calling convention issue for
> UndiRuntiumeDxe driver.
> 
> Add "EFIAPI" to UNDI command entry point function according to UEFI calling
> convention.
> 
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> ---
>  OptionRomPkg/UndiRuntimeDxe/Decode.c | 3 ++-
>  OptionRomPkg/UndiRuntimeDxe/Undi32.h | 4 ++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/OptionRomPkg/UndiRuntimeDxe/Decode.c
> b/OptionRomPkg/UndiRuntimeDxe/Decode.c
> index 5f85347..cff6942 100644
> --- a/OptionRomPkg/UndiRuntimeDxe/Decode.c
> +++ b/OptionRomPkg/UndiRuntimeDxe/Decode.c
> @@ -1,7 +1,7 @@
>  /** @file
>    Provides the basic UNID functions.
> 
> -Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
>  This program and the accompanying materials
>  are licensed and made available under the terms and conditions of the BSD
> License
>  which accompanies this distribution.  The full text of the license may be
> found at
> @@ -1276,6 +1276,7 @@ UNDI_Receive (
>  **/
>  // TODO:    cdb - add argument and description to function comment
>  VOID
> +EFIAPI
>  UNDI_APIEntry_new (
>    IN  UINT64 cdb
>    )
> diff --git a/OptionRomPkg/UndiRuntimeDxe/Undi32.h
> b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
> index 18341dd..00b48f6 100644
> --- a/OptionRomPkg/UndiRuntimeDxe/Undi32.h
> +++ b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
> @@ -1,7 +1,7 @@
>  /** @file
>    EFI internal structures for the EFI UNDI driver.
> 
> -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
>  This program and the accompanying materials
>  are licensed and made available under the terms and conditions of the BSD
> License
>  which accompanies this distribution.  The full text of the license may be
> found at
> @@ -338,7 +338,7 @@ UNDI_Receive (
>    IN  NIC_DATA_INSTANCE *AdapterInfo
>    );
> 
> -VOID UNDI_APIEntry_new(UINT64);
> +VOID EFIAPI UNDI_APIEntry_new(UINT64);
>  VOID UNDI_APIEntry_Common(UINT64);
> 
>  PXE_IPV4 convert_mcip(PXE_MAC_ADDR *);
> --
> 2.7.4.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] OptionRomPkg: Fix calling convention issue for UndiRuntiumeDxe driver.

Posted by Ye, Ting 7 years, 6 months ago

Reviewed-by: Ye Ting <ting.ye@intel.com> 

-----Original Message-----
From: Fu, Siyuan 
Sent: Friday, April 21, 2017 9:33 AM
To: edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
Subject: [Patch] OptionRomPkg: Fix calling convention issue for UndiRuntiumeDxe driver.

Add "EFIAPI" to UNDI command entry point function according to UEFI calling convention.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
---
 OptionRomPkg/UndiRuntimeDxe/Decode.c | 3 ++-  OptionRomPkg/UndiRuntimeDxe/Undi32.h | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OptionRomPkg/UndiRuntimeDxe/Decode.c b/OptionRomPkg/UndiRuntimeDxe/Decode.c
index 5f85347..cff6942 100644
--- a/OptionRomPkg/UndiRuntimeDxe/Decode.c
+++ b/OptionRomPkg/UndiRuntimeDxe/Decode.c
@@ -1,7 +1,7 @@
 /** @file
   Provides the basic UNID functions.
 
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials  are licensed and made available under the terms and conditions of the BSD License  which accompanies this distribution.  The full text of the license may be found at @@ -1276,6 +1276,7 @@ UNDI_Receive (  **/
 // TODO:    cdb - add argument and description to function comment
 VOID
+EFIAPI
 UNDI_APIEntry_new (
   IN  UINT64 cdb
   )
diff --git a/OptionRomPkg/UndiRuntimeDxe/Undi32.h b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
index 18341dd..00b48f6 100644
--- a/OptionRomPkg/UndiRuntimeDxe/Undi32.h
+++ b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
@@ -1,7 +1,7 @@
 /** @file
   EFI internal structures for the EFI UNDI driver.
 
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials  are licensed and made available under the terms and conditions of the BSD License  which accompanies this distribution.  The full text of the license may be found at @@ -338,7 +338,7 @@ UNDI_Receive (
   IN  NIC_DATA_INSTANCE *AdapterInfo
   );
 
-VOID UNDI_APIEntry_new(UINT64);
+VOID EFIAPI UNDI_APIEntry_new(UINT64);
 VOID UNDI_APIEntry_Common(UINT64);
 
 PXE_IPV4 convert_mcip(PXE_MAC_ADDR *);
--
2.7.4.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel