MdeModulePkg: Define correct ABI for issuing UNDI command and UNDI callback functions in SnpDxe.

This update ensure correct calling convention for interfaces between binary UNDI driver and SnpDxe.

Signed-off-by: xdu2
Reviewed-by: geekboy15a

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12657 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
xdu2 2011-11-03 02:59:20 +00:00
parent cdd9529279
commit 9c9f585937
3 changed files with 85 additions and 64 deletions

View File

@ -3,7 +3,7 @@
the callback routines for Undi3.1 have an extra parameter UniqueId which the callback routines for Undi3.1 have an extra parameter UniqueId which
stores the interface context for the NIC that snp is trying to talk. stores the interface context for the NIC that snp is trying to talk.
Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -49,6 +49,7 @@ extern EFI_PCI_IO_PROTOCOL *mPciIo;
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackV2p30 ( SnpUndi32CallbackV2p30 (
IN UINT64 CpuAddr, IN UINT64 CpuAddr,
IN OUT UINT64 DeviceAddrPtr IN OUT UINT64 DeviceAddrPtr
@ -91,6 +92,7 @@ SnpUndi32CallbackV2p30 (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackBlock30 ( SnpUndi32CallbackBlock30 (
IN UINT32 Enable IN UINT32 Enable
) )
@ -120,6 +122,7 @@ SnpUndi32CallbackBlock30 (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackDelay30 ( SnpUndi32CallbackDelay30 (
IN UINT64 MicroSeconds IN UINT64 MicroSeconds
) )
@ -149,6 +152,7 @@ SnpUndi32CallbackDelay30 (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackMemio30 ( SnpUndi32CallbackMemio30 (
IN UINT8 ReadOrWrite, IN UINT8 ReadOrWrite,
IN UINT8 NumBytes, IN UINT8 NumBytes,
@ -239,6 +243,7 @@ SnpUndi32CallbackMemio30 (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackBlock ( SnpUndi32CallbackBlock (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT32 Enable IN UINT32 Enable
@ -270,6 +275,7 @@ SnpUndi32CallbackBlock (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackDelay ( SnpUndi32CallbackDelay (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT64 MicroSeconds IN UINT64 MicroSeconds
@ -296,6 +302,7 @@ SnpUndi32CallbackDelay (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackMemio ( SnpUndi32CallbackMemio (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT8 ReadOrWrite, IN UINT8 ReadOrWrite,
@ -389,6 +396,7 @@ SnpUndi32CallbackMemio (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackMap ( SnpUndi32CallbackMap (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT64 CpuAddr, IN UINT64 CpuAddr,
@ -482,6 +490,7 @@ SnpUndi32CallbackMap (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackUnmap ( SnpUndi32CallbackUnmap (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT64 CpuAddr, IN UINT64 CpuAddr,
@ -535,6 +544,7 @@ SnpUndi32CallbackUnmap (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackSync ( SnpUndi32CallbackSync (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT64 CpuAddr, IN UINT64 CpuAddr,

View File

@ -58,6 +58,7 @@ SnpNotifyExitBootServices (
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI
IssueHwUndiCommand ( IssueHwUndiCommand (
UINT64 Cdb UINT64 Cdb
) )

View File

@ -1,7 +1,7 @@
/** @file /** @file
Declaration of strctures and functions for SnpDxe driver. Declaration of strctures and functions for SnpDxe driver.
Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed This program and the accompanying materials are licensed
and made available under the terms and conditions of the BSD License which 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 accompanies this distribution. The full text of the license may be found at
@ -49,7 +49,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
typedef typedef
EFI_STATUS EFI_STATUS
(*ISSUE_UNDI32_COMMAND) ( (EFIAPI *ISSUE_UNDI32_COMMAND) (
UINT64 Cdb UINT64 Cdb
); );
@ -295,6 +295,7 @@ DelV2p (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackBlock30 ( SnpUndi32CallbackBlock30 (
IN UINT32 Enable IN UINT32 Enable
); );
@ -308,6 +309,7 @@ SnpUndi32CallbackBlock30 (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackDelay30 ( SnpUndi32CallbackDelay30 (
IN UINT64 MicroSeconds IN UINT64 MicroSeconds
); );
@ -331,6 +333,7 @@ SnpUndi32CallbackDelay30 (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackMemio30 ( SnpUndi32CallbackMemio30 (
IN UINT8 ReadOrWrite, IN UINT8 ReadOrWrite,
IN UINT8 NumBytes, IN UINT8 NumBytes,
@ -355,6 +358,7 @@ SnpUndi32CallbackMemio30 (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackV2p30 ( SnpUndi32CallbackV2p30 (
IN UINT64 CpuAddr, IN UINT64 CpuAddr,
IN OUT UINT64 DeviceAddrPtr IN OUT UINT64 DeviceAddrPtr
@ -375,6 +379,7 @@ SnpUndi32CallbackV2p30 (
zero indicates release zero indicates release
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackBlock ( SnpUndi32CallbackBlock (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT32 Enable IN UINT32 Enable
@ -391,6 +396,7 @@ SnpUndi32CallbackBlock (
@param MicroSeconds number of micro seconds to pause, ususlly multiple of 10. @param MicroSeconds number of micro seconds to pause, ususlly multiple of 10.
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackDelay ( SnpUndi32CallbackDelay (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT64 MicroSeconds IN UINT64 MicroSeconds
@ -410,6 +416,7 @@ SnpUndi32CallbackDelay (
to write. to write.
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackMemio ( SnpUndi32CallbackMemio (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT8 ReadOrWrite, IN UINT8 ReadOrWrite,
@ -433,6 +440,7 @@ SnpUndi32CallbackMemio (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackMap ( SnpUndi32CallbackMap (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT64 CpuAddr, IN UINT64 CpuAddr,
@ -456,6 +464,7 @@ SnpUndi32CallbackMap (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackUnmap ( SnpUndi32CallbackUnmap (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT64 CpuAddr, IN UINT64 CpuAddr,
@ -486,6 +495,7 @@ SnpUndi32CallbackUnmap (
**/ **/
VOID VOID
EFIAPI
SnpUndi32CallbackSync ( SnpUndi32CallbackSync (
IN UINT64 UniqueId, IN UINT64 UniqueId,
IN UINT64 CpuAddr, IN UINT64 CpuAddr,