mirror of https://github.com/acidanthera/audk.git
ShellPkg: Fix EFIAPI usage inconsistencies
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10888 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
8d095e78c6
commit
e26d7b5975
|
@ -18,7 +18,9 @@
|
|||
#include <Library/ShellCEntryLib.h>
|
||||
#include <Library/SortLib.h>
|
||||
|
||||
INTN Test(CONST VOID*b1, CONST VOID*b2)
|
||||
INTN
|
||||
EFIAPI
|
||||
Test(CONST VOID*b1, CONST VOID*b2)
|
||||
{
|
||||
if (*(INTN*)b1 == *(INTN*)b2) {
|
||||
return (0);
|
||||
|
|
|
@ -341,7 +341,7 @@ typedef UINT32 EFI_SHELL_DEVICE_NAME_FLAGS;
|
|||
**/
|
||||
typedef
|
||||
EFI_STATUS
|
||||
(*EFI_SHELL_GET_DEVICE_NAME) (
|
||||
(EFIAPI *EFI_SHELL_GET_DEVICE_NAME) (
|
||||
IN EFI_HANDLE DeviceHandle,
|
||||
IN EFI_SHELL_DEVICE_NAME_FLAGS Flags,
|
||||
IN CHAR8 *Language,
|
||||
|
|
|
@ -43,8 +43,8 @@ typedef struct {
|
|||
typedef struct {
|
||||
UINT8 Type;
|
||||
UINT8 SubType;
|
||||
VOID (*SerialFun) (EFI_DEVICE_PATH_PROTOCOL *, DEVICE_CONSIST_MAPPING_INFO *);
|
||||
INTN (*CompareFun) (EFI_DEVICE_PATH_PROTOCOL *, EFI_DEVICE_PATH_PROTOCOL *);
|
||||
VOID (EFIAPI *SerialFun) (EFI_DEVICE_PATH_PROTOCOL *, DEVICE_CONSIST_MAPPING_INFO *);
|
||||
INTN (EFIAPI *CompareFun) (EFI_DEVICE_PATH_PROTOCOL *, EFI_DEVICE_PATH_PROTOCOL *);
|
||||
} DEV_PATH_CONSIST_MAPPING_TABLE;
|
||||
|
||||
|
||||
|
@ -259,6 +259,7 @@ AppendCSDGuid (
|
|||
}
|
||||
|
||||
INTN
|
||||
EFIAPI
|
||||
_DevPathCompareAcpi (
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath1,
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath2
|
||||
|
@ -284,6 +285,7 @@ _DevPathCompareAcpi (
|
|||
}
|
||||
|
||||
INTN
|
||||
EFIAPI
|
||||
_DevPathComparePci (
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath1,
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath2
|
||||
|
@ -1063,7 +1065,7 @@ GetDeviceConsistMappingInfo (
|
|||
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
|
||||
)
|
||||
{
|
||||
VOID (*SerialFun) (EFI_DEVICE_PATH_PROTOCOL *, DEVICE_CONSIST_MAPPING_INFO *);
|
||||
VOID (EFIAPI *SerialFun) (EFI_DEVICE_PATH_PROTOCOL *, DEVICE_CONSIST_MAPPING_INFO *);
|
||||
|
||||
UINTN Index;
|
||||
|
||||
|
@ -1204,10 +1206,10 @@ ShellCommandConsistMappingUnInitialize (
|
|||
}
|
||||
|
||||
/**
|
||||
Create a consistent mapped name for the device specified by DevicePath
|
||||
Create a consistent mapped name for the device specified by DevicePath
|
||||
based on the Table.
|
||||
|
||||
This must be called after ShellCommandConsistMappingInitialize() and
|
||||
This must be called after ShellCommandConsistMappingInitialize() and
|
||||
before ShellCommandConsistMappingUnInitialize() is called.
|
||||
|
||||
@param[in] DeviecPath The pointer to the dev path for the device.
|
||||
|
|
|
@ -191,6 +191,7 @@ PerformQuickSort (
|
|||
@return > 0 Buffer1 is greater than Buffer2
|
||||
**/
|
||||
INTN
|
||||
EFIAPI
|
||||
DevicePathCompare (
|
||||
IN CONST VOID *Buffer1,
|
||||
IN CONST VOID *Buffer2
|
||||
|
|
Loading…
Reference in New Issue