From 4f981f69ae1140d7480eb01ac46dde16bf8e4fc3 Mon Sep 17 00:00:00 2001 From: Talamudupula Date: Wed, 13 Jan 2021 12:54:01 -0700 Subject: [PATCH] Add missing EFIAPI in GpioSocLib.h Adding the EFIAPI modifier to make sure all lib function calls follow correct calling convention. Signed-off-by: Talamudupula --- Silicon/CommonSocPkg/Include/GpioLibConfig.h | 8 -------- .../CommonSocPkg/Include/Library/GpioSocLib.h | 18 ++++++++++++++++++ Silicon/CommonSocPkg/Library/GpioLib/GpioLib.c | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Silicon/CommonSocPkg/Include/GpioLibConfig.h b/Silicon/CommonSocPkg/Include/GpioLibConfig.h index 39649544..fd604235 100644 --- a/Silicon/CommonSocPkg/Include/GpioLibConfig.h +++ b/Silicon/CommonSocPkg/Include/GpioLibConfig.h @@ -464,14 +464,6 @@ typedef struct { // #define NO_REGISTER_FOR_PROPERTY 0xFFFF -/*#define GPIO_PAD_DEF(Group,Pad) (UINT32)(((Group) << 16) + (Pad)) -#define GPIO_GROUP_DEF(GroupIndex,ChipsetId) ((GroupIndex) | ((ChipsetId) << 8)) -#define GPIO_GET_GROUP_INDEX(Group) ((Group) & 0x1F) -#define GPIO_GET_GROUP_FROM_PAD(GpioPad) (((GpioPad) & 0x0F1F0000) >> 16) -#define GPIO_GET_GROUP_INDEX_FROM_PAD(GpioPad) GPIO_GET_GROUP_INDEX (GPIO_GET_GROUP_FROM_PAD(GpioPad)) -#define GPIO_GET_PAD_NUMBER(GpioPad) ((GpioPad) & 0x1FF) -#define GPIO_GET_CHIPSET_ID(GpioPad) (((GpioPad) >> 24) & 0xF) -*/ #define GPIO_GET_PAD_POSITION(PadNumber) ((PadNumber) % 32) #define GPIO_GET_DW_NUM(PadNumber) ((PadNumber) / 32u) diff --git a/Silicon/CommonSocPkg/Include/Library/GpioSocLib.h b/Silicon/CommonSocPkg/Include/Library/GpioSocLib.h index 4e6817b1..e67817eb 100644 --- a/Silicon/CommonSocPkg/Include/Library/GpioSocLib.h +++ b/Silicon/CommonSocPkg/Include/Library/GpioSocLib.h @@ -27,6 +27,7 @@ @retval EFI_INVALID_PARAMETER Invalid group or pad number **/ EFI_STATUS +EFIAPI GpioLockPads ( VOID ); @@ -41,6 +42,7 @@ GpioLockPads ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioClearGpiGpeSts ( IN GPIO_PAD GpioPad ); @@ -62,6 +64,7 @@ GpioClearGpiGpeSts ( @retval EFI_INVALID_PARAMETER Invalid group or pad number **/ EFI_STATUS +EFIAPI GpioGetGroupDwToGpeDwX ( OUT GPIO_GROUP *GroupToGpeDw0, OUT UINT32 *GroupDwForGpeDw0, @@ -81,6 +84,7 @@ GpioGetGroupDwToGpeDwX ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioLockPadCfg ( IN GPIO_PAD GpioPad ); @@ -97,6 +101,7 @@ GpioLockPadCfg ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetPadCfgLock ( IN GPIO_PAD GpioPad, OUT UINT32 *PadCfgLock @@ -113,6 +118,7 @@ GpioGetPadCfgLock ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioUnlockPadCfg ( IN GPIO_PAD GpioPad ); @@ -129,6 +135,7 @@ GpioUnlockPadCfg ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetOutputValue ( IN GPIO_PAD GpioPad, IN UINT32 Value @@ -146,6 +153,7 @@ GpioSetOutputValue ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetOutputValue ( IN GPIO_PAD GpioPad, OUT UINT32 *OutputVal @@ -163,6 +171,7 @@ GpioGetOutputValue ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetInputValue ( IN GPIO_PAD GpioPad, OUT UINT32 *InputVal @@ -180,6 +189,7 @@ GpioGetInputValue ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetInputInversion ( IN GPIO_PAD GpioPad, IN UINT32 Value @@ -197,6 +207,7 @@ GpioSetInputInversion ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetInputInversion ( IN GPIO_PAD GpioPad, OUT UINT32 *InvertState @@ -214,6 +225,7 @@ GpioGetInputInversion ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetPadInterruptConfig ( IN GPIO_PAD GpioPad, IN GPIO_INT_CONFIG Value @@ -231,6 +243,7 @@ GpioSetPadInterruptConfig ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetPadElectricalConfig ( IN GPIO_PAD GpioPad, IN GPIO_ELECTRICAL_CONFIG Value @@ -248,6 +261,7 @@ GpioSetPadElectricalConfig ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetPadResetConfig ( IN GPIO_PAD GpioPad, IN GPIO_RESET_CONFIG Value @@ -265,6 +279,7 @@ GpioSetPadResetConfig ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetPadResetConfig ( IN GPIO_PAD GpioPad, IN GPIO_RESET_CONFIG *Value @@ -280,6 +295,7 @@ GpioGetPadResetConfig ( @retval PadCfgRegValue PADCFG_DWx value **/ UINT32 +EFIAPI GpioReadPadCfgReg ( IN GPIO_PAD GpioPad, IN UINT8 DwReg @@ -297,6 +313,7 @@ GpioReadPadCfgReg ( @retval none **/ VOID +EFIAPI GpioWritePadCfgReg ( IN GPIO_PAD GpioPad, IN UINT8 DwReg, @@ -315,6 +332,7 @@ GpioWritePadCfgReg ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetPadConfig ( IN GPIO_PAD GpioPad, OUT GPIO_CONFIG *GpioData diff --git a/Silicon/CommonSocPkg/Library/GpioLib/GpioLib.c b/Silicon/CommonSocPkg/Library/GpioLib/GpioLib.c index cb67db5e..842e1513 100644 --- a/Silicon/CommonSocPkg/Library/GpioLib/GpioLib.c +++ b/Silicon/CommonSocPkg/Library/GpioLib/GpioLib.c @@ -146,6 +146,7 @@ Error: @retval PadCfgRegValue PADCFG_DWx value **/ UINT32 +EFIAPI GpioReadPadCfgReg ( IN GPIO_PAD GpioPad, IN UINT8 DwReg @@ -181,6 +182,7 @@ GpioReadPadCfgReg ( @retval none **/ VOID +EFIAPI GpioWritePadCfgReg ( IN GPIO_PAD GpioPad, IN UINT8 DwReg, @@ -742,6 +744,7 @@ GpioConfigFromPadCfgRegValue ( @retval EFI_INVALID_PARAMETER Invalid group or pad number **/ EFI_STATUS +EFIAPI GpioGetPadConfig ( IN GPIO_PAD GpioPad, OUT GPIO_CONFIG *GpioData @@ -930,6 +933,7 @@ GpioPadCfgRegValueFromGpioConfig ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetOutputValue ( IN GPIO_PAD GpioPad, IN UINT32 Value @@ -968,6 +972,7 @@ GpioSetOutputValue ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetOutputValue ( IN GPIO_PAD GpioPad, OUT UINT32 *OutputVal @@ -1001,6 +1006,7 @@ GpioGetOutputValue ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetInputValue ( IN GPIO_PAD GpioPad, OUT UINT32 *InputVal @@ -1066,6 +1072,7 @@ GpioGetPadIoApicIrqNumber ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetInputInversion ( IN GPIO_PAD GpioPad, IN UINT32 Value @@ -1104,6 +1111,7 @@ GpioSetInputInversion ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetInputInversion ( IN GPIO_PAD GpioPad, OUT UINT32 *InvertState @@ -1136,6 +1144,7 @@ GpioGetInputInversion ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetPadInterruptConfig ( IN GPIO_PAD GpioPad, IN GPIO_INT_CONFIG Value @@ -1237,6 +1246,7 @@ GpioSetPadInterruptConfig ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetPadElectricalConfig ( IN GPIO_PAD GpioPad, IN GPIO_ELECTRICAL_CONFIG Value @@ -1277,6 +1287,7 @@ GpioSetPadElectricalConfig ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioSetPadResetConfig ( IN GPIO_PAD GpioPad, IN GPIO_RESET_CONFIG Value @@ -1328,6 +1339,7 @@ GpioSetPadResetConfig ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetPadResetConfig ( IN GPIO_PAD GpioPad, IN GPIO_RESET_CONFIG *Value @@ -1588,6 +1600,7 @@ GpioGetPadCfgLockForGroupDw ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioGetPadCfgLock ( IN GPIO_PAD GpioPad, OUT UINT32 *PadCfgLock @@ -1727,6 +1740,7 @@ GpioUnlockPadCfgForGroupDw ( @retval EFI_INVALID_PARAMETER Invalid group or pad number **/ EFI_STATUS +EFIAPI GpioUnlockPadCfg ( IN GPIO_PAD GpioPad ) @@ -1786,6 +1800,7 @@ GpioLockPadCfgForGroupDw ( @retval EFI_INVALID_PARAMETER Invalid group or pad number **/ EFI_STATUS +EFIAPI GpioLockPadCfg ( IN GPIO_PAD GpioPad ) @@ -1982,6 +1997,7 @@ GpioGetGroupToGpeDwX ( @retval EFI_INVALID_PARAMETER Invalid group or pad number **/ EFI_STATUS +EFIAPI GpioGetGroupDwToGpeDwX ( OUT GPIO_GROUP *GroupToGpeDw0, OUT UINT32 *GroupDwForGpeDw0, @@ -2147,6 +2163,7 @@ GpioCheckFor2Tier ( @retval EFI_INVALID_PARAMETER Invalid GpioPad **/ EFI_STATUS +EFIAPI GpioClearGpiGpeSts ( IN GPIO_PAD GpioPad ) @@ -2196,6 +2213,7 @@ GpioClearGpiGpeSts ( @retval EFI_INVALID_PARAMETER Invalid group or pad number **/ EFI_STATUS +EFIAPI GpioLockPads ( VOID )