[edk2-devel] [PATCH v2 2/2] SctPkg: Fix the UefiSct -Wincompatible-pointer-types warnings
Abdul Lateef Attar via groups.io
abdattar=amd.com at groups.io
Thu Jun 9 10:54:02 UTC 2022
Fixes the incompatible pointer types warning for UefiSct package.
Cc: G Edhaya Chandran <Edhaya.Chandran at arm.com>
Cc: Barton Gao <gaojie at byosoft.com.cn>
Cc: Carolyn Gjertsen <Carolyn.Gjertsen at amd.com>
Cc: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud at arm.com>
Cc: Eric Jin <eric.jin at intel.com>
Cc: Arvin Chen <arvinx.chen at intel.com>
Cc: Supreeth Venkatesh <Supreeth.Venkatesh at amd.com>
Signed-off-by: Abdul Lateef Attar <abdattar at amd.com>
---
uefi-sct/SctPkg/Include/Library/EntsLib.h | 3 +
uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.h | 6 +
uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.h | 4 +
uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.h | 4 +
uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.h | 1 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.h | 7 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.h | 9 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.h | 9 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.h | 6 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.h | 8 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.h | 3 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.h | 4 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.h | 9 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.h | 4 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.h | 11 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.h | 8 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.h | 8 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.h | 15 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.h | 17 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.h | 10 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.h | 9 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.h | 9 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.h | 8 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.h | 2 +
uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.h | 1 +
uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.h | 4 +
uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.h | 3 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestMain.h | 21 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTest.h | 45 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestMain.h | 13 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestMain.h | 16 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.h | 27 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTest.h | 158 ++++++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBbTestMain_uefi.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTest.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestMain.h | 10 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestMain.h | 10 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h | 6 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestMain.h | 14 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestMain.h | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestMain.h | 15 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestMain.h | 9 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestMain.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTest.h | 14 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestMain.h | 13 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestMain.h | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestMain.h | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.h | 6 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestMain.h | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.h | 11 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestMain.h | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.h | 7 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.h | 7 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestMain.h | 15 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestMain.h | 6 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestMain.h | 7 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTest.h | 11 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTest.h | 5 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTest.h | 7 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.h | 3 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.h | 9 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestMain.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestMain.h | 13 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestMain.h | 13 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTest.h | 15 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.h | 8 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.h | 14 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.h | 23 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestMain.h | 8 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.h | 11 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.h | 11 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.h | 13 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestMain.h | 9 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestMain.h | 8 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestMain.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestMain.h | 10 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.h | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.h | 3 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestMain.h | 8 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestMain.h | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestMain.h | 43 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestMain.h | 34 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestMain.h | 6 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestMain.h | 9 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.h | 31 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestMain.h | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTest.h | 10 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTest.h | 10 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.h | 5 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestMain.h | 10 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestMain.h | 10 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.h | 12 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.h | 17 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.h | 83 +++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestMain.h | 26 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestMain.h | 10 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.h | 8 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.h | 30 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.h | 21 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.h | 21 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestMain.h | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.h | 6 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestMain.h | 3 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.h | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.h | 13 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.h | 8 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestMain.h | 7 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest.h | 23 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTest.h | 23 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTest.h | 12 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestMain.h | 6 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestMain.h | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestMain.h | 7 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestMain.h | 10 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h | 16 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include/EftpImplement.h | 1 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.h | 5 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.h | 1 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.h | 3 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.h | 4 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.h | 4 +-
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.h | 1 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.h | 6 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.h | 6 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.h | 4 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.h | 1 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/UI.h | 6 +
uefi-sct/SctPkg/UEFI/Protocol/Hii.h | 2 +-
uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.c | 1 +
uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.c | 12 +-
uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.c | 6 +-
uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.c | 6 +-
uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.c | 3 +-
uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.c | 7 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.c | 12 +-
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.c | 9 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.c | 6 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.c | 6 +-
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.c | 8 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.c | 3 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.c | 4 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.c | 9 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.c | 4 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.c | 15 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.c | 8 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.c | 8 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.c | 15 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.c | 53 +-
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.c | 10 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.c | 9 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.c | 9 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.c | 8 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.c | 2 +
uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.c | 3 +-
uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.c | 6 +-
uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCheckEvent.c | 14 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCloseEvent.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEvent.c | 16 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEventEx.c | 18 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRaiseTPL.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRestoreTPL.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSetTimer.c | 23 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSignalEvent.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestWaitForEvent.c | 15 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/Support.c | 5 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestConformance.c | 5 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestFunction.c | 41 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestStress.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestConformance.c | 7 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestFunction.c | 235 ++++-----
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestStress.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestConformance.c | 6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestFunction.c | 21 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestStress.c | 7 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver1/BusDriver1.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver2/BusDriver2.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver3/BusDriver3.c | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusOverrideDriver1/BusOverrideDriver1.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver2/DBindingDriver2.c | 6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver4/DBindingDriver4.c | 6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver5/DBindingDriver5.c | 6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver1/DeviceDriver1.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver11/DeviceDriver11.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver110/DeviceDriver110.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver111/DeviceDriver111.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver12/DeviceDriver12.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver13/DeviceDriver13.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver14/DeviceDriver14.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver15/DeviceDriver15.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver18/DeviceDriver18.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver19/DeviceDriver19.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver2/DeviceDriver2.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver3/DeviceDriver3.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver4/DeviceDriver4.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver5/DeviceDriver5.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver6/DeviceDriver6.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver7/DeviceDriver7.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/PlatformOverrideDriver1/PlatformOverrideDriver1.c | 6 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver1/TestDriver1.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver2/TestDriver2.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver3/TestDriver3.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver4/TestDriver4.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver5/TestDriver5.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.c | 27 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestConformance.c | 19 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction.c | 21 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c | 55 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c | 70 ++-
uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestStress.c | 9 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_uefi.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTestRequired.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestConformance.c | 8 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c | 8 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestConformance.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestFunction.c | 7 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestStress.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestConformance.c | 17 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c | 9 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestConformance.c | 9 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestFunction.c | 9 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestCase.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestConformance.c | 8 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestFunction.c | 8 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestStress.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestConformance.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c | 31 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestConformance.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestFunction.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestConformance.c | 10 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestFunction.c | 7 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestMain.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestConformance.c | 10 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c | 13 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestConformance.c | 42 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestFunction.c | 42 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestFunction.c | 6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestCacheFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestExceptionCallbackFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestFunction.c | 3 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestCacheFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestExceptionCallbackFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestCacheFunction.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestExceptionCallbackFunction.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCacheFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestCacheFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestExceptionCallbackFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestConformance.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestFunction.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestFunction.c | 12 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestConformance.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c | 18 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestFunction.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestConformance.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestCoverage.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestFunction.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.c | 10 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestConformance.c | 29 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestFunction.c | 10 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestConformance.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestFunction.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestStress.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestConformance.c | 3 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Flush.c | 7 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Read.c | 10 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Write.c | 7 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestConformance.c | 12 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestMain.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestConformance.c | 6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestMain.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestConformance.c | 6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c | 11 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestFunction.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestConformance.c | 3 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestFunction.c | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c | 9 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestFunction.c | 87 ++--
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestConformance.c | 8 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestFunction.c | 9 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestConformance.c | 67 ++-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestFunction.c | 12 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestConformance.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c | 17 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestStress.c | 8 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestConformance.c | 25 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestFunction.c | 12 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestConformance.c | 38 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestFunction.c | 19 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestConformance.c | 89 ++++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestFunction.c | 31 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestConformance.c | 14 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestFunction.c | 26 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestConformance.c | 15 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestFunction.c | 29 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestConformance.c | 47 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestFunction.c | 23 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestConformance.c | 40 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestFunction.c | 22 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c | 22 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestFunction.c | 15 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestConformance.c | 55 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestFunction.c | 33 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestConformance.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestFunction.c | 19 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c | 45 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestFunction.c | 35 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTestMain.c | 3 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestConformance.c | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestFunction.c | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestConformance.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestFunction.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestFunction.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestConformance.c | 17 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_1.c | 18 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_2.c | 14 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestStress.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestConformance.c | 15 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_1.c | 12 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c | 12 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestStress.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestConformance.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestFunction.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/ConfigureClpParameterBlkBBTestFunction.c | 7 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestConformance.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestFunction.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestConformance.c | 17 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c | 160 ++++--
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestConformance.c | 9 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestFunction.c | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestConformance.c | 9 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestFunction.c | 5 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestConformance.c | 5 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestFunction.c | 55 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestConformance.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestFunction.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestConformance.c | 6 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestFunction.c | 6 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestConformance.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestFunction.c | 7 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestConformance.c | 7 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestFunction.c | 8 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestConformance.c | 16 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestFunction.c | 36 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestStress.c | 34 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestConformance.c | 31 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c | 55 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Auto.c | 5 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Manual.c | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestConformance.c | 22 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_FlushEx.c | 9 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c | 55 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_ReadEx.c | 9 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_WriteEx.c | 9 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c | 537 ++++++++++----------
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c | 13 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestConformance.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestFunction.c | 7 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestStress.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestConformance.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestFunction.c | 4 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestStress.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestConformance.c | 14 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestFunction.c | 20 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_efi.c | 22 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_uefi.c | 24 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_efi.c | 86 ++--
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c | 390 +++++++-------
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestConformance.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.c | 13 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestConformance.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestFunction.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformance.c | 9 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestConformance.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestFunction.c | 6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestStress.c | 8 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestFunction.c | 48 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestStress.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestFunction.c | 48 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestStress.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestBasic.c | 89 +++-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestConformance.c | 103 +++-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestBasic.c | 81 ++-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestConformance.c | 91 +++-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestMain.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTestConformance.c | 68 ++-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestConformance.c | 21 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestFunction.c | 13 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestConformance.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestFunction.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestConformance.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestFunction.c | 5 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestStress.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestConformance.c | 14 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestFunction.c | 14 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestStress.c | 4 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c | 1 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestFunction.c | 3 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestConformance.c | 57 ++-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c | 29 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.c | 2 +
uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestStress.c | 6 +-
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Exec/EftpImplement.c | 1 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsStr.c | 3 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/ComponentName.c | 4 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.c | 5 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.c | 4 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.c | 3 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.c | 4 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.c | 13 +-
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.c | 19 +-
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c | 6 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c | 6 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.c | 4 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.c | 1 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Load/SupportFile.c | 14 +-
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/ConfigMenu.c | 6 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/KeyFunction.c | 10 +
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/MainMenu.c | 16 +-
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/TestNodeMenu.c | 12 +
uefi-sct/SctPkg/build.sh | 25 +-
500 files changed, 5544 insertions(+), 1169 deletions(-)
diff --git a/uefi-sct/SctPkg/Include/Library/EntsLib.h b/uefi-sct/SctPkg/Include/Library/EntsLib.h
index f29779c097f3..beebf21ba2a5 100644
--- a/uefi-sct/SctPkg/Include/Library/EntsLib.h
+++ b/uefi-sct/SctPkg/Include/Library/EntsLib.h
@@ -292,6 +292,7 @@ EntsStrDuplicate (
;
INTN
+EFIAPI
EntsLibStubStriCmp (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *s1,
@@ -300,6 +301,7 @@ EntsLibStubStriCmp (
;
VOID
+EFIAPI
EntsLibStubStrLwrUpr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *Str
@@ -307,6 +309,7 @@ EntsLibStubStrLwrUpr (
;
BOOLEAN
+EFIAPI
EntsLibStubMetaiMatch (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.h
index 6389731a0f7d..be8ef863ba80 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.h
@@ -28,6 +28,7 @@ Abstract:
#include "Eas.h"
EFI_STATUS
+EFIAPI
BS_CreateEvent_EntsTest (
VOID *ClientInterface
)
@@ -49,6 +50,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_CloseEvent_EntsTest (
VOID *ClientInterface
)
@@ -70,6 +72,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_SignalEvent_EntsTest (
VOID *ClientInterface
)
@@ -91,6 +94,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_WaitForEvent_EntsTest (
VOID *ClientInterface
)
@@ -112,6 +116,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_CheckEvent_EntsTest (
VOID *ClientInterface
)
@@ -133,6 +138,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_SetTimer_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.h
index f7c248c5ba5d..517fdee97552 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.h
@@ -29,6 +29,7 @@ Abstract:
#include "Eas.h"
EFI_STATUS
+EFIAPI
BS_AllocatePages_EntsTest (
VOID *ClientInterface
)
@@ -50,6 +51,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_FreePages_EntsTest (
VOID *ClientInterface
)
@@ -71,6 +73,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_AllocatePool_EntsTest (
VOID *ClientInterface
)
@@ -92,6 +95,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_FreePool_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.h
index 0643201e2de5..88c5bc219cc2 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.h
@@ -29,6 +29,7 @@ Abstract:
#include "Eas.h"
EFI_STATUS
+EFIAPI
BS_SetWatchdogTimer_EntsTest (
VOID *ClientInterface
)
@@ -50,6 +51,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_Stall_EntsTest (
VOID *ClientInterface
)
@@ -71,6 +73,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_CopyMem_EntsTest (
VOID *ClientInterface
)
@@ -92,6 +95,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BS_SetMem_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.h
index 326444ac5f28..3557ecf08f18 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.h
@@ -28,6 +28,7 @@ Abstract:
#include "Eas.h"
EFI_STATUS
+EFIAPI
GS_MemCmp_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.h
index 63e7a01a5235..11b272728245 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/Arp.h>
EFI_STATUS
+EFIAPI
ArpConfig_EntsTest (
VOID *ClientInterface
)
@@ -52,6 +53,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ArpAdd_EntsTest (
VOID *ClientInterface
)
@@ -73,6 +75,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ArpFind_EntsTest (
VOID *ClientInterface
)
@@ -94,6 +97,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ArpDelete_EntsTest (
VOID *ClientInterface
)
@@ -115,6 +119,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ArpFlush_EntsTest (
VOID *ClientInterface
)
@@ -136,6 +141,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ArpRequest_EntsTest (
VOID *ClientInterface
)
@@ -157,6 +163,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ArpCancel_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.h
index cdb6a227ffe6..8dc9c7f43292 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/Arp.h>
EFI_STATUS
+EFIAPI
ArpServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -53,6 +54,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ArpServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.h
index f2126006fbda..dc35c67f3bec 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/Dhcp4.h>
EFI_STATUS
+EFIAPI
Dhcp4Config_EntsTest (
VOID *ClientInterface
)
@@ -52,6 +53,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -73,6 +75,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp4Start_EntsTest (
VOID *ClientInterface
)
@@ -94,6 +97,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp4RenewRebind_EntsTest (
VOID *ClientInterface
)
@@ -115,6 +119,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp4Release_EntsTest (
VOID *ClientInterface
)
@@ -136,6 +141,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp4Stop_EntsTest (
VOID *ClientInterface
)
@@ -157,6 +163,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp4Build_EntsTest (
VOID *ClientInterface
)
@@ -178,6 +185,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp4TransmitReceive_EntsTest (
VOID *ClientInterface
)
@@ -199,6 +207,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp4Parse_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.h
index 513ea852b324..b791747d4f20 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/Dhcp4.h>
EFI_STATUS
+EFIAPI
Dhcp4CreateChild_EntsTest (
VOID *ClientInterface
)
@@ -53,6 +54,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp4DestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.h
index f6178c324f38..85008ef93282 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
#include <UEFI/Protocol/Dhcp6.h>
EFI_STATUS
+EFIAPI
Dhcp6Config_EntsTest (
VOID *ClientInterface
)
@@ -55,6 +56,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -76,6 +78,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp6Start_EntsTest (
VOID *ClientInterface
)
@@ -97,6 +100,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp6InfoRequest_EntsTest (
VOID *ClientInterface
)
@@ -118,6 +122,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp6RenewRebind_EntsTest (
VOID *ClientInterface
)
@@ -139,6 +144,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp6Decline_EntsTest (
VOID *ClientInterface
)
@@ -160,6 +166,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp6Release_EntsTest (
VOID *ClientInterface
)
@@ -181,6 +188,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp6Stop_EntsTest (
VOID *ClientInterface
)
@@ -202,6 +210,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp6Parse_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.h
index 3f1611281f71..1fa06c183cab 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
#include <UEFI/Protocol/Dhcp6.h>
EFI_STATUS
+EFIAPI
Dhcp6CreateChild_EntsTest (
VOID *ClientInterface
)
@@ -56,6 +57,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Dhcp6DestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.h
index 95c1cca716a9..3016dc79d19e 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/Http.h>
EFI_STATUS
+EFIAPI
HttpGetModeData_EntsTest (
VOID *ClientInterface
)
@@ -52,6 +53,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
HttpConfigure_EntsTest (
VOID *ClientInterface
)
@@ -74,6 +76,7 @@ Returns:
EFI_STATUS
+EFIAPI
HttpRequest_EntsTest (
VOID *ClientInterface
)
@@ -95,6 +98,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
HttpCancel_EntsTest (
VOID *ClientInterface
)
@@ -116,6 +120,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
HttpResponse_EntsTest (
VOID *ClientInterface
)
@@ -137,6 +142,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
HttpPoll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.h
index d64b160500cc..00990324a35d 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/Http.h>
EFI_STATUS
+EFIAPI
HttpServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -53,6 +54,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
HttpServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.h
index ddf0e1ce4223..0150e15c6334 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.h
@@ -30,6 +30,7 @@ Abstract:
#include <UEFI/Protocol/Ip4.h>
EFI_STATUS
+EFIAPI
Ip4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -51,6 +52,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Configure_EntsTest (
VOID *ClientInterface
)
@@ -72,6 +74,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Groups_EntsTest (
VOID *ClientInterface
)
@@ -93,6 +96,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Routes_EntsTest (
VOID *ClientInterface
)
@@ -114,6 +118,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Transmit_EntsTest (
VOID *ClientInterface
)
@@ -135,6 +140,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Receive_EntsTest (
VOID *ClientInterface
)
@@ -156,6 +162,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Cancel_EntsTest (
VOID *ClientInterface
)
@@ -177,6 +184,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.h
index 71f2e46ea25f..412f02a07777 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.h
@@ -33,6 +33,7 @@ Abstract:
#include <UEFI/Protocol/Ip4.h>
EFI_STATUS
+EFIAPI
Ip4ConfigStart_EntsTest (
VOID *ClientInterface
)
@@ -54,6 +55,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4ConfigStop_EntsTest (
VOID *ClientInterface
)
@@ -75,6 +77,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4ConfigGetData_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.h
index 23d1544b2d53..266fa63f1add 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.h
@@ -33,6 +33,7 @@ Abstract:
#include <UEFI/Protocol/Ip4.h>
EFI_STATUS
+EFIAPI
Ip4Config2SetData_EntsTest (
VOID *ClientInterface
)
@@ -54,6 +55,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Config2GetData_EntsTest (
VOID *ClientInterface
)
@@ -75,6 +77,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Config2RegisterDataNotify_EntsTest (
VOID *ClientInterface
)
@@ -96,6 +99,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4Config2UnregisterDataNotify_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.h
index e3f395809fcd..ded5af712890 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
typedef EFI_SERVICE_BINDING_PROTOCOL EFI_IP4_SERVICE_BINDING_PROTOCOL;
EFI_STATUS
+EFIAPI
Ip4ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -56,6 +57,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip4ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.h
index 9ca2cf70b926..9cacfc1d20d6 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
#include <UEFI/Protocol/Ip6.h>
EFI_STATUS
+EFIAPI
Ip6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -55,6 +56,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip6Configure_EntsTest (
VOID *ClientInterface
)
@@ -76,6 +78,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip6Groups_EntsTest (
VOID *ClientInterface
)
@@ -97,11 +100,13 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip6Neighbors_EntsTest (
VOID *ClientInterface
);
EFI_STATUS
+EFIAPI
Ip6Routes_EntsTest (
VOID *ClientInterface
)
@@ -123,6 +128,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip6Transmit_EntsTest (
VOID *ClientInterface
)
@@ -144,6 +150,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip6Receive_EntsTest (
VOID *ClientInterface
)
@@ -165,6 +172,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip6Cancel_EntsTest (
VOID *ClientInterface
)
@@ -186,6 +194,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip6Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.h
index 8bdc26cd0a6f..ddf2dcb7e71f 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.h
@@ -34,21 +34,25 @@ Abstract:
#include <UEFI/Protocol/Ip6.h>
EFI_STATUS
+EFIAPI
Ip6ConfigSetData_EntsTest (
VOID *ClientInterface
);
EFI_STATUS
+EFIAPI
Ip6ConfigGetData_EntsTest (
VOID *ClientInterface
);
EFI_STATUS
+EFIAPI
Ip6ConfigRegisterDataNotify_EntsTest (
VOID *ClientInterface
);
EFI_STATUS
+EFIAPI
Ip6ConfigUnregisterDataNotify_EntsTest (
VOID *ClientInterface
);
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.h
index 8198825c8b52..efb7556bf16b 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.h
@@ -37,6 +37,7 @@ Abstract:
typedef EFI_SERVICE_BINDING_PROTOCOL EFI_IP6_SERVICE_BINDING_PROTOCOL;
EFI_STATUS
+EFIAPI
Ip6ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -59,6 +60,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Ip6ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.h
index 9d4dce382315..11cb092786cb 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/ManagedNetwork.h>
EFI_STATUS
+EFIAPI
MnpConfig_EntsTest (
VOID *ClientInterface
)
@@ -52,6 +53,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpGetModeData_EntsTest (
VOID *ClientInterface
)
@@ -73,6 +75,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpMCastIpToMac_EntsTest (
VOID *ClientInterface
)
@@ -94,6 +97,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpGroup_EntsTest (
VOID *ClientInterface
)
@@ -115,6 +119,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpTransmit_EntsTest (
VOID *ClientInterface
)
@@ -136,6 +141,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpReceive_EntsTest (
VOID *ClientInterface
)
@@ -157,6 +163,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpPoll_EntsTest (
VOID *ClientInterface
)
@@ -178,6 +185,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpTransmitMultiPacket_EntsTest (
VOID *ClientInterface
)
@@ -200,6 +208,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpReceiveMultiPacket_EntsTest (
VOID *ClientInterface
)
@@ -221,6 +230,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpPollPattern1_EntsTest (
VOID *ClientInterface
)
@@ -242,6 +252,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpCancel_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.h
index a8ca045b040a..d1c893fec954 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
typedef EFI_SERVICE_BINDING_PROTOCOL EFI_MNP_SERVICE_BINDING_PROTOCOL;
EFI_STATUS
+EFIAPI
MnpCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -56,6 +57,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MnpDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.h
index 429d82ea9458..b02fb2cc2135 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.h
@@ -30,6 +30,7 @@ Abstract:
#include <UEFI/Protocol/Mtftp4.h>
EFI_STATUS
+EFIAPI
Mtftp4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -51,6 +52,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp4Configure_EntsTest (
VOID *ClientInterface
)
@@ -72,6 +74,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp4GetInfo_EntsTest (
VOID *ClientInterface
)
@@ -93,6 +96,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp4ParseOptions_EntsTest (
VOID *ClientInterface
)
@@ -114,6 +118,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp4ReadFile_EntsTest (
VOID *ClientInterface
)
@@ -135,6 +140,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp4WriteFile_EntsTest (
VOID *ClientInterface
)
@@ -156,6 +162,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp4ReadDirectory_EntsTest (
VOID *ClientInterface
)
@@ -177,6 +184,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp4Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.h
index 9ce8c9f1f988..dd7f1a573122 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.h
@@ -30,6 +30,7 @@ Abstract:
#include <UEFI/Protocol/Mtftp4.h>
EFI_STATUS
+EFIAPI
Mtftp4ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -52,6 +53,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp4ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.h
index da8f99951efe..6f0469fdf6c0 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
#include <UEFI/Protocol/Mtftp6.h>
EFI_STATUS
+EFIAPI
Mtftp6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -55,6 +56,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp6Configure_EntsTest (
VOID *ClientInterface
)
@@ -76,6 +78,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp6GetInfo_EntsTest (
VOID *ClientInterface
)
@@ -97,6 +100,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp6ParseOptions_EntsTest (
VOID *ClientInterface
)
@@ -118,6 +122,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp6ReadFile_EntsTest (
VOID *ClientInterface
)
@@ -139,6 +144,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp6WriteFile_EntsTest (
VOID *ClientInterface
)
@@ -160,6 +166,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp6ReadDirectory_EntsTest (
VOID *ClientInterface
)
@@ -181,6 +188,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp6Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.h
index d3f2caebf9da..26fd43cf3099 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
#include <UEFI/Protocol/Mtftp6.h>
EFI_STATUS
+EFIAPI
Mtftp6ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -56,6 +57,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Mtftp6ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.h
index dc91ade85ded..d3c048606995 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.h
@@ -30,6 +30,7 @@ Abstract:
#include "Eas.h"
EFI_STATUS
+EFIAPI
PXEBaseCodeStart_EntsTest (
VOID *ClientInterface
)
@@ -51,6 +52,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeStop_EntsTest (
VOID *ClientInterface
)
@@ -72,6 +74,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeDhcp_EntsTest (
VOID *ClientInterface
)
@@ -93,6 +96,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeDiscover_EntsTest (
VOID *ClientInterface
)
@@ -114,6 +118,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeMtftp_EntsTest (
VOID *ClientInterface
)
@@ -135,6 +140,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeUdpWrite_EntsTest (
VOID *ClientInterface
)
@@ -156,6 +162,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeUdpRead_EntsTest (
VOID *ClientInterface
)
@@ -177,6 +184,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeSetIpFilter_EntsTest (
VOID *ClientInterface
)
@@ -198,6 +206,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeArp_EntsTest (
VOID *ClientInterface
)
@@ -219,6 +228,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeSetParameters_EntsTest (
VOID *ClientInterface
)
@@ -240,6 +250,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeSetStationIp_EntsTest (
VOID *ClientInterface
)
@@ -261,6 +272,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeSetPackets_EntsTest (
VOID *ClientInterface
)
@@ -282,6 +294,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeMode_EntsTest (
VOID *ClientInterface
)
@@ -303,6 +316,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeUdpWritePattern1_EntsTest (
VOID *ClientInterface
)
@@ -324,6 +338,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
PXEBaseCodeUdpReadPattern1_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.h
index 17b12ec784de..1772ab3bb0ee 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/SimpleNetwork.h>
EFI_STATUS
+EFIAPI
SimpleNetworkStart_EntsTest (
VOID *ClientInterface
)
@@ -52,6 +53,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkStop_EntsTest (
VOID *ClientInterface
)
@@ -73,6 +75,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkInitialize_EntsTest (
VOID *ClientInterface
)
@@ -94,6 +97,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkReset_EntsTest (
VOID *ClientInterface
)
@@ -115,6 +119,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkShutdown_EntsTest (
VOID *ClientInterface
)
@@ -136,6 +141,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkReceiveFilters_EntsTest (
VOID *ClientInterface
)
@@ -157,6 +163,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkStationAddress_EntsTest (
VOID *ClientInterface
)
@@ -178,6 +185,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkStatistics_EntsTest (
VOID *ClientInterface
)
@@ -199,6 +207,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkMCastIPToMAC_EntsTest (
VOID *ClientInterface
)
@@ -220,6 +229,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkNvData_EntsTest (
VOID *ClientInterface
)
@@ -241,6 +251,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkGetStatus_EntsTest (
VOID *ClientInterface
)
@@ -262,6 +273,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkTransmit_EntsTest (
VOID *ClientInterface
)
@@ -283,6 +295,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkReceive_EntsTest (
VOID *ClientInterface
)
@@ -304,6 +317,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkMode_EntsTest (
VOID *ClientInterface
)
@@ -325,6 +339,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkTransmitPattern1_EntsTest (
VOID *ClientInterface
)
@@ -346,6 +361,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkTransmitPattern2_EntsTest (
VOID *ClientInterface
)
@@ -367,6 +383,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SimpleNetworkReceivePattern1_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.h
index ec07af38ad16..fec0c7df3b0e 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/Tcp4.h>
EFI_STATUS
+EFIAPI
Tcp4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -52,6 +53,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4Configure_EntsTest (
VOID *ClientInterface
)
@@ -73,6 +75,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4Routes_EntsTest (
VOID *ClientInterface
)
@@ -94,6 +97,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4Connect_EntsTest (
VOID *ClientInterface
)
@@ -115,6 +119,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4Accept_EntsTest (
VOID *ClientInterface
)
@@ -136,6 +141,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4Transmit_EntsTest (
VOID *ClientInterface
)
@@ -157,6 +163,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4Receive_EntsTest (
VOID *ClientInterface
)
@@ -178,6 +185,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4Close_EntsTest (
VOID *ClientInterface
)
@@ -199,6 +207,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4Cancel_EntsTest (
VOID *ClientInterface
)
@@ -220,6 +229,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.h
index aaa8a283ebfe..7ccfdfa7de1a 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/Tcp4.h>
EFI_STATUS
+EFIAPI
Tcp4ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -53,6 +54,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp4ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.h
index 414e6cf6fa48..b6f7b62d3fb5 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.h
@@ -37,6 +37,7 @@ Abstract:
#include <UEFI/Protocol/Tcp6.h>
EFI_STATUS
+EFIAPI
Tcp6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -58,6 +59,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp6Configure_EntsTest (
VOID *ClientInterface
)
@@ -79,6 +81,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp6Connect_EntsTest (
VOID *ClientInterface
)
@@ -100,6 +103,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp6Accept_EntsTest (
VOID *ClientInterface
)
@@ -121,6 +125,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp6Transmit_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +147,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp6Receive_EntsTest (
VOID *ClientInterface
)
@@ -163,6 +169,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp6Close_EntsTest (
VOID *ClientInterface
)
@@ -184,6 +191,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp6Cancel_EntsTest (
VOID *ClientInterface
)
@@ -205,6 +213,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp6Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.h
index 3b0f343264b1..b0e1b6b13847 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
#include <UEFI/Protocol/Tcp6.h>
EFI_STATUS
+EFIAPI
Tcp6ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -56,6 +57,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Tcp6ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.h
index 83c3a8ff0b77..7e44883d295a 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.h
@@ -31,6 +31,7 @@ Abstract:
#include <UEFI/Protocol/Udp4.h>
EFI_STATUS
+EFIAPI
Udp4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -52,6 +53,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp4Configure_EntsTest (
VOID *ClientInterface
)
@@ -73,6 +75,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp4Groups_EntsTest (
VOID *ClientInterface
)
@@ -94,6 +97,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp4Routes_EntsTest (
VOID *ClientInterface
)
@@ -115,6 +119,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp4Poll_EntsTest (
VOID *ClientInterface
)
@@ -136,6 +141,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp4Receive_EntsTest (
VOID *ClientInterface
)
@@ -157,6 +163,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp4Transmit_EntsTest (
VOID *ClientInterface
)
@@ -178,6 +185,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp4Cancel_EntsTest (
VOID *ClientInterface
)
@@ -199,6 +207,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp4SignalRecycleEvent_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.h
index a1d1bcf6d758..497db002d623 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
typedef EFI_SERVICE_BINDING_PROTOCOL EFI_UDP4_SERVICE_BINDING_PROTOCOL;
EFI_STATUS
+EFIAPI
Udp4ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -56,6 +57,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp4ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.h
index 656642853f1b..51dc1b7a3539 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.h
@@ -34,6 +34,7 @@ Abstract:
#include <UEFI/Protocol/Udp6.h>
EFI_STATUS
+EFIAPI
Udp6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -55,6 +56,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp6Configure_EntsTest (
VOID *ClientInterface
)
@@ -76,6 +78,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp6Groups_EntsTest (
VOID *ClientInterface
)
@@ -97,6 +100,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp6Poll_EntsTest (
VOID *ClientInterface
)
@@ -118,6 +122,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp6Receive_EntsTest (
VOID *ClientInterface
)
@@ -139,6 +144,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp6Transmit_EntsTest (
VOID *ClientInterface
)
@@ -160,6 +166,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp6Cancel_EntsTest (
VOID *ClientInterface
)
@@ -181,6 +188,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp6SignalRecycleEvent_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.h
index d12884538904..2050190d4cdf 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.h
@@ -37,6 +37,7 @@ Abstract:
typedef EFI_SERVICE_BINDING_PROTOCOL EFI_UDP6_SERVICE_BINDING_PROTOCOL;
EFI_STATUS
+EFIAPI
Udp6ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -59,6 +60,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
Udp6ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.h
index 1c9445ca208b..f4c5d742c2b9 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.h
@@ -29,6 +29,7 @@ Abstract:
#include "Eas.h"
EFI_STATUS
+EFIAPI
RT_ResetSystem_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.h
index 5571c34fe673..a91e3329889d 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.h
@@ -29,6 +29,7 @@ Abstract:
#include "Eas.h"
EFI_STATUS
+EFIAPI
RT_GetTime_EntsTest (
VOID *ClientInterface
)
@@ -50,6 +51,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
RT_SetTime_EntsTest (
VOID *ClientInterface
)
@@ -71,6 +73,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
RT_GetWakeupTime_EntsTest (
VOID *ClientInterface
)
@@ -92,6 +95,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
RT_SetWakeupTime_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.h b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.h
index cb469d58a814..e64bde005efd 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.h
+++ b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.h
@@ -29,6 +29,7 @@ Abstract:
#include "Eas.h"
EFI_STATUS
+EFIAPI
RT_GetVariable_EntsTest (
VOID *ClientInterface
)
@@ -50,6 +51,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
RT_GetNextVariableName_EntsTest (
VOID *ClientInterface
)
@@ -71,6 +73,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
RT_SetVariable_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestMain.h
index 87451f9f9a91..55667d71b3e8 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestMain.h
@@ -56,6 +56,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -64,6 +65,7 @@ BBTestCreateEvent_Conf (
);
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -72,6 +74,7 @@ BBTestCreateEvent_Func (
);
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -80,6 +83,7 @@ BBTestCreateEventEx_Conf (
);
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -88,6 +92,7 @@ BBTestCreateEventEx_Func (
);
#endif
EFI_STATUS
+EFIAPI
BBTestCloseEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -96,6 +101,7 @@ BBTestCloseEvent_Func (
);
EFI_STATUS
+EFIAPI
BBTestSignalEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -104,6 +110,7 @@ BBTestSignalEvent_Func (
);
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -112,6 +119,7 @@ BBTestWaitForEvent_Conf (
);
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -120,6 +128,7 @@ BBTestWaitForEvent_Func (
);
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +137,7 @@ BBTestWaitForEvent_Stress (
);
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -136,6 +146,7 @@ BBTestCheckEvent_Conf (
);
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -144,6 +155,7 @@ BBTestCheckEvent_Func (
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -152,6 +164,7 @@ BBTestSetTimer_Conf (
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -160,6 +173,7 @@ BBTestSetTimer_Func (
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -168,6 +182,7 @@ BBTestSetTimer_Stress (
);
EFI_STATUS
+EFIAPI
BBTestRaiseTPL_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -176,6 +191,7 @@ BBTestRaiseTPL_Func (
);
EFI_STATUS
+EFIAPI
BBTestRestoreTPL_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -188,30 +204,35 @@ BBTestRestoreTPL_Func (
//
VOID
+EFIAPI
NotifyFunction (
IN EFI_EVENT Event,
IN VOID *Context
);
VOID
+EFIAPI
NotifyFunctionTpl (
IN EFI_EVENT Event,
IN VOID *Context
);
VOID
+EFIAPI
NotifyFunctionTplEx (
IN EFI_EVENT Event,
IN VOID *Context
);
VOID
+EFIAPI
NotifyFunctionSignal (
IN EFI_EVENT Event,
IN VOID *Context
);
VOID
+EFIAPI
NotifyFunctionNoSignal (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTest.h
index 008584577ed1..d2fbca0625e3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTest.h
@@ -154,6 +154,7 @@ BBTestImageBootServicesUnload (
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestLoadImageConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -165,6 +166,7 @@ BBTestLoadImageConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestStartImageConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -176,6 +178,7 @@ BBTestStartImageConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestUnloadImageConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -187,6 +190,7 @@ BBTestUnloadImageConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestExitConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -198,6 +202,7 @@ BBTestExitConsistencyTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestExitBootServicesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -209,6 +214,7 @@ BBTestExitBootServicesConsistencyTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -220,6 +226,7 @@ BBTestLoadImageInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -231,6 +238,7 @@ BBTestStartImageInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -242,6 +250,7 @@ BBTestUnloadImageInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -253,6 +262,7 @@ BBTestExitInterfaceTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestImageServicesCombinationTest1 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -264,46 +274,55 @@ BBTestImageServicesCombinationTest1 (
// Checkpoint functions for TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -312,31 +331,37 @@ BBTestLoadImageInterfaceTestCheckPoint9 (
// Checkpoint functions for TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -345,51 +370,61 @@ BBTestStartImageInterfaceTestCheckPoint6 (
// Checkpoint functions for TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -398,51 +433,61 @@ BBTestUnloadImageInterfaceTestCheckPoint10 (
// Checkpoint functions for TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.h
index 3e713f44a1c3..b5e34c956073 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.h
@@ -124,12 +124,14 @@ ImageTestCopySimpleFileToMemory (
);
VOID
+EFIAPI
ImageTestNotifyFunction (
IN EFI_EVENT Event,
IN OUT VOID *Context
);
VOID
+EFIAPI
ImageTestNotifyFunctionForCombinationTest1 (
IN EFI_EVENT Event,
IN OUT VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestMain.h
index b81b119b64dd..21605dc80df0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestMain.h
@@ -50,6 +50,7 @@ extern EFI_TPL TplArray[TPL_ARRAY_SIZE];
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestGetMemoryMapConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -61,6 +62,7 @@ BBTestGetMemoryMapConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestAllocatePagesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -72,6 +74,7 @@ BBTestAllocatePagesConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestFreePagesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -83,6 +86,7 @@ BBTestFreePagesConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestAllocatePoolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +98,7 @@ BBTestAllocatePoolConsistencyTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestFreePoolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -105,6 +110,7 @@ BBTestFreePoolConsistencyTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestGetMemoryMapInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -116,6 +122,7 @@ BBTestGetMemoryMapInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestAllocatePagesInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -127,6 +134,7 @@ BBTestAllocatePagesInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestFreePagesInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -138,6 +146,7 @@ BBTestFreePagesInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestAllocatePoolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -149,6 +158,7 @@ BBTestAllocatePoolInterfaceTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestFreePoolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -160,6 +170,7 @@ BBTestFreePoolInterfaceTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestGetMemoryMapStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -171,6 +182,7 @@ BBTestGetMemoryMapStressTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestPagesStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -182,6 +194,7 @@ BBTestPagesStressTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestPoolStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestMain.h
index 9e98ec013c74..d43738887ad3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestMain.h
@@ -77,6 +77,7 @@ static const UINTN mon_lengths[2][12] = {
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestSetWatchdogTimerConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -88,6 +89,7 @@ BBTestSetWatchdogTimerConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestGetNextMonotonicCountConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -99,6 +101,7 @@ BBTestGetNextMonotonicCountConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestInstallConfigurationTableConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -110,6 +113,7 @@ BBTestInstallConfigurationTableConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestCalculateCrc32ConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -121,6 +125,7 @@ BBTestCalculateCrc32ConsistencyTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestSetWatchdogTimerInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -132,6 +137,7 @@ BBTestSetWatchdogTimerInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestStallInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -143,6 +149,7 @@ BBTestStallInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestCopyMemInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -154,6 +161,7 @@ BBTestCopyMemInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestSetMemInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -165,6 +173,7 @@ BBTestSetMemInterfaceTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestGetNextMonotonicCountInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -176,6 +185,7 @@ BBTestGetNextMonotonicCountInterfaceTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestInstallConfigurationTableInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -187,6 +197,7 @@ BBTestInstallConfigurationTableInterfaceTest (
// TDS 4.7
//
EFI_STATUS
+EFIAPI
BBTestCalculateCrc32InterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -198,6 +209,7 @@ BBTestCalculateCrc32InterfaceTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestSetWatchdogTimerStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -209,6 +221,7 @@ BBTestSetWatchdogTimerStressTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestStallStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -220,6 +233,7 @@ BBTestStallStressTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestCopyMemStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -231,6 +245,7 @@ BBTestCopyMemStressTest (
// TDS 5.4
//
EFI_STATUS
+EFIAPI
BBTestSetMemStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -242,6 +257,7 @@ BBTestSetMemStressTest (
// TDS 5.5
//
EFI_STATUS
+EFIAPI
BBTestGetNextMonotonicCountStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.h
index 73a6fa8f5303..ff405c4df69a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.h
@@ -37,125 +37,148 @@ typedef struct {
} NOTIFY_CONTEXT_2;
VOID
+EFIAPI
InitializeTestProtocol1 (
OUT TEST_PROTOCOL_1 *TestProtocol1
);
EFI_STATUS
+EFIAPI
TestProtocol1Func1(
IN TEST_PROTOCOL_1 *This
);
VOID
+EFIAPI
InitializeTestProtocol2 (
OUT TEST_PROTOCOL_2 *TestProtocol2
);
EFI_STATUS
+EFIAPI
TestProtocol2Func1(
IN TEST_PROTOCOL_2 *This
);
VOID
+EFIAPI
Protocol1ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_1 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
);
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol1 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_1 *InterfaceFunctionTestProtocol1
);
VOID
+EFIAPI
Protocol2ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_2 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
);
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol2 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_2 *InterfaceFunctionTestProtocol2
);
VOID
+EFIAPI
Protocol3ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
);
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol3 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_3 *InterfaceFunctionTestProtocol3
);
VOID
+EFIAPI
Protocol4ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_4 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
);
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol4 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_4 *InterfaceFunctionTestProtocol4
);
VOID
+EFIAPI
Protocol5ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_5 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
);
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol5 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_5 *InterfaceFunctionTestProtocol5
);
VOID
+EFIAPI
CreateInvalidHandle (
OUT EFI_HANDLE *InvalidHandle
);
VOID
+EFIAPI
ReleaseInvalidHandle (
IN EFI_HANDLE InvalidHandle
);
VOID
+EFIAPI
CreateVendorDevicePath (
OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
IN EFI_GUID Guid
);
VOID
+EFIAPI
CreateVendorDevicePathNode (
OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
IN EFI_GUID Guid
);
VOID
+EFIAPI
FreeVendorDevicePath (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
);
VOID
+EFIAPI
FreeVendorDevicePathNode (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePathNode
);
VOID
+EFIAPI
TestNotifyFunction0 (
IN EFI_EVENT Event,
IN VOID *Context
);
VOID
+EFIAPI
TestNotifyFunction1 (
IN EFI_EVENT Event,
IN OUT VOID *Context
);
VOID
+EFIAPI
TestNotifyFunction2 (
IN EFI_EVENT Event,
IN VOID *Context
@@ -168,6 +191,7 @@ IsNodeInDevicePath (
);
EFI_STATUS
+EFIAPI
LoadStartImage (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HANDLE CurrentImageHandle,
@@ -176,6 +200,7 @@ LoadStartImage (
);
EFI_STATUS
+EFIAPI
GetPlatformOverrideDriverImages (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HANDLE CurrentImageHandle,
@@ -185,11 +210,13 @@ GetPlatformOverrideDriverImages (
);
EFI_STATUS
+EFIAPI
AliasLocateHandleBuffer (
IN EFI_GUID *Guid
);
EFI_STATUS
+EFIAPI
CheckForCleanEnvironment (
OUT UINTN *Numbers
);
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTest.h
index 454810bb3ba1..cb79bfaf87b7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTest.h
@@ -224,6 +224,7 @@ ReleaseGlobalData ();
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -235,6 +236,7 @@ BBTestInstallProtocolInterfaceConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -246,6 +248,7 @@ BBTestUninstallProtocolInterfaceConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -257,6 +260,7 @@ BBTestReinstallProtocolInterfaceConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -268,6 +272,7 @@ BBTestRegisterProtocolNotifyConsistencyTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -279,6 +284,7 @@ BBTestInstallMultipleProtocolInterfacesConsistencyTest (
// TDS 3.6
//
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -290,6 +296,7 @@ BBTestUninstallMultipleProtocolInterfacesConsistencyTest (
// TDS 3.7
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -301,6 +308,7 @@ BBTestLocateHandleConsistencyTest (
// TDS 3.8
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -312,6 +320,7 @@ BBTestLocateHandleBufferConsistencyTest (
// TDS 3.9
//
EFI_STATUS
+EFIAPI
BBTestHandleProtocolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -323,6 +332,7 @@ BBTestHandleProtocolConsistencyTest (
// TDS 3.10
//
EFI_STATUS
+EFIAPI
BBTestLocateProtocolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -334,6 +344,7 @@ BBTestLocateProtocolConsistencyTest (
// TDS 3.11
//
EFI_STATUS
+EFIAPI
BBTestLocateDevicePathConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -345,6 +356,7 @@ BBTestLocateDevicePathConsistencyTest (
// TDS 3.12
//
EFI_STATUS
+EFIAPI
BBTestProtocolsPerHandleConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -356,6 +368,7 @@ BBTestProtocolsPerHandleConsistencyTest (
// TDS 3.13
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -367,6 +380,7 @@ BBTestOpenProtocolConsistencyTest (
// TDS 3.14
//
EFI_STATUS
+EFIAPI
BBTestCloseProtocolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -378,6 +392,7 @@ BBTestCloseProtocolConsistencyTest (
// TDS 3.15
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInformationConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -389,6 +404,7 @@ BBTestOpenProtocolInformationConsistencyTest (
// TDS 3.16
//
EFI_STATUS
+EFIAPI
BBTestConnectControllerConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -400,6 +416,7 @@ BBTestConnectControllerConsistencyTest (
// TDS 3.17
//
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -416,6 +433,7 @@ BBTestDisconnectControllerConsistencyTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -427,6 +445,7 @@ BBTestInstallProtocolInterfaceInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -438,6 +457,7 @@ BBTestUninstallProtocolInterfaceInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -449,6 +469,7 @@ BBTestReinstallProtocolInterfaceInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -460,6 +481,7 @@ BBTestRegisterProtocolNotifyInterfaceTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -471,6 +493,7 @@ BBTestInstallMultipleProtocolInterfacesInterfaceTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -482,6 +505,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTest (
// TDS 4.7
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -493,6 +517,7 @@ BBTestLocateHandleInterfaceTest (
// TDS 4.8
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -504,6 +529,7 @@ BBTestLocateHandleBufferInterfaceTest (
// TDS 4.9
//
EFI_STATUS
+EFIAPI
BBTestHandleProtocolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -515,6 +541,7 @@ BBTestHandleProtocolInterfaceTest (
// TDS 4.10
//
EFI_STATUS
+EFIAPI
BBTestLocateProtocolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -526,6 +553,7 @@ BBTestLocateProtocolInterfaceTest (
// TDS 4.11
//
EFI_STATUS
+EFIAPI
BBTestLocateDevicePathInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -537,6 +565,7 @@ BBTestLocateDevicePathInterfaceTest (
// TDS 4.12
//
EFI_STATUS
+EFIAPI
BBTestProtocolsPerHandleInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -548,6 +577,7 @@ BBTestProtocolsPerHandleInterfaceTest (
// TDS 4.13
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -559,6 +589,7 @@ BBTestOpenProtocolInterfaceTest111 (
// TDS 4.14
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -570,6 +601,7 @@ BBTestOpenProtocolInterfaceTest222 (
// TDS 4.15
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest333 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -581,6 +613,7 @@ BBTestOpenProtocolInterfaceTest333 (
// TDS 4.16
//
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -592,6 +625,7 @@ BBTestCloseProtocolInterfaceTest (
// TDS 4.17
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInformationInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -603,6 +637,7 @@ BBTestOpenProtocolInformationInterfaceTest (
// TDS 4.18
//
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -614,6 +649,7 @@ BBTestConnectControllerInterfaceTest (
// TDS 4.19
//
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -625,26 +661,31 @@ BBTestDisconnectControllerInterfaceTest (
// Checkpoint Functions for InstallProtocolInterface()
//
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -654,51 +695,61 @@ BBTestInstallProtocolInterfaceInterfaceTestCheckPoint5 (
//
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -708,61 +759,73 @@ BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint10 (
//
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint11 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint12 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -772,41 +835,49 @@ BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint12 (
//
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -816,41 +887,49 @@ BBTestRegisterProtocolNotifyInterfaceTestCheckPoint8 (
//
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -860,51 +939,61 @@ BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint8 (
//
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -914,21 +1003,25 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint10 (
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -938,16 +1031,19 @@ BBTestLocateHandleInterfaceTestCheckPoint4 (
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -957,6 +1053,7 @@ BBTestLocateHandleBufferInterfaceTestCheckPoint3 (
//
EFI_STATUS
+EFIAPI
BBTestHandleProtocolInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -966,16 +1063,19 @@ BBTestHandleProtocolInterfaceTestCheckPoint1 (
//
EFI_STATUS
+EFIAPI
BBTestLocateProtocolInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLocateProtocolInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestLocateProtocolInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -985,6 +1085,7 @@ BBTestLocateProtocolInterfaceTestCheckPoint3 (
//
EFI_STATUS
+EFIAPI
BBTestLocateDevicePathInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -994,6 +1095,7 @@ BBTestLocateDevicePathInterfaceTestCheckPoint1 (
//
EFI_STATUS
+EFIAPI
BBTestProtocolsPerHandleInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -1003,51 +1105,61 @@ BBTestProtocolsPerHandleInterfaceTestCheckPoint1 (
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -1057,36 +1169,43 @@ BBTestOpenProtocolInterfaceTest111CheckPoint10 (
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -1096,16 +1215,19 @@ BBTestOpenProtocolInterfaceTest222CheckPoint7 (
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest333CheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest333CheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest333CheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -1115,36 +1237,43 @@ BBTestOpenProtocolInterfaceTest333CheckPoint3 (
//
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -1154,6 +1283,7 @@ BBTestCloseProtocolInterfaceTestCheckPoint7 (
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInformationInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -1163,76 +1293,91 @@ BBTestOpenProtocolInformationInterfaceTestCheckPoint1 (
//
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint7_13 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint11 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint12 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint14 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint15 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint16 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -1242,31 +1387,37 @@ BBTestConnectControllerInterfaceTestCheckPoint16 (
//
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -1280,6 +1431,7 @@ BBTestDisconnectControllerInterfaceTestCheckPoint6 (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestCombinationTest1 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1291,6 +1443,7 @@ BBTestCombinationTest1 (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestCombinationTest2 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1302,6 +1455,7 @@ BBTestCombinationTest2 (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestCombinationTest3 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1314,21 +1468,25 @@ BBTestCombinationTest3 (
//
EFI_STATUS
+EFIAPI
BBTestCombinationTest2CheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCombinationTest2CheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCombinationTest2CheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCombinationTest2CheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBbTestMain_uefi.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBbTestMain_uefi.h
index 424b8c4ca2d2..33bdfafb52a9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBbTestMain_uefi.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBbTestMain_uefi.h
@@ -61,6 +61,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
RequiredElementsBbTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -69,6 +70,7 @@ RequiredElementsBbTest (
);
EFI_STATUS
+EFIAPI
PlatformSpecificElementsBbTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTest.h
index 757417e11524..e64d90469f06 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTest.h
@@ -81,6 +81,7 @@ BBTestExeModeUnload (
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestFpuControlWordTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -92,6 +93,7 @@ BBTestFpuControlWordTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestMxCsrTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestMain.h
index ff940fb042d8..dd2cc196b30d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestMain.h
@@ -88,6 +88,7 @@ TestCalculateCheckSum8 (
//
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -97,6 +98,7 @@ BBTestInstallAcpiTableConformanceTest (
EFI_STATUS
+EFIAPI
BBTestUninstallAcpiTableConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -106,6 +108,7 @@ BBTestUninstallAcpiTableConformanceTest (
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -115,6 +118,7 @@ BBTestInstallAcpiTableFunctionTest (
EFI_STATUS
+EFIAPI
BBTestUninstallAcpiTableFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -124,6 +128,7 @@ BBTestUninstallAcpiTableFunctionTest (
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
@@ -131,6 +136,7 @@ BBTestInstallAcpiTableConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
@@ -138,6 +144,7 @@ BBTestInstallAcpiTableConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
@@ -145,6 +152,7 @@ BBTestInstallAcpiTableConformanceTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestUninstallAcpiTableConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
@@ -152,6 +160,7 @@ BBTestUninstallAcpiTableConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
@@ -159,6 +168,7 @@ BBTestInstallAcpiTableFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestUninstallAcpiTableFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestMain.h
index 28aef297e624..e72ea3ed11ca 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestMain.h
@@ -55,6 +55,7 @@ BBTestAbsolutePointerProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -63,6 +64,7 @@ BBTestResetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -71,6 +73,7 @@ BBTestResetFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestGetStateFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -79,6 +82,7 @@ BBTestGetStateFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetStateFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -87,6 +91,7 @@ BBTestGetStateFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestWaitForInputFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -98,6 +103,7 @@ BBTestWaitForInputFunctionManualTest (
// Conformance Test
//
EFI_STATUS
+EFIAPI
BBTestWaitForInputConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -106,6 +112,7 @@ BBTestWaitForInputConformanceManualTest (
);
EFI_STATUS
+EFIAPI
BBTestResetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -114,6 +121,7 @@ BBTestResetConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -125,6 +133,7 @@ BBTestGetStateConformanceAutoTest (
// Extensive Test
//
EFI_STATUS
+EFIAPI
BBTestResetClearanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +142,7 @@ BBTestResetClearanceManualTest (
);
EFI_STATUS
+EFIAPI
BBTestGetStateExtensiveManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h
index c99e2f0976ea..9952fbcab833 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.h
@@ -106,6 +106,7 @@ UnloadAdapterInfoBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestGetInformationConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -114,6 +115,7 @@ BBTestGetInformationConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetInformationConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -122,6 +124,7 @@ BBTestSetInformationConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -131,6 +134,7 @@ BBTestGetSupportedTypesConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetInformationFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -139,6 +143,7 @@ BBTestGetInformationFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestSetInformationFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -147,6 +152,7 @@ BBTestSetInformationFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestMain.h
index aecea20cfbf6..2d42e62f8511 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestMain.h
@@ -56,6 +56,7 @@ BBTestAtaPassThruProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestGetNextPortFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -64,6 +65,7 @@ BBTestGetNextPortFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -72,6 +74,7 @@ BBTestBuildDevicePathFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -80,6 +83,7 @@ BBTestGetDeviceFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetPortFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -88,6 +92,7 @@ BBTestResetPortFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -96,6 +101,7 @@ BBTestResetDeviceFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -104,6 +110,7 @@ BBTestGetNextDeviceFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -112,6 +119,7 @@ BBTestPassThruFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -120,6 +128,7 @@ BBTestModeConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextPortConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +137,7 @@ BBTestGetNextPortConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -136,6 +146,7 @@ BBTestBuildDevicePathConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDeviceConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -144,6 +155,7 @@ BBTestGetDeviceConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetDeviceConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -152,6 +164,7 @@ BBTestResetDeviceConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextDeviceConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -160,6 +173,7 @@ BBTestGetNextDeviceConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.h
index 645e71dc39fe..41c5266b875d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.h
@@ -55,6 +55,7 @@ UnloadAuthenticationTest (
);
EFI_STATUS
+EFIAPI
BBTestAuthenticationFunctionTestA (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -63,6 +64,7 @@ BBTestAuthenticationFunctionTestA (
);
EFI_STATUS
+EFIAPI
BBTestAuthenticationFunctionTestB(
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestMain.h
index 91996bf4b5fe..e9b657e56d45 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestMain.h
@@ -53,6 +53,7 @@ Abstract:
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestMain.h
index 8e6c0e382b00..ce0a18a23e42 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestMain.h
@@ -139,6 +139,7 @@ BBTestBlockIoProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestReadBlocksConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -147,6 +148,7 @@ BBTestReadBlocksConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestReadBlocksConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -155,6 +157,7 @@ BBTestReadBlocksConformanceManualTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -163,6 +166,7 @@ BBTestWriteBlocksConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -171,6 +175,7 @@ BBTestWriteBlocksConformanceManualTest (
);
EFI_STATUS
+EFIAPI
BBTestFlushBlocksConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -180,6 +185,7 @@ BBTestFlushBlocksConformanceAutoTest (
EFI_STATUS
+EFIAPI
BBTestFlushBlocksConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -192,6 +198,7 @@ BBTestFlushBlocksConformanceManualTest (
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -200,6 +207,7 @@ BBTestResetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestReadBlocksFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -208,6 +216,7 @@ BBTestReadBlocksFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -216,6 +225,7 @@ BBTestWriteBlocksFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestFlushBlocksFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -224,6 +234,7 @@ BBTestFlushBlocksFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestMediaInfoCheckAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -232,6 +243,7 @@ BBTestMediaInfoCheckAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestMediaIntegrityManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -244,6 +256,7 @@ BBTestMediaIntegrityManualTest (
//
EFI_STATUS
+EFIAPI
BBTestResetStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -252,6 +265,7 @@ BBTestResetStressAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestReadBlocksStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -260,6 +274,7 @@ BBTestReadBlocksStressAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestMain.h
index d4f0b85ec373..26ce63e94c8a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestMain.h
@@ -122,6 +122,7 @@ BBTestBlockIo2ProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestReadBlocksExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -130,6 +131,7 @@ BBTestReadBlocksExConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestReadBlocksExConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -138,6 +140,7 @@ BBTestReadBlocksExConformanceManualTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -146,6 +149,7 @@ BBTestWriteBlocksExConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestFlushBlocksExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -158,6 +162,7 @@ BBTestFlushBlocksExConformanceAutoTest (
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -166,6 +171,7 @@ BBTestResetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -174,6 +180,7 @@ BBTestReadBlocksExFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -182,6 +189,7 @@ BBTestWriteBlocksExFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestFlushBlocksExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -190,6 +198,7 @@ BBTestFlushBlocksExFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestMediaInfoCheckAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestMain.h
index aae6ad09b980..a42a0136c081 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestMain.h
@@ -54,6 +54,7 @@ BBTestBusSpecificDriverOverrideProtocolUnload (
EFI_STATUS
+EFIAPI
BBTestGetDriverFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -62,6 +63,7 @@ BBTestGetDriverFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDriverConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTest.h
index 797be2e9d04d..dfa87cd8aa32 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTest.h
@@ -91,6 +91,7 @@ InitializeBBTestComponentName (
);
EFI_STATUS
+EFIAPI
BBTestComponentNameUnload (
IN EFI_HANDLE ImageHandle
);
@@ -103,6 +104,7 @@ BBTestComponentNameUnload (
// TDS 9.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverNameBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -114,6 +116,7 @@ BBTestGetDriverNameBasicTest (
// TDS 9.2.2
//
EFI_STATUS
+EFIAPI
BBTestGetControllerNameBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -129,6 +132,7 @@ BBTestGetControllerNameBasicTest (
// TDS 9.2.1.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverNameBasicTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -138,6 +142,7 @@ BBTestGetDriverNameBasicTestCheckpoint1 (
// TDS 9.2.2.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetControllerNameBasicTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -147,6 +152,7 @@ BBTestGetControllerNameBasicTestCheckpoint1 (
// TDS 9.2.2.2.2
//
EFI_STATUS
+EFIAPI
BBTestGetControllerNameBasicTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -160,6 +166,7 @@ BBTestGetControllerNameBasicTestCheckpoint2 (
// TDS 9.3.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -171,6 +178,7 @@ BBTestGetDriverNameConformanceTest (
// TDS 9.3.2
//
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -186,6 +194,7 @@ BBTestGetControllerNameConformanceTest (
// TDS 9.3.1.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -195,6 +204,7 @@ BBTestGetDriverNameConformanceTestCheckpoint1 (
// TDS 9.3.1.2.2
//
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -204,6 +214,7 @@ BBTestGetDriverNameConformanceTestCheckpoint2 (
// TDS 9.3.2.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -213,6 +224,7 @@ BBTestGetControllerNameConformanceTestCheckpoint1 (
// TDS 9.3.2.2.2
//
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -222,12 +234,14 @@ BBTestGetControllerNameConformanceTestCheckpoint2 (
// TDS 9.3.3.2.3
//
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
);
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestMain.h
index f7964a7822c7..1823e1c0f0a8 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestMain.h
@@ -96,6 +96,7 @@ BBTestComponentName2Unload (
);
EFI_STATUS
+EFIAPI
BBTestGetDriverNameFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -104,6 +105,7 @@ BBTestGetDriverNameFuncTest (
);
EFI_STATUS
+EFIAPI
BBTestGetControllerNameFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -112,24 +114,28 @@ BBTestGetControllerNameFuncTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDriverNameFuncTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
);
EFI_STATUS
+EFIAPI
BBTestGetControllerNameFuncTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
);
EFI_STATUS
+EFIAPI
BBTestGetControllerNameFuncTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
);
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -138,6 +144,7 @@ BBTestGetDriverNameConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -146,36 +153,42 @@ BBTestGetControllerNameConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
);
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
);
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
);
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
);
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
);
/*
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestMain.h
index b14676af84f6..0d047e2f00dc 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestMain.h
@@ -92,6 +92,7 @@ LoadedImageTestComposeSimpleFilePath (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestSetDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +101,7 @@ BBTestSetDataConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -108,6 +110,7 @@ BBTestGetDataConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -116,6 +119,7 @@ BBTestSetDataFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestMain.h
index 883ec7ef313f..75e5ea6f9b0f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestMain.h
@@ -55,6 +55,7 @@ BBTestDebugPortProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -63,6 +64,7 @@ BBTestResetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -71,6 +73,7 @@ BBTestWriteFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestReadFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -79,6 +82,7 @@ BBTestReadFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestPollFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.h
index aba49457a737..65dc246e2613 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.h
@@ -46,6 +46,7 @@ InitializeBBTestDebugSupport (
);
EFI_STATUS
+EFIAPI
BBTestDebugSupportProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -55,6 +56,7 @@ BBTestDebugSupportProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestIsaFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -63,6 +65,7 @@ BBTestIsaFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetMaximumProcessorIndexFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -71,6 +74,7 @@ BBTestGetMaximumProcessorIndexFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestRegisterPeriodicCallbackFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -79,6 +83,7 @@ BBTestRegisterPeriodicCallbackFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestRegisterExceptionCallbackFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -87,6 +92,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestInvalidateInstructionCacheFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestMain.h
index 29c70f811d18..d5fe83f7a86e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestMain.h
@@ -40,6 +40,7 @@ Abstract:
//TDS 4.1.1
//
EFI_STATUS
+EFIAPI
GetInfo_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -51,6 +52,7 @@ GetInfo_Func (
//TDS 4.1.2
//
EFI_STATUS
+EFIAPI
Decompress_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -62,6 +64,7 @@ Decompress_Func (
//TDS 4.2.1
//
EFI_STATUS
+EFIAPI
GetInfo_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -73,6 +76,7 @@ GetInfo_Conf (
//TDS 4.2.2
//
EFI_STATUS
+EFIAPI
Decompress_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.h
index d98e5a09449a..7f12092f0ace 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.h
@@ -40,6 +40,7 @@ Abstract:
//TDS 4.1.1
//
EFI_STATUS
+EFIAPI
MemRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -51,6 +52,7 @@ MemRead_Func (
//TDS 4.1.2
//
EFI_STATUS
+EFIAPI
MemWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -62,6 +64,7 @@ MemWrite_Func (
//TDS 4.1.3
//
EFI_STATUS
+EFIAPI
IoRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -73,6 +76,7 @@ IoRead_Func (
//TDS 4.1.4
//
EFI_STATUS
+EFIAPI
IoWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -85,6 +89,7 @@ IoWrite_Func (
//TDS 4.1.5
//
EFI_STATUS
+EFIAPI
PciRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -96,6 +101,7 @@ PciRead_Func (
//TDS 4.1.6
//
EFI_STATUS
+EFIAPI
PciWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -108,6 +114,7 @@ PciWrite_Func (
//TDS 4.1.7
//
EFI_STATUS
+EFIAPI
Map_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -130,6 +137,7 @@ Unmap_Func (
//TDS 4.1.9
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -141,6 +149,7 @@ AllocateBuffer_Func (
//TDS 4.1.10
//
EFI_STATUS
+EFIAPI
FreeBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -152,6 +161,7 @@ FreeBuffer_Func (
//TDS 4.1.11
//
EFI_STATUS
+EFIAPI
Flush_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -287,6 +297,7 @@ InitializeBBTestDeviceIo (
);
EFI_STATUS
+EFIAPI
BBTestDeviceIoUnload (
IN EFI_HANDLE ImageHandle
);
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestMain.h
index 3bf366a9544f..2e6b7081057f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestMain.h
@@ -52,6 +52,7 @@ BBTestDevicePathProtocolUnload (
// Function Interface test declaration section
//
EFI_STATUS
+EFIAPI
BBTestDevicePathNodeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.h
index dfdd561734dd..930b93c12663 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.h
@@ -45,6 +45,7 @@ InitializeBBTestDevicePathFromTextProtocol (
);
EFI_STATUS
+EFIAPI
BBTestDevicePathFromTextProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -53,6 +54,7 @@ BBTestDevicePathFromTextProtocolUnload (
// Function Interface test declaration section
//
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDeviceNodeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -61,6 +63,7 @@ DevicePathFromTextConvertTextToDeviceNodeFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -69,6 +72,7 @@ DevicePathFromTextConvertTextToDevicePathFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDeviceNodeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -77,6 +81,7 @@ DevicePathFromTextConvertTextToDeviceNodeConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -85,6 +90,7 @@ DevicePathFromTextConvertTextToDevicePathConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -93,6 +99,7 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
);
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDevicePathCoverageTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.h
index 211b2228bf1d..3a39f9cd3203 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.h
@@ -74,6 +74,7 @@ InitializeBBTestDevicePathToTextProtocol (
);
EFI_STATUS
+EFIAPI
BBTestDevicePathToTextProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -82,6 +83,7 @@ BBTestDevicePathToTextProtocolUnload (
// Function Interface test declaration section
//
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDeviceNodeToTextFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -90,6 +92,7 @@ DevicePathToTextConvertDeviceNodeToTextFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDevicePathToTextFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -98,6 +101,7 @@ DevicePathToTextConvertDevicePathToTextFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDeviceNodeToTextConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -106,6 +110,7 @@ DevicePathToTextConvertDeviceNodeToTextConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDevicePathToTextConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -114,6 +119,7 @@ DevicePathToTextConvertDevicePathToTextConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDeviceNodeToTextCoverageTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -122,6 +128,7 @@ DevicePathToTextConvertDeviceNodeToTextCoverageTest (
);
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDevicePathToTextCoverageTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestMain.h
index 4cf5b998a103..aada73c2fa18 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestMain.h
@@ -61,6 +61,7 @@ BBTestDevicePathUtilitiesProtocolUnload (
// Function Interface test declaration section
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesCreateDeviceNodeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -69,6 +70,7 @@ DevicePathUtilitiesCreateDeviceNodeFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDeviceNodeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -77,6 +79,7 @@ DevicePathUtilitiesAppendDeviceNodeFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesGetDevicePathSizeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -85,6 +88,7 @@ DevicePathUtilitiesGetDevicePathSizeFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesDuplicateDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -93,6 +97,7 @@ DevicePathUtilitiesDuplicateDevicePathFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -101,6 +106,7 @@ DevicePathUtilitiesAppendDevicePathFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDevicePathInstanceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -109,6 +115,7 @@ DevicePathUtilitiesAppendDevicePathInstanceFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesGetNextDevicePathInstanceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +124,7 @@ DevicePathUtilitiesGetNextDevicePathInstanceFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesIsDevicePathMultiInstanceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -125,6 +133,7 @@ DevicePathUtilitiesIsDevicePathMultiInstanceFunctionTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesCreateDeviceNodeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +142,7 @@ DevicePathUtilitiesCreateDeviceNodeConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDeviceNodeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -141,6 +151,7 @@ DevicePathUtilitiesAppendDeviceNodeConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -149,6 +160,7 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDevicePathInstanceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -157,6 +169,7 @@ DevicePathUtilitiesAppendDevicePathInstanceConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesGetNextDevicePathInstanceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -165,6 +178,7 @@ DevicePathUtilitiesGetNextDevicePathInstanceConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesGetDevicePathSizeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -173,6 +187,7 @@ DevicePathUtilitiesGetDevicePathSizeConformanceTest (
);
EFI_STATUS
+EFIAPI
DevicePathUtilitiesDuplicateDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestMain.h
index 877ed152bc2e..708ef8794190 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestMain.h
@@ -59,6 +59,7 @@ BBTestDiskIoProtocolUnload (
);
EFI_STATUS
+EFIAPI
BBTestReadDiskConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -68,6 +69,7 @@ BBTestReadDiskConformanceAutoTest (
EFI_STATUS
+EFIAPI
BBTestWriteDiskConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -80,6 +82,7 @@ BBTestWriteDiskConformanceAutoTest (
//
EFI_STATUS
+EFIAPI
BBTestReadDiskFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -88,6 +91,7 @@ BBTestReadDiskFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteDiskFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +104,7 @@ BBTestWriteDiskFunctionAutoTest (
//
EFI_STATUS
+EFIAPI
BBTestReadDiskStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -108,6 +113,7 @@ BBTestReadDiskStressAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteDiskStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestMain.h
index f02fedbacc72..3abbd87ebb41 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestMain.h
@@ -64,6 +64,7 @@ BBTestDiskIo2ProtocolUnload (
);
EFI_STATUS
+EFIAPI
BBTestReadDiskExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -72,6 +73,7 @@ BBTestReadDiskExConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestFlushDiskExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -80,6 +82,7 @@ BBTestFlushDiskExConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteDiskExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -91,6 +94,7 @@ BBTestWriteDiskExConformanceAutoTest (
// Function Interface test declaration section
//
EFI_STATUS
+EFIAPI
BBTestCancelFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -99,6 +103,7 @@ BBTestCancelFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -107,6 +112,7 @@ BBTestReadDiskExFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestFlushDiskExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -115,6 +121,7 @@ BBTestFlushDiskExFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestWriteDiskExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTest.h
index 9d450abbf6d4..9b1e06057538 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTest.h
@@ -79,6 +79,7 @@ InitializeBBTestDriverConfiguration (
);
EFI_STATUS
+EFIAPI
BBTestDriverConfigurationUnload (
IN EFI_HANDLE ImageHandle
);
@@ -91,6 +92,7 @@ BBTestDriverConfigurationUnload (
// TDS 5.2.1
//
EFI_STATUS
+EFIAPI
BBTestSetOptionsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -102,6 +104,7 @@ BBTestSetOptionsConformanceTest (
// TDS 5.2.2
//
EFI_STATUS
+EFIAPI
BBTestOptionsValidConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -113,6 +116,7 @@ BBTestOptionsValidConformanceTest (
// TDS 5.2.3
//
EFI_STATUS
+EFIAPI
BBTestForceDefaultsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +132,7 @@ BBTestForceDefaultsConformanceTest (
// TDS 5.2.1.2.1
//
EFI_STATUS
+EFIAPI
BBTestSetOptionsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -137,6 +142,7 @@ BBTestSetOptionsConformanceTestCheckpoint1 (
// TDS 5.2.1.2.2
//
EFI_STATUS
+EFIAPI
BBTestSetOptionsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -146,6 +152,7 @@ BBTestSetOptionsConformanceTestCheckpoint2 (
// TDS 5.2.1.2.3
//
EFI_STATUS
+EFIAPI
BBTestSetOptionsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -155,6 +162,7 @@ BBTestSetOptionsConformanceTestCheckpoint3 (
// TDS 5.2.2.2.1
//
EFI_STATUS
+EFIAPI
BBTestOptionsValidConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -164,6 +172,7 @@ BBTestOptionsValidConformanceTestCheckpoint1 (
// TDS 5.2.2.2.2
//
EFI_STATUS
+EFIAPI
BBTestOptionsValidConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -173,6 +182,7 @@ BBTestOptionsValidConformanceTestCheckpoint2 (
// TDS 5.2.3.2.1
//
EFI_STATUS
+EFIAPI
BBTestForceDefaultsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -182,6 +192,7 @@ BBTestForceDefaultsConformanceTestCheckpoint1 (
// TDS 5.2.3.2.2
//
EFI_STATUS
+EFIAPI
BBTestForceDefaultsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTest.h
index d2703e0ae54a..a63954630ecf 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTest.h
@@ -73,6 +73,7 @@ InitializeBBTestDriverDiagnostics (
);
EFI_STATUS
+EFIAPI
BBTestDriverDiagnosticsUnload (
IN EFI_HANDLE ImageHandle
);
@@ -85,6 +86,7 @@ BBTestDriverDiagnosticsUnload (
// TDS 7.2.1
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +102,7 @@ BBTestRunDiagnosticsConformanceTest (
// TDS 7.2.1.2.1
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics
@@ -109,6 +112,7 @@ BBTestRunDiagnosticsConformanceTestCheckpoint1 (
// TDS 7.2.1.2.2
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics
@@ -118,6 +122,7 @@ BBTestRunDiagnosticsConformanceTestCheckpoint2 (
// TDS 7.2.1.2.3
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTest.h
index 675ed196e38e..0f02cfed417b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTest.h
@@ -91,6 +91,7 @@ BBTestDriverDiagnostics2Unload (
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -104,6 +105,7 @@ BBTestRunDiagnosticsConformanceTest (
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
@@ -111,6 +113,7 @@ BBTestRunDiagnosticsConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
@@ -118,12 +121,14 @@ BBTestRunDiagnosticsConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
);
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -132,12 +137,14 @@ BBTestRunDiagnosticsFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsFuncTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
);
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsFuncTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.h
index 3a0c63edfc76..61b3dbc2f682 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.h
@@ -46,11 +46,13 @@ InitializeBBTestDriverSupportedEfiVersion (
);
EFI_STATUS
+EFIAPI
BBTestDriverSupportedEfiVersionProtocolUnload (
IN EFI_HANDLE ImageHandle
);
EFI_STATUS
+EFIAPI
BBTestLengthParameterAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -59,6 +61,7 @@ BBTestLengthParameterAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestFirmwareVersionParameterAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.h
index 5e02e74ddf08..4593c2c5cf8d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.h
@@ -78,6 +78,7 @@ extern EFI_GUID gBlackBoxEfiEbcDriverProtocolGuid;
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestCreateThunkBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -89,6 +90,7 @@ BBTestCreateThunkBasicTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestUnloadImageBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +102,7 @@ BBTestUnloadImageBasicTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestRegisterICacheFlushBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -111,6 +114,7 @@ BBTestRegisterICacheFlushBasicTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestGetVersionBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -126,6 +130,7 @@ BBTestGetVersionBasicTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestCreateThunkConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -137,6 +142,7 @@ BBTestCreateThunkConformanceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestUnloadImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -148,6 +154,7 @@ BBTestUnloadImageConformanceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestGetVersionConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -173,12 +180,14 @@ ReadImageFile (
);
EFI_STATUS
+EFIAPI
FlushICache (
IN EFI_PHYSICAL_ADDRESS Start,
IN UINT64 Length
);
EFI_STATUS
+EFIAPI
TestFlushICache (
IN EFI_PHYSICAL_ADDRESS Start,
IN UINT64 Length
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestMain.h
index 4b569d329ab5..7a838f8fed99 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestMain.h
@@ -74,6 +74,7 @@ UnloadEraseBlockBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestEraseBlocksConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -83,6 +84,7 @@ BBTestEraseBlocksConformanceTest (
EFI_STATUS
+EFIAPI
BBTestEraseBlocksFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestMain.h
index 3a51b4185512..5ebeabe9cf5d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestMain.h
@@ -54,6 +54,7 @@ BBTestExtScsiPassThruProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestGetNextTargetLunFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -62,6 +63,7 @@ BBTestGetNextTargetLunFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -70,6 +72,7 @@ BBTestBuildDevicePathFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetTargetLunFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -78,6 +81,7 @@ BBTestGetTargetLunFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetChannelFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -86,6 +90,7 @@ BBTestResetChannelFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetTargetLunFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +99,7 @@ BBTestResetTargetLunFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextTargetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -102,6 +108,7 @@ BBTestGetNextTargetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -110,6 +117,7 @@ BBTestPassThruFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextTargetLunConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +126,7 @@ BBTestGetNextTargetLunConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -126,6 +135,7 @@ BBTestBuildDevicePathConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetTargetLunConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -134,6 +144,7 @@ BBTestGetTargetLunConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetTargetLunConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +153,7 @@ BBTestResetTargetLunConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextTargetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -150,6 +162,7 @@ BBTestGetNextTargetConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestMain.h
index cfd40c915ecd..b9ff3dc786d3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestMain.h
@@ -102,6 +102,7 @@ UnloadFirmwareManagementBBTest (
/*
EFI_STATUS
+EFIAPI
BBTestUnitTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -115,6 +116,7 @@ BBTestUnitTest (
//
EFI_STATUS
+EFIAPI
BBTestGetImageInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -123,6 +125,7 @@ BBTestGetImageInfoFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -131,6 +134,7 @@ BBTestGetImageFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestSetImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -139,6 +143,7 @@ BBTestSetImageFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestCheckImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -147,6 +152,7 @@ BBTestCheckImageFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetPackageInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -155,6 +161,7 @@ BBTestGetPackageInfoFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -167,6 +174,7 @@ BBTestSetPackageInfoFunctionTest (
//
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -175,6 +183,7 @@ BBTestGetImageInfoConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -183,6 +192,7 @@ BBTestGetImageConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -191,6 +201,7 @@ BBTestSetImageConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestCheckImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -199,6 +210,7 @@ BBTestCheckImageConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetPackageInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -207,6 +219,7 @@ BBTestGetPackageInfoConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTest.h
index 1ee98017b775..6febbac51d42 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTest.h
@@ -552,6 +552,7 @@ extern EFI_GUID gBlackBoxEfiGraphicsOutputVideoToBufferExtensiveGuid;
// Individual test cases are specified by the Test Entry Field.
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputSpecialFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -579,6 +580,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputQueryModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -606,6 +608,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputSetModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -633,6 +636,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoFillFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -660,6 +664,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoBltBufferFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -687,6 +692,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoToVideoFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -717,6 +723,7 @@ Returns:
// confomance functions
//
EFI_STATUS
+EFIAPI
BBTestQueryModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -744,6 +751,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestBltConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -771,6 +779,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestSetModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -801,6 +810,7 @@ Returns:
// stress test
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoFillStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -828,6 +838,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoBltBufferStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -855,6 +866,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoToVideoStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -882,6 +894,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestVideoFillBufferToVideoManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -909,6 +922,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestVideoFillVideoToVideoManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -936,6 +950,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
BBTestVideoToBltBufferExtensiveAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.h
index bedad19211b8..0e17954d7762 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.h
@@ -69,6 +69,7 @@ InitializeHIIConfigAccessBBTest (
EFI_STATUS
+EFIAPI
UnloadHIIConfigAccessBBTest (
IN EFI_HANDLE ImageHandle
);
@@ -79,6 +80,7 @@ UnloadHIIConfigAccessBBTest (
//
/*
EFI_STATUS
+EFIAPI
BBTestUnitTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -87,6 +89,7 @@ BBTestUnitTest (
);
*/
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -95,6 +98,7 @@ BBTestExtractConfigConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -103,6 +107,7 @@ BBTestRouteConfigConformanceTest (
);
/*
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -111,6 +116,7 @@ BBTestCallBackConformanceTest (
);
*/
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -119,6 +125,7 @@ BBTestExtractConfigFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -127,6 +134,7 @@ BBTestRouteConfigFunctionTest (
);
/*
EFI_STATUS
+EFIAPI
BBTestCallBackFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.h
index 22f7d26c49e0..ab26c0b0714d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.h
@@ -47,6 +47,7 @@ InitializeBBTestHIIConfigRouting (
);
EFI_STATUS
+EFIAPI
BBTestHIIConfigRoutingProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -56,6 +57,7 @@ BBTestHIIConfigRoutingProtocolUnload (
//
/*
EFI_STATUS
+EFIAPI
BBTestUnitAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -64,6 +66,7 @@ BBTestUnitAutoTest (
);
*/
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -72,6 +75,7 @@ BBTestExtractConfigFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestExportConfigFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -80,6 +84,7 @@ BBTestExportConfigFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -88,6 +93,7 @@ BBTestRouteConfigFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestBlockToConfigFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -96,6 +102,7 @@ BBTestBlockToConfigFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestConfigToBlockFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -104,6 +111,7 @@ BBTestConfigToBlockFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetAltCfgFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -112,6 +120,7 @@ BBTestGetAltCfgFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -120,6 +129,7 @@ BBTestExtractConfigConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestExportConfigConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +138,7 @@ BBTestExportConfigConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -136,6 +147,7 @@ BBTestRouteConfigConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -144,6 +156,7 @@ BBTestBlockToConfigConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -152,6 +165,7 @@ BBTestConfigToBlockConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetAltCfgConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.h
index 58fc98b616fe..273579bc1920 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.h
@@ -135,6 +135,7 @@ UnloadHIIDatabaseBBTest (
);
EFI_STATUS
+EFIAPI
DoNothingPackageNotifyFn (
IN UINT8 PackageType,
IN CONST EFI_GUID *PackageGuid,
@@ -147,6 +148,7 @@ DoNothingPackageNotifyFn (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewPackageListConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -155,6 +157,7 @@ BBTestNewPackageListConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestRemovePackageListConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -163,6 +166,7 @@ BBTestRemovePackageListConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -171,6 +175,7 @@ BBTestUpdatePackageListConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -179,6 +184,7 @@ BBTestListPackageListsConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -187,6 +193,7 @@ BBTestExportPackageListsConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -195,6 +202,7 @@ BBTestRegisterPackageNotifyConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -203,6 +211,7 @@ BBTestUnregisterPackageNotifyConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -211,6 +220,7 @@ BBTestFindKeyboardLayoutsConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -219,6 +229,7 @@ BBTestGetKeyboardLayoutConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -227,6 +238,7 @@ BBTestSetKeyboardLayoutConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -235,6 +247,7 @@ BBTestGetPackageListHandleConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestNewPackageListFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -243,6 +256,7 @@ BBTestNewPackageListFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestRemovePackageListFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -251,6 +265,7 @@ BBTestRemovePackageListFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -259,6 +274,7 @@ BBTestUpdatePackageListFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestListPackageListsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -267,6 +283,7 @@ BBTestListPackageListsFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestExportPackageListsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -275,6 +292,7 @@ BBTestExportPackageListsFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -283,6 +301,7 @@ BBTestRegisterPackageNotifyFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -291,6 +310,7 @@ BBTestUnregisterPackageNotifyFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -299,6 +319,7 @@ BBTestFindKeyboardLayoutsFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -307,6 +328,7 @@ BBTestGetKeyboardLayoutFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -315,6 +337,7 @@ BBTestSetKeyboardLayoutFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestMain.h
index bf86accb5202..8782f22af10e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestMain.h
@@ -94,6 +94,7 @@ UnloadHIIFontBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestStringToImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -102,6 +103,7 @@ BBTestStringToImageConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -110,6 +112,7 @@ BBTestStringIdToImageConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +121,7 @@ BBTestGetGlyphConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetFontInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -126,6 +130,7 @@ BBTestGetFontInfoConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -134,6 +139,7 @@ BBTestStringToImageFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +148,7 @@ BBTestStringIdToImageFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -150,6 +157,7 @@ BBTestGetGlyphFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetFontInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.h
index fde8e70fa483..ac02c3d75809 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.h
@@ -94,6 +94,7 @@ InitializeHIIFontExBBTest (
EFI_STATUS
+EFIAPI
UnloadHIIFontExBBTest (
IN EFI_HANDLE ImageHandle
);
@@ -103,6 +104,7 @@ UnloadHIIFontExBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestStringToImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -111,6 +113,7 @@ BBTestStringToImageExConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -119,6 +122,7 @@ BBTestStringIdToImageExConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -127,6 +131,7 @@ BBTestGetGlyphExConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -135,6 +140,7 @@ BBTestGetFontInfoExConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -143,6 +149,7 @@ BBTestGetGlyphInfoConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -151,6 +158,7 @@ BBTestStringToImageExFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -159,6 +167,7 @@ BBTestStringIdToImageExFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -167,6 +176,7 @@ BBTestGetGlyphExFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -175,6 +185,7 @@ BBTestGetFontInfoExFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.h
index 88a545c043ee..ebaa13ca56ef 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.h
@@ -87,6 +87,7 @@ InitializeHIIImageBBTest (
EFI_STATUS
+EFIAPI
UnloadHIIImageBBTest (
IN EFI_HANDLE ImageHandle
);
@@ -96,6 +97,7 @@ UnloadHIIImageBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -104,6 +106,7 @@ BBTestNewImageConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -112,6 +115,7 @@ BBTestGetImageConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -120,6 +124,7 @@ BBTestSetImageConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +133,7 @@ BBTestDrawImageConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -136,6 +142,7 @@ BBTestDrawImageIdConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestNewImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -144,6 +151,7 @@ BBTestNewImageFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -152,6 +160,7 @@ BBTestGetImageFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestSetImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -160,6 +169,7 @@ BBTestSetImageFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -168,6 +178,7 @@ BBTestDrawImageFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.h
index f7bc1a0c548d..20aca2e858fe 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.h
@@ -93,6 +93,7 @@ InitializeHIIImageExBBTest (
EFI_STATUS
+EFIAPI
UnloadHIIImageExBBTest (
IN EFI_HANDLE ImageHandle
);
@@ -102,6 +103,7 @@ UnloadHIIImageExBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -110,6 +112,7 @@ BBTestNewImageExConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +121,7 @@ BBTestGetImageExConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -126,6 +130,7 @@ BBTestSetImageExConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -134,6 +139,7 @@ BBTestDrawImageExConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +148,7 @@ BBTestDrawImageIdExConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -150,6 +157,7 @@ BBTestGetImageInfoConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestNewImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -158,6 +166,7 @@ BBTestNewImageExFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -166,6 +175,7 @@ BBTestGetImageExFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestSetImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -174,6 +184,7 @@ BBTestSetImageExFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -182,6 +193,7 @@ BBTestDrawImageExFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -190,6 +202,7 @@ BBTestDrawImageIdExFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetImageInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestMain.h
index 81be489bd868..b85d7dcf5c8f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestMain.h
@@ -104,6 +104,7 @@ BBTestNewStringConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -112,6 +113,7 @@ BBTestGetStringConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetStringConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -120,6 +122,7 @@ BBTestSetStringConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetLanguagesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +131,7 @@ BBTestGetLanguagesConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetSecondaryLanguagesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -136,6 +140,7 @@ BBTestGetSecondaryLanguagesConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestNewStringFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -144,6 +149,7 @@ BBTestNewStringFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetStringFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -152,6 +158,7 @@ BBTestGetStringFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestSetStringFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -160,6 +167,7 @@ BBTestSetStringFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetLanguagesFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -168,6 +176,7 @@ BBTestGetLanguagesFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetSecondaryLanguagesFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestMain.h
index d76b07d02e30..3a9c36b7b0f3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestMain.h
@@ -137,6 +137,7 @@ Hash2ServiceBindingDestoryChild (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestGetHashSizeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -145,6 +146,7 @@ BBTestGetHashSizeConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestHashConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -153,6 +155,7 @@ BBTestHashConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestHashInitConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -161,6 +164,7 @@ BBTestHashInitConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestHashUpdateConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -169,6 +173,7 @@ BBTestHashUpdateConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestHashFinalConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -177,6 +182,7 @@ BBTestHashFinalConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetHashSizeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -185,6 +191,7 @@ BBTestGetHashSizeFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestHashFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -193,6 +200,7 @@ BBTestHashFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestHashMultiBlocksFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestMain.h
index d149e95b6146..916e7ee38c25 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestMain.h
@@ -80,6 +80,7 @@ UnloadIPsec2BBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestProcessExtConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -88,6 +89,7 @@ BBTestProcessExtConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestMain.h
index ea24d3f51cf1..7c5d343f646d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestMain.h
@@ -93,6 +93,7 @@ UnloadIPsecConfigBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestSetDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -101,6 +102,7 @@ BBTestSetDataConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -109,6 +111,7 @@ BBTestGetDataConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +120,7 @@ BBTestGetNextSelectorConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -125,6 +129,7 @@ BBTestRegisterDataNotifyConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +138,7 @@ BBTestUnregisterDataNotifyConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -141,6 +147,7 @@ BBTestSetDataFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -149,6 +156,7 @@ BBTestGetDataFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -157,6 +165,7 @@ BBTestGetNextSelectorFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -165,6 +174,7 @@ BBTestRegisterDataNotifyFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.h
index c1eecc614a38..78d48d97e488 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.h
@@ -54,6 +54,7 @@ UnloadLoadFileTest (
);
EFI_STATUS
+EFIAPI
BBTestLoadFileFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.h
index 1ad3e9a39c93..a022b543db59 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.h
@@ -80,6 +80,7 @@ InitializeBBTestLoadedImageProtocol (
);
EFI_STATUS
+EFIAPI
BBTestLoadedImageProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -89,6 +90,7 @@ BBTestLoadedImageProtocolUnload (
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestLoadedImageTest1 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +102,7 @@ BBTestLoadedImageTest1 (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestLoadedImageTest2 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestMain.h
index e83ec37cead3..82d3a29c109a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestMain.h
@@ -126,6 +126,7 @@ UnloadNVMEPassThruBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -134,6 +135,7 @@ BBTestPassThruConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextNamespaceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +144,7 @@ BBTestGetNextNamespaceConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -150,6 +153,7 @@ BBTestBuildDevicePathConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNamespaceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -158,6 +162,7 @@ BBTestGetNamespaceConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -166,6 +171,7 @@ BBTestPassThruFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextNamespaceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -174,6 +180,7 @@ BBTestGetNextNamespaceFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -182,6 +189,7 @@ BBTestBuildDevicePathFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNamespaceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestMain.h
index 7c5027c9d68a..2c1b326134c3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestMain.h
@@ -89,6 +89,7 @@ UnloadPkcs7VerifyBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestVerifyBufferConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -97,6 +98,7 @@ BBTestVerifyBufferConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestVerifySignatureConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -105,6 +107,7 @@ BBTestVerifySignatureConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestVerifyBufferFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -113,6 +116,7 @@ BBTestVerifyBufferFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestVerifySignatureFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.h
index 33818f867436..14ff14acd5ab 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.h
@@ -53,6 +53,7 @@ InitializePartitionInfoBBTest (
);
EFI_STATUS
+EFIAPI
UnloadPartitionInfoBBTest (
IN EFI_HANDLE ImageHandle
);
@@ -61,6 +62,7 @@ UnloadPartitionInfoBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestPartitionInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestMain.h
index 3e80233fcc7a..fd0642f8bff5 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestMain.h
@@ -44,6 +44,7 @@ Abstract:
//TDS 4.1.1
//
EFI_STATUS
+EFIAPI
PollMem_Func_Manual (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -54,6 +55,7 @@ PollMem_Func_Manual (
//internal help function.
//
EFI_STATUS
+EFIAPI
PollMemCheckPoint (
IN EFI_PCI_IO_PROTOCOL *PciIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -69,6 +71,7 @@ PollMemCheckPoint (
//TDS 4.1.2
//
EFI_STATUS
+EFIAPI
PollMem_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -81,6 +84,7 @@ PollMem_Func (
//TDS 4.1.3
//
EFI_STATUS
+EFIAPI
PollIo_Func_Manual (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -92,6 +96,7 @@ PollIo_Func_Manual (
//internal function to check the PollIo Check Point.
//
EFI_STATUS
+EFIAPI
PollIoCheckPoint (
IN EFI_PCI_IO_PROTOCOL *PciIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -107,6 +112,7 @@ PollIoCheckPoint (
//TDS 4.1.4
//
EFI_STATUS
+EFIAPI
PollIo_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +124,7 @@ PollIo_Func (
//TDS 4.1.5
//
EFI_STATUS
+EFIAPI
MemRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -130,6 +137,7 @@ MemRead_Func (
//TDS 4.1.6
//
EFI_STATUS
+EFIAPI
MemWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -141,6 +149,7 @@ MemWrite_Func (
//TDS 4.1.7
//
EFI_STATUS
+EFIAPI
IoRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -152,6 +161,7 @@ IoRead_Func (
//TDS 4.1.8
//
EFI_STATUS
+EFIAPI
IoWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -164,6 +174,7 @@ IoWrite_Func (
//TDS 4.1.9
//
EFI_STATUS
+EFIAPI
PciRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -175,6 +186,7 @@ PciRead_Func (
//TDS 4.1.10
//
EFI_STATUS
+EFIAPI
PciWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -186,6 +198,7 @@ PciWrite_Func (
//TDS 4.1.11
//
EFI_STATUS
+EFIAPI
CopyMem_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -197,6 +210,7 @@ CopyMem_Func (
//TDS 4.1.12
//
EFI_STATUS
+EFIAPI
Map_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -208,6 +222,7 @@ Map_Func (
//TDS 4.1.13
//
EFI_STATUS
+EFIAPI
Unmap_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -219,6 +234,7 @@ Unmap_Func (
//TDS 4.1.14
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -230,6 +246,7 @@ AllocateBuffer_Func (
//TDS 4.1.15
//
EFI_STATUS
+EFIAPI
FreeBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -241,6 +258,7 @@ FreeBuffer_Func (
//TDS 4.1.16
//
EFI_STATUS
+EFIAPI
Flush_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -252,6 +270,7 @@ Flush_Func (
//TDS 4.1.17
//
EFI_STATUS
+EFIAPI
GetLocation_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -263,6 +282,7 @@ GetLocation_Func (
//TDS 4.1.18
//
EFI_STATUS
+EFIAPI
Attributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -275,6 +295,7 @@ Attributes_Func (
//TDS 4.1.19
//
EFI_STATUS
+EFIAPI
GetBarAttributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -286,6 +307,7 @@ GetBarAttributes_Func (
//TDS 4.1.20
//
EFI_STATUS
+EFIAPI
SetBarAttributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -301,6 +323,7 @@ SetBarAttributes_Func (
//TDS 4.2.1
//
EFI_STATUS
+EFIAPI
PollMem_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -312,6 +335,7 @@ PollMem_Conf (
//TDS 4.2.2
//
EFI_STATUS
+EFIAPI
PollIo_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -323,6 +347,7 @@ PollIo_Conf (
//TDS 4.2.3
//
EFI_STATUS
+EFIAPI
MemRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -334,6 +359,7 @@ MemRead_Conf (
//TDS 4.2.4
//
EFI_STATUS
+EFIAPI
MemWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -345,6 +371,7 @@ MemWrite_Conf (
//TDS 4.2.5
//
EFI_STATUS
+EFIAPI
IoRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -356,6 +383,7 @@ IoRead_Conf (
//TDS 4.2.6
//
EFI_STATUS
+EFIAPI
IoWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -367,6 +395,7 @@ IoWrite_Conf (
//TDS 4.2.7
//
EFI_STATUS
+EFIAPI
PciRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -378,6 +407,7 @@ PciRead_Conf (
//TDS 4.2.8
//
EFI_STATUS
+EFIAPI
PciWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -389,6 +419,7 @@ PciWrite_Conf (
//TDS 4.2.9
//
EFI_STATUS
+EFIAPI
CopyMem_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -400,6 +431,7 @@ CopyMem_Conf (
//TDS 4.2.10
//
EFI_STATUS
+EFIAPI
Map_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -411,6 +443,7 @@ Map_Conf (
//TDS 4.2.11
//
EFI_STATUS
+EFIAPI
Unmap_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -422,6 +455,7 @@ Unmap_Conf (
//TDS 4.2.12
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -433,6 +467,7 @@ AllocateBuffer_Conf (
//TDS 4.2.13
//
EFI_STATUS
+EFIAPI
FreeBuffer_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -445,6 +480,7 @@ FreeBuffer_Conf (
//TDS 4.2.14
//
EFI_STATUS
+EFIAPI
GetLocation_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -456,6 +492,7 @@ GetLocation_Conf (
//TDS 4.2.15
//
EFI_STATUS
+EFIAPI
Attributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -468,6 +505,7 @@ Attributes_Conf (
//TDS 4.2.16
//
EFI_STATUS
+EFIAPI
GetBarAttributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -479,6 +517,7 @@ GetBarAttributes_Conf (
//TDS 4.2.17
//
EFI_STATUS
+EFIAPI
SetBarAttributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -489,6 +528,7 @@ SetBarAttributes_Conf (
//TDS 4.3.1
//
EFI_STATUS
+EFIAPI
MapUnmap_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -500,6 +540,7 @@ MapUnmap_Stress (
//TDS 4.3.2
//
EFI_STATUS
+EFIAPI
AllocateBufferFreeBuffer_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -511,6 +552,7 @@ AllocateBufferFreeBuffer_Stress (
//TDS 4.2.3
//
EFI_STATUS
+EFIAPI
Attributes_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -522,6 +564,7 @@ Attributes_Stress (
//TDS 4.3.4
//
EFI_STATUS
+EFIAPI
GetAndSetBarAttributes_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.h
index ee5643636816..075114e70a99 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.h
@@ -298,12 +298,14 @@ GetAlternateValueByFile (
);
VOID
+EFIAPI
EventNotifyWriteMem (
IN EFI_EVENT Event,
IN VOID *Context
);
VOID
+EFIAPI
EventNotifyWriteIo (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestMain.h
index dfcbfdea53ac..2bdadd1a7c02 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestMain.h
@@ -43,6 +43,7 @@ Abstract:
//TDS 4.1.1
//
EFI_STATUS
+EFIAPI
PollMem_Func_Manual (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -51,6 +52,7 @@ PollMem_Func_Manual (
);
EFI_STATUS
+EFIAPI
PollMemCheckPoint (
IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *RootBridgeIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -65,6 +67,7 @@ PollMemCheckPoint (
//TDS 4.1.2
//
EFI_STATUS
+EFIAPI
PollMem_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -76,6 +79,7 @@ PollMem_Func (
//TDS 4.2.3
//
EFI_STATUS
+EFIAPI
PollIo_Func_Manual (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -84,6 +88,7 @@ PollIo_Func_Manual (
);
EFI_STATUS
+EFIAPI
PollIoCheckPoint (
IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *RootBridgeIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -98,6 +103,7 @@ PollIoCheckPoint (
//TDS 4.1.4
//
EFI_STATUS
+EFIAPI
PollIo_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -109,6 +115,7 @@ PollIo_Func (
//TDS 4.1.5
//
EFI_STATUS
+EFIAPI
MemRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -120,6 +127,7 @@ MemRead_Func (
//TDS 4.1.6
//
EFI_STATUS
+EFIAPI
MemWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -131,6 +139,7 @@ MemWrite_Func (
//TDS 4.1.7
//
EFI_STATUS
+EFIAPI
IoRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +151,7 @@ IoRead_Func (
//TDS 4.1.8
//
EFI_STATUS
+EFIAPI
IoWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -153,6 +163,7 @@ IoWrite_Func (
//TDS 4.1.9
//
EFI_STATUS
+EFIAPI
PciRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -164,6 +175,7 @@ PciRead_Func (
//TDS 4.1.10
//
EFI_STATUS
+EFIAPI
PciWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -175,6 +187,7 @@ PciWrite_Func (
//TDS 4.1.11
//
EFI_STATUS
+EFIAPI
CopyMem_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -186,6 +199,7 @@ CopyMem_Func (
//TDS 4.1.12
//
EFI_STATUS
+EFIAPI
Map_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -208,6 +222,7 @@ Unmap_Func (
//TDS 4.1.14
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -219,6 +234,7 @@ AllocateBuffer_Func (
//TDS 4.1.15
//
EFI_STATUS
+EFIAPI
FreeBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -232,6 +248,7 @@ FreeBuffer_Func (
//TDS 4.1.16
//
EFI_STATUS
+EFIAPI
Flush_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -243,6 +260,7 @@ Flush_Func (
//TDS 4.1.17
//
EFI_STATUS
+EFIAPI
GetAttributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -254,6 +272,7 @@ GetAttributes_Func (
//TDS 4.1.18
//
EFI_STATUS
+EFIAPI
SetAttributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -264,6 +283,7 @@ SetAttributes_Func (
//TDS 4.1.19
//
EFI_STATUS
+EFIAPI
Configuration_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -275,6 +295,7 @@ Configuration_Func (
//TDS 4.2.1
//
EFI_STATUS
+EFIAPI
PollMem_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -286,6 +307,7 @@ PollMem_Conf (
//TDS 4.2.2
//
EFI_STATUS
+EFIAPI
PollIo_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -297,6 +319,7 @@ PollIo_Conf (
//TDS 4.2.3
//
EFI_STATUS
+EFIAPI
MemRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -308,6 +331,7 @@ MemRead_Conf (
//TDS 4.2.4
//
EFI_STATUS
+EFIAPI
MemWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -319,6 +343,7 @@ MemWrite_Conf (
//TDS 4.2.5
//
EFI_STATUS
+EFIAPI
IoRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -330,6 +355,7 @@ IoRead_Conf (
//TDS 4.2.6
//
EFI_STATUS
+EFIAPI
IoWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -341,6 +367,7 @@ IoWrite_Conf (
//TDS 4.2.7
//
EFI_STATUS
+EFIAPI
PciRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -352,6 +379,7 @@ PciRead_Conf (
//TDS 4.2.8
//
EFI_STATUS
+EFIAPI
PciWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -363,6 +391,7 @@ PciWrite_Conf (
//TDS 4.2.9
//
EFI_STATUS
+EFIAPI
CopyMem_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -374,6 +403,7 @@ CopyMem_Conf (
//TDS 4.2.10
//
EFI_STATUS
+EFIAPI
Map_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -386,6 +416,7 @@ Map_Conf (
//TDS 4.2.11
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -398,6 +429,7 @@ AllocateBuffer_Conf (
//TDS 4.2.12
//
EFI_STATUS
+EFIAPI
GetAttributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -410,6 +442,7 @@ GetAttributes_Conf (
//TDS 4.2.13
//
EFI_STATUS
+EFIAPI
SetAttributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -421,6 +454,7 @@ SetAttributes_Conf (
//TDS 4.3.1
//
EFI_STATUS
+EFIAPI
SetAttributes_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.h
index 0be18f987a1b..beda3a55b53f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.h
@@ -216,12 +216,14 @@ GetAlternateValueByFile (
);
VOID
+EFIAPI
EventNotifyWriteMem (
IN EFI_EVENT Event,
IN VOID *Context
);
VOID
+EFIAPI
EventNotifyWriteIo (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestMain.h
index 1342a74cf207..93d230bd765d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestMain.h
@@ -54,6 +54,7 @@ BBTestPlatformDriverOverrideProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestGetDriverFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -62,6 +63,7 @@ BBTestGetDriverFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDriverPathFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -70,6 +72,7 @@ BBTestGetDriverPathFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestDriverLoadedFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -78,6 +81,7 @@ BBTestDriverLoadedFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDriverConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -86,6 +90,7 @@ BBTestGetDriverConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDriverPathConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +99,7 @@ BBTestGetDriverPathConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestDriverLoadedConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestMain.h
index ec321af2b2c0..04242ea24b03 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestMain.h
@@ -96,6 +96,7 @@ BBTestPlatformToDriverConfigurationProtocolUnload (
EFI_STATUS
+EFIAPI
BBTestQueryFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -104,6 +105,7 @@ BBTestQueryFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResponseFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -113,6 +115,7 @@ BBTestResponseFunctionAutoTest (
EFI_STATUS
+EFIAPI
BBTestQueryConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -121,6 +124,7 @@ BBTestQueryConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResponseConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -130,6 +134,7 @@ BBTestResponseConformanceAutoTest (
EFI_STATUS
+EFIAPI
BBTestCLPCommandAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -138,6 +143,7 @@ BBTestCLPCommandAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestCLPReturnStringAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -146,6 +152,7 @@ BBTestCLPReturnStringAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestCLPCmdStatusAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -154,6 +161,7 @@ BBTestCLPCmdStatusAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestCLPErrorValueAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -162,6 +170,7 @@ BBTestCLPErrorValueAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestCLPMessageCodeAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.h
index 87f0926a54e8..b94f200ff7aa 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.h
@@ -47,6 +47,7 @@ extern UINTN gCallBackInvoked;
EFI_STATUS
+EFIAPI
BBTestNewStartFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -55,6 +56,7 @@ BBTestNewStartFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestNewStopFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -63,6 +65,7 @@ BBTestNewStopFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestNewSetIpFilterFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -71,6 +74,7 @@ BBTestNewSetIpFilterFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestNewStartConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -79,6 +83,7 @@ BBTestNewStartConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestNewStopConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -95,6 +100,7 @@ BBTestNewStopConformanceTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestStartFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -106,6 +112,7 @@ BBTestStartFunctionTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestStopFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +124,7 @@ BBTestStopFunctionTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestDhcpFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +136,7 @@ BBTestDhcpFunctionTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestDiscoverFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -139,6 +148,7 @@ BBTestDiscoverFunctionTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestMtftpFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -150,6 +160,7 @@ BBTestMtftpFunctionTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestUdpWriteFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -161,6 +172,7 @@ BBTestUdpWriteFunctionTest (
// TDS 4.7
//
EFI_STATUS
+EFIAPI
BBTestUdpReadFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -172,6 +184,7 @@ BBTestUdpReadFunctionTest (
// TDS 4.8
//
EFI_STATUS
+EFIAPI
BBTestSetIpFilterFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -183,6 +196,7 @@ BBTestSetIpFilterFunctionTest (
// TDS 4.9
//
EFI_STATUS
+EFIAPI
BBTestArpFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -194,6 +208,7 @@ BBTestArpFunctionTest (
// TDS 4.10
//
EFI_STATUS
+EFIAPI
BBTestSetParametersFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -205,6 +220,7 @@ BBTestSetParametersFunctionTest (
// TDS 4.11
//
EFI_STATUS
+EFIAPI
BBTestSetStationIpFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -216,6 +232,7 @@ BBTestSetStationIpFunctionTest (
// TDS 4.12
//
EFI_STATUS
+EFIAPI
BBTestSetPacketsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -231,6 +248,7 @@ BBTestSetPacketsFunctionTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestStartConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -242,6 +260,7 @@ BBTestStartConformanceTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestStopConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -253,6 +272,7 @@ BBTestStopConformanceTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestDhcpConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -264,6 +284,7 @@ BBTestDhcpConformanceTest (
// TDS 5.4
//
EFI_STATUS
+EFIAPI
BBTestDiscoverConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -275,6 +296,7 @@ BBTestDiscoverConformanceTest (
// TDS 5.5
//
EFI_STATUS
+EFIAPI
BBTestMtftpConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -286,6 +308,7 @@ BBTestMtftpConformanceTest (
// TDS 5.6
//
EFI_STATUS
+EFIAPI
BBTestUdpWriteConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -297,6 +320,7 @@ BBTestUdpWriteConformanceTest (
// TDS 5.7
//
EFI_STATUS
+EFIAPI
BBTestUdpReadConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -308,6 +332,7 @@ BBTestUdpReadConformanceTest (
// TDS 5.8
//
EFI_STATUS
+EFIAPI
BBTestSetIpFilterConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -319,6 +344,7 @@ BBTestSetIpFilterConformanceTest (
//
//
EFI_STATUS
+EFIAPI
BBTestArpConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -330,6 +356,7 @@ BBTestArpConformanceAutoTest (
// TDS 5.9
//
EFI_STATUS
+EFIAPI
BBTestArpConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -341,6 +368,7 @@ BBTestArpConformanceManualTest (
// TDS 5.10
//
EFI_STATUS
+EFIAPI
BBTestSetParametersConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -352,6 +380,7 @@ BBTestSetParametersConformanceTest (
// TDS 5.11
//
EFI_STATUS
+EFIAPI
BBTestSetStationIpConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -363,6 +392,7 @@ BBTestSetStationIpConformanceTest (
// TDS 5.12
//
EFI_STATUS
+EFIAPI
BBTestSetPacketsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -480,6 +510,7 @@ IsIpMaskEqual (
);
EFI_PXE_BASE_CODE_CALLBACK_STATUS
+EFIAPI
NewCallBack (
IN EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL *This,
IN EFI_PXE_BASE_CODE_FUNCTION Function,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestMain.h
index 72274a02a29b..4623c8c3ef24 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestMain.h
@@ -68,6 +68,7 @@ UnloadBBTestRamDiskProtocol (
// Prototypes: Test Cases
//
EFI_STATUS
+EFIAPI
BBTestRegisterRamDiskFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -77,6 +78,7 @@ BBTestRegisterRamDiskFunctionTest (
EFI_STATUS
+EFIAPI
BBTestUnregisterRamDiskFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -86,6 +88,7 @@ BBTestUnregisterRamDiskFunctionTest (
EFI_STATUS
+EFIAPI
BBTestRegisterRamDiskConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -95,6 +98,7 @@ BBTestRegisterRamDiskConformanceTest (
EFI_STATUS
+EFIAPI
BBTestUnregisterRamDiskConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTest.h
index 4ec9e64abbec..1ca56045ab39 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTest.h
@@ -76,6 +76,7 @@ BBTestRandomNumberUnload (
EFI_STATUS
+EFIAPI
BBTestGetInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -85,6 +86,7 @@ BBTestGetInfoFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetRNGFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +96,7 @@ BBTestGetRNGFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
@@ -101,6 +104,7 @@ BBTestGetInfoFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetRNGFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
@@ -108,6 +112,7 @@ BBTestGetRNGFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetRNGFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
@@ -115,6 +120,7 @@ BBTestGetRNGFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -124,6 +130,7 @@ BBTestGetInfoConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetRNGConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +140,7 @@ BBTestGetRNGConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
@@ -140,6 +148,7 @@ BBTestGetInfoConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetRNGConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
@@ -147,6 +156,7 @@ BBTestGetRNGConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetRNGConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTest.h
index d57a0e6b8105..f4480003e5f3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTest.h
@@ -81,6 +81,7 @@ BBTestRegularExpressionUnload (
EFI_STATUS
+EFIAPI
BBTestRegExGetInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -90,6 +91,7 @@ BBTestRegExGetInfoFunctionTest (
EFI_STATUS
+EFIAPI
BBTestMatchStringFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -99,6 +101,7 @@ BBTestMatchStringFunctionTest (
EFI_STATUS
+EFIAPI
BBTestRegExGetInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -106,6 +109,7 @@ BBTestRegExGetInfoFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestMatchStringFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -113,6 +117,7 @@ BBTestMatchStringFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestMatchStringFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -120,6 +125,7 @@ BBTestMatchStringFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -129,6 +135,7 @@ BBTestGetInfoConformanceTest (
EFI_STATUS
+EFIAPI
BBTestMatchStringConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -138,6 +145,7 @@ BBTestMatchStringConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -145,6 +153,7 @@ BBTestGetInfoConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestMatchStringConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -152,6 +161,7 @@ BBTestMatchStringConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestMatchStringConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.h
index 84fb5ef9b8c7..394f8e18b478 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.h
@@ -78,6 +78,7 @@ InitializeResetNotificationBBTest (
);
EFI_STATUS
+EFIAPI
UnloadResetNotificationBBTest (
IN EFI_HANDLE ImageHandle
);
@@ -86,6 +87,7 @@ UnloadResetNotificationBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestRegisterResetNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +96,7 @@ BBTestRegisterResetNotifyConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestUnregisterResetNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -103,6 +106,7 @@ BBTestUnregisterResetNotifyConformanceTest (
EFI_STATUS
+EFIAPI
BBTestRegisterResetNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -111,6 +115,7 @@ BBTestRegisterResetNotifyFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestUnregisterResetNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestMain.h
index 9d8631e386d5..3c4065b0cc6f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestMain.h
@@ -102,6 +102,7 @@ UnloadSDMMCPassThruBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -110,6 +111,7 @@ BBTestPassThruConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextSlotConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +120,7 @@ BBTestGetNextSlotConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -126,6 +129,7 @@ BBTestBuildDevicePathConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestGetSlotNumberConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -134,6 +138,7 @@ BBTestGetSlotNumberConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestResetDeviceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -143,6 +148,7 @@ BBTestResetDeviceConformanceTest (
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -151,6 +157,7 @@ BBTestPassThruFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextSlotFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -159,6 +166,7 @@ BBTestGetNextSlotFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -167,6 +175,7 @@ BBTestBuildDevicePathFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetSlotNumberFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -175,6 +184,7 @@ BBTestGetSlotNumberFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestResetDeviceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestMain.h
index 6f4bb467cc2d..b71c9e208c31 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestMain.h
@@ -54,6 +54,7 @@ BBTestScsiIoProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestGetDeviceTypeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -62,6 +63,7 @@ BBTestGetDeviceTypeFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDeviceLocationFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -70,6 +72,7 @@ BBTestGetDeviceLocationFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetBusFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -78,6 +81,7 @@ BBTestResetBusFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -86,6 +90,7 @@ BBTestResetDeviceFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestExecuteScsiCommandFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +99,7 @@ BBTestExecuteScsiCommandFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDeviceTypeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -102,6 +108,7 @@ BBTestGetDeviceTypeConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetDeviceLocationConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -110,6 +117,7 @@ BBTestGetDeviceLocationConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetBusConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +126,7 @@ BBTestResetBusConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetDeviceConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -126,6 +135,7 @@ BBTestResetDeviceConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestExecuteScsiCommandConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.h
index d634cd4f8b32..eef80997896d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.h
@@ -43,6 +43,7 @@ InitializeBBTestScsiPassThru (
);
EFI_STATUS
+EFIAPI
BBTestScsiPassThruProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -52,6 +53,7 @@ BBTestScsiPassThruProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestGetNextDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -60,6 +62,7 @@ BBTestGetNextDeviceFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -68,6 +71,7 @@ BBTestBuildDevicePathFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetTargetLunFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -76,6 +80,7 @@ BBTestGetTargetLunFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetChannelFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -84,6 +89,7 @@ BBTestResetChannelFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetTargetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -92,6 +98,7 @@ BBTestResetTargetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +107,7 @@ BBTestPassThruFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetNextDeviceConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -108,6 +116,7 @@ BBTestGetNextDeviceConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -116,6 +125,7 @@ BBTestBuildDevicePathConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetTargetLunConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -124,6 +134,7 @@ BBTestGetTargetLunConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetTargetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -132,6 +143,7 @@ BBTestResetTargetConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.h
index cb26f0f4f393..35ff0b5fc52e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.h
@@ -94,6 +94,7 @@ extern CHAR16 *gStopBitsString[];
// TDS 3.1
//
EFI_STATUS
+EFIAPI
ResetFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -105,6 +106,7 @@ ResetFuncTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
SetAttributesFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -116,6 +118,7 @@ SetAttributesFuncTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
SetControlFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -127,6 +130,7 @@ SetControlFuncTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
GetControlFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -138,6 +142,7 @@ GetControlFuncTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
WriteFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -149,6 +154,7 @@ WriteFuncTest (
// TDS 3.6
//
EFI_STATUS
+EFIAPI
ReadFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -160,6 +166,7 @@ ReadFuncTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
SetAttributesConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -171,6 +178,7 @@ SetAttributesConfTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
SetControlConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -182,6 +190,7 @@ SetControlConfTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
WriteConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -193,6 +202,7 @@ WriteConfTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
ReadConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -204,6 +214,7 @@ ReadConfTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
ResetStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -215,6 +226,7 @@ ResetStressTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
SetAttributesStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -226,6 +238,7 @@ SetAttributesStressTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
SetControlStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -237,6 +250,7 @@ SetControlStressTest (
// TDS 5.4
//
EFI_STATUS
+EFIAPI
GetControlStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -248,6 +262,7 @@ GetControlStressTest (
// TDS 5.5
//
EFI_STATUS
+EFIAPI
WriteStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -259,6 +274,7 @@ WriteStressTest (
// TDS 5.6
//
EFI_STATUS
+EFIAPI
ReadStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -271,6 +287,7 @@ ReadStressTest (
//
EFI_STATUS
+EFIAPI
GetTestSupportLibrary (
IN EFI_HANDLE SupportHandle,
OUT EFI_STANDARD_TEST_LIBRARY_PROTOCOL **StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.h
index 713d8b64dc56..44294495b0e8 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.h
@@ -236,6 +236,7 @@ InitializeBBTestSimpleFileSystem (
);
EFI_STATUS
+EFIAPI
BBTestSimpleFileSystemUnload (
IN EFI_HANDLE ImageHandle
);
@@ -248,6 +249,7 @@ BBTestSimpleFileSystemUnload (
// TDS 5.1.1
//
EFI_STATUS
+EFIAPI
BBTestOpenVolumeBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -259,6 +261,7 @@ BBTestOpenVolumeBasicTest (
// TDS 5.1.2
//
EFI_STATUS
+EFIAPI
BBTestOpenBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -270,6 +273,7 @@ BBTestOpenBasicTest (
// TDS 5.1.3
//
EFI_STATUS
+EFIAPI
BBTestCloseBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -281,6 +285,7 @@ BBTestCloseBasicTest (
// TDS 5.1.4
//
EFI_STATUS
+EFIAPI
BBTestDeleteBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -292,6 +297,7 @@ BBTestDeleteBasicTest (
// TDS 5.1.5
//
EFI_STATUS
+EFIAPI
BBTestReadBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -303,6 +309,7 @@ BBTestReadBasicTest (
// TDS 5.1.6
//
EFI_STATUS
+EFIAPI
BBTestWriteBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -314,6 +321,7 @@ BBTestWriteBasicTest (
// TDS 5.1.7
//
EFI_STATUS
+EFIAPI
BBTestFlushBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -325,6 +333,7 @@ BBTestFlushBasicTest (
// TDS 5.1.8
//
EFI_STATUS
+EFIAPI
BBTestSetPositionBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -336,6 +345,7 @@ BBTestSetPositionBasicTest (
// TDS 5.1.9
//
EFI_STATUS
+EFIAPI
BBTestGetPositionBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -347,6 +357,7 @@ BBTestGetPositionBasicTest (
// TDS 5.1.10
//
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -358,6 +369,7 @@ BBTestGetInfoBasicTest (
// TDS 5.1.11
//
EFI_STATUS
+EFIAPI
BBTestSetInfoBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -373,6 +385,7 @@ BBTestSetInfoBasicTest (
// TDS 5.1.12
//
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -384,6 +397,7 @@ BBTestOpenExBasicTest (
// TDS 5.1.13
//
EFI_STATUS
+EFIAPI
BBTestReadExBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -395,6 +409,7 @@ BBTestReadExBasicTest (
// TDS 5.1.14
//
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -406,6 +421,7 @@ BBTestWriteExBasicTest (
// TDS 5.1.15
//
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -421,6 +437,7 @@ BBTestFlushExBasicTest (
// TDS 5.1.1.2.1
//
EFI_STATUS
+EFIAPI
BBTestOpenVolumeBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -430,6 +447,7 @@ BBTestOpenVolumeBasicTestCheckpoint1 (
// TDS 5.1.2.2.1
//
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -440,6 +458,7 @@ BBTestOpenBasicTestCheckpoint1 (
// TDS 5.1.2.2.2
//
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -450,6 +469,7 @@ BBTestOpenBasicTestCheckpoint2 (
// TDS 5.1.3.2.1
//
EFI_STATUS
+EFIAPI
BBTestCloseBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -459,6 +479,7 @@ BBTestCloseBasicTestCheckpoint1 (
// TDS 5.1.4.2.1
//
EFI_STATUS
+EFIAPI
BBTestDeleteBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -468,6 +489,7 @@ BBTestDeleteBasicTestCheckpoint1 (
// TDS 5.1.4.2.2
//
EFI_STATUS
+EFIAPI
BBTestDeleteBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -477,6 +499,7 @@ BBTestDeleteBasicTestCheckpoint2 (
// TDS 5.1.4.2.3
//
EFI_STATUS
+EFIAPI
BBTestDeleteBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -486,6 +509,7 @@ BBTestDeleteBasicTestCheckpoint3 (
// TDS 5.1.5.2.1
//
EFI_STATUS
+EFIAPI
BBTestReadBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -495,6 +519,7 @@ BBTestReadBasicTestCheckpoint1 (
// TDS 5.1.5.2.2
//
EFI_STATUS
+EFIAPI
BBTestReadBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -504,6 +529,7 @@ BBTestReadBasicTestCheckpoint2 (
// TDS 5.1.6.2.1
//
EFI_STATUS
+EFIAPI
BBTestWriteBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -513,6 +539,7 @@ BBTestWriteBasicTestCheckpoint1 (
// TDS 5.1.7.2.1
//
EFI_STATUS
+EFIAPI
BBTestFlushBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -522,6 +549,7 @@ BBTestFlushBasicTestCheckpoint1 (
// TDS 5.1.7.2.2
//
EFI_STATUS
+EFIAPI
BBTestFlushBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -531,6 +559,7 @@ BBTestFlushBasicTestCheckpoint2 (
// TDS 5.1.8.2.1
//
EFI_STATUS
+EFIAPI
BBTestSetPositionBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *v
@@ -540,6 +569,7 @@ BBTestSetPositionBasicTestCheckpoint1 (
// TDS 5.1.8.2.2
//
EFI_STATUS
+EFIAPI
BBTestSetPositionBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -549,6 +579,7 @@ BBTestSetPositionBasicTestCheckpoint2 (
// TDS 5.1.9.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetPositionBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *v
@@ -558,6 +589,7 @@ BBTestGetPositionBasicTestCheckpoint1 (
// TDS 5.1.10.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -568,6 +600,7 @@ BBTestGetInfoBasicTestCheckpoint1 (
// TDS 5.1.10.2.2
//
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -578,6 +611,7 @@ BBTestGetInfoBasicTestCheckpoint2 (
// TDS 5.1.10.2.3
//
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -587,6 +621,7 @@ BBTestGetInfoBasicTestCheckpoint3 (
// TDS 5.1.10.2.4
//
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -596,6 +631,7 @@ BBTestGetInfoBasicTestCheckpoint4 (
// TDS 5.1.11.2.1
//
EFI_STATUS
+EFIAPI
BBTestSetInfoBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -606,6 +642,7 @@ BBTestSetInfoBasicTestCheckpoint1 (
// TDS 5.1.11.2.2
//
EFI_STATUS
+EFIAPI
BBTestSetInfoBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -615,6 +652,7 @@ BBTestSetInfoBasicTestCheckpoint2 (
// TDS 5.1.11.2.3
//
EFI_STATUS
+EFIAPI
BBTestSetInfoBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -628,6 +666,7 @@ BBTestSetInfoBasicTestCheckpoint3 (
// TDS 5.2.1
//
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -639,6 +678,7 @@ BBTestOpenConformanceTest (
// TDS 5.2.2
//
EFI_STATUS
+EFIAPI
BBTestDeleteConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -650,6 +690,7 @@ BBTestDeleteConformanceTest (
// TDS 5.2.3
//
EFI_STATUS
+EFIAPI
BBTestWriteConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -661,6 +702,7 @@ BBTestWriteConformanceTest (
// TDS 5.2.4
//
EFI_STATUS
+EFIAPI
BBTestFlushConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -672,6 +714,7 @@ BBTestFlushConformanceTest (
// TDS 5.2.5
//
EFI_STATUS
+EFIAPI
BBTestSetPositionConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -683,6 +726,7 @@ BBTestSetPositionConformanceTest (
// TDS 5.2.6
//
EFI_STATUS
+EFIAPI
BBTestGetPositionConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -694,6 +738,7 @@ BBTestGetPositionConformanceTest (
// TDS 5.2.7
//
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -705,6 +750,7 @@ BBTestGetInfoConformanceTest (
// TDS 5.2.8
//
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -716,6 +762,7 @@ BBTestSetInfoConformanceTest (
// TDS 5.2.9
//
EFI_STATUS
+EFIAPI
BBTestOpenExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -727,6 +774,7 @@ BBTestOpenExConformanceTest (
// TDS 5.2.10
//
EFI_STATUS
+EFIAPI
BBTestWriteExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -739,6 +787,7 @@ BBTestWriteExConformanceTest (
// TDS 5.2.11
//
EFI_STATUS
+EFIAPI
BBTestFlushExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -750,6 +799,7 @@ BBTestFlushExConformanceTest (
// TDS 5.2.12
//
EFI_STATUS
+EFIAPI
BBTestReadExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -766,6 +816,7 @@ BBTestReadExConformanceTest (
// TDS 5.2.1.2.1
//
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -775,6 +826,7 @@ BBTestOpenConformanceTestCheckpoint1(
// TDS 5.2.1.2.2
//
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -784,6 +836,7 @@ BBTestOpenConformanceTestCheckpoint2(
// TDS 5.2.1.2.3
//
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -793,6 +846,7 @@ BBTestOpenConformanceTestCheckpoint3(
// TDS 5.2.1.2.4
//
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint4(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -802,6 +856,7 @@ BBTestOpenConformanceTestCheckpoint4(
// TDS 5.2.1.2.5
//
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint5(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -811,6 +866,7 @@ BBTestOpenConformanceTestCheckpoint5(
// TDS 5.2.1.2.6
//
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint6(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -820,6 +876,7 @@ BBTestOpenConformanceTestCheckpoint6(
// TDS 5.2.2.2.1
//
EFI_STATUS
+EFIAPI
BBTestDeleteConformanceTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -829,6 +886,7 @@ BBTestDeleteConformanceTestCheckpoint1(
// TDS 5.2.3.2.1
//
EFI_STATUS
+EFIAPI
BBTestWriteConformanceTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -838,6 +896,7 @@ BBTestWriteConformanceTestCheckpoint1(
// TDS 5.2.3.2.2
//
EFI_STATUS
+EFIAPI
BBTestWriteConformanceTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -847,6 +906,7 @@ BBTestWriteConformanceTestCheckpoint2(
// TDS 5.2.3.2.3
//
EFI_STATUS
+EFIAPI
BBTestWriteConformanceTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -856,6 +916,7 @@ BBTestWriteConformanceTestCheckpoint3(
// TDS 5.2.4.2.1
//
EFI_STATUS
+EFIAPI
BBTestFlushConformanceTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -865,6 +926,7 @@ BBTestFlushConformanceTestCheckpoint1(
// TDS 5.2.4.2.2
//
EFI_STATUS
+EFIAPI
BBTestFlushConformanceTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -874,6 +936,7 @@ BBTestFlushConformanceTestCheckpoint2(
// TDS 5.2.5.2.1
//
EFI_STATUS
+EFIAPI
BBTestSetPositionConformanceTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -883,6 +946,7 @@ BBTestSetPositionConformanceTestCheckpoint1(
// TDS 5.2.6.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetPositionConformanceTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -892,6 +956,7 @@ BBTestGetPositionConformanceTestCheckpoint1(
// TDS 5.2.7.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -901,6 +966,7 @@ BBTestGetInfoConformanceTestCheckpoint1(
// TDS 5.2.7.2.2
//
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -910,6 +976,7 @@ BBTestGetInfoConformanceTestCheckpoint2(
// TDS 5.2.8.2.1
//
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -919,6 +986,7 @@ BBTestSetInfoConformanceTestCheckpoint1(
// TDS 5.2.8.2.2
//
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -928,6 +996,7 @@ BBTestSetInfoConformanceTestCheckpoint2(
// TDS 5.2.8.2.3
//
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -937,6 +1006,7 @@ BBTestSetInfoConformanceTestCheckpoint3(
// TDS 5.2.8.2.4
//
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint4(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -946,12 +1016,14 @@ BBTestSetInfoConformanceTestCheckpoint4(
// TDS 5.2.8.2.5
//
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint5(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
);
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint6(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -959,6 +1031,7 @@ BBTestSetInfoConformanceTestCheckpoint6(
// TDS 5.2.8.2.7
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint7(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -966,6 +1039,7 @@ BBTestSetInfoConformanceTestCheckpoint7(
// TDS 5.2.8.2.8
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint8 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -981,6 +1055,7 @@ BBTestSetInfoConformanceTestCheckpoint8 (
// TDS 5.3.1
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest1 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -992,6 +1067,7 @@ BBTestSimpleFileSytemExtensiveTest1 (
// TDS 5.3.2
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest2 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1003,6 +1079,7 @@ BBTestSimpleFileSytemExtensiveTest2 (
// TDS 5.3.3
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest3 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1014,6 +1091,7 @@ BBTestSimpleFileSytemExtensiveTest3 (
// TDS 5.3.4
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest4 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1025,6 +1103,7 @@ BBTestSimpleFileSytemExtensiveTest4 (
// TDS 5.3.5
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest5 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1036,6 +1115,7 @@ BBTestSimpleFileSytemExtensiveTest5 (
// TDS 5.3.6
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest6 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1047,6 +1127,7 @@ BBTestSimpleFileSytemExtensiveTest6 (
// TDS 5.3.7
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemOpenStress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1058,6 +1139,7 @@ BBTestSimpleFileSytemOpenStress (
// TDS 5.3.8
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemGetInfoStress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1069,6 +1151,7 @@ BBTestSimpleFileSytemGetInfoStress (
// TDS 5.3.9
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemSetInfoStress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestMain.h
index 2df780477cac..ea14aaa77963 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestMain.h
@@ -45,6 +45,7 @@ Abstract:
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestStartFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -56,6 +57,7 @@ BBTestStartFunctionTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestStopFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -67,6 +69,7 @@ BBTestStopFunctionTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestInitializeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -78,6 +81,7 @@ BBTestInitializeFunctionTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -89,6 +93,7 @@ BBTestResetFunctionTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestShutdownFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +105,7 @@ BBTestShutdownFunctionTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestReceiveFilterFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -111,6 +117,7 @@ BBTestReceiveFilterFunctionTest (
// TDS 4.7
//
EFI_STATUS
+EFIAPI
BBTestStationAddressFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -122,6 +129,7 @@ BBTestStationAddressFunctionTest (
// TDS 4.8
//
EFI_STATUS
+EFIAPI
BBTestStatisticsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +141,7 @@ BBTestStatisticsFunctionTest (
// TDS 4.9
//
EFI_STATUS
+EFIAPI
BBTestMCastIpToMacFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -144,6 +153,7 @@ BBTestMCastIpToMacFunctionTest (
// TDS 4.10
//
EFI_STATUS
+EFIAPI
BBTestNVDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -155,6 +165,7 @@ BBTestNVDataFunctionTest (
// TDS 4.11
//
EFI_STATUS
+EFIAPI
BBTestGetStatusFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -166,6 +177,7 @@ BBTestGetStatusFunctionTest (
// TDS 4.12
//
EFI_STATUS
+EFIAPI
BBTestTransmitFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -177,6 +189,7 @@ BBTestTransmitFunctionTest (
// TDS 4.13
//
EFI_STATUS
+EFIAPI
BBTestReceiveFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -192,6 +205,7 @@ BBTestReceiveFunctionTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestStartConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -203,6 +217,7 @@ BBTestStartConformanceTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestStopConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -214,6 +229,7 @@ BBTestStopConformanceTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestInitializeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -225,6 +241,7 @@ BBTestInitializeConformanceTest (
// TDS 5.4
//
EFI_STATUS
+EFIAPI
BBTestResetConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -236,6 +253,7 @@ BBTestResetConformanceTest (
// TDS 5.5
//
EFI_STATUS
+EFIAPI
BBTestShutdownConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -247,6 +265,7 @@ BBTestShutdownConformanceTest (
// TDS 5.6
//
EFI_STATUS
+EFIAPI
BBTestReceiveFilterConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -258,6 +277,7 @@ BBTestReceiveFilterConformanceTest (
// TDS 5.7
//
EFI_STATUS
+EFIAPI
BBTestStationAddressConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -269,6 +289,7 @@ BBTestStationAddressConformanceTest (
// TDS 5.8
//
EFI_STATUS
+EFIAPI
BBTestStatisticsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -280,6 +301,7 @@ BBTestStatisticsConformanceTest (
// TDS 5.9
//
EFI_STATUS
+EFIAPI
BBTestMCastIpToMacConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -291,6 +313,7 @@ BBTestMCastIpToMacConformanceTest (
// TDS 5.10
//
EFI_STATUS
+EFIAPI
BBTestNVDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -302,6 +325,7 @@ BBTestNVDataConformanceTest (
// TDS 5.11
//
EFI_STATUS
+EFIAPI
BBTestGetStatusConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -313,6 +337,7 @@ BBTestGetStatusConformanceTest (
// TDS 5.12
//
EFI_STATUS
+EFIAPI
BBTestTransmitConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -324,6 +349,7 @@ BBTestTransmitConformanceTest (
// TDS 5.13
//
EFI_STATUS
+EFIAPI
BBTestReceiveConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestMain.h
index e02e97b58d65..5d2f550ad259 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestMain.h
@@ -57,6 +57,7 @@ BBTestSimplePointerProtocolUnload (
// Interface function
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -65,14 +66,16 @@ BBTestResetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
IN EFI_TEST_LEVEL TestLevel,
IN EFI_HANDLE SupportHandle
);
-EFI_STATUS
+EFI_STATUS
+EFIAPI
BBTestGetStateFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -81,6 +84,7 @@ BBTestGetStateFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetStateFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -89,6 +93,7 @@ BBTestGetStateFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestWaitForInputFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +105,7 @@ BBTestWaitForInputFunctionManualTest (
// Conformance Test
//
EFI_STATUS
+EFIAPI
BBTestWaitForInputConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -112,6 +118,7 @@ BBTestWaitForInputConformanceManualTest (
// Extensive Test
//
EFI_STATUS
+EFIAPI
BBTestResetClearanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -120,6 +127,7 @@ BBTestResetClearanceManualTest (
);
EFI_STATUS
+EFIAPI
BBTestGetStateExtensiveManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.h
index 3497ba21e77f..6c13f9ee962d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.h
@@ -68,6 +68,7 @@ InitializeBBTestSimpleTextIn (
);
EFI_STATUS
+EFIAPI
BBTestSimpleTextInProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -77,6 +78,7 @@ BBTestSimpleTextInProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -86,6 +88,7 @@ BBTestReadKeyStrokeConformanceManualTest (
EFI_STATUS
+EFIAPI
BBTestWaitForKeyConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -97,6 +100,7 @@ BBTestWaitForKeyConformanceManualTest (
// Interface function
//
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -105,6 +109,7 @@ BBTestReadKeyStrokeFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -113,6 +118,7 @@ BBTestResetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -121,6 +127,7 @@ BBTestResetFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestWaitForKeyFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +140,7 @@ BBTestWaitForKeyFunctionManualTest (
//
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.h
index b1d6698f4ad9..ea89321ca98f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.h
@@ -106,6 +106,7 @@ UnloadSimpleTextInputExBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -115,6 +116,7 @@ BBTestResetFunctionAutoTest (
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -124,6 +126,7 @@ BBTestResetFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +136,7 @@ BBTestReadKeyStrokeExFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestSetStateFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +146,7 @@ BBTestSetStateFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -151,6 +156,7 @@ BBTestRegisterKeyNotifyFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -160,6 +166,7 @@ BBTestUnregisterKeyNotifyFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -169,6 +176,7 @@ BBTestReadKeyStrokeExFunctionAutoTest (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -178,6 +186,7 @@ BBTestReadKeyStrokeExConformanceTest (
EFI_STATUS
+EFIAPI
BBTestSetStateConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -187,6 +196,7 @@ BBTestSetStateConformanceTest (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -196,6 +206,7 @@ BBTestRegisterKeyNotifyConformanceTest (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -208,6 +219,7 @@ BBTestUnregisterKeyNotifyConformanceTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -215,6 +227,7 @@ BBTestResetFunctionAutoTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -222,6 +235,7 @@ BBTestResetFunctionManualTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -229,6 +243,7 @@ BBTestReadKeyStrokeExFunctionManualTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestSetStateFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -236,6 +251,7 @@ BBTestSetStateFunctionManualTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -243,6 +259,7 @@ BBTestRegisterKeyNotifyFunctionManualTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -250,6 +267,7 @@ BBTestUnregisterKeyNotifyFunctionManualTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExFunctionAutoTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -257,6 +275,7 @@ BBTestReadKeyStrokeExFunctionAutoTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -264,6 +283,7 @@ BBTestReadKeyStrokeExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -271,6 +291,7 @@ BBTestReadKeyStrokeExConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestSetStateConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -278,6 +299,7 @@ BBTestSetStateConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestSetStateConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -285,6 +307,7 @@ BBTestSetStateConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -292,6 +315,7 @@ BBTestRegisterKeyNotifyConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -299,6 +323,7 @@ BBTestRegisterKeyNotifyConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -306,6 +331,7 @@ BBTestRegisterKeyNotifyConformanceTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -313,6 +339,7 @@ BBTestUnregisterKeyNotifyConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -320,6 +347,7 @@ BBTestUnregisterKeyNotifyConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -358,12 +386,14 @@ KeyStatePrint (
EFI_STATUS
+EFIAPI
TestRegisterNotifyFunction (
IN EFI_KEY_DATA *KeyData
);
EFI_STATUS
+EFIAPI
FunctionTestNotifyFunction (
IN EFI_KEY_DATA *KeyData
);
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.h
index d515ea4d8f7c..b985e0947545 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.h
@@ -53,11 +53,13 @@ InitializeBBTestSimpleTextOutput (
);
EFI_STATUS
+EFIAPI
BBTestSimpleTextOutputProtocolUnload (
IN EFI_HANDLE ImageHandle
);
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -66,6 +68,7 @@ BBTestResetFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -74,6 +77,7 @@ BBTestResetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestOutputStringFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -82,6 +86,7 @@ BBTestOutputStringFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestOutputStringFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -90,6 +95,7 @@ BBTestOutputStringFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestTestStringFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -98,6 +104,7 @@ BBTestTestStringFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestQueryModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -106,6 +113,7 @@ BBTestQueryModeFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetModeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -114,6 +122,7 @@ BBTestSetModeFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestSetModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -122,6 +131,7 @@ BBTestSetModeFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetAttributeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -130,6 +140,7 @@ BBTestSetAttributeFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestSetAttributeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -138,6 +149,7 @@ BBTestSetAttributeFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestClearScreenFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -146,6 +158,7 @@ BBTestClearScreenFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestClearScreenFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -154,6 +167,7 @@ BBTestClearScreenFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -162,6 +176,7 @@ BBTestSetCursorPositionFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -170,6 +185,7 @@ BBTestSetCursorPositionFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestEnableCursorFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -178,6 +194,7 @@ BBTestEnableCursorFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestEnableCursorFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -189,6 +206,7 @@ BBTestEnableCursorFunctionAutoTest (
// Conformance test function definition
//
EFI_STATUS
+EFIAPI
BBTestQueryModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -197,6 +215,7 @@ BBTestQueryModeConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -205,6 +224,7 @@ BBTestSetModeConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetAttributeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -213,6 +233,7 @@ BBTestSetAttributeConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.h
index 3dce653f22db..35cc3a85900e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.h
@@ -49,11 +49,13 @@ InitializeBBTestSimpleTextOutput (
);
EFI_STATUS
+EFIAPI
BBTestSimpleTextOutputProtocolUnload (
IN EFI_HANDLE ImageHandle
);
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -62,6 +64,7 @@ BBTestResetFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -70,6 +73,7 @@ BBTestResetFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestOutputStringFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -78,6 +82,7 @@ BBTestOutputStringFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestOutputStringFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -86,6 +91,7 @@ BBTestOutputStringFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestTestStringFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +100,7 @@ BBTestTestStringFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestQueryModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -102,6 +109,7 @@ BBTestQueryModeFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetModeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -110,6 +118,7 @@ BBTestSetModeFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestSetModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +127,7 @@ BBTestSetModeFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetAttributeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -126,6 +136,7 @@ BBTestSetAttributeFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestSetAttributeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -134,6 +145,7 @@ BBTestSetAttributeFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestClearScreenFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +154,7 @@ BBTestClearScreenFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestClearScreenFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -150,6 +163,7 @@ BBTestClearScreenFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -158,6 +172,7 @@ BBTestSetCursorPositionFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -166,6 +181,7 @@ BBTestSetCursorPositionFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestEnableCursorFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -174,6 +190,7 @@ BBTestEnableCursorFunctionManualTest (
);
EFI_STATUS
+EFIAPI
BBTestEnableCursorFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -185,6 +202,7 @@ BBTestEnableCursorFunctionAutoTest (
// Conformance test function definition
//
EFI_STATUS
+EFIAPI
BBTestQueryModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -193,6 +211,7 @@ BBTestQueryModeConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -201,6 +220,7 @@ BBTestSetModeConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetAttributeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -209,6 +229,7 @@ BBTestSetAttributeConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestMain.h
index 03469fc27faa..b4524427a206 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestMain.h
@@ -95,6 +95,7 @@ BBTestStorageSecurityCommandProtocolUnload (
//
EFI_STATUS
+EFIAPI
BBTestReceiveDataConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -103,6 +104,7 @@ BBTestReceiveDataConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestSendDataConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.h
index 1c35408039f5..b66f921c6916 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.h
@@ -34,6 +34,7 @@ Abstract:
// Function prototypes
//
EFI_STATUS
+EFIAPI
BBTestTapeFunctionRead (
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
@@ -42,6 +43,7 @@ BBTestTapeFunctionRead (
);
EFI_STATUS
+EFIAPI
BBTestTapeFunctionWrite (
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
@@ -50,6 +52,7 @@ BBTestTapeFunctionWrite (
);
EFI_STATUS
+EFIAPI
BBTestTapeFunctionRewind (
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
@@ -58,6 +61,7 @@ BBTestTapeFunctionRewind (
);
EFI_STATUS
+EFIAPI
BBTestTapeFunctionSpace (
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
@@ -66,6 +70,7 @@ BBTestTapeFunctionSpace (
);
EFI_STATUS
+EFIAPI
BBTestTapeFunctionWriteFM (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -74,6 +79,7 @@ BBTestTapeFunctionWriteFM (
);
EFI_STATUS
+EFIAPI
BBTestTapeFunctionReset (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestMain.h
index b9180591c76c..d90dfc0abb36 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestMain.h
@@ -75,6 +75,7 @@ UnloadTimeStampBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestGetTimestampFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -83,6 +84,7 @@ BBTestGetTimestampFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestGetPropertiesFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -92,6 +94,7 @@ BBTestGetPropertiesFunctionAutoTest (
EFI_STATUS
+EFIAPI
BBTestGetPropertiesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.h
index 5a7fbc5a75bf..406d1baf1b4f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.h
@@ -59,6 +59,7 @@ InitializeUFSDeviceConfigBBTest (
);
EFI_STATUS
+EFIAPI
UnloadUFSDeviceConfigBBTest (
IN EFI_HANDLE ImageHandle
);
@@ -67,6 +68,7 @@ UnloadUFSDeviceConfigBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestRwUfsDescriptorConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -75,6 +77,7 @@ BBTestRwUfsDescriptorConfTest (
);
EFI_STATUS
+EFIAPI
BBTestRwUfsFlagConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -83,6 +86,7 @@ BBTestRwUfsFlagConfTest (
);
EFI_STATUS
+EFIAPI
BBTestRwUfsAttributeConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.h
index 94addf4f020f..836ee6a19acb 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.h
@@ -80,12 +80,14 @@ InitializeBBTestUgaDraw (
);
EFI_STATUS
+EFIAPI
BBTestUgaDrawProtocolUnload (
IN EFI_HANDLE ImageHandle
);
EFI_STATUS
+EFIAPI
BBTestGetModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +96,7 @@ BBTestGetModeFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoFillFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -102,6 +105,7 @@ BBTestEfiUgaVideoFillFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoBltBufferFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -110,6 +114,7 @@ BBTestEfiUgaVideoBltBufferFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoToVideoFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -121,6 +126,7 @@ BBTestEfiUgaVideoToVideoFunctionAutoTest (
// Conformance function
//
EFI_STATUS
+EFIAPI
BBTestGetModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -129,6 +135,7 @@ BBTestGetModeConformanceAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestBltConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +149,7 @@ BBTestBltConformanceAutoTest (
//
EFI_STATUS
+EFIAPI
BBTestVideoFillBufferToVideoManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -150,6 +158,7 @@ BBTestVideoFillBufferToVideoManualTest (
);
EFI_STATUS
+EFIAPI
BBTestVideoFillVideoToVideoManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -158,6 +167,7 @@ BBTestVideoFillVideoToVideoManualTest (
);
EFI_STATUS
+EFIAPI
BBTestVideoToBltBufferAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -166,6 +176,7 @@ BBTestVideoToBltBufferAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoFillStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -174,6 +185,7 @@ BBTestEfiUgaVideoFillStressAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoBltBufferStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -182,6 +194,7 @@ BBTestEfiUgaVideoBltBufferStressAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoToVideoStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.h
index ca6306782b09..e4f07573d30e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.h
@@ -75,11 +75,13 @@ InitializeBBTestUnicodeCollation (
);
EFI_STATUS
+EFIAPI
BBTestUnicodeCollationProtocolUnload (
IN EFI_HANDLE ImageHandle
);
EFI_STATUS
+EFIAPI
BBTestStriCollFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -88,6 +90,7 @@ BBTestStriCollFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestMetaiMatchFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -96,6 +99,7 @@ BBTestMetaiMatchFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestStrLwrFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -104,6 +108,7 @@ BBTestStrLwrFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestStrUprFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -112,6 +117,7 @@ BBTestStrUprFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestFatToStrFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -120,6 +126,7 @@ BBTestFatToStrFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestStrToFatFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +135,7 @@ BBTestStrToFatFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestMain.h
index 3452b98d3c24..2a8b9b8d9231 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestMain.h
@@ -82,6 +82,7 @@ BBTestUnicodeCollationProtocolUnload (
);
EFI_STATUS
+EFIAPI
BBTestStriCollFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -90,6 +91,7 @@ BBTestStriCollFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestMetaiMatchFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -98,6 +100,7 @@ BBTestMetaiMatchFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestStrLwrFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -106,6 +109,7 @@ BBTestStrLwrFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestStrUprFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -114,6 +118,7 @@ BBTestStrUprFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestFatToStrFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -122,6 +127,7 @@ BBTestFatToStrFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestStrToFatFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -130,6 +136,7 @@ BBTestStrToFatFunctionAutoTest (
);
EFI_STATUS
+EFIAPI
BBTestStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest.h
index 11ea9bc8419b..114ccd07bb95 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest.h
@@ -230,6 +230,7 @@ Abstract:
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -261,6 +262,7 @@ Returns:
// TDS 4.2.1
//
EFI_STATUS
+EFIAPI
Usb2HcResetBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -292,6 +294,7 @@ Returns:
// TDS 4.3.1
//
EFI_STATUS
+EFIAPI
Usb2HcGetStateBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -323,6 +326,7 @@ Returns:
// TDS 4.4.1
//
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -354,6 +358,7 @@ Returns:
// TDS 4.5.1
//
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -385,6 +390,7 @@ Returns:
// TDS 4.6.1
//
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -416,6 +422,7 @@ Returns:
// TDS 4.7.1
//
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -447,6 +454,7 @@ Returns:
// TDS 4.8.1
//
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -478,6 +486,7 @@ Returns:
// TDS 4.9.1
//
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -509,6 +518,7 @@ Returns:
// TDS 5.1.1
//
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -540,6 +550,7 @@ Returns:
// TDS 5.2.1
//
EFI_STATUS
+EFIAPI
Usb2HcResetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -571,6 +582,7 @@ Returns:
// TDS 5.3.1
//
EFI_STATUS
+EFIAPI
Usb2HcGetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -602,6 +614,7 @@ Returns:
// TDS 5.4.1
//
EFI_STATUS
+EFIAPI
Usb2HcSetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -633,6 +646,7 @@ Returns:
// TDS 5.5.1
//
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -664,6 +678,7 @@ Returns:
// TDS 5.6.1
//
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -695,6 +710,7 @@ Returns:
// TDS 5.7.1
//
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -726,6 +742,7 @@ Returns:
// TDS 5.8.1
//
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -757,6 +774,7 @@ Returns:
// TDS 5.9.1
//
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -788,6 +806,7 @@ Returns:
// TDS 5.14.1
//
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -819,6 +838,7 @@ Returns:
// TDS 5.13.1
//
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -850,6 +870,7 @@ Returns:
// TDS 5.10.1
//
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -881,6 +902,7 @@ Returns:
// TDS 5.11.1
//
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -912,6 +934,7 @@ Returns:
// TDS 5.12.1
//
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTest.h
index d2989c354b26..84a096090fef 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTest.h
@@ -93,6 +93,7 @@ Abstract:
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
UsbHcResetBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -104,6 +105,7 @@ UsbHcResetBasicAutoTest (
// TDS 4.1.2
//
EFI_STATUS
+EFIAPI
UsbHcGetStateBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -115,6 +117,7 @@ UsbHcGetStateBasicAutoTest (
// TDS 4.1.3
//
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -126,6 +129,7 @@ UsbHcSetStateBasicAutoTest (
// TDS 4.1.4
//
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortNumberBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -137,6 +141,7 @@ UsbHcGetRootHubPortNumberBasicManualTest (
// TDS 4.1.5
//
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -148,6 +153,7 @@ UsbHcGetRootHubPortStatusBasicAutoTest (
// TDS 4.1.6
//
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -159,6 +165,7 @@ UsbHcGetRootHubPortStatusBasicManualTest (
// TDS 4.1.7
//
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -170,6 +177,7 @@ UsbHcSetRootHubPortFeatureBasicAutoTest (
// TDS 4.1.8
//
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -181,6 +189,7 @@ UsbHcClearRootHubPortFeatureBasicAutoTest (
// TDS 4.1.9
//
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -192,6 +201,7 @@ UsbHcClearRootHubPortFeatureBasicManualTest (
// TDS 4.2.1
//
EFI_STATUS
+EFIAPI
UsbHcResetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -203,6 +213,7 @@ UsbHcResetConformanceAutoTest (
// TDS 4.2.2
//
EFI_STATUS
+EFIAPI
UsbHcGetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -214,6 +225,7 @@ UsbHcGetStateConformanceAutoTest (
// TDS 4.2.3
//
EFI_STATUS
+EFIAPI
UsbHcSetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -225,6 +237,7 @@ UsbHcSetStateConformanceAutoTest (
// TDS 4.2.4
//
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -236,6 +249,7 @@ UsbHcControlTransferConformanceAutoTest (
// TDS 4.2.5
//
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -247,6 +261,7 @@ UsbHcBulkTransferConformanceAutoTest (
// TDS 4.2.6
//
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -258,6 +273,7 @@ UsbHcAsyncInterruptTransferConformanceAutoTest (
// TDS 4.2.7
//
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -269,6 +285,7 @@ UsbHcSyncInterruptTransferConformanceAutoTest (
// TDS 4.x
//
EFI_STATUS
+EFIAPI
UsbHcAsyncIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -280,6 +297,7 @@ UsbHcAsyncIsochronousTransferConformanceAutoTest (
// TDS 4.x
//
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -291,6 +309,7 @@ UsbHcIsochronousTransferConformanceAutoTest (
// TDS 4.2.8
//
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortNumberConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -302,6 +321,7 @@ UsbHcGetRootHubPortNumberConformanceAutoTest (
// TDS 4.2.9
//
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -313,6 +333,7 @@ UsbHcGetRootHubPortStatusConformanceAutoTest (
// TDS 4.2.10
//
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -324,6 +345,7 @@ UsbHcSetRootHubPortFeatureConformanceAutoTest (
// TDS 4.2.11
//
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -339,6 +361,7 @@ InitializeBBTestUsbHc (
);
EFI_STATUS
+EFIAPI
BBTestUsbHcUnload (
IN EFI_HANDLE ImageHandle
);
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTest.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTest.h
index 30cb3379a7ae..f0fff383c826 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTest.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTest.h
@@ -192,6 +192,7 @@ typedef struct {
// TDS 5.1
//
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -223,6 +224,7 @@ Returns:
// TDS 5.2
//
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -254,6 +256,7 @@ Returns:
// TDS 5.3
//
EFI_STATUS
+EFIAPI
UsbAsyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -285,6 +288,7 @@ Returns:
// TDS 5.4
//
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -316,6 +320,7 @@ Returns:
// TDS 5.x
//
EFI_STATUS
+EFIAPI
UsbAsyncIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -347,6 +352,7 @@ Returns:
// TDS 5.x
//
EFI_STATUS
+EFIAPI
UsbIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -378,6 +384,7 @@ Returns:
// TDS 5.5
//
EFI_STATUS
+EFIAPI
UsbGetDeviceDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -409,6 +416,7 @@ Returns:
// TDS 5.6
//
EFI_STATUS
+EFIAPI
UsbGetConfigDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -440,6 +448,7 @@ Returns:
// TDS 5.7
//
EFI_STATUS
+EFIAPI
UsbGetInterfaceDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -471,6 +480,7 @@ Returns:
// TDS 5.8
//
EFI_STATUS
+EFIAPI
UsbGetEndpointDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -502,6 +512,7 @@ Returns:
// TDS 5.9
//
EFI_STATUS
+EFIAPI
UsbPortResetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -533,6 +544,7 @@ Returns:
// TDS 5.10
//
EFI_STATUS
+EFIAPI
UsbGetStringDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestMain.h
index 1090c2221869..ed4afbc14a98 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestMain.h
@@ -101,6 +101,7 @@ UnloadVlanConfigBBTest (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestSetConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -109,6 +110,7 @@ BBTestSetConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestFindConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +119,7 @@ BBTestFindConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestRemoveConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -126,6 +129,7 @@ BBTestRemoveConformanceTest (
EFI_STATUS
+EFIAPI
BBTestSetFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -134,6 +138,7 @@ BBTestSetFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestFindFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +147,7 @@ BBTestFindFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestRemoveFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestMain.h
index de2d2f3baaed..649ca3902d33 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestMain.h
@@ -39,6 +39,7 @@ Revision History
#define ISCSI_INITIATORNAME_MAXIMUM_SIZE 224
EFI_STATUS
+EFIAPI
BBTestGetFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -47,6 +48,7 @@ BBTestGetFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestSetFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -55,6 +57,7 @@ BBTestSetFunctionTest (
);
EFI_STATUS
+EFIAPI
BBTestGetConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -63,6 +66,7 @@ BBTestGetConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestSetConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestMain.h
index 52e9fa8f9a34..03cfc4b762d7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestMain.h
@@ -67,6 +67,7 @@ extern EFI_GUID mEfiCapsuleHeaderGuid;
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestResetSystemInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -78,6 +79,7 @@ BBTestResetSystemInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestResetSystemManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +96,7 @@ BBTestResetSystemManualTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestResetSystemStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -105,6 +108,7 @@ BBTestResetSystemStressTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestResetSystemManualStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -113,6 +117,7 @@ BBTestResetSystemManualStressTest (
);
EFI_STATUS
+EFIAPI
BBTestQueryCapsuleCapabilitiesTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -121,6 +126,7 @@ BBTestQueryCapsuleCapabilitiesTest (
);
EFI_STATUS
+EFIAPI
BBTestUpdateCapsuleConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -129,6 +135,7 @@ BBTestUpdateCapsuleConformanceTest (
);
EFI_STATUS
+EFIAPI
BBTestQueryCapsuleCapabilitiesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestMain.h
index ea2c56caab2b..3e41d94b4b7e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestMain.h
@@ -52,6 +52,7 @@ extern EFI_TPL TplArray[TPL_ARRAY_SIZE];
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestGetTimeConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -63,6 +64,7 @@ BBTestGetTimeConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestSetTimeConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -74,6 +76,7 @@ BBTestSetTimeConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestGetWakeupTimeConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -85,6 +88,7 @@ BBTestGetWakeupTimeConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestSetWakeupTimeConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +104,7 @@ BBTestSetWakeupTimeConsistencyTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestGetTimeInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -111,6 +116,7 @@ BBTestGetTimeInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestSetTimeInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -122,6 +128,7 @@ BBTestSetTimeInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestGetWakeupTimeInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +140,7 @@ BBTestGetWakeupTimeInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestSetWakeupTimeInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -148,6 +156,7 @@ BBTestSetWakeupTimeInterfaceTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestGetTimeStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -159,6 +168,7 @@ BBTestGetTimeStressTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestGetWakeupTimeStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h
index 7eaa56daf7ba..80e31f193664 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.h
@@ -150,6 +150,7 @@ extern EFI_GUID gTestVendor2Guid;
// TDS 3.1
//
EFI_STATUS
+EFIAPI
GetVariableConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -161,6 +162,7 @@ GetVariableConfTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -172,6 +174,7 @@ GetNextVariableNameConfTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
SetVariableConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -184,6 +187,7 @@ SetVariableConfTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
QueryVariableInfoConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -192,6 +196,7 @@ QueryVariableInfoConfTest (
);
EFI_STATUS
+EFIAPI
AuthVariableDERConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -200,6 +205,7 @@ AuthVariableDERConfTest (
);
EFI_STATUS
+EFIAPI
AuthVariableDERFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -213,6 +219,7 @@ AuthVariableDERFuncTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
GetVariableFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -224,6 +231,7 @@ GetVariableFuncTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
GetNextVariableNameFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -235,6 +243,7 @@ GetNextVariableNameFuncTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
SetVariableFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -247,6 +256,7 @@ SetVariableFuncTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
QueryVariableInfoFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -255,6 +265,7 @@ QueryVariableInfoFuncTest (
);
EFI_STATUS
+EFIAPI
HardwareErrorRecordFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -263,6 +274,7 @@ HardwareErrorRecordFuncTest (
);
EFI_STATUS
+EFIAPI
HardwareErrorRecordConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -276,6 +288,7 @@ HardwareErrorRecordConfTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
MultipleStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -287,6 +300,7 @@ MultipleStressTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
OverflowStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -298,6 +312,7 @@ OverflowStressTest (
// Support functions
//
EFI_STATUS
+EFIAPI
GetTestSupportLibrary (
IN EFI_HANDLE SupportHandle,
OUT EFI_STANDARD_TEST_LIBRARY_PROTOCOL **StandardLib,
@@ -308,6 +323,7 @@ GetTestSupportLibrary (
#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
EFI_STATUS
+EFIAPI
Myitox (
IN UINTN Num,
OUT CHAR16 *StringNum
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include/EftpImplement.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include/EftpImplement.h
index 8e09bf910f92..3eaf607b10f5 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include/EftpImplement.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include/EftpImplement.h
@@ -40,6 +40,7 @@ Abstract:
// External functions declarations
//
EFI_STATUS
+EFIAPI
EftpDispatchFileTransferComd (
ENTS_CMD_TYPE Operation
)
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.h
index a1414bfa8625..b2a16d5e3655 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.h
@@ -82,6 +82,7 @@ typedef struct _EFTP_SERVICE_BINDING_PRIVATE {
} EFTP_SERVICE_BINDING_PRIVATE;
EFI_STATUS
+EFIAPI
EftpDriverBindingSupported (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
@@ -108,6 +109,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpDriverBindingStart (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
@@ -135,6 +137,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpDriverBindingStop (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
@@ -162,6 +165,7 @@ EftpDriverBindingStop (
;
EFI_STATUS
+EFIAPI
EftpServiceBindingCreateChild (
IN EFI_SERVICE_BINDING_PROTOCOL *This,
IN OUT EFI_HANDLE *ChildHandle
@@ -187,6 +191,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpServiceBindingDestroyChild (
IN EFI_SERVICE_BINDING_PROTOCOL *This,
IN EFI_HANDLE ChildHandle
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.h
index 373b32c5b510..0263f3a418c4 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.h
@@ -352,6 +352,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpSetTimer (
IN EFTP_IO_PRIVATE *Private,
UINTN Sec,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.h
index 5169887c6d45..7cd7c391a2f5 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.h
@@ -105,6 +105,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpGetOptions (
IN EFI_EFTP_PROTOCOL *This,
IN UINT32 PacketLen,
@@ -137,6 +138,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpExtractOptions (
IN EFI_EFTP_PROTOCOL *This,
IN EFTP_OPTION *Option,
@@ -165,6 +167,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpCheckOption (
IN EFI_EFTP_OPTION *OptionList,
IN UINT32 OptionCount,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.h
index 41968d03f914..3eab4fcbed3e 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.h
@@ -74,6 +74,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpSendPacket (
EFTP_IO_PRIVATE *Private,
EFTP_PACKET_BUFFER *Buf
@@ -269,6 +270,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpStartRcv (
IN EFTP_IO_PRIVATE*Private
)
@@ -291,6 +293,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpSendError (
IN EFTP_IO_PRIVATE *Private,
IN EFTP_ERRINFO *Err,
@@ -318,6 +321,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpResendPacket (
IN EFTP_IO_PRIVATE *Private,
IN EFTP_PACKET_BUFFER *Buf,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.h
index 2f10b6123c53..6c57e851f5ee 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.h
@@ -134,6 +134,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpBuildRrq (
IN EFTP_IO_PRIVATE *Private,
IN UINT16 OpCode
@@ -198,7 +199,8 @@ Returns:
None
--*/
-
;
+
+;
VOID
EftpRrqCleanUp (
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.h
index ce7fcebbc17e..38c886cfe981 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.h
@@ -103,6 +103,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpBuildWrq (
IN EFTP_IO_PRIVATE*Private
)
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.h
index 63ec5997e5c5..cf52d537479e 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.h
@@ -69,6 +69,7 @@ typedef enum {
} LINK_LAYER_STATUS;
EFI_STATUS
+EFIAPI
IP4NetworkSaveContext(
EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -92,6 +93,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
IP4NetworkRestoreContext(
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -118,6 +120,7 @@ Returns:
// External functions declarations
//
EFI_STATUS
+EFIAPI
IP4NetworkListener (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN OUT UINTN *Size,
@@ -144,6 +147,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
IP4NetworkSender (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN CHAR16 *Buffer
@@ -170,6 +174,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
InitIP4Network (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -192,6 +197,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ResetIP4Network (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.h
index ad54399d55f8..35e48b4bd9e5 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.h
@@ -87,6 +87,7 @@ typedef enum {
#define MAX_PACKET_LENGTH 1492
EFI_STATUS
+EFIAPI
ManagedNetworkSaveContext (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -110,6 +111,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ManagedNetworkRestoreContext(
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -136,6 +138,7 @@ Returns:
// External functions declarations
//
EFI_STATUS
+EFIAPI
ManagedNetworkListener (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN OUT UINTN *Size,
@@ -162,6 +165,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ManagedNetworkSender (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN CHAR16 *Buffer
@@ -187,6 +191,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
InitManagedNetwork (
IN EFI_ENTS_MONITOR_PROTOCOL *This
) /*++
@@ -208,6 +213,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ResetManagedNetwork (
IN EFI_ENTS_MONITOR_PROTOCOL *This
) /*++
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.h
index 3bdd0aaef5d3..5a249616570d 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.h
@@ -36,6 +36,7 @@ Abstract:
// External functions declarations
//
EFI_STATUS
+EFIAPI
SerialListener (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN OUT UINTN *Size,
@@ -63,6 +64,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
SerialSender (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN CHAR16 *Buffer
@@ -89,6 +91,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
InitSerial (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -111,6 +114,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ResetSerial (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.h
index 2a9204f42eae..88f275e45c90 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.h
@@ -101,6 +101,7 @@ BOOLEAN
);
BOOLEAN
+EFIAPI
IhvInterfaceFilter (
IN VOID *ClientInterface,
IN EFI_HANDLE SupportHandle,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/UI.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/UI.h
index 798b03a76d0f..56f49c7097fb 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/UI.h
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/UI.h
@@ -489,21 +489,25 @@ DoIterEdit (
//
EFI_STATUS
+EFIAPI
UpFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
DownFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
PageUpFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
PageDownFunc (
IN EFI_MENU_PAGE *MenuPage
);
@@ -514,11 +518,13 @@ SpaceFunc (
);
EFI_STATUS
+EFIAPI
LeftArrowFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
RightArrowFunc (
IN EFI_MENU_PAGE *MenuPage
);
diff --git a/uefi-sct/SctPkg/UEFI/Protocol/Hii.h b/uefi-sct/SctPkg/UEFI/Protocol/Hii.h
index 450cda7a848c..2b0895f37a3a 100644
--- a/uefi-sct/SctPkg/UEFI/Protocol/Hii.h
+++ b/uefi-sct/SctPkg/UEFI/Protocol/Hii.h
@@ -383,7 +383,7 @@ EFI_STATUS
IN CONST EFI_HII_IMAGE_EX_PROTOCOL *This,
IN EFI_HII_HANDLE PackageList,
IN EFI_IMAGE_ID ImageId,
- OUT EFI_IMAGE_INPUT *Image
+ OUT EFI_IMAGE_OUTPUT *Image
);
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.c b/uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.c
index 82c93594ec28..73403af12fb8 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.c
@@ -72,6 +72,7 @@ SCRTRuntimeDriverInit(
}
VOID
+EFIAPI
SCRTDriverClassAddressChangeEvent (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.c
index 81dda6fb9592..18187bbe8745 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/BootService/EventTimerAndTaskPriorityService/EventTimerAndTaskPriorityENTSTestCase.c
@@ -21,16 +21,18 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "EventTimerAndTaskPriorityENTSTestCase.h"
VOID
+EFIAPI
BSNotifyFunction0 (
EFI_EVENT Event,
VOID *Context
);
VOID
+EFIAPI
BSNotifyFunction1 (
EFI_EVENT Event,
VOID *Context
@@ -80,6 +82,7 @@ ENTS_ARG_FIELD BSCreateEventArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_CreateEvent_EntsTest (
VOID *ClientInterface
)
@@ -132,6 +135,7 @@ ENTS_ARG_FIELD BSCloseEventArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_CloseEvent_EntsTest (
VOID *ClientInterface
)
@@ -178,6 +182,7 @@ ENTS_ARG_FIELD BSSignalEventArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_SignalEvent_EntsTest (
VOID *ClientInterface
)
@@ -234,6 +239,7 @@ ENTS_ARG_FIELD BSWaitForEventArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_WaitForEvent_EntsTest (
VOID *ClientInterface
)
@@ -284,6 +290,7 @@ ENTS_ARG_FIELD BSCheckEventArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_CheckEvent_EntsTest (
VOID *ClientInterface
)
@@ -340,6 +347,7 @@ ENTS_ARG_FIELD BSSetTimerArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_SetTimer_EntsTest (
VOID *ClientInterface
)
@@ -372,6 +380,7 @@ Returns:
}
VOID
+EFIAPI
BSNotifyFunction0 (
EFI_EVENT Event,
VOID *Context
@@ -397,6 +406,7 @@ Returns:
}
VOID
+EFIAPI
BSNotifyFunction1 (
EFI_EVENT Event,
VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.c
index 1045386670a8..0f346733cd9d 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/BootService/MemoryAllocationService/MemoryAllocationENTSTestCase.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MemoryAllocationENTSTestCase.h"
//
@@ -59,6 +59,7 @@ ENTS_ARG_FIELD BSAllocatePagesArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_AllocatePages_EntsTest (
VOID *ClientInterface
)
@@ -115,6 +116,7 @@ ENTS_ARG_FIELD BSFreePagesArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_FreePages_EntsTest (
VOID *ClientInterface
)
@@ -174,6 +176,7 @@ ENTS_ARG_FIELD BSAllocatePoolArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_AllocatePool_EntsTest (
VOID *ClientInterface
)
@@ -224,6 +227,7 @@ ENTS_ARG_FIELD BSFreePoolArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_FreePool_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.c
index f12161c60bdb..947248bf0bcf 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/BootService/MiscellaneousBootService/MiscellaneousBootENTSTestCase.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MiscellaneousBootENTSTestCase.h"
//
@@ -59,6 +59,7 @@ ENTS_ARG_FIELD BSSetWatchdogTimerArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_SetWatchdogTimer_EntsTest (
VOID *ClientInterface
)
@@ -110,6 +111,7 @@ ENTS_ARG_FIELD BSStallArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_Stall_EntsTest (
VOID *ClientInterface
)
@@ -161,6 +163,7 @@ ENTS_ARG_FIELD BSCopyMemArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_CopyMem_EntsTest (
VOID *ClientInterface
)
@@ -216,6 +219,7 @@ ENTS_ARG_FIELD BSSetMemArgField[] = {
};
EFI_STATUS
+EFIAPI
BS_SetMem_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.c
index 08a13cce2c6e..5879eb3d5329 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTestCase.c
@@ -21,7 +21,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "GenericServiceENTSTestCase.h"
//
@@ -53,6 +53,7 @@ ENTS_ARG_FIELD gGSMemCmpArgField[] = {
};
EFI_STATUS
+EFIAPI
GS_MemCmp_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.c
index 93bd85c77dce..3cb34336cd7d 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.c
@@ -71,6 +71,7 @@ ENTS_INTERFACE gArpEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gArpEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
ArpENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -153,6 +154,7 @@ Error:
}
EFI_STATUS
+EFIAPI
ArpENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.c
index 075490a4f711..1711cda490e1 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gArpConfigArgField[] = {
};
EFI_STATUS
+EFIAPI
ArpConfig_EntsTest (
VOID *ClientInterface
)
@@ -112,6 +113,7 @@ ENTS_ARG_FIELD gArpAddArgField[] = {
};
EFI_STATUS
+EFIAPI
ArpAdd_EntsTest (
VOID *ClientInterface
)
@@ -190,6 +192,7 @@ ENTS_ARG_FIELD gArpFindArgField[] = {
};
EFI_STATUS
+EFIAPI
ArpFind_EntsTest (
VOID *ClientInterface
)
@@ -249,6 +252,7 @@ ENTS_ARG_FIELD gArpDeleteArgField[] = {
};
EFI_STATUS
+EFIAPI
ArpDelete_EntsTest (
VOID *ClientInterface
)
@@ -294,6 +298,7 @@ ENTS_ARG_FIELD gArpFlushArgField[] = {
};
EFI_STATUS
+EFIAPI
ArpFlush_EntsTest (
VOID *ClientInterface
)
@@ -350,6 +355,7 @@ ENTS_ARG_FIELD gArpRequestArgField[] = {
};
EFI_STATUS
+EFIAPI
ArpRequest_EntsTest (
VOID *ClientInterface
)
@@ -406,6 +412,7 @@ ENTS_ARG_FIELD gArpCancelArgField[] = {
};
EFI_STATUS
+EFIAPI
ArpCancel_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.c
index dbfdb37d5a05..c136c039a0fb 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gArpServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
ArpServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gArpServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
ArpServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.c
index b817775d8dd0..d29dae20a24f 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.c
@@ -81,6 +81,7 @@ ENTS_INTERFACE gDhcp4EntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gDhcp4EntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Dhcp4ENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -163,6 +164,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Dhcp4ENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.c
index 38f951b84b3e..c947cea39a91 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gDhcp4GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -76,7 +77,6 @@ Returns:
//
// Define Call Back Function
//
-static
EFI_STATUS
Dhcp4CallBackFunc_Abort (
IN EFI_DHCP4_PROTOCOL * This,
@@ -104,7 +104,6 @@ static EFI_DHCP4_CALLBACK Dhcp4CallBackFuncList[] = {
Dhcp4CallBackFunc_DoNothing
};
-static
EFI_STATUS
Dhcp4CallBackFunc_Abort (
IN EFI_DHCP4_PROTOCOL * This,
@@ -126,7 +125,6 @@ Dhcp4CallBackFunc_Abort (
return EFI_ABORTED;
}
-static
EFI_STATUS
Dhcp4CallBackFunc_DoNothing (
IN EFI_DHCP4_PROTOCOL * This,
@@ -159,6 +157,7 @@ ENTS_ARG_FIELD gDhcp4ConfigArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4Config_EntsTest (
VOID *ClientInterface
)
@@ -215,6 +214,7 @@ ENTS_ARG_FIELD gDhcp4StartArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4Start_EntsTest (
VOID *ClientInterface
)
@@ -269,6 +269,7 @@ ENTS_ARG_FIELD gDhcp4RenewRebindArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4RenewRebind_EntsTest (
VOID *ClientInterface
)
@@ -313,6 +314,7 @@ ENTS_ARG_FIELD gDhcp4ReleaseArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4Release_EntsTest (
VOID *ClientInterface
)
@@ -354,6 +356,7 @@ ENTS_ARG_FIELD gDhcp4StopArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4Stop_EntsTest (
VOID *ClientInterface
)
@@ -426,6 +429,7 @@ ENTS_ARG_FIELD gDhcp4BuildArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4Build_EntsTest (
VOID *ClientInterface
)
@@ -479,6 +483,7 @@ ENTS_ARG_FIELD gDhcp4TransmitReceiveArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4TransmitReceive_EntsTest (
VOID *ClientInterface
)
@@ -539,6 +544,7 @@ ENTS_ARG_FIELD gDhcp4ParseArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4Parse_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.c
index 44fa33df7b02..ae3550d9db48 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gDhcp4CreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4CreateChild_EntsTest (
VOID *ClientInterface
)
@@ -143,6 +144,7 @@ ENTS_ARG_FIELD gDhcp4DestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp4DestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.c
index e5afe3fd4f2f..322c335ce18c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.c
@@ -83,6 +83,7 @@ ENTS_INTERFACE gDhcp6EntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gDhcp6EntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Dhcp6ENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -165,6 +166,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Dhcp6ENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.c
index 7d2c17498e17..56ff2c078422 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTestCase.c
@@ -65,6 +65,7 @@ ENTS_ARG_FIELD gDhcp6GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -311,6 +312,7 @@ ENTS_ARG_FIELD gDhcp6ConfigArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6Config_EntsTest (
VOID *ClientInterface
)
@@ -362,6 +364,7 @@ ENTS_ARG_FIELD gDhcp6StartArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6Start_EntsTest (
VOID *ClientInterface
)
@@ -502,6 +505,7 @@ ENTS_ARG_FIELD gDhcp6InfoRequestArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6InfoRequest_EntsTest (
VOID *ClientInterface
)
@@ -564,6 +568,7 @@ ENTS_ARG_FIELD gDhcp6RenewRebindArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6RenewRebind_EntsTest (
VOID *ClientInterface
)
@@ -618,6 +623,7 @@ ENTS_ARG_FIELD gDhcp6DeclineArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6Decline_EntsTest (
VOID *ClientInterface
)
@@ -672,6 +678,7 @@ ENTS_ARG_FIELD gDhcp6ReleaseArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6Release_EntsTest (
VOID *ClientInterface
)
@@ -716,6 +723,7 @@ ENTS_ARG_FIELD gDhcp6StopArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6Stop_EntsTest (
VOID *ClientInterface
)
@@ -773,6 +781,7 @@ ENTS_ARG_FIELD gDhcp6ParseArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6Parse_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.c
index 64feb5cb0ead..947df3583982 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.c
@@ -47,6 +47,7 @@ ENTS_INTERFACE gDhcp6ServiceBindingEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gDhcp6ServiceBindingEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Dhcp6SBENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -138,6 +139,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Dhcp6SBENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.c
index e28f7494d12a..4d37bd67505c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gDhcp6CreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6CreateChild_EntsTest (
VOID *ClientInterface
)
@@ -143,6 +144,7 @@ ENTS_ARG_FIELD gDhcp6DestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Dhcp6DestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c
index f380df707fff..9e120d54c0ce 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c
@@ -65,6 +65,7 @@ ENTS_INTERFACE gHttpEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gHttpEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
HttpENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -148,6 +149,7 @@ Error:
}
EFI_STATUS
+EFIAPI
HttpENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.c
index e7bb10cab133..31c3455a3dd9 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gHttpGetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
HttpGetModeData_EntsTest (
VOID *ClientInterface
)
@@ -93,6 +94,7 @@ ENTS_ARG_FIELD gHttpConfigureArgField[] = {
};
EFI_STATUS
+EFIAPI
HttpConfigure_EntsTest (
VOID *ClientInterface
)
@@ -143,6 +145,7 @@ ENTS_ARG_FIELD gHttpRequestArgField[] = {
};
EFI_STATUS
+EFIAPI
HttpRequest_EntsTest (
VOID *ClientInterface
)
@@ -193,6 +196,7 @@ ENTS_ARG_FIELD gHttpResponseArgField[] = {
};
EFI_STATUS
+EFIAPI
HttpResponse_EntsTest (
VOID *ClientInterface
)
@@ -243,6 +247,7 @@ ENTS_ARG_FIELD gHttpCancelArgField[] = {
};
EFI_STATUS
+EFIAPI
HttpCancel_EntsTest (
VOID *ClientInterface
)
@@ -288,6 +293,7 @@ ENTS_ARG_FIELD gHttpPollArgField[] = {
};
EFI_STATUS
+EFIAPI
HttpPoll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.c
index e3011724ad3d..2e2c71848c59 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gHttpServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
HttpServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -97,7 +98,7 @@ Returns:
Status = tBS->HandleProtocol (
HandleBuffer[HandleIndex],
&gEfiEntsProtocolGuid,
- &Interface
+ (VOID **) &Interface
);
if (EFI_ERROR (Status)) {
goto Done;
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gHttpServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
HttpServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
@@ -197,7 +199,7 @@ Returns:
Status = tBS->HandleProtocol (
HandleBuffer[HandleIndex],
&gEfiEntsProtocolGuid,
- &Interface
+ (VOID **) &Interface
);
if (EFI_ERROR (Status)) {
goto Done;
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.c
index 4853c2a641ba..5962dcaeacbf 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.c
@@ -76,6 +76,7 @@ ENTS_INTERFACE gIp4EntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gIp4EntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Ip4ENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -158,6 +159,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Ip4ENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.c
index eb036428d560..8caf24cba5df 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTestCase.c
@@ -53,6 +53,7 @@ ENTS_ARG_FIELD gIp4GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -104,6 +105,7 @@ ENTS_ARG_FIELD gIp4ConfigureArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Configure_EntsTest (
VOID *ClientInterface
)
@@ -158,6 +160,7 @@ ENTS_ARG_FIELD gIp4GroupsArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Groups_EntsTest (
VOID *ClientInterface
)
@@ -223,6 +226,7 @@ ENTS_ARG_FIELD gIp4RoutesArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Routes_EntsTest (
VOID *ClientInterface
)
@@ -275,6 +279,7 @@ ENTS_ARG_FIELD gIp4TransmitArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Transmit_EntsTest (
VOID *ClientInterface
)
@@ -324,6 +329,7 @@ ENTS_ARG_FIELD gIp4ReceiveArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Receive_EntsTest (
VOID *ClientInterface
)
@@ -373,6 +379,7 @@ ENTS_ARG_FIELD gIp4CancelArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Cancel_EntsTest (
VOID *ClientInterface
)
@@ -417,6 +424,7 @@ ENTS_ARG_FIELD gIp4PollArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.c
index 9cec46c8b691..8f1cf7c9def9 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTestCase.c
@@ -48,6 +48,7 @@ ENTS_ARG_FIELD gIp4ConfigStartArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4ConfigStart_EntsTest (
VOID *ClientInterface
)
@@ -93,6 +94,7 @@ ENTS_ARG_FIELD gIp4ConfigStopArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4ConfigStop_EntsTest (
VOID *ClientInterface
)
@@ -144,6 +146,7 @@ ENTS_ARG_FIELD gIp4ConfigGetDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4ConfigGetData_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.c
index d4c3ad07340a..3c5b2e84bed2 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.c
@@ -57,6 +57,7 @@ ENTS_INTERFACE gIp4Config2EntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gIp4Config2EntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Ip4Config2ENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -139,6 +140,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Ip4Config2ENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.c
index b4e3a73ad231..79a5e4c2dd1a 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTestCase.c
@@ -53,6 +53,7 @@ ENTS_ARG_FIELD gIp4Config2SetDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Config2SetData_EntsTest (
VOID *ClientInterface
)
@@ -114,6 +115,7 @@ ENTS_ARG_FIELD gIp4Config2GetDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Config2GetData_EntsTest (
VOID *ClientInterface
)
@@ -170,6 +172,7 @@ ENTS_ARG_FIELD gIp4Config2RegisterDataNotifyArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4Config2RegisterDataNotify_EntsTest (
VOID *ClientInterface
)
@@ -226,6 +229,7 @@ ENTS_ARG_FIELD gIp4Config2UnregisterDataNotifyArgField[] = {
EFI_STATUS
+EFIAPI
Ip4Config2UnregisterDataNotify_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.c
index 5ddc0704d90c..86d837e3225f 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gIp4ServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gIp4ServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip4ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.c
index 3f5d9a1c6710..6074e0524eb5 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTestCase.c
@@ -53,6 +53,7 @@ ENTS_ARG_FIELD gIp6GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -104,6 +105,7 @@ ENTS_ARG_FIELD gIp6ConfigureArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6Configure_EntsTest (
VOID *ClientInterface
)
@@ -158,6 +160,7 @@ ENTS_ARG_FIELD gIp6GroupsArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6Groups_EntsTest (
VOID *ClientInterface
)
@@ -223,6 +226,7 @@ ENTS_ARG_FIELD gIp6RoutesArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6Routes_EntsTest (
VOID *ClientInterface
)
@@ -295,6 +299,7 @@ ENTS_ARG_FIELD gIp6NeighborsArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6Neighbors_EntsTest (
VOID *ClientInterface
)
@@ -333,6 +338,7 @@ ENTS_ARG_FIELD gIp6TransmitArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6Transmit_EntsTest (
VOID *ClientInterface
)
@@ -382,6 +388,7 @@ ENTS_ARG_FIELD gIp6ReceiveArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6Receive_EntsTest (
VOID *ClientInterface
)
@@ -431,6 +438,7 @@ ENTS_ARG_FIELD gIp6CancelArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6Cancel_EntsTest (
VOID *ClientInterface
)
@@ -475,6 +483,7 @@ ENTS_ARG_FIELD gIp6PollArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.c
index 388a80e718b8..cf80fb7c6b33 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTestCase.c
@@ -52,6 +52,7 @@ ENTS_ARG_FIELD gIp6ConfigSetDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6ConfigSetData_EntsTest (
VOID *ClientInterface
)
@@ -98,6 +99,7 @@ ENTS_ARG_FIELD gIp6ConfigGetDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6ConfigGetData_EntsTest (
VOID *ClientInterface
)
@@ -139,6 +141,7 @@ ENTS_ARG_FIELD gIp6ConfigRegisterDataNotifyArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6ConfigRegisterDataNotify_EntsTest (
VOID *ClientInterface
)
@@ -180,6 +183,7 @@ ENTS_ARG_FIELD gIp6ConfigUnregisterDataNotifyArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6ConfigUnregisterDataNotify_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.c
index b847fb056164..d54b134864b9 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.c
@@ -48,6 +48,7 @@ ENTS_INTERFACE gIp6ServiceBindingEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gIp6ServiceBindingEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Ip6ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -139,6 +140,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Ip6ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.c
index ae13e6e0b23a..e5d8126dba81 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gIp6ServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gIp6ServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Ip6ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.c
index 2a248d94ccca..e0860db11d02 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.c
@@ -91,6 +91,7 @@ ENTS_INTERFACE gMnpEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gMnpEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
MnpENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -173,6 +174,7 @@ Error:
}
EFI_STATUS
+EFIAPI
MnpENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.c
index 116265146331..add0a17007a9 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTestCase.c
@@ -39,12 +39,14 @@ RegenerateToken (
);
VOID
+EFIAPI
MnpCallBackFunction0 (
EFI_EVENT Event,
VOID *Context
);
VOID
+EFIAPI
MnpCallBackFunction1 (
EFI_EVENT Event,
VOID *Context
@@ -74,6 +76,7 @@ ENTS_ARG_FIELD gMnpConfigArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpConfig_EntsTest (
VOID *ClientInterface
)
@@ -128,6 +131,7 @@ ENTS_ARG_FIELD gMnpGetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpGetModeData_EntsTest (
VOID *ClientInterface
)
@@ -188,6 +192,7 @@ ENTS_ARG_FIELD gMnpMCastIpToMacArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpMCastIpToMac_EntsTest (
VOID *ClientInterface
)
@@ -244,6 +249,7 @@ ENTS_ARG_FIELD gMnpGroupArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpGroup_EntsTest (
VOID *ClientInterface
)
@@ -293,6 +299,7 @@ ENTS_ARG_FIELD gMnpTransmitArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpTransmit_EntsTest (
VOID *ClientInterface
)
@@ -353,6 +360,7 @@ ENTS_ARG_FIELD gMnpTransmitMultiPacketArgField[] =
};
EFI_STATUS
+EFIAPI
MnpTransmitMultiPacket_EntsTest (
VOID *ClientInterface
)
@@ -466,6 +474,7 @@ RegenerateToken (
}
VOID
+EFIAPI
MnpCallBackFunction0 (
EFI_EVENT Event,
VOID *Context
@@ -476,6 +485,7 @@ MnpCallBackFunction0 (
}
VOID
+EFIAPI
MnpCallBackFunction1 (
EFI_EVENT Event,
VOID *Context
@@ -514,6 +524,7 @@ ENTS_ARG_FIELD gMnpReceiveArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpReceive_EntsTest (
VOID *ClientInterface
)
@@ -572,6 +583,7 @@ ENTS_ARG_FIELD gMnpReceiveMultiArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpReceiveMultiPacket_EntsTest (
VOID *ClientInterface
)
@@ -676,6 +688,7 @@ ENTS_ARG_FIELD gMnpPollArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpPoll_EntsTest (
VOID *ClientInterface
)
@@ -721,6 +734,7 @@ ENTS_ARG_FIELD gMnpPollPattern1ArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpPollPattern1_EntsTest (
VOID *ClientInterface
)
@@ -798,6 +812,7 @@ ENTS_ARG_FIELD gMnpCancelArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpCancel_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.c
index 3e842786e2fb..a72772abd975 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.c
@@ -46,6 +46,7 @@ ENTS_INTERFACE gMnpServiceBindingEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gMnpServiceBindingEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
MnpSBENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -137,6 +138,7 @@ Error:
}
EFI_STATUS
+EFIAPI
MnpSBENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.c
index fa4f72179b8f..9e6da2da6076 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gMnpCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -141,6 +142,7 @@ ENTS_ARG_FIELD gMnpDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
MnpDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.c
index 5eb9e89bdb85..2aff2d77d4df 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gMtftp4GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -98,6 +99,7 @@ ENTS_ARG_FIELD gMtftp4ConfigureArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4Configure_EntsTest (
VOID *ClientInterface
)
@@ -183,6 +185,7 @@ ENTS_ARG_FIELD gMtftp4GetInfoArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4GetInfo_EntsTest (
VOID *ClientInterface
)
@@ -259,6 +262,7 @@ ENTS_ARG_FIELD gMtftp4ParseOptionsArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4ParseOptions_EntsTest (
VOID *ClientInterface
)
@@ -435,6 +439,7 @@ ENTS_ARG_FIELD gMtftp4ReadFileArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4ReadFile_EntsTest (
VOID *ClientInterface
)
@@ -619,6 +624,7 @@ ENTS_ARG_FIELD gMtftp4WriteFileArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4WriteFile_EntsTest (
VOID *ClientInterface
)
@@ -812,6 +818,7 @@ ENTS_ARG_FIELD gMtftp4ReadDirectoryArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4ReadDirectory_EntsTest (
VOID *ClientInterface
)
@@ -882,6 +889,7 @@ ENTS_ARG_FIELD gMtftp4PollArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.c
index a50dbd2cbee1..5378597aaf81 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.c
@@ -46,6 +46,7 @@ ENTS_INTERFACE gMtftp4ServiceBindingEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gMtftp4ServiceBindingEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Mtftp4ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -137,6 +138,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Mtftp4ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.c
index 99e5f2b72ba2..ca043495b1fc 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gMtftp4ServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gMtftp4ServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp4ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.c
index 3d87568b7b75..55821a916c1d 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gMtftp6GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -98,6 +99,7 @@ ENTS_ARG_FIELD gMtftp6ConfigureArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6Configure_EntsTest (
VOID *ClientInterface
)
@@ -183,6 +185,7 @@ ENTS_ARG_FIELD gMtftp6GetInfoArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6GetInfo_EntsTest (
VOID *ClientInterface
)
@@ -259,6 +262,7 @@ ENTS_ARG_FIELD gMtftp6ParseOptionsArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6ParseOptions_EntsTest (
VOID *ClientInterface
)
@@ -435,6 +439,7 @@ ENTS_ARG_FIELD gMtftp6ReadFileArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6ReadFile_EntsTest (
VOID *ClientInterface
)
@@ -619,6 +624,7 @@ ENTS_ARG_FIELD gMtftp6WriteFileArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6WriteFile_EntsTest (
VOID *ClientInterface
)
@@ -812,6 +818,7 @@ ENTS_ARG_FIELD gMtftp6ReadDirectoryArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6ReadDirectory_EntsTest (
VOID *ClientInterface
)
@@ -882,6 +889,7 @@ ENTS_ARG_FIELD gMtftp6PollArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c
index 07a1ca0d8dc6..c115aa966ed7 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c
@@ -47,6 +47,7 @@ ENTS_INTERFACE gMtftp6ServiceBindingEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gMtftp6ServiceBindingEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Mtftp6ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -138,6 +139,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Mtftp6ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.c
index 0d69c1067d30..322f6a76d135 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gMtftp6ServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gMtftp6ServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Mtftp6ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.c
index b83e7d80fb85..3d35010a2321 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gPXEBaseCodeStartArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeStart_EntsTest (
VOID *ClientInterface
)
@@ -93,6 +94,7 @@ ENTS_ARG_FIELD gPXEBaseCodeStopArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeStop_EntsTest (
VOID *ClientInterface
)
@@ -146,6 +148,7 @@ ENTS_ARG_FIELD gPXEBaseCodeDhcpArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeDhcp_EntsTest (
VOID *ClientInterface
)
@@ -210,6 +213,7 @@ ENTS_ARG_FIELD gPXEBaseCodeDiscoverArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeDiscover_EntsTest (
VOID *ClientInterface
)
@@ -302,6 +306,7 @@ ENTS_ARG_FIELD gPXEBaseCodeMtftpArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeMtftp_EntsTest (
VOID *ClientInterface
)
@@ -404,6 +409,7 @@ ENTS_ARG_FIELD gPXEBaseCodeUdpWriteArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeUdpWrite_EntsTest (
VOID *ClientInterface
)
@@ -502,6 +508,7 @@ ENTS_ARG_FIELD gPXEBaseCodeUdpReadArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeUdpRead_EntsTest (
VOID *ClientInterface
)
@@ -559,6 +566,7 @@ ENTS_ARG_FIELD gPXEBaseCodeSetIpFilterArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeSetIpFilter_EntsTest (
VOID *ClientInterface
)
@@ -613,6 +621,7 @@ ENTS_ARG_FIELD gPXEBaseCodeArpArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeArp_EntsTest (
VOID *ClientInterface
)
@@ -683,6 +692,7 @@ ENTS_ARG_FIELD gPXEBaseCodeSetParametersArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeSetParameters_EntsTest (
VOID *ClientInterface
)
@@ -741,6 +751,7 @@ ENTS_ARG_FIELD gPXEBaseCodeSetStationIpArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeSetStationIp_EntsTest (
VOID *ClientInterface
)
@@ -846,6 +857,7 @@ ENTS_ARG_FIELD gPXEBaseCodeSetPacketsArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeSetPackets_EntsTest (
VOID *ClientInterface
)
@@ -901,6 +913,7 @@ ENTS_ARG_FIELD gPXEBaseCodeModeArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeMode_EntsTest (
VOID *ClientInterface
)
@@ -998,6 +1011,7 @@ ENTS_ARG_FIELD gPXEBaseCodeUdpWritePattern1ArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeUdpWritePattern1_EntsTest (
VOID *ClientInterface
)
@@ -1110,6 +1124,7 @@ ENTS_ARG_FIELD gPXEBaseCodeUdpReadPattern1ArgField[] = {
};
EFI_STATUS
+EFIAPI
PXEBaseCodeUdpReadPattern1_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.c
index bbcdb951141c..38607568e63e 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.c
@@ -120,6 +120,7 @@ ENTS_INTERFACE gSimpleNetworkEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gSimpleNetworkEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
SimpleNetworkENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -202,6 +203,7 @@ Error:
}
EFI_STATUS
+EFIAPI
SimpleNetworkENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.c
index f3b3c997e6cf..7c180bfc69f4 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTestCase.c
@@ -24,8 +24,8 @@ Abstract:
#include "SimpleNetworkENTSTestCase.h"
-static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 };
-
+static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 };
+
//
// SimpleNetwork.Start
//
@@ -39,6 +39,7 @@ ENTS_ARG_FIELD gSimpleNetworkStartArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkStart_EntsTest (
VOID *ClientInterface
)
@@ -86,6 +87,7 @@ ENTS_ARG_FIELD gSimpleNetworkStopArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkStop_EntsTest (
VOID *ClientInterface
)
@@ -144,6 +146,7 @@ ENTS_ARG_FIELD gSimpleNetworkInitializeArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkInitialize_EntsTest (
VOID *ClientInterface
)
@@ -194,6 +197,7 @@ ENTS_ARG_FIELD gSimpleNetworkResetArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkReset_EntsTest (
VOID *ClientInterface
)
@@ -238,6 +242,7 @@ ENTS_ARG_FIELD gSimpleNetworkShutdownArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkShutdown_EntsTest (
VOID *ClientInterface
)
@@ -304,6 +309,7 @@ ENTS_ARG_FIELD gSimpleNetworkReceiveFiltersArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkReceiveFilters_EntsTest (
VOID *ClientInterface
)
@@ -362,6 +368,7 @@ ENTS_ARG_FIELD gSimpleNetworkStationAddressArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkStationAddress_EntsTest (
VOID *ClientInterface
)
@@ -422,6 +429,7 @@ ENTS_ARG_FIELD gSimpleNetworkStatisticsArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkStatistics_EntsTest (
VOID *ClientInterface
)
@@ -483,6 +491,7 @@ ENTS_ARG_FIELD gSimpleNetworkMCastIPToMACArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkMCastIPToMAC_EntsTest (
VOID *ClientInterface
)
@@ -549,6 +558,7 @@ ENTS_ARG_FIELD gSimpleNetworkNvDataArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkNvData_EntsTest (
VOID *ClientInterface
)
@@ -606,6 +616,7 @@ ENTS_ARG_FIELD gSimpleNetworkGetStatusArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkGetStatus_EntsTest (
VOID *ClientInterface
)
@@ -681,6 +692,7 @@ ENTS_ARG_FIELD gSimpleNetworkTransmitArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkTransmit_EntsTest (
VOID *ClientInterface
)
@@ -760,6 +772,7 @@ ENTS_ARG_FIELD gSimpleNetworkReceiveArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkReceive_EntsTest (
VOID *ClientInterface
)
@@ -809,6 +822,7 @@ ENTS_ARG_FIELD gSimpleNetworkModeArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkMode_EntsTest (
VOID *ClientInterface
)
@@ -895,6 +909,7 @@ ENTS_ARG_FIELD gSimpleNetworkTransmitPattern1ArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkTransmitPattern1_EntsTest (
VOID *ClientInterface
)
@@ -930,8 +945,8 @@ Returns:
Status = EFI_SUCCESS;
tBS->Stall (5000);
- if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
- BeginTime = Epoch;
+ if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
+ BeginTime = Epoch;
for (Index = 0; Index < 1;) {
Status = SimpleNetwork->Transmit (
SimpleNetwork,
@@ -967,8 +982,8 @@ Returns:
}
}
- if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
- BeginTime = Epoch;
+ if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
+ BeginTime = Epoch;
for (Index = 1; Index < TransmitPattern1Number;) {
Status = SimpleNetwork->Transmit (
@@ -1006,8 +1021,8 @@ Returns:
}
End:
- if (tRT->GetTime (&EndTime, NULL) != EFI_SUCCESS)
- EndTime = Epoch;
+ if (tRT->GetTime (&EndTime, NULL) != EFI_SUCCESS)
+ EndTime = Epoch;
*TransmitPattern1Status = Status;
@@ -1095,6 +1110,7 @@ ENTS_ARG_FIELD gSimpleNetworkTransmitPattern2ArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkTransmitPattern2_EntsTest (
VOID *ClientInterface
)
@@ -1130,8 +1146,8 @@ Returns:
Status = EFI_SUCCESS;
tBS->Stall (5000);
- if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
- BeginTime = Epoch;
+ if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
+ BeginTime = Epoch;
for (Index = 0; Index < 1;) {
Status = SimpleNetwork->Transmit (
SimpleNetwork,
@@ -1167,8 +1183,8 @@ Returns:
}
}
- if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
- BeginTime = Epoch;
+ if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
+ BeginTime = Epoch;
for (Index = 1; Index < TransmitPattern2Number;) {
Status = SimpleNetwork->Transmit (
@@ -1206,8 +1222,8 @@ Returns:
}
End:
- if (tRT->GetTime (&EndTime, NULL) != EFI_SUCCESS)
- EndTime = Epoch;
+ if (tRT->GetTime (&EndTime, NULL) != EFI_SUCCESS)
+ EndTime = Epoch;
*TransmitPattern1Status = Status;
@@ -1286,6 +1302,7 @@ ENTS_ARG_FIELD gSimpleNetworkReceivePattern1ArgField[] = {
};
EFI_STATUS
+EFIAPI
SimpleNetworkReceivePattern1_EntsTest (
VOID *ClientInterface
)
@@ -1334,8 +1351,8 @@ Returns:
}
}
- if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
- BeginTime = Epoch;
+ if (tRT->GetTime (&BeginTime, NULL) != EFI_SUCCESS)
+ BeginTime = Epoch;
for (Index = 1; Index < ReceivePattern1Number;) {
*ReceivePattern1BufferSize = BufferSizeOrg;
@@ -1355,8 +1372,8 @@ Returns:
}
}
- if (tRT->GetTime (&EndTime, NULL) != EFI_SUCCESS)
- EndTime = Epoch;
+ if (tRT->GetTime (&EndTime, NULL) != EFI_SUCCESS)
+ EndTime = Epoch;
*ReceivePattern1Status = Status;
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.c
index 6d3e0dc36025..f7af50fa7bc2 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTestCase.c
@@ -63,6 +63,7 @@ ENTS_ARG_FIELD gTcp4GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -117,6 +118,7 @@ ENTS_ARG_FIELD gTcp4ConfigureArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4Configure_EntsTest (
VOID *ClientInterface
)
@@ -182,6 +184,7 @@ ENTS_ARG_FIELD gTcp4RoutesArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4Routes_EntsTest (
VOID *ClientInterface
)
@@ -235,6 +238,7 @@ ENTS_ARG_FIELD gTcp4ConnectArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4Connect_EntsTest (
VOID *ClientInterface
)
@@ -285,6 +289,7 @@ ENTS_ARG_FIELD gTcp4AcceptArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4Accept_EntsTest (
VOID *ClientInterface
)
@@ -335,6 +340,7 @@ ENTS_ARG_FIELD gTcp4TransmitArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4Transmit_EntsTest (
VOID *ClientInterface
)
@@ -385,6 +391,7 @@ ENTS_ARG_FIELD gTcp4ReceiveArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4Receive_EntsTest (
VOID *ClientInterface
)
@@ -435,6 +442,7 @@ ENTS_ARG_FIELD gTcp4CloseArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4Close_EntsTest (
VOID *ClientInterface
)
@@ -485,6 +493,7 @@ ENTS_ARG_FIELD gTcp4CancelArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4Cancel_EntsTest (
VOID *ClientInterface
)
@@ -530,6 +539,7 @@ ENTS_ARG_FIELD gTcp4PollArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c
index b887ee64afeb..cd2dce630019 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c
@@ -46,6 +46,7 @@ ENTS_INTERFACE gTcp4ServiceBindingEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gTcp4ServiceBindingEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Tcp4ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -137,6 +138,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Tcp4ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.c
index 65408124a4ee..782e82adf4d7 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gTcp4ServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gTcp4ServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp4ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.c
index 7d219e917dde..4f8c564f0813 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTestCase.c
@@ -63,6 +63,7 @@ ENTS_ARG_FIELD gTcp6GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -117,6 +118,7 @@ ENTS_ARG_FIELD gTcp6ConfigureArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6Configure_EntsTest (
VOID *ClientInterface
)
@@ -167,6 +169,7 @@ ENTS_ARG_FIELD gTcp6ConnectArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6Connect_EntsTest (
VOID *ClientInterface
)
@@ -217,6 +220,7 @@ ENTS_ARG_FIELD gTcp6AcceptArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6Accept_EntsTest (
VOID *ClientInterface
)
@@ -267,6 +271,7 @@ ENTS_ARG_FIELD gTcp6TransmitArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6Transmit_EntsTest (
VOID *ClientInterface
)
@@ -317,6 +322,7 @@ ENTS_ARG_FIELD gTcp6ReceiveArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6Receive_EntsTest (
VOID *ClientInterface
)
@@ -367,6 +373,7 @@ ENTS_ARG_FIELD gTcp6CloseArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6Close_EntsTest (
VOID *ClientInterface
)
@@ -417,6 +424,7 @@ ENTS_ARG_FIELD gTcp6CancelArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6Cancel_EntsTest (
VOID *ClientInterface
)
@@ -462,6 +470,7 @@ ENTS_ARG_FIELD gTcp6PollArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6Poll_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c
index 6c49bd1d0a78..547e74842a49 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c
@@ -47,6 +47,7 @@ ENTS_INTERFACE gTcp6ServiceBindingEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gTcp6ServiceBindingEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Tcp6ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -138,6 +139,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Tcp6ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.c
index c38e7e4db8bd..26c6534ddedd 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gTcp6ServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gTcp6ServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Tcp6ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.c
index 303f6a421838..e56669d39e51 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTestCase.c
@@ -58,6 +58,7 @@ ENTS_ARG_FIELD gUdp4GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -116,6 +117,7 @@ ENTS_ARG_FIELD gUdp4ConfigureArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4Configure_EntsTest (
VOID *ClientInterface
)
@@ -176,6 +178,7 @@ ENTS_ARG_FIELD gUdp4GroupsArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4Groups_EntsTest (
VOID *ClientInterface
)
@@ -247,6 +250,7 @@ ENTS_ARG_FIELD gUdp4RoutesArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4Routes_EntsTest (
VOID *ClientInterface
)
@@ -300,6 +304,7 @@ ENTS_ARG_FIELD gUdp4PollArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4Poll_EntsTest (
VOID *ClientInterface
)
@@ -352,6 +357,7 @@ ENTS_ARG_FIELD gUdp4ReceiveArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4Receive_EntsTest (
VOID *ClientInterface
)
@@ -407,6 +413,7 @@ ENTS_ARG_FIELD gUdp4TransmitArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4Transmit_EntsTest (
VOID *ClientInterface
)
@@ -462,6 +469,7 @@ ENTS_ARG_FIELD gUdp4CancelArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4Cancel_EntsTest (
VOID *ClientInterface
)
@@ -517,6 +525,7 @@ ENTS_ARG_FIELD gUdp4SignalRecycleEventArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4SignalRecycleEvent_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.c
index e42d1dc8793e..2148585f95f6 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.c
@@ -46,6 +46,7 @@ ENTS_INTERFACE gUdp4ServiceBindingEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gUdp4ServiceBindingEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Udp4ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -137,6 +138,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Udp4ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.c
index 6c3588733924..88e0445aef39 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gUdp4ServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gUdp4ServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp4ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.c
index a90862064fe8..5155c2c55d64 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.c
@@ -76,6 +76,7 @@ ENTS_INTERFACE gUdp6EntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gUdp6EntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Udp6ENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -159,6 +160,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Udp6ENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.c
index 1059a439317f..748f16ddaf7c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTestCase.c
@@ -58,6 +58,7 @@ ENTS_ARG_FIELD gUdp6GetModeDataArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6GetModeData_EntsTest (
VOID *ClientInterface
)
@@ -116,6 +117,7 @@ ENTS_ARG_FIELD gUdp6ConfigureArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6Configure_EntsTest (
VOID *ClientInterface
)
@@ -176,6 +178,7 @@ ENTS_ARG_FIELD gUdp6GroupsArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6Groups_EntsTest (
VOID *ClientInterface
)
@@ -227,6 +230,7 @@ ENTS_ARG_FIELD gUdp6PollArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6Poll_EntsTest (
VOID *ClientInterface
)
@@ -279,6 +283,7 @@ ENTS_ARG_FIELD gUdp6ReceiveArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6Receive_EntsTest (
VOID *ClientInterface
)
@@ -334,6 +339,7 @@ ENTS_ARG_FIELD gUdp6TransmitArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6Transmit_EntsTest (
VOID *ClientInterface
)
@@ -389,6 +395,7 @@ ENTS_ARG_FIELD gUdp6CancelArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6Cancel_EntsTest (
VOID *ClientInterface
)
@@ -444,6 +451,7 @@ ENTS_ARG_FIELD gUdp6SignalRecycleEventArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6SignalRecycleEvent_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.c
index 292e66f66a00..adf524139e06 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.c
@@ -47,6 +47,7 @@ ENTS_INTERFACE gUdp6ServiceBindingEntsInterfaceList[] = {
EFI_ENTS_PROTOCOL *gUdp6ServiceBindingEntsProtocolInterface = NULL;
EFI_STATUS
+EFIAPI
Udp6ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
);
@@ -138,6 +139,7 @@ Error:
}
EFI_STATUS
+EFIAPI
Udp6ServiceBindingENTSTestUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.c
index 7eb491194283..e34f2fa04a60 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTestCase.c
@@ -43,6 +43,7 @@ ENTS_ARG_FIELD gUdp6ServiceBindingCreateChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6ServiceBindingCreateChild_EntsTest (
VOID *ClientInterface
)
@@ -142,6 +143,7 @@ ENTS_ARG_FIELD gUdp6ServiceBindingDestroyChildArgField[] = {
};
EFI_STATUS
+EFIAPI
Udp6ServiceBindingDestroyChild_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.c
index 1ffb0ee7ed9c..83c660e9b992 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/MiscellaneousRuntimeService/MiscellaneousRuntimeENTSTestCase.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MiscellaneousRuntimeENTSTestCase.h"
//
@@ -54,6 +54,7 @@ ENTS_ARG_FIELD tRTResetSystemArgField[] = {
};
EFI_STATUS
+EFIAPI
RT_ResetSystem_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.c
index 44f0acb4e84d..1f0b8c36ff4d 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/TimeService/TimeENTSTestCase.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "TimeENTSTestCase.h"
//
@@ -49,6 +49,7 @@ ENTS_ARG_FIELD tRTGetTimeArgField[] = {
};
EFI_STATUS
+EFIAPI
RT_GetTime_EntsTest (
VOID *ClientInterface
)
@@ -98,6 +99,7 @@ ENTS_ARG_FIELD tRTSetTimeArgField[] = {
};
EFI_STATUS
+EFIAPI
RT_SetTime_EntsTest (
VOID *ClientInterface
)
@@ -154,6 +156,7 @@ ENTS_ARG_FIELD tRTGetWakeupTimeArgField[] = {
};
EFI_STATUS
+EFIAPI
RT_GetWakeupTime_EntsTest (
VOID *ClientInterface
)
@@ -209,6 +212,7 @@ ENTS_ARG_FIELD tRTSetWakeupTimeArgField[] = {
};
EFI_STATUS
+EFIAPI
RT_SetWakeupTime_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.c b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.c
index 92440efc8697..c191379263e7 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/RuntimeService/VariableService/VariableENTSTestCase.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "VariableENTSTestCase.h"
//
@@ -64,6 +64,7 @@ ENTS_ARG_FIELD tRTGetVariableArgField[] = {
};
EFI_STATUS
+EFIAPI
RT_GetVariable_EntsTest (
VOID *ClientInterface
)
@@ -126,6 +127,7 @@ ENTS_ARG_FIELD tRTGetNextVariableNameArgField[] = {
};
EFI_STATUS
+EFIAPI
RT_GetNextVariableName_EntsTest (
VOID *ClientInterface
)
@@ -196,6 +198,7 @@ ENTS_ARG_FIELD tRTSetVariableArgField[] = {
};
EFI_STATUS
+EFIAPI
RT_SetVariable_EntsTest (
VOID *ClientInterface
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCheckEvent.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCheckEvent.c
index dcc3bd0230c3..865b8b604eea 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCheckEvent.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCheckEvent.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "EventTimerTaskPriorityServicesBBTestMain.h"
//
@@ -32,26 +32,31 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func_Sub4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -61,6 +66,7 @@ BBTestCheckEvent_Func_Sub4 (
//
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -97,6 +103,7 @@ BBTestCheckEvent_Conf (
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -154,6 +161,7 @@ BBTestCheckEvent_Func (
//
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -212,6 +220,7 @@ BBTestCheckEvent_Conf_Sub1 (
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -270,6 +279,7 @@ BBTestCheckEvent_Func_Sub1 (
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -328,6 +338,7 @@ BBTestCheckEvent_Func_Sub2 (
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -395,6 +406,7 @@ BBTestCheckEvent_Func_Sub3 (
EFI_STATUS
+EFIAPI
BBTestCheckEvent_Func_Sub4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCloseEvent.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCloseEvent.c
index 5dfb3c3ca21e..a2ff6a29c88f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCloseEvent.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCloseEvent.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "EventTimerTaskPriorityServicesBBTestMain.h"
//
@@ -32,6 +32,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestCloseEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -41,6 +42,7 @@ BBTestCloseEvent_Func_Sub1 (
//
EFI_STATUS
+EFIAPI
BBTestCloseEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -80,6 +82,7 @@ BBTestCloseEvent_Func (
//
EFI_STATUS
+EFIAPI
BBTestCloseEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEvent.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEvent.c
index d5c033f7ea47..7863c1f5eff2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEvent.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEvent.c
@@ -33,36 +33,43 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf_Sub4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Func_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -72,6 +79,7 @@ BBTestCreateEvent_Func_Sub3 (
//
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -122,6 +130,7 @@ BBTestCreateEvent_Conf (
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -173,6 +182,7 @@ BBTestCreateEvent_Func (
//
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -248,6 +258,7 @@ BBTestCreateEvent_Conf_Sub1 (
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -323,6 +334,7 @@ BBTestCreateEvent_Conf_Sub2 (
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -391,6 +403,7 @@ BBTestCreateEvent_Conf_Sub3 (
}
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Conf_Sub4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -462,6 +475,7 @@ BBTestCreateEvent_Conf_Sub4 (
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -537,6 +551,7 @@ BBTestCreateEvent_Func_Sub1 (
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -608,6 +623,7 @@ BBTestCreateEvent_Func_Sub2 (
EFI_STATUS
+EFIAPI
BBTestCreateEvent_Func_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEventEx.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEventEx.c
index 03b7ae6ef761..0c91c9655bc3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEventEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestCreateEventEx.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "EventTimerTaskPriorityServicesBBTestMain.h"
#ifndef EVT_NOTIFY_SIGNAL_ALL
@@ -47,41 +47,48 @@ EFI_GUID gEfiEventMemoryMapChangeGuid = { 0x78BEE926, 0x692F, 0x48FD, { 0x9E,
//
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf_Sub4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
#endif
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Func_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -91,6 +98,7 @@ BBTestCreateEventEx_Func_Sub3 (
//
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -149,6 +157,7 @@ BBTestCreateEventEx_Conf (
}
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -211,6 +220,7 @@ BBTestCreateEventEx_Func (
//
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -297,6 +307,7 @@ BBTestCreateEventEx_Conf_Sub1 (
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -394,6 +405,7 @@ BBTestCreateEventEx_Conf_Sub2 (
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -477,6 +489,7 @@ BBTestCreateEventEx_Conf_Sub3 (
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Conf_Sub4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -572,6 +585,7 @@ BBTestCreateEventEx_Conf_Sub4 (
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -727,6 +741,7 @@ BBTestCreateEventEx_Func_Sub1 (
#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -885,6 +900,7 @@ BBTestCreateEventEx_Func_Sub2 (
}
EFI_STATUS
+EFIAPI
BBTestCreateEventEx_Func_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRaiseTPL.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRaiseTPL.c
index e62f0066ca66..a113f9aef3ed 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRaiseTPL.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRaiseTPL.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "EventTimerTaskPriorityServicesBBTestMain.h"
//
@@ -32,6 +32,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestRaiseTPL_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -41,6 +42,7 @@ BBTestRaiseTPL_Func_Sub1 (
//
EFI_STATUS
+EFIAPI
BBTestRaiseTPL_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -80,6 +82,7 @@ BBTestRaiseTPL_Func (
//
EFI_STATUS
+EFIAPI
BBTestRaiseTPL_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRestoreTPL.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRestoreTPL.c
index 7f0d8ccb20b2..37088120c23b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRestoreTPL.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestRestoreTPL.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "EventTimerTaskPriorityServicesBBTestMain.h"
//
@@ -32,6 +32,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestRestoreTPL_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -41,6 +42,7 @@ BBTestRestoreTPL_Func_Sub1 (
//
EFI_STATUS
+EFIAPI
BBTestRestoreTPL_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -76,6 +78,7 @@ BBTestRestoreTPL_Func (
EFI_STATUS
+EFIAPI
BBTestRestoreTPL_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSetTimer.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSetTimer.c
index b869d93b6a53..2ce3426b04fa 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSetTimer.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSetTimer.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "EventTimerTaskPriorityServicesBBTestMain.h"
//
@@ -32,41 +32,49 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestSetTimer_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Conf_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -76,6 +84,7 @@ BBTestSetTimer_Func_Sub6 (
//
EFI_STATUS
+EFIAPI
BBTestSetTimer_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +126,7 @@ BBTestSetTimer_Conf (
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -182,6 +192,7 @@ BBTestSetTimer_Func (
EFI_STATUS
+EFIAPI
BBTestSetTimer_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -198,6 +209,7 @@ BBTestSetTimer_Stress (
//
EFI_STATUS
+EFIAPI
BBTestSetTimer_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -272,6 +284,7 @@ BBTestSetTimer_Conf_Sub1 (
EFI_STATUS
+EFIAPI
BBTestSetTimer_Conf_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -346,6 +359,7 @@ BBTestSetTimer_Conf_Sub2 (
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -414,6 +428,7 @@ BBTestSetTimer_Func_Sub1 (
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -482,6 +497,7 @@ BBTestSetTimer_Func_Sub2 (
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -560,6 +576,7 @@ BBTestSetTimer_Func_Sub3 (
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -638,6 +655,7 @@ BBTestSetTimer_Func_Sub4 (
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -705,6 +723,7 @@ BBTestSetTimer_Func_Sub5 (
}
EFI_STATUS
+EFIAPI
BBTestSetTimer_Func_Sub6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -769,4 +788,4 @@ BBTestSetTimer_Func_Sub6 (
// Done
//
return EFI_SUCCESS;
-}
+}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSignalEvent.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSignalEvent.c
index cd80e6027bba..b95ff58888c0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSignalEvent.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestSignalEvent.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "EventTimerTaskPriorityServicesBBTestMain.h"
//
@@ -32,6 +32,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestSignalEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -41,6 +42,7 @@ BBTestSignalEvent_Func_Sub1 (
//
EFI_STATUS
+EFIAPI
BBTestSignalEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -80,6 +82,7 @@ BBTestSignalEvent_Func (
//
EFI_STATUS
+EFIAPI
BBTestSignalEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestWaitForEvent.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestWaitForEvent.c
index a8a30c8f179d..fb47a8a66de7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestWaitForEvent.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTestWaitForEvent.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "EventTimerTaskPriorityServicesBBTestMain.h"
//
@@ -32,26 +32,31 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Conf_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Conf_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
);
@@ -61,6 +66,7 @@ BBTestWaitForEvent_Func_Sub2 (
//
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -102,6 +108,7 @@ BBTestWaitForEvent_Conf (
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -142,6 +149,7 @@ BBTestWaitForEvent_Func (
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -157,6 +165,7 @@ BBTestWaitForEvent_Stress (
//
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Conf_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -229,6 +238,7 @@ BBTestWaitForEvent_Conf_Sub1 (
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Conf_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -288,6 +298,7 @@ BBTestWaitForEvent_Conf_Sub2 (
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Conf_Sub3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -347,6 +358,7 @@ BBTestWaitForEvent_Conf_Sub3 (
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Func_Sub1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -417,6 +429,7 @@ BBTestWaitForEvent_Func_Sub1 (
EFI_STATUS
+EFIAPI
BBTestWaitForEvent_Func_Sub2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/Support.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/Support.c
index 0c900a3eca69..4e9466c789e9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/Support.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/Support.c
@@ -28,6 +28,7 @@ Abstract:
VOID
+EFIAPI
NotifyFunction (
IN EFI_EVENT Event,
IN VOID *Context
@@ -49,6 +50,7 @@ NotifyFunction (
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
VOID
+EFIAPI
NotifyFunctionTplEx(
IN EFI_EVENT Event,
IN VOID *Context
@@ -85,6 +87,7 @@ NotifyFunctionTplEx(
#endif
VOID
+EFIAPI
NotifyFunctionTpl (
IN EFI_EVENT Event,
IN VOID *Context
@@ -110,6 +113,7 @@ NotifyFunctionTpl (
VOID
+EFIAPI
NotifyFunctionSignal (
IN EFI_EVENT Event,
IN VOID *Context
@@ -120,6 +124,7 @@ NotifyFunctionSignal (
}
VOID
+EFIAPI
NotifyFunctionNoSignal (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestConformance.c
index 2bd79db8d5ad..90081f04f025 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestConformance.c
@@ -49,6 +49,7 @@ EFI_GUID gTestVendor1Guid = TEST_VENDOR1_GUID;
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestLoadImageConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -412,6 +413,7 @@ BBTestLoadImageConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestStartImageConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -534,6 +536,7 @@ BBTestStartImageConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestUnloadImageConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -651,6 +654,7 @@ BBTestUnloadImageConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestExitConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -771,6 +775,7 @@ BBTestExitConsistencyTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestExitBootServicesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestFunction.c
index 11f78cd42fa1..b48833a66dd7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestFunction.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "Misc.h"
extern EFI_GUID gBlackBoxEfiHIIPackageListProtocolGuid;
@@ -49,6 +49,7 @@ EFI_GUID NameGuid3 = RUNTIME_SERVICES_DRIVER_IMAGE_2_NAME_GUI
* @return EFI_SUCCESS
*/
EFI_STATUS
+EFIAPI
ImageTestDriversUnload (
IN EFI_HANDLE ImageHandle
)
@@ -71,6 +72,7 @@ ImageTestDriversUnload (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -182,6 +184,7 @@ BBTestLoadImageInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -268,6 +271,7 @@ BBTestStartImageInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -378,6 +382,7 @@ BBTestUnloadImageInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -475,6 +480,7 @@ BBTestExitInterfaceTest (
}
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -721,6 +727,7 @@ BBTestLoadImageInterfaceTestCheckPoint1 (
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -970,6 +977,7 @@ BBTestLoadImageInterfaceTestCheckPoint3 (
}
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1179,6 +1187,7 @@ BBTestLoadImageInterfaceTestCheckPoint4 (
}
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1365,6 +1374,7 @@ BBTestLoadImageInterfaceTestCheckPoint5 (
}
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1498,6 +1508,7 @@ BBTestLoadImageInterfaceTestCheckPoint6 (
}
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1763,6 +1774,7 @@ BBTestLoadImageInterfaceTestCheckPoint7 (
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1917,6 +1929,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestLoadImageInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2119,6 +2132,7 @@ BBTestLoadImageInterfaceTestCheckPoint9 (
#endif
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2430,6 +2444,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2776,6 +2791,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3057,6 +3073,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3402,6 +3419,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3649,6 +3667,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestStartImageInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3829,6 +3848,7 @@ BBTestStartImageInterfaceTestCheckPoint6 (
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3975,6 +3995,7 @@ BBTestUnloadImageInterfaceTestCheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4119,6 +4140,7 @@ BBTestUnloadImageInterfaceTestCheckPoint2 (
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4263,6 +4285,7 @@ BBTestUnloadImageInterfaceTestCheckPoint3 (
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4429,6 +4452,7 @@ BBTestUnloadImageInterfaceTestCheckPoint4 (
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4711,6 +4735,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5014,6 +5039,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5346,6 +5372,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5629,6 +5656,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5926,6 +5954,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUnloadImageInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6261,6 +6290,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6405,6 +6435,7 @@ BBTestExitInterfaceTestCheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6549,6 +6580,7 @@ BBTestExitInterfaceTestCheckPoint2 (
}
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6693,6 +6725,7 @@ BBTestExitInterfaceTestCheckPoint3 (
}
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6885,6 +6918,7 @@ NextLoop:
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7242,6 +7276,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7623,6 +7658,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7932,6 +7968,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -8317,6 +8354,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -8626,6 +8664,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestExitInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestStress.c
index a2a90d1bbafb..c4abd6f7490d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestStress.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "Misc.h"
/**
@@ -37,6 +37,7 @@ Abstract:
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestImageServicesCombinationTest1 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.c
index 0a7c31062adf..d75d8061ec9c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Misc.c
@@ -675,6 +675,7 @@ Done:
VOID
+EFIAPI
ImageTestNotifyFunction (
IN EFI_EVENT Event,
IN OUT VOID *Context
@@ -688,6 +689,7 @@ ImageTestNotifyFunction (
}
VOID
+EFIAPI
ImageTestNotifyFunctionForCombinationTest1 (
IN EFI_EVENT Event,
IN OUT VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestConformance.c
index 1b81ecbcf242..4c2b468af4d2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MemoryAllocationServicesBBTestMain.h"
/**
@@ -39,6 +39,7 @@ Abstract:
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestGetMemoryMapConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -307,6 +308,7 @@ BBTestGetMemoryMapConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestAllocatePagesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -688,6 +690,7 @@ BBTestAllocatePagesConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestFreePagesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -863,6 +866,7 @@ BBTestFreePagesConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestAllocatePoolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1092,6 +1096,7 @@ BBTestAllocatePoolConsistencyTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestFreePoolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestFunction.c
index 82c9baab148e..4e65d7a1c562 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestFunction.c
@@ -2,7 +2,7 @@
Copyright 2006 - 2013 Unified EFI, Inc.<BR>
Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
- Copyright (c) 2021, ARM Limited. All rights reserved.
+ Copyright (c) 2021, ARM Limited. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MemoryAllocationServicesBBTestMain.h"
#define ALLOCATEPAGES_MEMORYTYPE_NUM 16
@@ -82,6 +82,7 @@ EFI_MEMORY_TYPE AllocatePoolMemoryType[ALLOCATEPOOL_MEMORYTYPE_NUM] = {
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestGetMemoryMapInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -337,6 +338,7 @@ BBTestGetMemoryMapInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestAllocatePagesInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -418,7 +420,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -438,7 +440,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory != 0) {
Status = gtBS->FreePages (
@@ -456,7 +458,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -479,7 +481,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
} else {
PageNum = (UINTN)Descriptor.NumberOfPages;
@@ -513,7 +515,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -533,7 +535,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory <= Descriptor.PhysicalStart +
SctLShiftU64 (Descriptor.NumberOfPages, EFI_PAGE_SHIFT) -
@@ -555,7 +557,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex],
+ (UINTN)AllocatePagesMemoryType[TypeIndex],
Descriptor.PhysicalStart,
Descriptor.NumberOfPages,
Memory
@@ -590,7 +592,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory2 & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -610,7 +612,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if ( Memory2 <= Descriptor.PhysicalStart +
SctLShiftU64 (Descriptor.NumberOfPages, EFI_PAGE_SHIFT) -
@@ -632,7 +634,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex],
+ (UINTN)AllocatePagesMemoryType[TypeIndex],
Memory2
);
if (Memory != 0) {
@@ -651,7 +653,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -671,7 +673,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -695,23 +697,23 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
} else {
PageNum = (UINTN)Descriptor.NumberOfPages;
Start = Descriptor.PhysicalStart;
- //
- // Calculate New Start address and PageNum with 64k alignment to
- // cover the case that some memory types' alignment is more than
- // 4k. If the available memory is less than 192k, the memory
- // allocation call will be skipped.
- //
- if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
+ //
+ // Calculate New Start address and PageNum with 64k alignment to
+ // cover the case that some memory types' alignment is more than
+ // 4k. If the available memory is less than 192k, the memory
+ // allocation call will be skipped.
+ //
+ if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
break;
}
- Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
- PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
+ Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
+ PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
Memory = Start;
@@ -743,7 +745,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -763,7 +765,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory == Start) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -783,7 +785,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory != 0) {
Status = gtBS->FreePages (
@@ -801,7 +803,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -828,23 +830,23 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
} else {
PageNum = (UINTN)Descriptor.NumberOfPages;
Start = Descriptor.PhysicalStart;
- //
- // Calculate New Start address and PageNum with 64k alignment to
- // cover the case that some memory types' alignment is more than
- // 4k. If the available memory is less than 192k, the memory
- // allocation call will be skipped.
- //
- if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
+ //
+ // Calculate New Start address and PageNum with 64k alignment to
+ // cover the case that some memory types' alignment is more than
+ // 4k. If the available memory is less than 192k, the memory
+ // allocation call will be skipped.
+ //
+ if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
break;
}
- Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
- PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
+ Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
+ PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
Memory = Start;
@@ -876,7 +878,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -896,7 +898,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory == Start) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -916,7 +918,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory != 0) {
Status = gtBS->FreePages (
@@ -934,7 +936,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -954,23 +956,23 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
} else {
PageNum = (UINTN)Descriptor.NumberOfPages;
Start = Descriptor.PhysicalStart;
- //
- // Calculate New Start address and PageNum with 64k alignment to
- // cover the case that some memory types' alignment is more than
- // 4k. If the available memory is less than 192k, the memory
- // allocation call will be skipped.
- //
- if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
+ //
+ // Calculate New Start address and PageNum with 64k alignment to
+ // cover the case that some memory types' alignment is more than
+ // 4k. If the available memory is less than 192k, the memory
+ // allocation call will be skipped.
+ //
+ if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
break;
}
- Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
- PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
+ Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
+ PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
Memory = Start + (SctLShiftU64 (PageNum/3, EFI_PAGE_SHIFT) & 0xFFFFFFFFFFFF0000);
@@ -1002,7 +1004,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1022,7 +1024,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory == Start + (SctLShiftU64 (PageNum/3, EFI_PAGE_SHIFT) & 0xFFFFFFFFFFFF0000)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1042,7 +1044,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory != 0) {
Status = gtBS->FreePages (
@@ -1060,7 +1062,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -1080,23 +1082,23 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
} else {
PageNum = (UINTN)Descriptor.NumberOfPages;
Start = Descriptor.PhysicalStart;
- //
- // Calculate New Start address and PageNum with 64k alignment to
- // cover the case that some memory types' alignment is more than
- // 4k. If the available memory is less than 192k, the memory
- // allocation call will be skipped.
- //
- if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
+ //
+ // Calculate New Start address and PageNum with 64k alignment to
+ // cover the case that some memory types' alignment is more than
+ // 4k. If the available memory is less than 192k, the memory
+ // allocation call will be skipped.
+ //
+ if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
break;
}
- Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
- PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
+ Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
+ PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
Memory = Start + (SctLShiftU64 (PageNum * 2 / 3, EFI_PAGE_SHIFT) & 0xFFFFFFFFFFFF0000);
@@ -1128,7 +1130,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1148,7 +1150,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory == Start + (SctLShiftU64 (PageNum * 2 / 3, EFI_PAGE_SHIFT) & 0xFFFFFFFFFFFF0000)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1168,7 +1170,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory != 0) {
Status = gtBS->FreePages (
@@ -1186,7 +1188,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -1213,23 +1215,23 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
} else {
PageNum = (UINTN)Descriptor.NumberOfPages;
Start = Descriptor.PhysicalStart;
- //
- // Calculate New Start address and PageNum with 64k alignment to
- // cover the case that some memory types' alignment is more than
- // 4k. If the available memory is less than 192k, the memory
- // allocation call will be skipped.
- //
- if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
+ //
+ // Calculate New Start address and PageNum with 64k alignment to
+ // cover the case that some memory types' alignment is more than
+ // 4k. If the available memory is less than 192k, the memory
+ // allocation call will be skipped.
+ //
+ if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
break;
}
- Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
- PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
+ Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
+ PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
Memory = Start;
@@ -1261,7 +1263,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1281,7 +1283,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory == Start) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1301,7 +1303,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory != 0) {
Status = gtBS->FreePages (
@@ -1319,7 +1321,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -1339,23 +1341,23 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
} else {
PageNum = (UINTN)Descriptor.NumberOfPages;
Start = Descriptor.PhysicalStart;
- //
- // Calculate New Start address and PageNum with 64k alignment to
- // cover the case that some memory types' alignment is more than
- // 4k. If the available memory is less than 192k, the memory
- // allocation call will be skipped.
- //
- if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
+ //
+ // Calculate New Start address and PageNum with 64k alignment to
+ // cover the case that some memory types' alignment is more than
+ // 4k. If the available memory is less than 192k, the memory
+ // allocation call will be skipped.
+ //
+ if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
break;
}
- Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
- PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
+ Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
+ PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
Memory = Start;
@@ -1396,7 +1398,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1416,7 +1418,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory == Start) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1436,7 +1438,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory != 0) {
if (PageNum != 1) {
@@ -1461,7 +1463,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -1481,23 +1483,23 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
} else {
PageNum = (UINTN)Descriptor.NumberOfPages;
Start = Descriptor.PhysicalStart;
- //
- // Calculate New Start address and PageNum with 64k alignment to
- // cover the case that some memory types' alignment is more than
- // 4k. If the available memory is less than 192k, the memory
- // allocation call will be skipped.
- //
- if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
+ //
+ // Calculate New Start address and PageNum with 64k alignment to
+ // cover the case that some memory types' alignment is more than
+ // 4k. If the available memory is less than 192k, the memory
+ // allocation call will be skipped.
+ //
+ if (PageNum < (3 * EFI_SIZE_TO_PAGES(0x10000))) {
break;
}
- Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
- PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
+ Start = (Start + 0xFFFF) & 0xFFFFFFFFFFFF0000;
+ PageNum = PageNum - (2 * EFI_SIZE_TO_PAGES(0x10000));
Memory = Start;
@@ -1529,7 +1531,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (!(Memory & EFI_PAGE_MASK)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1549,7 +1551,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory == Start) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1569,7 +1571,7 @@ BBTestAllocatePagesInterfaceTest (
__FILE__,
(UINTN)__LINE__,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
if (Memory != 0) {
Status = gtBS->FreePages (
@@ -1587,7 +1589,7 @@ BBTestAllocatePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
}
@@ -1612,6 +1614,7 @@ BBTestAllocatePagesInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestFreePagesInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1678,7 +1681,7 @@ BBTestFreePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
continue;
}
@@ -1707,7 +1710,7 @@ BBTestFreePagesInterfaceTest (
(UINTN)__LINE__,
Status,
TplArray[Index],
- (UINTN)AllocatePagesMemoryType[TypeIndex]
+ (UINTN)AllocatePagesMemoryType[TypeIndex]
);
}
@@ -1729,6 +1732,7 @@ BBTestFreePagesInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestAllocatePoolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1845,6 +1849,7 @@ BBTestAllocatePoolInterfaceTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestFreePoolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1945,4 +1950,4 @@ BBTestFreePoolInterfaceTest (
FreeMemoryMap ();
return EFI_SUCCESS;
-}
+}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestStress.c
index ce41c000d026..d194e004ff54 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTestStress.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MemoryAllocationServicesBBTestMain.h"
#define MAX_REPEAT_TIMES 100
@@ -51,6 +51,7 @@ INTN FreeSeqIndex2[SEQ_NUM] = {
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestGetMemoryMapStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -148,6 +149,7 @@ BBTestGetMemoryMapStressTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestPagesStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -389,6 +391,7 @@ BBTestPagesStressTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestPoolStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestConformance.c
index 5bd9eb326c63..9e59acf64af9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MiscBootServicesBBTestMain.h"
/**
@@ -39,6 +39,7 @@ Abstract:
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestSetWatchdogTimerConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -61,6 +62,7 @@ BBTestSetWatchdogTimerConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestGetNextMonotonicCountConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -122,6 +124,7 @@ BBTestGetNextMonotonicCountConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestInstallConfigurationTableConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -208,6 +211,7 @@ BBTestInstallConfigurationTableConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestCalculateCrc32ConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestFunction.c
index ad72646bada2..6f832e31be93 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestFunction.c
@@ -24,11 +24,11 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MiscBootServicesBBTestMain.h"
-static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 };
-
+static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 };
+
/**
* Entrypoint for gtBS->SetWatchdogTimer() Interface Test.
* @param This a pointer of EFI_BB_TEST_PROTOCOL.
@@ -41,6 +41,7 @@ static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 };
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestSetWatchdogTimerInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -790,6 +791,7 @@ SetWatchdogTimerStep6:
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestStallInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -823,15 +825,15 @@ BBTestStallInterfaceTest (
//
// 4.2.2.1 Stall must succeed.
//
- if (gtRT->GetTime (&StartTime, NULL) != EFI_SUCCESS)
- StartTime = Epoch;
+ if (gtRT->GetTime (&StartTime, NULL) != EFI_SUCCESS)
+ StartTime = Epoch;
OldTpl = gtBS->RaiseTPL (TplArray[Index]);
Status = gtBS->Stall (
10000000
);
gtBS->RestoreTPL (OldTpl);
- if (gtRT->GetTime (&EndTime, NULL) != EFI_SUCCESS)
- EndTime = Epoch;
+ if (gtRT->GetTime (&EndTime, NULL) != EFI_SUCCESS)
+ EndTime = Epoch;
if (Status == EFI_SUCCESS) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
@@ -896,6 +898,7 @@ BBTestStallInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestCopyMemInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1267,6 +1270,7 @@ BBTestCopyMemInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestSetMemInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1460,6 +1464,7 @@ BBTestSetMemInterfaceTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestGetNextMonotonicCountInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1754,6 +1759,7 @@ GetNextMonotonicCountStep2:
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestInstallConfigurationTableInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2121,6 +2127,7 @@ BBTestInstallConfigurationTableInterfaceTest (
// TDS 4.7
//
EFI_STATUS
+EFIAPI
BBTestCalculateCrc32InterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestStress.c
index 20b2b2a940ec..e9d9d471f795 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTestStress.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MiscBootServicesBBTestMain.h"
#define MAX_REPEAT_TIMES 20
@@ -41,6 +41,7 @@ Abstract:
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestSetWatchdogTimerStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -160,6 +161,7 @@ BBTestSetWatchdogTimerStressTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestStallStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -235,6 +237,7 @@ BBTestStallStressTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestCopyMemStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -363,6 +366,7 @@ BBTestCopyMemStressTest (
// TDS 5.4
//
EFI_STATUS
+EFIAPI
BBTestSetMemStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -489,6 +493,7 @@ BBTestSetMemStressTest (
// TDS 5.5
//
EFI_STATUS
+EFIAPI
BBTestGetNextMonotonicCountStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver1/BusDriver1.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver1/BusDriver1.c
index 315e3a053723..ea223607c0b9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver1/BusDriver1.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver1/BusDriver1.c
@@ -88,6 +88,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol2ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_2 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver2/BusDriver2.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver2/BusDriver2.c
index db01a15c0978..4bdf267ec64a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver2/BusDriver2.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver2/BusDriver2.c
@@ -85,6 +85,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol2ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_2 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -328,6 +329,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol2ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_2 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver3/BusDriver3.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver3/BusDriver3.c
index a7dde064ad34..088f38cade8f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver3/BusDriver3.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver3/BusDriver3.c
@@ -86,6 +86,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol2ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_2 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -97,6 +98,7 @@ InitializeInterfaceFunctionTestProtocol2 (
);
VOID
+EFIAPI
Protocol3ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -374,6 +376,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol2ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_2 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -393,6 +396,7 @@ InitializeInterfaceFunctionTestProtocol2 (
}
VOID
+EFIAPI
Protocol3ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusOverrideDriver1/BusOverrideDriver1.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusOverrideDriver1/BusOverrideDriver1.c
index 4518ea9039c4..2595ca42e2d2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusOverrideDriver1/BusOverrideDriver1.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusOverrideDriver1/BusOverrideDriver1.c
@@ -90,6 +90,7 @@ InitializeDriverBinding (
);
EFI_STATUS
+EFIAPI
BusOverrideDriver1GetDriver (
IN EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL *This,
IN OUT EFI_HANDLE *DriverImageHandle
@@ -354,6 +355,7 @@ InitializeDriverBinding (
}
EFI_STATUS
+EFIAPI
BusOverrideDriver1GetDriver (
IN EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL *This,
IN OUT EFI_HANDLE *DriverImageHandle
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver2/DBindingDriver2.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver2/DBindingDriver2.c
index 5c53d5d09c74..abf99d87d636 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver2/DBindingDriver2.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver2/DBindingDriver2.c
@@ -78,7 +78,8 @@ DBindingDriver2BindingStop (
IN EFI_HANDLE *ChildHandleBuffer
);
-void
+VOID
+EFIAPI
DBindingDriver2GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
@@ -332,7 +333,8 @@ DBindingDriver2BindingStop (
return EFI_SUCCESS;
}
-void
+VOID
+EFIAPI
DBindingDriver2GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver4/DBindingDriver4.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver4/DBindingDriver4.c
index 94d7461ad83d..7a494c892d41 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver4/DBindingDriver4.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver4/DBindingDriver4.c
@@ -79,7 +79,8 @@ DBindingDriver4BindingStop (
IN EFI_HANDLE *ChildHandleBuffer
);
-void
+VOID
+EFIAPI
DBindingDriver4GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
@@ -355,7 +356,8 @@ DBindingDriver4BindingStop (
return EFI_SUCCESS;
}
-void
+VOID
+EFIAPI
DBindingDriver4GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver5/DBindingDriver5.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver5/DBindingDriver5.c
index a6196b64ff45..9a9a8390e8c5 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver5/DBindingDriver5.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver5/DBindingDriver5.c
@@ -79,7 +79,8 @@ DBindingDriver5BindingStop (
IN EFI_HANDLE *ChildHandleBuffer
);
-void
+VOID
+EFIAPI
DBindingDriver5GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
@@ -355,7 +356,8 @@ DBindingDriver5BindingStop (
return EFI_SUCCESS;
}
-void
+VOID
+EFIAPI
DBindingDriver5GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver1/DeviceDriver1.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver1/DeviceDriver1.c
index 79191d7e1ed4..9253504bc194 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver1/DeviceDriver1.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver1/DeviceDriver1.c
@@ -78,6 +78,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol2ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_2 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -254,6 +255,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol2ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_2 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver11/DeviceDriver11.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver11/DeviceDriver11.c
index 79a853ceb41d..b88203634a4a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver11/DeviceDriver11.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver11/DeviceDriver11.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol4ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_4 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -259,6 +260,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol4ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_4 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver110/DeviceDriver110.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver110/DeviceDriver110.c
index acc59b470be3..a5ec0203d36f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver110/DeviceDriver110.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver110/DeviceDriver110.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol10ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_10 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -259,6 +260,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol10ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_10 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver111/DeviceDriver111.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver111/DeviceDriver111.c
index 2007cb263760..cf543131e836 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver111/DeviceDriver111.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver111/DeviceDriver111.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol11ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_11 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -259,6 +260,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol11ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_11 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver12/DeviceDriver12.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver12/DeviceDriver12.c
index 3e12a603fa70..7875a42a1ad3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver12/DeviceDriver12.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver12/DeviceDriver12.c
@@ -85,6 +85,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol5ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_5 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -270,6 +271,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol5ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_5 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver13/DeviceDriver13.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver13/DeviceDriver13.c
index 025302ccd832..b5be5b8342a0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver13/DeviceDriver13.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver13/DeviceDriver13.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol6ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_6 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -270,6 +271,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol6ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_6 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver14/DeviceDriver14.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver14/DeviceDriver14.c
index 6620ba227d9c..5e984b7c1884 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver14/DeviceDriver14.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver14/DeviceDriver14.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol7ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_7 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -259,6 +260,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol7ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_7 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver15/DeviceDriver15.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver15/DeviceDriver15.c
index 7414e93825d8..fe9b546fbe6b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver15/DeviceDriver15.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver15/DeviceDriver15.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol8ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_8 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -300,6 +301,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol8ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_8 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver18/DeviceDriver18.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver18/DeviceDriver18.c
index 5816950aa0b0..1ec883576e8c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver18/DeviceDriver18.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver18/DeviceDriver18.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol8ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_8 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -259,6 +260,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol8ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_8 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver19/DeviceDriver19.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver19/DeviceDriver19.c
index 1fba4df772f8..f0a53dc90376 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver19/DeviceDriver19.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver19/DeviceDriver19.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol9ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_9 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -259,6 +260,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol9ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_9 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver2/DeviceDriver2.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver2/DeviceDriver2.c
index e230e72ba9f1..897e3c6c6ec5 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver2/DeviceDriver2.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver2/DeviceDriver2.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol3ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -259,6 +260,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol3ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver3/DeviceDriver3.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver3/DeviceDriver3.c
index 20313d14eded..254ed133bc06 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver3/DeviceDriver3.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver3/DeviceDriver3.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol4ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_4 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -257,6 +258,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol4ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_4 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver4/DeviceDriver4.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver4/DeviceDriver4.c
index 4662b45af8b9..3f1fd9b2fd9b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver4/DeviceDriver4.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver4/DeviceDriver4.c
@@ -85,6 +85,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol3ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -262,6 +263,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol3ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver5/DeviceDriver5.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver5/DeviceDriver5.c
index 670f551ccb31..ef1a5e586335 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver5/DeviceDriver5.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver5/DeviceDriver5.c
@@ -85,6 +85,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol3ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -259,6 +260,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol3ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver6/DeviceDriver6.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver6/DeviceDriver6.c
index 4bf57d198ee5..a2d9891d9861 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver6/DeviceDriver6.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver6/DeviceDriver6.c
@@ -84,6 +84,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol4ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_4 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -258,6 +259,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol4ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_4 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver7/DeviceDriver7.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver7/DeviceDriver7.c
index 084e924a6ca7..0d5844bdbd2c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver7/DeviceDriver7.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver7/DeviceDriver7.c
@@ -83,6 +83,7 @@ InitializeDriverBinding (
);
VOID
+EFIAPI
Protocol5ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_5 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -257,6 +258,7 @@ InitializeDriverBinding (
}
VOID
+EFIAPI
Protocol5ReportProtocolAttributes(
IN INTERFACE_FUNCTION_TEST_PROTOCOL_5 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/PlatformOverrideDriver1/PlatformOverrideDriver1.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/PlatformOverrideDriver1/PlatformOverrideDriver1.c
index 7271e8978ede..da52878d18ed 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/PlatformOverrideDriver1/PlatformOverrideDriver1.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/PlatformOverrideDriver1/PlatformOverrideDriver1.c
@@ -98,6 +98,7 @@ InitializeDriverBinding (
);
EFI_STATUS
+EFIAPI
PlatformOverrideDriver1GetDriver (
IN EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
@@ -105,6 +106,7 @@ PlatformOverrideDriver1GetDriver (
);
EFI_STATUS
+EFIAPI
PlatformOverrideDriver1GetDriverPath (
IN EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
@@ -112,6 +114,7 @@ PlatformOverrideDriver1GetDriverPath (
);
EFI_STATUS
+EFIAPI
PlatformOverrideDriver1DriverLoaded (
IN EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
@@ -440,6 +443,7 @@ InitializeDriverBinding (
}
EFI_STATUS
+EFIAPI
PlatformOverrideDriver1GetDriver (
IN EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
@@ -479,6 +483,7 @@ PlatformOverrideDriver1GetDriver (
}
EFI_STATUS
+EFIAPI
PlatformOverrideDriver1GetDriverPath (
IN EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
@@ -519,6 +524,7 @@ PlatformOverrideDriver1GetDriverPath (
}
EFI_STATUS
+EFIAPI
PlatformOverrideDriver1DriverLoaded (
IN EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver1/TestDriver1.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver1/TestDriver1.c
index d5f258bb300e..fb18a190749c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver1/TestDriver1.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver1/TestDriver1.c
@@ -44,6 +44,7 @@ InitializeTestDriver1 (
);
VOID
+EFIAPI
TestDriver1GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
@@ -209,6 +210,7 @@ Done:
}
VOID
+EFIAPI
TestDriver1GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver2/TestDriver2.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver2/TestDriver2.c
index 279d518f0e68..b4f0b82be674 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver2/TestDriver2.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver2/TestDriver2.c
@@ -44,6 +44,7 @@ InitializeTestDriver2 (
);
VOID
+EFIAPI
TestDriver2GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
@@ -210,6 +211,7 @@ Done:
}
VOID
+EFIAPI
TestDriver2GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver3/TestDriver3.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver3/TestDriver3.c
index c8dcb82e32c2..991c3a21673a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver3/TestDriver3.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver3/TestDriver3.c
@@ -44,6 +44,7 @@ InitializeTestDriver3 (
);
VOID
+EFIAPI
TestDriver3GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
@@ -210,6 +211,7 @@ Done:
}
VOID
+EFIAPI
TestDriver3GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver4/TestDriver4.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver4/TestDriver4.c
index 86f4e2f3fbbd..d4c265183bc7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver4/TestDriver4.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver4/TestDriver4.c
@@ -44,6 +44,7 @@ InitializeTestDriver4 (
);
VOID
+EFIAPI
TestDriver4GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
@@ -220,6 +221,7 @@ Done:
}
VOID
+EFIAPI
TestDriver4GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver5/TestDriver5.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver5/TestDriver5.c
index d3a0cad0d1e6..55c5c5041666 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver5/TestDriver5.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver5/TestDriver5.c
@@ -44,6 +44,7 @@ InitializeTestDriver5 (
);
VOID
+EFIAPI
TestDriver5GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
@@ -248,6 +249,7 @@ Done:
}
VOID
+EFIAPI
TestDriver5GetNextStatusReport (
IN EXTERNAL_DRIVER_PROTOCOL_1 *This,
IN EFI_STATUS *NextStatus
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.c
index 941f0de4f46d..cd5bf933ee52 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Misc.c
@@ -37,6 +37,7 @@ CHAR16 *mFilePath;
// TestProtocol1 Functions
//
VOID
+EFIAPI
InitializeTestProtocol1 (
OUT TEST_PROTOCOL_1 *TestProtocol1
)
@@ -47,6 +48,7 @@ InitializeTestProtocol1 (
}
EFI_STATUS
+EFIAPI
TestProtocol1Func1 (
IN TEST_PROTOCOL_1 *This
)
@@ -60,6 +62,7 @@ TestProtocol1Func1 (
// TestProtocol2 Functions
//
VOID
+EFIAPI
InitializeTestProtocol2 (
OUT TEST_PROTOCOL_2 *TestProtocol2
)
@@ -70,6 +73,7 @@ InitializeTestProtocol2 (
}
EFI_STATUS
+EFIAPI
TestProtocol2Func1 (
IN TEST_PROTOCOL_2 *This
)
@@ -83,6 +87,7 @@ TestProtocol2Func1 (
// InterfaceFunctionTestProtocol1 Functions
//
VOID
+EFIAPI
Protocol1ReportProtocolAttributes (
IN INTERFACE_FUNCTION_TEST_PROTOCOL_1 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -92,6 +97,7 @@ Protocol1ReportProtocolAttributes (
}
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol1 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_1 *InterfaceFunctionTestProtocol1
)
@@ -107,6 +113,7 @@ InitializeInterfaceFunctionTestProtocol1 (
//
VOID
+EFIAPI
Protocol2ReportProtocolAttributes (
IN INTERFACE_FUNCTION_TEST_PROTOCOL_2 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -116,6 +123,7 @@ Protocol2ReportProtocolAttributes (
}
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol2 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_2 *InterfaceFunctionTestProtocol2
)
@@ -131,6 +139,7 @@ InitializeInterfaceFunctionTestProtocol2 (
//
VOID
+EFIAPI
Protocol3ReportProtocolAttributes (
IN INTERFACE_FUNCTION_TEST_PROTOCOL_3 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -140,6 +149,7 @@ Protocol3ReportProtocolAttributes (
}
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol3 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_3 *InterfaceFunctionTestProtocol3
)
@@ -155,6 +165,7 @@ InitializeInterfaceFunctionTestProtocol3 (
//
VOID
+EFIAPI
Protocol4ReportProtocolAttributes (
IN INTERFACE_FUNCTION_TEST_PROTOCOL_4 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -164,6 +175,7 @@ Protocol4ReportProtocolAttributes (
}
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol4 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_4 *InterfaceFunctionTestProtocol4
)
@@ -179,6 +191,7 @@ InitializeInterfaceFunctionTestProtocol4 (
//
VOID
+EFIAPI
Protocol5ReportProtocolAttributes (
IN INTERFACE_FUNCTION_TEST_PROTOCOL_5 *This,
OUT PROTOCOL_ATTRIBUTES *ProtocolAttributes
@@ -188,6 +201,7 @@ Protocol5ReportProtocolAttributes (
}
VOID
+EFIAPI
InitializeInterfaceFunctionTestProtocol5 (
OUT INTERFACE_FUNCTION_TEST_PROTOCOL_5 *InterfaceFunctionTestProtocol5
)
@@ -209,6 +223,7 @@ InitializeInterfaceFunctionTestProtocol5 (
* @see ReleaseInvalidHandle.
*/
VOID
+EFIAPI
CreateInvalidHandle (
OUT EFI_HANDLE *InvalidHandle
)
@@ -234,6 +249,7 @@ CreateInvalidHandle (
}
VOID
+EFIAPI
ReleaseInvalidHandle (
IN EFI_HANDLE InvalidHandle
)
@@ -250,6 +266,7 @@ ReleaseInvalidHandle (
}
VOID
+EFIAPI
CreateVendorDevicePath (
OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
IN EFI_GUID Guid
@@ -300,6 +317,7 @@ CreateVendorDevicePath (
}
VOID
+EFIAPI
CreateVendorDevicePathNode (
OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
IN EFI_GUID Guid
@@ -348,6 +366,7 @@ CreateVendorDevicePathNode (
}
VOID
+EFIAPI
FreeVendorDevicePath (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
@@ -359,6 +378,7 @@ FreeVendorDevicePath (
}
VOID
+EFIAPI
FreeVendorDevicePathNode (
IN EFI_DEVICE_PATH_PROTOCOL *DevicePathNode
)
@@ -370,6 +390,7 @@ FreeVendorDevicePathNode (
}
VOID
+EFIAPI
TestNotifyFunction0 (
IN EFI_EVENT Event,
IN VOID *Context
@@ -382,6 +403,7 @@ TestNotifyFunction0 (
}
VOID
+EFIAPI
TestNotifyFunction1 (
IN EFI_EVENT Event,
IN OUT VOID *Context
@@ -395,6 +417,7 @@ TestNotifyFunction1 (
}
VOID
+EFIAPI
TestNotifyFunction2 (
IN EFI_EVENT Event,
IN VOID *Context
@@ -445,6 +468,7 @@ IsNodeInDevicePath (
////////////////////////////
EFI_STATUS
+EFIAPI
LoadStartImage (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HANDLE CurrentImageHandle,
@@ -529,6 +553,7 @@ LoadStartImage (
EFI_STATUS
+EFIAPI
GetPlatformOverrideDriverImages (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HANDLE CurrentImageHandle,
@@ -707,6 +732,7 @@ Done:
}
EFI_STATUS
+EFIAPI
AliasLocateHandleBuffer (
IN EFI_GUID *Guid
)
@@ -733,6 +759,7 @@ AliasLocateHandleBuffer (
}
EFI_STATUS
+EFIAPI
CheckForCleanEnvironment (
OUT UINTN *Numbers
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestConformance.c
index ec3637dfbd63..f5ea27b78c2e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "Misc.h"
/**
@@ -41,6 +41,7 @@ Abstract:
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -277,6 +278,7 @@ BBTestInstallProtocolInterfaceConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -505,6 +507,7 @@ BBTestUninstallProtocolInterfaceConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -752,6 +755,7 @@ BBTestReinstallProtocolInterfaceConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -933,6 +937,7 @@ BBTestRegisterProtocolNotifyConsistencyTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1334,6 +1339,7 @@ Done:
// TDS 3.6
//
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1517,6 +1523,7 @@ BBTestUninstallMultipleProtocolInterfacesConsistencyTest (
// TDS 3.7
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1914,6 +1921,7 @@ BBTestLocateHandleConsistencyTest (
// TDS 3.8
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2145,6 +2153,7 @@ BBTestLocateHandleBufferConsistencyTest (
// TDS 3.9
//
EFI_STATUS
+EFIAPI
BBTestHandleProtocolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2380,6 +2389,7 @@ BBTestHandleProtocolConsistencyTest (
// TDS 3.10
//
EFI_STATUS
+EFIAPI
BBTestLocateProtocolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2650,6 +2660,7 @@ Done:
// TDS 3.11
//
EFI_STATUS
+EFIAPI
BBTestLocateDevicePathConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3028,6 +3039,7 @@ Done:
// TDS 3.12
//
EFI_STATUS
+EFIAPI
BBTestProtocolsPerHandleConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3248,6 +3260,7 @@ BBTestProtocolsPerHandleConsistencyTest (
// TDS 3.13
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3853,6 +3866,7 @@ BBTestOpenProtocolConsistencyTest (
// TDS 3.14
//
EFI_STATUS
+EFIAPI
BBTestCloseProtocolConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4288,6 +4302,7 @@ Done:
// TDS 3.15
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInformationConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4438,6 +4453,7 @@ BBTestOpenProtocolInformationConsistencyTest (
// TDS 3.16
//
EFI_STATUS
+EFIAPI
BBTestConnectControllerConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4629,6 +4645,7 @@ BBTestConnectControllerConsistencyTest (
// TDS 3.17
//
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction.c
index 7e9029981eaf..e52cced7d497 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "Misc.h"
/**
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -130,6 +131,7 @@ BBTestInstallProtocolInterfaceInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -243,6 +245,7 @@ BBTestUninstallProtocolInterfaceInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -371,6 +374,7 @@ BBTestReinstallProtocolInterfaceInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -478,6 +482,7 @@ BBTestRegisterProtocolNotifyInterfaceTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -578,6 +583,7 @@ BBTestInstallMultipleProtocolInterfacesInterfaceTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -690,6 +696,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTest (
// TDS 4.7
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -763,6 +770,7 @@ BBTestLocateHandleInterfaceTest (
// TDS 4.8
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -828,6 +836,7 @@ BBTestLocateHandleBufferInterfaceTest (
// TDS 4.9
//
EFI_STATUS
+EFIAPI
BBTestHandleProtocolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -880,6 +889,7 @@ BBTestHandleProtocolInterfaceTest (
// TDS 4.10
//
EFI_STATUS
+EFIAPI
BBTestLocateProtocolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -946,6 +956,7 @@ BBTestLocateProtocolInterfaceTest (
// TDS 4.11
//
EFI_STATUS
+EFIAPI
BBTestLocateDevicePathInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -998,6 +1009,7 @@ BBTestLocateDevicePathInterfaceTest (
// TDS 4.12
//
EFI_STATUS
+EFIAPI
BBTestProtocolsPerHandleInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1049,6 +1061,7 @@ BBTestProtocolsPerHandleInterfaceTest (
// TDS 4.13
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1166,6 +1179,7 @@ BBTestOpenProtocolInterfaceTest111 (
// TDS 4.14
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1261,6 +1275,7 @@ BBTestOpenProtocolInterfaceTest222 (
// TDS 4.15
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest333 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1328,6 +1343,7 @@ BBTestOpenProtocolInterfaceTest333 (
// TDS 4.16
//
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1429,6 +1445,7 @@ BBTestCloseProtocolInterfaceTest (
// TDS 4.17
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInformationInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1481,6 +1498,7 @@ BBTestOpenProtocolInformationInterfaceTest (
// TDS 4.18
//
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1646,6 +1664,7 @@ BBTestConnectControllerInterfaceTest (
// TDS 4.19
//
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c
index 104e93b5456a..58e1a05a0bd0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_2.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "Misc.h"
//
@@ -32,6 +32,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -295,6 +296,7 @@ BBTestInstallProtocolInterfaceInterfaceTestCheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -634,6 +636,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -965,6 +968,7 @@ NextLoop:
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1246,6 +1250,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestInstallProtocolInterfaceInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1473,6 +1478,7 @@ BBTestInstallProtocolInterfaceInterfaceTestCheckPoint5 (
//
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1755,6 +1761,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2014,6 +2021,7 @@ BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint2 (
}
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2241,6 +2249,7 @@ BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint3 (
}
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2468,6 +2477,7 @@ BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint4 (
}
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2697,6 +2707,7 @@ BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint5 (
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2999,6 +3010,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3268,6 +3280,7 @@ BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint7 (
}
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3570,6 +3583,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3872,6 +3886,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4069,6 +4084,7 @@ BBTestUninstallProtocolInterfaceInterfaceTestCheckPoint10 (
//
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4270,6 +4286,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4489,6 +4506,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4714,6 +4732,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4940,6 +4959,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5166,6 +5186,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5459,6 +5480,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5751,6 +5773,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6007,6 +6030,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6300,6 +6324,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6422,6 +6447,7 @@ BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint10 (
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint11 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6604,6 +6630,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestReinstallProtocolInterfaceInterfaceTestCheckPoint12 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6825,6 +6852,7 @@ NextLoop:
//
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7011,6 +7039,7 @@ BBTestRegisterProtocolNotifyInterfaceTestCheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7251,6 +7280,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7559,6 +7589,7 @@ RecordPlace:
}
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7846,6 +7877,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -8104,6 +8136,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -8424,6 +8457,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -8728,6 +8762,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestRegisterProtocolNotifyInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -8974,6 +9009,7 @@ Done:
//
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -9239,6 +9275,7 @@ BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -9576,6 +9613,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -9845,6 +9883,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -10184,6 +10223,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -10493,6 +10533,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -10720,6 +10761,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -10979,6 +11021,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestInstallMultipleProtocolInterfacesInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -11232,6 +11275,7 @@ Done:
//
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -11520,6 +11564,7 @@ NextLoop:
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -11771,6 +11816,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint2 (
}
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -12060,6 +12106,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint3 (
}
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -12348,6 +12395,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint4 (
}
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -12637,6 +12685,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint5 (
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -12991,6 +13040,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -13312,6 +13362,7 @@ BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint7 (
}
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -13666,6 +13717,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -14020,6 +14072,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestUninstallMultipleProtocolInterfacesInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c
index dcded9eb5b5d..2f4814b69f7f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c
@@ -24,13 +24,14 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "Misc.h"
//
// Checkpoint Functions for SctLocateHandle ()
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -366,6 +367,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -709,6 +711,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -977,6 +980,7 @@ BBTestLocateHandleInterfaceTestCheckPoint3 (
}
EFI_STATUS
+EFIAPI
BBTestLocateHandleInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1445,6 +1449,7 @@ Done:
//
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1747,6 +1752,7 @@ BBTestLocateHandleBufferInterfaceTestCheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2035,6 +2041,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestLocateHandleBufferInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2291,6 +2298,7 @@ BBTestLocateHandleBufferInterfaceTestCheckPoint3 (
//
EFI_STATUS
+EFIAPI
BBTestHandleProtocolInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2543,6 +2551,7 @@ NextLoop:
//
EFI_STATUS
+EFIAPI
BBTestLocateProtocolInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2700,6 +2709,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestLocateProtocolInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -2946,6 +2956,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestLocateProtocolInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3072,6 +3083,7 @@ NextLoop:
//
EFI_STATUS
+EFIAPI
BBTestLocateDevicePathInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3389,6 +3401,7 @@ Done:
//
EFI_STATUS
+EFIAPI
BBTestProtocolsPerHandleInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3767,6 +3780,7 @@ BBTestProtocolsPerHandleInterfaceTestCheckPoint1 (
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -3955,6 +3969,7 @@ BBTestOpenProtocolInterfaceTest111CheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4143,6 +4158,7 @@ BBTestOpenProtocolInterfaceTest111CheckPoint2 (
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4330,6 +4346,7 @@ BBTestOpenProtocolInterfaceTest111CheckPoint3 (
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4537,6 +4554,7 @@ BBTestOpenProtocolInterfaceTest111CheckPoint4 (
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4682,6 +4700,7 @@ BBTestOpenProtocolInterfaceTest111CheckPoint5 (
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4836,6 +4855,7 @@ BBTestOpenProtocolInterfaceTest111CheckPoint6 (
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -4990,6 +5010,7 @@ BBTestOpenProtocolInterfaceTest111CheckPoint7 (
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5302,6 +5323,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5613,6 +5635,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest111CheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -5927,6 +5950,7 @@ Done:
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6225,6 +6249,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6524,6 +6549,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -6824,6 +6850,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7141,6 +7168,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7518,6 +7546,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -7898,6 +7927,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest222CheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -8283,6 +8313,7 @@ Done:
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest333CheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -8642,6 +8673,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest333CheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -9013,6 +9045,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInterfaceTest333CheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -9394,6 +9427,7 @@ Done:
//
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -9624,6 +9658,7 @@ BBTestCloseProtocolInterfaceTestCheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -9855,6 +9890,7 @@ BBTestCloseProtocolInterfaceTestCheckPoint2 (
}
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -10086,6 +10122,7 @@ BBTestCloseProtocolInterfaceTestCheckPoint3 (
}
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -10334,6 +10371,7 @@ BBTestCloseProtocolInterfaceTestCheckPoint4 (
}
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -10582,6 +10620,7 @@ BBTestCloseProtocolInterfaceTestCheckPoint5 (
}
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -10831,6 +10870,7 @@ BBTestCloseProtocolInterfaceTestCheckPoint6 (
}
EFI_STATUS
+EFIAPI
BBTestCloseProtocolInterfaceTestCheckPoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -11084,6 +11124,7 @@ BBTestCloseProtocolInterfaceTestCheckPoint7 (
//
EFI_STATUS
+EFIAPI
BBTestOpenProtocolInformationInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -11971,6 +12012,7 @@ Done:
//
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -12113,6 +12155,7 @@ BBTestConnectControllerInterfaceTestCheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -12328,6 +12371,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -12694,6 +12738,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -12947,6 +12992,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -13199,6 +13245,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -13431,6 +13478,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint7_13 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -13654,6 +13702,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -14052,6 +14101,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint9 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -14248,6 +14298,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint10 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -14466,6 +14517,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint11 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -14898,6 +14950,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint12 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -15186,6 +15239,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint14 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -15396,11 +15450,11 @@ BBTestConnectControllerInterfaceTestCheckPoint14 (
EFI_TEST_ASSERTION_FAILED,
gTestGenericFailureGuid,
L"GetPlatformOverrideDriverImages - build environment",
- L"%a:%d:Status - %r",
+ L"%a:%d:Status - %r",
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
goto Done;
}
@@ -15547,6 +15601,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint15 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -15697,7 +15752,7 @@ BBTestConnectControllerInterfaceTestCheckPoint15 (
EFI_TEST_ASSERTION_FAILED,
gTestGenericFailureGuid,
L"GetPlatformOverrideDriverImages - build environment",
- L"%a:%d:Status - %r",
+ L"%a:%d:Status - %r",
__FILE__,
(UINTN)__LINE__,
Status
@@ -15858,6 +15913,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestConnectControllerInterfaceTestCheckPoint16 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -16083,6 +16139,7 @@ Done:
//
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -16205,6 +16262,7 @@ BBTestDisconnectControllerInterfaceTestCheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -16327,6 +16385,7 @@ BBTestDisconnectControllerInterfaceTestCheckPoint2 (
}
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -16533,6 +16592,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -16758,6 +16818,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -17042,6 +17103,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestDisconnectControllerInterfaceTestCheckPoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestStress.c
index bfeadd40e42a..4c5bee83f338 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestStress.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "Misc.h"
EFI_GUID StressTestNonInterfaceProtocolGuid[40];
@@ -164,6 +164,7 @@ EFI_GUID STRESS_TEST_NON_INTERFACE_PROTOCOL_39_GUID =
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestCombinationTest1 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -371,6 +372,7 @@ BBTestCombinationTest1 (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestCombinationTest2 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -440,6 +442,7 @@ BBTestCombinationTest2 (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestCombinationTest3 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1206,6 +1209,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestCombinationTest2CheckPoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1349,6 +1353,7 @@ BBTestCombinationTest2CheckPoint1 (
}
EFI_STATUS
+EFIAPI
BBTestCombinationTest2CheckPoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1503,6 +1508,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestCombinationTest2CheckPoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
@@ -1604,6 +1610,7 @@ BBTestCombinationTest2CheckPoint3 (
}
EFI_STATUS
+EFIAPI
BBTestCombinationTest2CheckPoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
index f9bbf051a275..272ed53b3497 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
@@ -414,6 +414,7 @@ GenTestConfigContent (
//
EFI_STATUS
+EFIAPI
PlatformSpecificElementsBbTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -440,7 +441,7 @@ Routine Description:
EFI_FILE *Root;
EFI_FILE *OldFile;
CONFIG_ERROR_DATA *ErrorData;
- UINT8 Index;
+ UINT32 Index;
BOOLEAN GenConfigINI;
CHAR16 String[MAX_LENGTH];
CHAR16 *FilePath;
@@ -1017,7 +1018,7 @@ CheckConsoleProtocols (
AssertionType,
gEfiCompliantBbTestPlatformAssertionGuid001,
L"UEFI Compliant - Console protocols must be implemented",
- L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx - %s",
+ L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx - %s",
__FILE__,
(UINTN)__LINE__,
ValueA ? L"Yes" : L"No",
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_uefi.c
index b632477ab30a..94e49128fd26 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_uefi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_uefi.c
@@ -28,7 +28,7 @@ Abstract:
// Includes
//
-#include "SctLib.h"
+#include "SctLib.h"
#include "EfiCompliantBbTestMain_uefi.h"
#include EFI_PROTOCOL_DEFINITION (LoadedImage)
#include EFI_PROTOCOL_DEFINITION (DevicePath)
@@ -137,6 +137,7 @@ CheckGloballyDefinedVariables(
//
EFI_STATUS
+EFIAPI
RequiredElementsBbTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTestRequired.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTestRequired.c
index 3b9ec38a963d..426bda3b2bb9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTestRequired.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTestRequired.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ExeModeBBTest.h"
/**
@@ -37,6 +37,7 @@ Abstract:
*/
EFI_STATUS
+EFIAPI
BBTestFpuControlWordTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -110,6 +111,7 @@ BBTestFpuControlWordTest (
* @return EFI_SUCCESS
*/
EFI_STATUS
+EFIAPI
BBTestMxCsrTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestConformance.c
index 68d740cdb160..8d122de3ac3a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestConformance.c
@@ -21,11 +21,12 @@ Abstract:
for EFI Driver Acpi Table Protocol's Conformance Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "AcpiTableProtocolBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -65,6 +66,7 @@ BBTestInstallAcpiTableConformanceTest (
EFI_STATUS
+EFIAPI
BBTestUninstallAcpiTableConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -100,6 +102,7 @@ BBTestUninstallAcpiTableConformanceTest (
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
@@ -140,6 +143,7 @@ BBTestInstallAcpiTableConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
@@ -190,6 +194,7 @@ BBTestInstallAcpiTableConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
@@ -240,6 +245,7 @@ BBTestInstallAcpiTableConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestUninstallAcpiTableConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c
index ea8aeb851279..2a3b9362daaf 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c
@@ -21,7 +21,7 @@ Abstract:
for EFI Driver Acpi Table Protocol's function Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "AcpiTableProtocolBBTestMain.h"
#define EFI_ACPI_TABLE_GUID \
@@ -47,6 +47,7 @@ typedef struct {
} EFI_ACPI_RSDP;
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -82,6 +83,7 @@ BBTestInstallAcpiTableFunctionTest (
EFI_STATUS
+EFIAPI
BBTestUninstallAcpiTableFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +119,7 @@ BBTestUninstallAcpiTableFunctionTest (
EFI_STATUS
+EFIAPI
BBTestInstallAcpiTableFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
@@ -303,7 +306,7 @@ BBTestInstallAcpiTableFunctionTestCheckpoint1 (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
if (EFI_SUCCESS == Status) {
Status = AcpiTable->UninstallAcpiTable (
@@ -323,6 +326,7 @@ EXIT:
EFI_STATUS
+EFIAPI
BBTestUninstallAcpiTableFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestConformance.c
index fe13193faa9f..67d403cc6955 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "AbsolutePointerBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestGetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -68,6 +69,7 @@ BBTestGetStateConformanceAutoTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestGetStateConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -95,6 +97,7 @@ BBTestGetStateConformanceManualTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestWaitForInputConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestFunction.c
index 86a3afc325fc..3ac765243433 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "AbsolutePointerBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -326,6 +327,7 @@ BBTestResetFunctionAutoTest (
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1086,6 +1088,7 @@ AssertionPoints2:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestGetStateFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1385,6 +1388,7 @@ BBTestGetStateFunctionAutoTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestGetStateFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1992,6 +1996,7 @@ Step13:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestWaitForInputFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestStress.c
index 56672ac1b116..14f16e824e5e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTestStress.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "AbsolutePointerBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestResetClearanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -518,6 +519,7 @@ BBTestResetClearanceManualTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestGetStateExtensiveManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestConformance.c
index 4a1f1ab721df..19ccac93c7c7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestConformance.c
@@ -25,18 +25,21 @@ Abstract:
EFI_STATUS
+EFIAPI
BBTestGetInformationConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
);
EFI_STATUS
+EFIAPI
BBTestGetInformationConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
);
EFI_STATUS
+EFIAPI
BBTestGetInformationConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -45,12 +48,14 @@ BBTestGetInformationConformanceTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestSetInformationConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
);
EFI_STATUS
+EFIAPI
BBTestSetInformationConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -59,12 +64,14 @@ BBTestSetInformationConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
);
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -75,6 +82,7 @@ BBTestGetSupportedTypesConformanceTestCheckpoint2 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestGetInformationConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +126,7 @@ BBTestGetInformationConformanceTest (
EFI_STATUS
+EFIAPI
BBTestSetInformationConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -158,6 +167,7 @@ BBTestSetInformationConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -202,6 +212,7 @@ BBTestGetSupportedTypesConformanceTest (
//
EFI_STATUS
+EFIAPI
BBTestGetInformationConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -256,6 +267,7 @@ BBTestGetInformationConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetInformationConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -342,6 +354,7 @@ BBTestGetInformationConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetInformationConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -433,6 +446,7 @@ BBTestGetInformationConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestSetInformationConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -477,6 +491,7 @@ BBTestSetInformationConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetInformationConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -590,6 +605,7 @@ BBTestSetInformationConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -632,6 +648,7 @@ BBTestGetSupportedTypesConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c
index 334bb9edc493..9372db298de0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c
@@ -28,6 +28,7 @@ Abstract:
EFI_STATUS
+EFIAPI
BBTestGetInformationFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -36,6 +37,7 @@ BBTestGetInformationFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestSetInformationFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -43,6 +45,7 @@ BBTestSetInformationFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -54,6 +57,7 @@ BBTestGetSupportedTypesFunctionTestCheckpoint1 (
//
EFI_STATUS
+EFIAPI
BBTestGetInformationFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -93,6 +97,7 @@ BBTestGetInformationFunctionTest (
EFI_STATUS
+EFIAPI
BBTestSetInformationFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -131,6 +136,7 @@ BBTestSetInformationFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -174,6 +180,7 @@ BBTestGetSupportedTypesFunctionTest (
//
EFI_STATUS
+EFIAPI
BBTestGetInformationFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -279,6 +286,7 @@ BBTestGetInformationFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestSetInformationFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
@@ -462,6 +470,7 @@ BBTestSetInformationFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetSupportedTypesFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_ADAPTER_INFORMATION_PROTOCOL *AdapterInfo
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestConformance.c
index bdd3fcf64165..c086fea9f570 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "AtaPassThruBBTestMain.h"
extern UINT8 EnterEvent;
@@ -68,6 +68,7 @@ IsPowerOfTwo (UINT32 Value)
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -154,6 +155,7 @@ BBTestModeConformanceAutoTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestGetNextPortConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -308,6 +310,7 @@ BBTestGetNextPortConformanceAutoTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -504,6 +507,7 @@ CheckPoint2:
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestGetDeviceConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -693,6 +697,7 @@ BBTestGetDeviceConformanceAutoTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestResetDeviceConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -851,6 +856,7 @@ BBTestResetDeviceConformanceAutoTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestGetNextDeviceConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1022,6 +1028,7 @@ BBTestGetNextDeviceConformanceAutoTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestFunction.c
index 93ae5fdf1be5..31356753ab0a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "AtaPassThruBBTestMain.h"
extern UINT8 EnterEvent;
@@ -42,6 +42,7 @@ extern UINT8 EnterEvent;
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestGetNextPortFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +129,7 @@ BBTestGetNextPortFunctionAutoTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -227,6 +229,7 @@ BBTestBuildDevicePathFunctionAutoTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestGetDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -351,6 +354,7 @@ BBTestGetDeviceFunctionAutoTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestResetPortFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -458,6 +462,7 @@ BBTestResetPortFunctionAutoTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestResetDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -555,6 +560,7 @@ BBTestResetDeviceFunctionAutoTest (
// TDS 3.6
//
EFI_STATUS
+EFIAPI
BBTestGetNextDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -660,6 +666,7 @@ BBTestGetNextDeviceFunctionAutoTest (
// TDS 3.7
//
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.c
index 2e5916593dd5..a417560d0f2e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTestMain.c
@@ -140,6 +140,7 @@ UnloadAuthenticationTest (
* @return EFI_SUCCESS Finish the test successfully.
********************************************************************************/
EFI_STATUS
+EFIAPI
BBTestAuthenticationFunctionTestA (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -211,6 +212,7 @@ BBTestAuthenticationFunctionTestA (
* @return EFI_SUCCESS Finish the test successfully.
********************************************************************************/
EFI_STATUS
+EFIAPI
BBTestAuthenticationFunctionTestB (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestCase.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestCase.c
index e5e0f09a0490..09ed57594daf 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestCase.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTestCase.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "BisBBTestMain.h"
/**
@@ -39,6 +39,7 @@ Abstract:
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestConformance.c
index 1f88b9f8b811..c71988e00591 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "BlockIoBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestReadBlocksConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -684,6 +685,7 @@ BBTestReadBlocksConformanceAutoTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestReadBlocksConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1114,6 +1116,7 @@ FreeBuffer:
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestWriteBlocksConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1850,6 +1853,7 @@ BBTestWriteBlocksConformanceAutoTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestWriteBlocksConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2490,6 +2494,7 @@ FreeBuffer:
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestFlushBlocksConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2641,6 +2646,7 @@ BBTestFlushBlocksConformanceAutoTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestFlushBlocksConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestFunction.c
index e25743b72772..519e808beb80 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "BlockIoBBTestMain.h"
/**
@@ -40,6 +40,7 @@ Abstract:
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -150,6 +151,7 @@ BBTestResetFunctionAutoTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestReadBlocksFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -403,6 +405,7 @@ BBTestReadBlocksFunctionAutoTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestWriteBlocksFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -922,6 +925,7 @@ BBTestWriteBlocksFunctionAutoTest (
// TDS 5.4
//
EFI_STATUS
+EFIAPI
BBTestFlushBlocksFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -949,6 +953,7 @@ BBTestFlushBlocksFunctionAutoTest (
// TDS 5.4
//
EFI_STATUS
+EFIAPI
BBTestMediaInfoCheckAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1044,6 +1049,7 @@ BBTestMediaInfoCheckAutoTest (
// TDS 5.5
//
EFI_STATUS
+EFIAPI
BBTestMediaIntegrityManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestStress.c
index 9a125f65acf5..a12fa672c29f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTestStress.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "BlockIoBBTestMain.h"
@@ -43,6 +43,7 @@ Abstract:
// TDS 6.1
//
EFI_STATUS
+EFIAPI
BBTestResetStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -163,6 +164,7 @@ BBTestResetStressAutoTest (
// TDS 6.2
//
EFI_STATUS
+EFIAPI
BBTestReadBlocksStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -681,6 +683,7 @@ BBTestReadBlocksStressAutoTest (
// TDS 6.3
//
EFI_STATUS
+EFIAPI
BBTestWriteBlocksStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestConformance.c
index 497b278ce53e..88f3247989af 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "BlockIo2BBTestMain.h"
STATIC BOOLEAN BlkIO2Finished;
@@ -54,6 +54,7 @@ NotifyFunc (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestReadBlocksExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1018,6 +1019,7 @@ BBTestReadBlocksExConformanceAutoTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1978,6 +1980,7 @@ BBTestWriteBlocksExConformanceAutoTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestFlushBlocksExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c
index ecc0370581b4..29cfb829e0c7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "BlockIo2BBTestMain.h"
#define BIO2ENTITY_SIGNATURE EFI_SIGNATURE_32('b','i','o','2')
@@ -56,6 +56,7 @@ typedef struct {
} BlockIO2_Batch_Task_Context;
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -63,6 +64,7 @@ BBTestReadBlocksExFunctionAutoTestCheckpoint1(
);
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -70,6 +72,7 @@ BBTestReadBlocksExFunctionAutoTestCheckpoint2(
);
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -77,6 +80,7 @@ BBTestReadBlocksExFunctionAutoTestCheckpoint3(
);
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTestCheckpoint4(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -84,6 +88,7 @@ BBTestReadBlocksExFunctionAutoTestCheckpoint4(
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -91,6 +96,7 @@ BBTestWriteBlocksExFunctionAutoTestCheckpoint1(
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -98,6 +104,7 @@ BBTestWriteBlocksExFunctionAutoTestCheckpoint2(
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -105,6 +112,7 @@ BBTestWriteBlocksExFunctionAutoTestCheckpoint3(
);
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTestCheckpoint4(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -113,6 +121,7 @@ BBTestWriteBlocksExFunctionAutoTestCheckpoint4(
EFI_STATUS
+EFIAPI
BBTestFushBlocksExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO2_PROTOCOL *BlockIo2
@@ -120,6 +129,7 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1(
EFI_STATUS
+EFIAPI
BBTestFushBlocksExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO2_PROTOCOL *BlockIo2
@@ -1157,6 +1167,7 @@ BlockIo2AsyncBatchWrite (
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1267,6 +1278,7 @@ BBTestResetFunctionAutoTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1409,6 +1421,7 @@ BBTestReadBlocksExFunctionAutoTest (
*/
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -1757,6 +1770,7 @@ END_WAIT:
*/
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -1998,6 +2012,7 @@ END:
*/
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -2315,6 +2330,7 @@ END:
*/
EFI_STATUS
+EFIAPI
BBTestReadBlocksExFunctionAutoTestCheckpoint4(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -2643,6 +2659,7 @@ END_WAIT:
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2785,6 +2802,7 @@ BBTestWriteBlocksExFunctionAutoTest (
*/
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -3277,6 +3295,7 @@ END:
*/
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -3566,6 +3585,7 @@ END:
*/
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -4015,6 +4035,7 @@ END:
*/
EFI_STATUS
+EFIAPI
BBTestWriteBlocksExFunctionAutoTestCheckpoint4(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO_PROTOCOL *BlockIo,
@@ -4489,6 +4510,7 @@ END:
// TDS 5.4
//
EFI_STATUS
+EFIAPI
BBTestFlushBlocksExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4581,6 +4603,7 @@ BBTestFlushBlocksExFunctionAutoTest (
*/
EFI_STATUS
+EFIAPI
BBTestFushBlocksExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO2_PROTOCOL *BlockIo2
@@ -4686,8 +4709,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1(
__FILE__,
(UINTN)__LINE__,
4,
- EFI_SUCCESS,
- BlockIo2TokenBuffer[IndexI].TransactionStatus
+ EFI_SUCCESS,
+ BlockIo2TokenBuffer[IndexI].TransactionStatus
);
Status = gtBS->SetTimer (TimerEvent, TimerCancel, 0);
@@ -4705,6 +4728,7 @@ END:
}
EFI_STATUS
+EFIAPI
BBTestFushBlocksExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_BLOCK_IO2_PROTOCOL *BlockIo2
@@ -4730,6 +4754,7 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint2(
// TDS
//
EFI_STATUS
+EFIAPI
BBTestMediaInfoCheckAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestConformance.c
index e63f7f7d6441..a5b94f593d84 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "BusSpecificDriverOverrideBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestFunction.c
index 7c4b436602fc..0940cca5e181 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "BusSpecificDriverOverrideBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestConformance.c
index 65f02ce04850..b24b82b91723 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ComponentNameBBTest.h"
//
@@ -107,6 +107,7 @@ CHAR8 IsoLatinTable[][4] = {
// TDS 9.3.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -162,6 +163,7 @@ BBTestGetDriverNameConformanceTest (
// TDS 9.3.2
//
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -213,6 +215,7 @@ BBTestGetControllerNameConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -280,6 +283,7 @@ BBTestGetDriverNameConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -337,6 +341,7 @@ BBTestGetDriverNameConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -505,6 +510,7 @@ BBTestGetControllerNameConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -582,6 +588,7 @@ BBTestGetControllerNameConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -732,6 +739,7 @@ BBTestGetControllerNameConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestFunction.c
index a13452956e5b..b1ecafe60411 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestFunction.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ComponentNameBBTest.h"
/**
@@ -41,6 +41,7 @@ Abstract:
// TDS 9.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverNameBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -92,6 +93,7 @@ BBTestGetDriverNameBasicTest (
// TDS 9.2.2
//
EFI_STATUS
+EFIAPI
BBTestGetControllerNameBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -137,6 +139,7 @@ BBTestGetControllerNameBasicTest (
}
EFI_STATUS
+EFIAPI
BBTestGetDriverNameBasicTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -188,6 +191,7 @@ BBTestGetDriverNameBasicTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetControllerNameBasicTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
@@ -335,6 +339,7 @@ BBTestGetControllerNameBasicTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameBasicTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME_PROTOCOL *ComponentName
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestMain.c
index 7be7c79510f2..fb6f814a8d97 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName/BlackBoxTest/ComponentNameBBTestMain.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ComponentNameBBTest.h"
EFI_HANDLE mImageHandle;
@@ -121,6 +121,7 @@ InitializeBBTestComponentName (
* @return EFI_SUCCESS Indicates the interface was Uninstalled
*/
EFI_STATUS
+EFIAPI
BBTestComponentNameUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestConformance.c
index 52a870a03010..b8ffdc615389 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestConformance.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ComponentName2BBTestMain.h"
//
@@ -86,6 +86,7 @@ EFI_GUID mTestNoInterfaceProtocol2Guid = TEST_NO_INTERFACE_PROTOCOL_2_GUID;
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -157,6 +158,7 @@ BBTestGetDriverNameConformanceTest (
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -223,6 +225,7 @@ BBTestGetControllerNameConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
@@ -337,6 +340,7 @@ BBTestGetDriverNameConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetDriverNameConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
@@ -464,6 +468,7 @@ BBTestGetDriverNameConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
@@ -631,6 +636,7 @@ BBTestGetControllerNameConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
@@ -778,6 +784,7 @@ BBTestGetControllerNameConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
@@ -979,6 +986,7 @@ BBTestGetControllerNameConformanceTestCheckpoint3 (
/*
EFI_STATUS
+EFIAPI
BBTestGetControllerNameConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c
index dff789307aec..371cc9efc7f7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c
@@ -21,7 +21,7 @@ Abstract:
for EFI Driver Component Name2 Protocol's Function Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ComponentName2BBTestMain.h"
@@ -36,6 +36,7 @@ Abstract:
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestGetDriverNameFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -105,6 +106,7 @@ BBTestGetDriverNameFuncTest (
*/
EFI_STATUS
+EFIAPI
BBTestGetControllerNameFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -165,6 +167,7 @@ BBTestGetControllerNameFuncTest (
}
EFI_STATUS
+EFIAPI
BBTestGetDriverNameFuncTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
@@ -285,6 +288,7 @@ BBTestGetDriverNameFuncTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameFuncTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
@@ -511,6 +515,7 @@ BBTestGetControllerNameFuncTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetControllerNameFuncTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_COMPONENT_NAME2_PROTOCOL *ComponentName
@@ -766,10 +771,10 @@ BBTestGetControllerNameFuncTestCheckpoint2 (
AssertionType,
gComponentName2BBTestFunctionAssertionGuid003,
L"Please Use Native RFC3066 which is preferable in UEFI 2.X\nCOMPONENT_NAME2_PROTOCOL.GetControllerName - GetControllerName() returns EFI_SUCCESS support language",
- L"%a:%d: Language - %c%c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
- __FILE__,
+ L"%a:%d: Language - %c%c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
+ __FILE__,
(UINTN)__LINE__,
- Lang[0],Lang[1],Lang[2],Lang[3],
+ Lang[0],Lang[1],Lang[2],Lang[3],
Index,
ChildIndex,
(ControllerName == NULL) ? L"(NULL)" : ControllerName,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestConformance.c
index 7d80ae309911..4a9ba4d4d7b7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestConformance.c
@@ -29,6 +29,7 @@ Abstract:
extern EFI_HANDLE mImageHandle;
EFI_STATUS
+EFIAPI
BBTestSetDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -60,11 +61,11 @@ BBTestSetDataConformanceTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -72,11 +73,11 @@ BBTestSetDataConformanceTest (
//
// Get the Profile Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiTestProfileLibraryGuid,
- (VOID **) &ProfileLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiTestProfileLibraryGuid,
+ (VOID **) &ProfileLib
+ );
if (EFI_ERROR(Status)) {
return Status;
@@ -219,6 +220,7 @@ BBTestSetDataConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -253,11 +255,11 @@ BBTestGetDataConformanceTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -265,11 +267,11 @@ BBTestGetDataConformanceTest (
//
// Get the Profile Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiTestProfileLibraryGuid,
- (VOID **) &ProfileLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiTestProfileLibraryGuid,
+ (VOID **) &ProfileLib
+ );
if (EFI_ERROR(Status)) {
return Status;
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestFunction.c
index 9061f5975eb9..61d44343562e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTestFunction.c
@@ -30,6 +30,7 @@ extern CONST EFI_STRING FullStr;
extern EFI_HANDLE mImageHandle;
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -64,11 +65,11 @@ BBTestSetDataFunctionTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -76,11 +77,11 @@ BBTestSetDataFunctionTest (
//
// Get the Profile Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiTestProfileLibraryGuid,
- (VOID **) &ProfileLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiTestProfileLibraryGuid,
+ (VOID **) &ProfileLib
+ );
if (EFI_ERROR(Status)) {
return Status;
@@ -233,6 +234,7 @@ BBTestSetDataFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -264,11 +266,11 @@ BBTestGetDataFunctionTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -276,11 +278,11 @@ BBTestGetDataFunctionTest (
//
// Get the Profile Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiTestProfileLibraryGuid,
- (VOID **) &ProfileLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiTestProfileLibraryGuid,
+ (VOID **) &ProfileLib
+ );
if (EFI_ERROR(Status)) {
return Status;
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestFunction.c
index ec7b9fa2e39a..3669df2fc14b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DebugPortBBTestMain.h"
/**
@@ -40,6 +40,7 @@ Abstract:
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -114,6 +115,7 @@ BBTestResetFunctionAutoTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestWriteFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -231,6 +233,7 @@ BBTestWriteFunctionManualTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestReadFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -355,6 +358,7 @@ BBTestReadFunctionManualTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestPollFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c
index 96ee7b57725e..a3b0a19d119d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c
@@ -39,6 +39,7 @@ Abstract:
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestInvalidateInstructionCacheFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c
index c27c0c0c02c2..633ec573708d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c
@@ -53,6 +53,7 @@ SoftwareBreak (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterExceptionCallbackFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestCacheFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestCacheFunction.c
index 96ee7b57725e..a3b0a19d119d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestCacheFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestCacheFunction.c
@@ -39,6 +39,7 @@ Abstract:
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestInvalidateInstructionCacheFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestExceptionCallbackFunction.c
index 03074668da7c..2a3a79b6d803 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestExceptionCallbackFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Arm/DebugSupportBBTestExceptionCallbackFunction.c
@@ -53,6 +53,7 @@ SoftwareBreak (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterExceptionCallbackFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestFunction.c
index d4824629955d..e4000d42b7c3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestFunction.c
@@ -41,6 +41,7 @@ extern volatile UINTN InvokedPeriodicCallback;
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestIsaFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +118,7 @@ BBTestIsaFunctionAutoTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestGetMaximumProcessorIndexFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -204,6 +206,7 @@ TimerNotifyFunction1 (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestRegisterPeriodicCallbackFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.c
index 0e3cd62e8dc0..99efa17afab5 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTestMain.c
@@ -103,6 +103,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
EFI_STATUS
+EFIAPI
BBTestDebugSupportProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -140,6 +141,7 @@ InitializeBBTestDebugSupport (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestDebugSupportProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestCacheFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestCacheFunction.c
index d1e988f29fa8..a32d1cf73c15 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestCacheFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestCacheFunction.c
@@ -39,6 +39,7 @@ Abstract:
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestInvalidateInstructionCacheFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestExceptionCallbackFunction.c
index 28a6c98459ee..e0fbd05e72ac 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestExceptionCallbackFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IA32/DebugSupportBBTestExceptionCallbackFunction.c
@@ -49,6 +49,7 @@ SoftwareBreak (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterExceptionCallbackFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestCacheFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestCacheFunction.c
index c2e52698a8c7..b3e44448cf1d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestCacheFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestCacheFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DebugSupportBBTestMain.h"
/**
@@ -40,6 +40,7 @@ Abstract:
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestInvalidateInstructionCacheFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestExceptionCallbackFunction.c
index f74597511a9d..cbfa895badb9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestExceptionCallbackFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/IPF/DebugSupportBBTestExceptionCallbackFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DebugSupportBBTestMain.h"
extern volatile UINTN InvokedExceptionCallback;
@@ -50,6 +50,7 @@ SoftwareBreak (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterExceptionCallbackFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCacheFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCacheFunction.c
index 96ee7b57725e..a3b0a19d119d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCacheFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCacheFunction.c
@@ -39,6 +39,7 @@ Abstract:
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestInvalidateInstructionCacheFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c
index c6e72806db00..45914fa9bf0b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c
@@ -54,6 +54,7 @@ SoftwareBreak (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterExceptionCallbackFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestCacheFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestCacheFunction.c
index 0618f7319cf7..a7aade9a050c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestCacheFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestCacheFunction.c
@@ -39,6 +39,7 @@ Abstract:
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestInvalidateInstructionCacheFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestExceptionCallbackFunction.c
index 6d9ad993cc67..6a5d93c3f1b4 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestExceptionCallbackFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/X64/DebugSupportBBTestExceptionCallbackFunction.c
@@ -49,6 +49,7 @@ SoftwareBreak (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestRegisterExceptionCallbackFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestConformance.c
index e9cd532937e7..9b8cb1350dda 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DecompressBBTestMain.h"
#include "DecompressBBTestSupport.h"
@@ -45,6 +45,7 @@ Abstract:
//TDS 4.2.1
//
EFI_STATUS
+EFIAPI
GetInfo_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -141,6 +142,7 @@ GetInfo_Conf (
//TDS 4.2.2
//
EFI_STATUS
+EFIAPI
Decompress_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestFunction.c
index acdab1d0b349..34a63e40a335 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTestFunction.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DecompressBBTestMain.h"
#include "DecompressBBTestSupport.h"
@@ -45,6 +45,7 @@ Abstract:
//TDS 4.1.1
//
EFI_STATUS
+EFIAPI
GetInfo_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -359,6 +360,7 @@ GetInfo_Func (
//TDS 4.1.2
//
EFI_STATUS
+EFIAPI
Decompress_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestFunction.c
index 1025ad846464..a316f06d3c93 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestFunction.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DeviceIoBBTestMain.h"
#include EFI_PROTOCOL_DEFINITION (PciIo)
#include "DeviceIoBBTestSupport.h"
@@ -48,6 +48,7 @@ Abstract:
//TDS 4.1.1
//
EFI_STATUS
+EFIAPI
MemRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -390,6 +391,7 @@ MemRead_Func (
//TDS 4.1.2
//
EFI_STATUS
+EFIAPI
MemWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -825,6 +827,7 @@ MemWrite_Func (
//TDS 4.1.3
//
EFI_STATUS
+EFIAPI
IoRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1169,6 +1172,7 @@ IoRead_Func (
//TDS 4.1.4
//
EFI_STATUS
+EFIAPI
IoWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1606,6 +1610,7 @@ IoWrite_Func (
//TDS 4.1.5
//
EFI_STATUS
+EFIAPI
PciRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1927,6 +1932,7 @@ PciRead_Func (
//TDS 4.1.6
//
EFI_STATUS
+EFIAPI
PciWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2374,6 +2380,7 @@ PciWrite_Func (
//TDS 4.1.7
//
EFI_STATUS
+EFIAPI
Map_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3038,6 +3045,7 @@ Unmap_Func (
//TDS 4.1.9
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3333,6 +3341,7 @@ AllocateBuffer_Func (
//TDS 4.1.10
//
EFI_STATUS
+EFIAPI
FreeBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3567,6 +3576,7 @@ FreeBuffer_Func (
//TDS 4.1.11
//
EFI_STATUS
+EFIAPI
Flush_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.c
index 522639319e8f..1c36762556bc 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DeviceIo/BlackBoxTest/DeviceIoBBTestMain.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DeviceIoBBTestMain.h"
#include "DeviceIoBBTestSupport.h"
@@ -274,6 +274,7 @@ Returns:
EFI_STATUS
+EFIAPI
BBTestDeviceIoUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestFunction.c
index 307901857c5f..c8757e958a22 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTestFunction.c
@@ -45,6 +45,7 @@ EFI_GUID gBlackBoxEfiDevicePathMessagingSASGuid = DEVICE_PATH_MESS
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestDevicePathNodeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestConformance.c
index 7310573ed765..eb6bd35b2937 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestConformance.c
@@ -30,6 +30,7 @@ Abstract:
// TDS 3.9.1
//
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDeviceNodeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -85,6 +86,7 @@ DevicePathFromTextConvertTextToDeviceNodeConformanceTest (
// TDS 3.9.2
//
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
index a794ed8ee173..c96ee2461df0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
@@ -1458,7 +1458,7 @@ CreateiScsiDeviceNode (
);
SctUnicodeToAscii (iSCSI->iSCSITargetName, NameStr, SctStrLen (NameStr));
iSCSI->TargetPortalGroupTag = (UINT16) SctStrToUInt (PortalGroupStr);
- StrToUInt8Array(LunStr, &LunNum);
+ StrToUInt8Array(LunStr, (UINT8 *)&LunNum);
iSCSI->Lun = LunNum;
Options = 0x0000;
@@ -1734,13 +1734,13 @@ CreateDNSDeviceNode (
}
if (DNS->IsIPv6 == 0) {
- SctStrToIPv4Addr (&IpStr1, (UINT8 *)DNS + sizeof (DNS_DEVICE_PATH));
- SctStrToIPv4Addr (&IpStr2, (UINT8 *)DNS + sizeof (DNS_DEVICE_PATH) + sizeof(EFI_IP_ADDRESS));
+ SctStrToIPv4Addr (&IpStr1, (EFI_IPv4_ADDRESS *)(DNS + sizeof (DNS_DEVICE_PATH)));
+ SctStrToIPv4Addr (&IpStr2, (EFI_IPv4_ADDRESS *)(DNS + sizeof (DNS_DEVICE_PATH) + sizeof(EFI_IP_ADDRESS)));
}
if (DNS->IsIPv6 == 1) {
- SctStrToIPv6Addr (&IpStr1, (UINT8 *)DNS + sizeof (DNS_DEVICE_PATH));
- SctStrToIPv6Addr (&IpStr2, (UINT8 *)DNS + sizeof (DNS_DEVICE_PATH) + sizeof(EFI_IP_ADDRESS));
+ SctStrToIPv6Addr (&IpStr1, (EFI_IPv6_ADDRESS *)(DNS + sizeof (DNS_DEVICE_PATH)));
+ SctStrToIPv6Addr (&IpStr2, (EFI_IPv6_ADDRESS *)(DNS + sizeof (DNS_DEVICE_PATH) + sizeof(EFI_IP_ADDRESS)));
}
return (EFI_DEVICE_PATH_PROTOCOL *) DNS;
@@ -2133,6 +2133,7 @@ CreateMediaRelativeOffsetRangeDeviceNode (
// TDS 3.10.1
//
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2233,8 +2234,8 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
L"EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL - ConvertDeviceNodeToText must correctly recover the converting ConvertTextToDeviceNode has acted on the device node string",
L"%a:%d, Convert MemoryMapped(%d,0x123456789ABCDEF,0xFEDCBA9876543210)",
__FILE__,
- (UINTN)__LINE__,
- EfiMaxMemoryType
+ (UINTN)__LINE__,
+ EfiMaxMemoryType
);
//
@@ -3415,7 +3416,7 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
L"%a:%d, Convert SD(0)",
__FILE__,
(UINTN)__LINE__
- );
+ );
//
// Bluetooth(001320F5FA77)
@@ -3802,6 +3803,7 @@ CreateFloppyDevicePath (
// TDS 3.10.2
//
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDevicePathCoverageTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestFunction.c
index 0ad76da8f23d..cca8af21e7ea 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestFunction.c
@@ -32,6 +32,7 @@ Abstract:
// TDS 3.8.1
//
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDeviceNodeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -183,6 +184,7 @@ DevicePathFromTextConvertTextToDeviceNodeFunctionTest (
// TDS 3.8.2
//
EFI_STATUS
+EFIAPI
DevicePathFromTextConvertTextToDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.c
index a21bb132a03c..7e54c757db5d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestMain.c
@@ -102,6 +102,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
EFI_STATUS
+EFIAPI
BBTestDevicePathFromTextProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -138,6 +139,7 @@ InitializeBBTestDevicePathFromTextProtocol (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestDevicePathFromTextProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestConformance.c
index 83c87908544b..f3e00c2c9cbb 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestConformance.c
@@ -30,6 +30,7 @@ Abstract:
// TDS 3.6.1
//
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDeviceNodeToTextConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -92,6 +93,7 @@ DevicePathToTextConvertDeviceNodeToTextConformanceTest (
// TDS 3.6.2
//
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDevicePathToTextConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestCoverage.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestCoverage.c
index bc54f904b65f..e01e126c3388 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestCoverage.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestCoverage.c
@@ -200,6 +200,7 @@ ConvertStrToIPv6Addr (
// TDS 3.7.1
//
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDeviceNodeToTextCoverageTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestFunction.c
index 2a49dff8c4fb..57b82cbb4c08 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestFunction.c
@@ -194,6 +194,7 @@ DevicePathCmp(
// TDS 3.5.1
//
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDeviceNodeToTextFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -343,6 +344,7 @@ DevicePathToTextConvertDeviceNodeToTextFunctionTest (
// TDS 3.5.2
//
EFI_STATUS
+EFIAPI
DevicePathToTextConvertDevicePathToTextFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.c
index b2c741816d72..2682f6e50b80 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTestMain.c
@@ -94,6 +94,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
EFI_STATUS
+EFIAPI
BBTestDevicePathToTextProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -130,6 +131,7 @@ InitializeBBTestDevicePathToTextProtocol (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestDevicePathToTextProtocolUnload (
IN EFI_HANDLE ImageHandle
)
@@ -1163,9 +1165,9 @@ BuildAtaDeviceNode (
Status = GetNextRequiredParam(&TextDeviceNode, L"Controller", &ParamIdentifierStr, &ParamIdentifierVal);
if ((!EFI_ERROR(Status)) && (ParamIdentifierVal != NULL)) {
- if ((SctStrCmp (ParamIdentifierVal, L"Primary") == 0) || (SctStrCmp(ParamIdentifierVal, L"0") == 0)) {
+ if ((SctStrCmp (ParamIdentifierVal, L"Primary") == 0) || (SctStrCmp(ParamIdentifierVal, L"0") == 0)) {
Atapi->PrimarySecondary = 0;
- } else if ((SctStrCmp (ParamIdentifierVal, L"Secondary") == 0) || (SctStrCmp(ParamIdentifierVal, L"1") == 0)) {
+ } else if ((SctStrCmp (ParamIdentifierVal, L"Secondary") == 0) || (SctStrCmp(ParamIdentifierVal, L"1") == 0)) {
Atapi->PrimarySecondary = 1;
} else {
goto InValidText;
@@ -1176,9 +1178,9 @@ BuildAtaDeviceNode (
Status = GetNextRequiredParam(&TextDeviceNode, L"Drive", &ParamIdentifierStr, &ParamIdentifierVal);
if ((!EFI_ERROR(Status)) && (ParamIdentifierVal != NULL)) {
- if ((SctStrCmp (ParamIdentifierVal, L"Master") == 0) || (SctStrCmp(ParamIdentifierVal, L"0") == 0)) {
+ if ((SctStrCmp (ParamIdentifierVal, L"Master") == 0) || (SctStrCmp(ParamIdentifierVal, L"0") == 0)) {
Atapi->SlaveMaster = 0;
- } else if ((SctStrCmp (ParamIdentifierVal, L"Slave") == 0) || (SctStrCmp(ParamIdentifierVal, L"1") == 0)) {
+ } else if ((SctStrCmp (ParamIdentifierVal, L"Slave") == 0) || (SctStrCmp(ParamIdentifierVal, L"1") == 0)) {
Atapi->SlaveMaster = 1;
} else {
goto InValidText;
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestConformance.c
index 49639d1c7a4f..70a660dab6d1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DevicePathUtilitiesBBTestMain.h"
#define PCINodeType 1
@@ -45,6 +45,7 @@ Abstract:
// TDS 3.4.1
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesCreateDeviceNodeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -90,8 +91,8 @@ DevicePathUtilitiesCreateDeviceNodeConformanceTest (
L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - CreatDeviceNode should not succeed with invalid NodeLength set",
L"%a:%d:Status - %r",
__FILE__,
- (UINTN)__LINE__,
- Status
+ (UINTN)__LINE__,
+ Status
);
return EFI_SUCCESS;
@@ -100,6 +101,7 @@ DevicePathUtilitiesCreateDeviceNodeConformanceTest (
// TDS 3.4.2
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDeviceNodeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -222,6 +224,7 @@ DevicePathUtilitiesAppendDeviceNodeConformanceTest (
// TDS 3.4.3
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -285,8 +288,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (
L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath should ignore Src1 when it is set NULL",
L"%a:%d:Status - %r",
__FILE__,
- (UINTN)__LINE__,
- Status
+ (UINTN)__LINE__,
+ Status
);
//
@@ -328,8 +331,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (
L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath should ignore Src2 when it is set NULL",
L"%a:%d:Status - %r",
__FILE__,
- (UINTN)__LINE__,
- Status
+ (UINTN)__LINE__,
+ Status
);
pDevicePath1 = DevicePathUtilities->AppendDevicePath (NULL, NULL);
@@ -355,6 +358,7 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (
// TDS 3.4.4
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDevicePathInstanceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -420,8 +424,8 @@ DevicePathUtilitiesAppendDevicePathInstanceConformanceTest (
L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - AppendDevicePathInstance should not succeed with DevicePathInstance set to be NULL",
L"%a:%d:Status - %r",
__FILE__,
- (UINTN)__LINE__,
- Status
+ (UINTN)__LINE__,
+ Status
);
return EFI_SUCCESS;
@@ -430,6 +434,7 @@ DevicePathUtilitiesAppendDevicePathInstanceConformanceTest (
// TDS 3.4.5
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesGetNextDevicePathInstanceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -477,14 +482,15 @@ DevicePathUtilitiesGetNextDevicePathInstanceConformanceTest (
L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - GetNextDevicePathInstance should not succeed with DevicePathInstance set to be NULL",
L"%a:%d:Status - %r",
__FILE__,
- (UINTN)__LINE__,
- Status
+ (UINTN)__LINE__,
+ Status
);
return EFI_SUCCESS;
}
EFI_STATUS
+EFIAPI
DevicePathUtilitiesGetDevicePathSizeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -534,6 +540,7 @@ DevicePathUtilitiesGetDevicePathSizeConformanceTest (
}
EFI_STATUS
+EFIAPI
DevicePathUtilitiesDuplicateDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestFunction.c
index 4efe03481e55..4d1ec144b321 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestFunction.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DevicePathUtilitiesBBTestMain.h"
#define PCINodeType 1
@@ -45,6 +45,7 @@ Abstract:
// TDS 3.3.1
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesCreateDeviceNodeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +134,7 @@ DevicePathUtilitiesCreateDeviceNodeFunctionTest (
// TDS 3.3.2
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDeviceNodeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -231,6 +233,7 @@ DevicePathUtilitiesAppendDeviceNodeFunctionTest (
// TDS 3.3.3
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesGetDevicePathSizeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -304,6 +307,7 @@ DevicePathUtilitiesGetDevicePathSizeFunctionTest (
// TDS 3.3.4
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesDuplicateDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -381,6 +385,7 @@ DevicePathUtilitiesDuplicateDevicePathFunctionTest (
// TDS 3.3.5
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -474,6 +479,7 @@ DevicePathUtilitiesAppendDevicePathFunctionTest (
// TDS 3.3.6
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesAppendDevicePathInstanceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -581,6 +587,7 @@ DevicePathUtilitiesAppendDevicePathInstanceFunctionTest (
// TDS 3.3.7
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesGetNextDevicePathInstanceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -691,6 +698,7 @@ DevicePathUtilitiesGetNextDevicePathInstanceFunctionTest (
// TDS 3.3.8
//
EFI_STATUS
+EFIAPI
DevicePathUtilitiesIsDevicePathMultiInstanceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestConformance.c
index c1ecf10a1f26..ccd0e08cc4d4 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DiskIoBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestReadDiskConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -363,6 +364,7 @@ BBTestReadDiskConformanceAutoTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestWriteDiskConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestFunction.c
index a1a28fb9ec9b..6a5a47413361 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DiskIoBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestReadDiskFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -374,6 +375,7 @@ BBTestReadDiskFunctionAutoTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestWriteDiskFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestStress.c
index b4d64b7e9e18..40170ccd820f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTestStress.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DiskIoBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 6.1
//
EFI_STATUS
+EFIAPI
BBTestReadDiskStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -597,6 +598,7 @@ FreeBuffer:
// TDS 6.2
//
EFI_STATUS
+EFIAPI
BBTestWriteDiskStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestConformance.c
index 3d0ef2ebc692..6ae09c3dbc8c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestConformance.c
@@ -56,6 +56,7 @@ NotifyFunc (
EFI_STATUS
+EFIAPI
BBTestReadDiskExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -490,6 +491,7 @@ BBTestReadDiskExConformanceAutoTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestWriteDiskExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -973,6 +975,7 @@ BBTestWriteDiskExConformanceAutoTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestFlushDiskExConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Flush.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Flush.c
index f4090f2c0a57..b659f6305553 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Flush.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Flush.c
@@ -30,6 +30,7 @@ Abstract:
EFI_STATUS
+EFIAPI
BBTestFlushDiskExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -39,6 +40,7 @@ BBTestFlushDiskExFunctionAutoTestCheckpoint1(
EFI_STATUS
+EFIAPI
BBTestFlushDiskExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -47,6 +49,7 @@ BBTestFlushDiskExFunctionAutoTestCheckpoint2(
);
EFI_STATUS
+EFIAPI
BBTestFlushDiskExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -373,6 +376,7 @@ DiskIo2AsyncBatchFlush (
EFI_STATUS
+EFIAPI
BBTestFlushDiskExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -497,6 +501,7 @@ BBTestFlushDiskExFunctionAutoTest (
*/
EFI_STATUS
+EFIAPI
BBTestFlushDiskExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -829,6 +834,7 @@ BBTestFlushDiskExFunctionAutoTestCheckpoint1(
*/
EFI_STATUS
+EFIAPI
BBTestFlushDiskExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -1033,6 +1039,7 @@ BBTestFlushDiskExFunctionAutoTestCheckpoint2(
*/
EFI_STATUS
+EFIAPI
BBTestFlushDiskExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Read.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Read.c
index a55652541387..d8f7a65bd541 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Read.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Read.c
@@ -28,6 +28,7 @@ Abstract:
#include "DiskIo2BBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -36,6 +37,7 @@ BBTestReadDiskExFunctionAutoTestCheckpoint1(
);
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -45,6 +47,7 @@ BBTestReadDiskExFunctionAutoTestCheckpoint2(
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -54,6 +57,7 @@ BBTestReadDiskExFunctionAutoTestCheckpoint3(
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTestCheckpoint4(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -563,6 +567,7 @@ EFIAPI DiskIo2FinishNotifyFunc (
EFI_STATUS
+EFIAPI
BBTestCancelFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -641,6 +646,7 @@ BBTestCancelFunctionAutoTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -783,6 +789,7 @@ BBTestReadDiskExFunctionAutoTest (
*/
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -1262,6 +1269,7 @@ END_WAIT:
*/
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -1617,6 +1625,7 @@ END:
*/
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -2062,6 +2071,7 @@ END:
*/
EFI_STATUS
+EFIAPI
BBTestReadDiskExFunctionAutoTestCheckpoint4(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Write.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Write.c
index e33fe53e1bf7..f9a720279f3c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Write.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTestFunction_Write.c
@@ -30,6 +30,7 @@ Abstract:
EFI_STATUS
+EFIAPI
BBTestWriteDiskExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -39,6 +40,7 @@ BBTestWriteDiskExFunctionAutoTestCheckpoint1(
EFI_STATUS
+EFIAPI
BBTestWriteDiskExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -48,6 +50,7 @@ BBTestWriteDiskExFunctionAutoTestCheckpoint2(
EFI_STATUS
+EFIAPI
BBTestWriteDiskExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -391,6 +394,7 @@ DiskIo2AsyncBatchWrite (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestWriteDiskExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -520,6 +524,7 @@ BBTestWriteDiskExFunctionAutoTest (
*/
EFI_STATUS
+EFIAPI
BBTestWriteDiskExFunctionAutoTestCheckpoint1(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -1108,6 +1113,7 @@ END:
*/
EFI_STATUS
+EFIAPI
BBTestWriteDiskExFunctionAutoTestCheckpoint2(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
@@ -1566,6 +1572,7 @@ END:
*/
EFI_STATUS
+EFIAPI
BBTestWriteDiskExFunctionAutoTestCheckpoint3(
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_DISK_IO_PROTOCOL *DiskIo,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestConformance.c
index 184daaec2f6d..4b5f9facfbbf 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DriverConfigurationBBTest.h"
//
@@ -100,6 +100,7 @@ CHAR8 IsoLatinTable[][4] = {
// TDS 5.2.1
//
EFI_STATUS
+EFIAPI
BBTestSetOptionsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -158,6 +159,7 @@ BBTestSetOptionsConformanceTest (
// TDS 5.2.2
//
EFI_STATUS
+EFIAPI
BBTestOptionsValidConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -213,6 +215,7 @@ BBTestOptionsValidConformanceTest (
// TDS 5.2.3
//
EFI_STATUS
+EFIAPI
BBTestForceDefaultsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -266,6 +269,7 @@ BBTestForceDefaultsConformanceTest (
// 5.2.1.2.1 call SetOptions() with invalid parameters
//
EFI_STATUS
+EFIAPI
BBTestSetOptionsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -410,6 +414,7 @@ BBTestSetOptionsConformanceTestCheckpoint1 (
// 5.2.1.2.2 Call SetOptions() with all unsupported languages
//
EFI_STATUS
+EFIAPI
BBTestSetOptionsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -503,6 +508,7 @@ BBTestSetOptionsConformanceTestCheckpoint2 (
// 5.2.1.2.3 Call SetOptions() with unsupported controller
//
EFI_STATUS
+EFIAPI
BBTestSetOptionsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -579,6 +585,7 @@ BBTestSetOptionsConformanceTestCheckpoint3 (
// 5.2.2.2.1 Call OptionsValid() with invalid parameters.
//
EFI_STATUS
+EFIAPI
BBTestOptionsValidConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -659,6 +666,7 @@ BBTestOptionsValidConformanceTestCheckpoint1 (
// 5.2.2.2.2 Call OptionsValid() with unsupported controller
//
EFI_STATUS
+EFIAPI
BBTestOptionsValidConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -721,6 +729,7 @@ BBTestOptionsValidConformanceTestCheckpoint2 (
// 5.2.3.2.1 Call ForceDefaults() with invalid parameters.
//
EFI_STATUS
+EFIAPI
BBTestForceDefaultsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
@@ -830,6 +839,7 @@ BBTestForceDefaultsConformanceTestCheckpoint1 (
// 5.2.3.2.2 Call ForceDefaults() with unsupported controller
//
EFI_STATUS
+EFIAPI
BBTestForceDefaultsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfig
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestMain.c
index f95bf501afad..ba0e81bdba62 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverConfiguration/BlackBoxTest/DriverConfigurationBBTestMain.c
@@ -21,7 +21,7 @@ Abstract:
for EFI Driver Configuration Protocol Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DriverConfigurationBBTest.h"
EFI_HANDLE mImageHandle;
@@ -115,6 +115,7 @@ InitializeBBTestDriverConfiguration (
* @return EFI_SUCCESS Indicates the interface was Uninstalled
*/
EFI_STATUS
+EFIAPI
BBTestDriverConfigurationUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestConformance.c
index 41e546154867..84c76ec72cde 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DriverDiagnosticsBBTest.h"
//
@@ -100,6 +100,7 @@ CHAR8 IsoLatinTable[][4] = {
// TDS 7.2.1
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -157,6 +158,7 @@ BBTestRunDiagnosticsConformanceTest (
// 7.2.1.2.1 Call RunDiagnostic() with invalid parameters
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics
@@ -388,6 +390,7 @@ BBTestRunDiagnosticsConformanceTestCheckpoint1 (
// 7.2.1.2.2 Call RunDiagnostic() with all unsupported languages
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics
@@ -491,6 +494,7 @@ BBTestRunDiagnosticsConformanceTestCheckpoint2 (
// 7.2.1.2.3 Call RunDiagnostic() with unsupported controller
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestMain.c
index 3d211417279e..6409a3480840 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics/BlackBoxTest/DriverDiagnosticsBBTestMain.c
@@ -21,7 +21,7 @@ Abstract:
for EFI Driver Diagnostics Protocol Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DriverDiagnosticsBBTest.h"
EFI_HANDLE mImageHandle;
@@ -97,6 +97,7 @@ InitializeBBTestDriverDiagnostics (
* @return EFI_SUCCESS Indicates the interface was Uninstalled
*/
EFI_STATUS
+EFIAPI
BBTestDriverDiagnosticsUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestConformance.c
index 8882b85f776e..8198a0c313e3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestConformance.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DriverDiagnostics2BBTest.h"
//
@@ -73,6 +73,7 @@ EFI_GUID mTestNoInterfaceProtocol2Guid = TEST_NO_INTERFACE_PROTOCOL_2_GUID;
*/
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -155,6 +156,7 @@ BBTestRunDiagnosticsConformanceTest (
// 7.2.1.2.1 Call RunDiagnostic() with invalid parameters
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
@@ -414,6 +416,7 @@ BBTestRunDiagnosticsConformanceTestCheckpoint1 (
// 7.2.1.2.2 Call RunDiagnostic() with all unsupported languages
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
@@ -580,6 +583,7 @@ BBTestRunDiagnosticsConformanceTestCheckpoint2 (
// 7.2.1.2.3 Call RunDiagnostic() with unsupported controller
//
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c
index 94b0470ba601..e816ead8ba95 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c
@@ -22,16 +22,18 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DriverDiagnostics2BBTest.h"
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsFuncTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
);
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsFuncTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
@@ -49,6 +51,7 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 (
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -116,6 +119,7 @@ BBTestRunDiagnosticsFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsFuncTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
@@ -387,6 +391,7 @@ BBTestRunDiagnosticsFuncTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRunDiagnosticsFuncTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2
@@ -685,10 +690,10 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 (
AssertionType,
gFunctionAssertionGuid002,
L"Please Use Native RFC3066 which is preferable in UEFI 2.X\nEFI_DRIVER_DIAGNOSTICS2_PROTOCOL.RunDiagnostics - RunDiagnostics() returns EFI_SUCCESS with supported language",
- L"%a:%d: Language - %c%c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
+ L"%a:%d: Language - %c%c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
__FILE__,
(UINTN)__LINE__,
- Lang[0],Lang[1],Lang[2],Lang[3],
+ Lang[0],Lang[1],Lang[2],Lang[3],
Index,
ChildIndex,
(ControllerName == NULL) ? L"(NULL)" : ControllerName,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestFunction.c
index eb46ba393874..a0cc119dad5e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestFunction.c
@@ -26,7 +26,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DriverSupportedEfiVersionBBTestMain.h"
@@ -42,6 +42,7 @@ Abstract:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestLengthParameterAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -115,6 +116,7 @@ BBTestLengthParameterAutoTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestFirmwareVersionParameterAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.c
index bab783673221..61b42cf7adc9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverSupportedEfiVersion/BlackBoxTest/DriverSupportedEfiVersionBBTestMain.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "DriverSupportedEfiVersionBBTestMain.h"
//
@@ -72,6 +72,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
EFI_STATUS
+EFIAPI
BBTestEfiVersionProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -107,6 +108,7 @@ InitializeBBTestDriverSupportedEfiVersion (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestDriverSupportedEfiVersionProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestConformance.c
index e65ae7ca9b11..87cc198ddd0b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestConformance.c
@@ -38,6 +38,7 @@ Abstract:
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestCreateThunkConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -150,6 +151,7 @@ BBTestCreateThunkConformanceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestUnloadImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -215,6 +217,7 @@ BBTestUnloadImageConformanceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestGetVersionConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestFunction.c
index 9d97aada93d9..40e6a06c48dc 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestFunction.c
@@ -38,6 +38,7 @@ Abstract:
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestCreateThunkBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -198,6 +199,7 @@ BBTestCreateThunkBasicTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestUnloadImageBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -332,6 +334,7 @@ BBTestUnloadImageBasicTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestRegisterICacheFlushBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -485,6 +488,7 @@ BBTestRegisterICacheFlushBasicTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestGetVersionBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.c
index 2f1cd712d129..8e64c517ccc4 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTestMain.c
@@ -415,6 +415,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
FlushICache (
IN EFI_PHYSICAL_ADDRESS Start,
IN UINT64 Length
@@ -431,6 +432,7 @@ FlushICache (
}
EFI_STATUS
+EFIAPI
TestFlushICache (
IN EFI_PHYSICAL_ADDRESS Start,
IN UINT64 Length
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c
index e243fab56f84..e6537220c938 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c
@@ -27,6 +27,7 @@ Abstract:
#include "EraseBlockBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestEraseBlocksConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -193,7 +194,7 @@ BBTestEraseBlocksConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
} else {
Status = EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, 0, &Token, EraseSize);
@@ -211,7 +212,7 @@ BBTestEraseBlocksConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
Status = EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBlock + 1, &Token, EraseSize);
if (Status == EFI_MEDIA_CHANGED)
@@ -228,7 +229,7 @@ BBTestEraseBlocksConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
Status = EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBlock - 10, &Token, EraseSize + 1);
if (Status == EFI_MEDIA_CHANGED)
@@ -245,7 +246,7 @@ BBTestEraseBlocksConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
Status = EraseBlock->EraseBlocks(EraseBlock, MediaId, LastBlock + 1, &Token, EraseSize);
if (Status == EFI_INVALID_PARAMETER)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestFunction.c
index 1b2873a20be2..b177b9e73040 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestFunction.c
@@ -29,6 +29,7 @@ Abstract:
extern UINT8 EnterEvent;
EFI_STATUS
+EFIAPI
BBTestEraseBlocksFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -71,7 +72,7 @@ BBTestEraseBlocksFunctionTest (
UINT64 Index;
UINTN Index1;
UINTN Remainder;
- UINT64 EraseCounter;
+ UINT64 EraseCounter;
EFI_ERASE_BLOCK_TOKEN Token;
EFI_BLOCK_IO2_TOKEN BlockIo2Token;
@@ -224,41 +225,41 @@ BBTestEraseBlocksFunctionTest (
// Read the data with 0, the first/last block should not be erased
ReadStatus = BlockIo->ReadBlocks (BlockIo, MediaId, Lba, BufferSize, (VOID*)Buffer2);
if (ReadStatus == EFI_SUCCESS) {
- for (Index1 = 0, EraseCounter = 0; Index1 < BlockSize; Index1++) {
- if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
+ for (Index1 = 0, EraseCounter = 0; Index1 < BlockSize; Index1++) {
+ if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
IsZero1 = FALSE;
break;
- } else if (Buffer2[Index1] == 0x00) {
- EraseCounter++;
+ } else if (Buffer2[Index1] == 0x00) {
+ EraseCounter++;
}
}
- if (EraseCounter!=0 && EraseCounter!=BlockSize) {
- IsZero1 = FALSE;
- }
+ if (EraseCounter!=0 && EraseCounter!=BlockSize) {
+ IsZero1 = FALSE;
+ }
- for (Index1 = BlockSize, EraseCounter = 0; Index1 < BufferSize - BlockSize; Index1++) {
- if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
+ for (Index1 = BlockSize, EraseCounter = 0; Index1 < BufferSize - BlockSize; Index1++) {
+ if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
IsZero2 = FALSE;
break;
- } else if (Buffer2[Index1] == 0x00) {
- EraseCounter++;
+ } else if (Buffer2[Index1] == 0x00) {
+ EraseCounter++;
}
}
- if (EraseCounter!=0 && EraseCounter!=(BufferSize - (BlockSize*2))) {
- IsZero2 = FALSE;
- }
+ if (EraseCounter!=0 && EraseCounter!=(BufferSize - (BlockSize*2))) {
+ IsZero2 = FALSE;
+ }
- for (Index1 = BufferSize - BlockSize, EraseCounter = 0; Index1 < BufferSize; Index1++) {
- if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
+ for (Index1 = BufferSize - BlockSize, EraseCounter = 0; Index1 < BufferSize; Index1++) {
+ if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
IsZero3 = FALSE;
break;
- } else if (Buffer2[Index1] == 0x00) {
- EraseCounter++;
+ } else if (Buffer2[Index1] == 0x00) {
+ EraseCounter++;
}
}
- if (EraseCounter!=0 && EraseCounter!=BlockSize) {
- IsZero3 = FALSE;
- }
+ if (EraseCounter!=0 && EraseCounter!=BlockSize) {
+ IsZero3 = FALSE;
+ }
if ((EraseStatus == EFI_SUCCESS) && (IsZero1 == FALSE) && (IsZero2 == TRUE) && ((IsZero3 == FALSE)))
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -508,41 +509,41 @@ BlockIo2:
// Read the data with 0, the first/last block should not be erased
ReadStatus = BlockIo2->ReadBlocksEx (BlockIo2, MediaId, Lba, &BlockIo2Token, BufferSize, (VOID*)Buffer2);
if (ReadStatus == EFI_SUCCESS) {
- for (Index1 = 0, EraseCounter = 0; Index1 < BlockSize; Index1++) {
- if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
+ for (Index1 = 0, EraseCounter = 0; Index1 < BlockSize; Index1++) {
+ if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
IsZero1 = FALSE;
break;
- } else if (Buffer2[Index1] == 0x00) {
- EraseCounter++;
+ } else if (Buffer2[Index1] == 0x00) {
+ EraseCounter++;
}
}
- if (EraseCounter!=0 && EraseCounter!=BlockSize) {
- IsZero1 = FALSE;
- }
+ if (EraseCounter!=0 && EraseCounter!=BlockSize) {
+ IsZero1 = FALSE;
+ }
- for (Index1 = BlockSize, EraseCounter = 0; Index1 < BufferSize - BlockSize; Index1++) {
- if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
+ for (Index1 = BlockSize, EraseCounter = 0; Index1 < BufferSize - BlockSize; Index1++) {
+ if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
IsZero2 = FALSE;
break;
- } else if (Buffer2[Index1] == 0x00) {
- EraseCounter++;
+ } else if (Buffer2[Index1] == 0x00) {
+ EraseCounter++;
}
}
- if (EraseCounter!=0 && EraseCounter!=(BufferSize - (BlockSize*2))) {
- IsZero2 = FALSE;
- }
+ if (EraseCounter!=0 && EraseCounter!=(BufferSize - (BlockSize*2))) {
+ IsZero2 = FALSE;
+ }
- for (Index1 = BufferSize - BlockSize, EraseCounter = 0; Index1 < BufferSize; Index1++) {
- if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
+ for (Index1 = BufferSize - BlockSize, EraseCounter = 0; Index1 < BufferSize; Index1++) {
+ if (Buffer2[Index1] != 0x00 && Buffer2[Index1] != 0xFF) {
IsZero3 = FALSE;
break;
- } else if (Buffer2[Index1] == 0x00) {
- EraseCounter++;
+ } else if (Buffer2[Index1] == 0x00) {
+ EraseCounter++;
}
}
- if (EraseCounter!=0 && EraseCounter!=BlockSize) {
- IsZero3 = FALSE;
- }
+ if (EraseCounter!=0 && EraseCounter!=BlockSize) {
+ IsZero3 = FALSE;
+ }
if ((EraseStatus == EFI_SUCCESS) && (IsZero1 == FALSE) && (IsZero2 == TRUE) && ((IsZero3 == FALSE)))
AssertionType = EFI_TEST_ASSERTION_PASSED;
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestConformance.c
index 602c333a5c2a..53fc624b17e3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ExtScsiPassThruBBTestMain.h"
extern UINT8 EnterEvent;
@@ -41,6 +41,7 @@ extern UINT8 EnterEvent;
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestGetNextTargetLunConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -202,6 +203,7 @@ BBTestGetNextTargetLunConformanceAutoTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -409,6 +411,7 @@ BBTestBuildDevicePathConformanceAutoTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestGetTargetLunConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -611,6 +614,7 @@ BBTestGetTargetLunConformanceAutoTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestResetTargetLunConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -780,6 +784,7 @@ BBTestResetTargetLunConformanceAutoTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestGetNextTargetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -914,6 +919,7 @@ BBTestGetNextTargetConformanceAutoTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestFunction.c
index fcdacc7d019b..52c8413c2ad7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ExtScsiPassThruBBTestMain.h"
extern UINT8 EnterEvent;
@@ -42,6 +42,7 @@ extern UINT8 EnterEvent;
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestGetNextTargetLunFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -140,6 +141,7 @@ BBTestGetNextTargetLunFunctionAutoTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -244,6 +246,7 @@ BBTestBuildDevicePathFunctionAutoTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestGetTargetLunFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -385,6 +388,7 @@ BBTestGetTargetLunFunctionAutoTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestResetChannelFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -460,6 +464,7 @@ BBTestResetChannelFunctionAutoTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestResetTargetLunFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -563,6 +568,7 @@ BBTestResetTargetLunFunctionAutoTest (
// TDS 3.6
//
EFI_STATUS
+EFIAPI
BBTestGetNextTargetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -660,6 +666,7 @@ BBTestGetNextTargetFunctionAutoTest (
// TDS 3.7
//
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestConformance.c
index fea8ffd1ad22..b83cc19fe1d1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestConformance.c
@@ -2,7 +2,7 @@
Copyright 2006 - 2016 Unified EFI, Inc.<BR>
Copyright (c) 2010 - 2016, Dell Inc. All rights reserved.<BR>
- Copyright (c) 2021, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2021, 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
@@ -67,96 +67,112 @@ CheckForSupportSetPackageInfo (
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestCheckImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestCheckImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -173,6 +189,7 @@ BBTestSetPackageInfoConformanceTestCheckpoint4 (
// ****************************************************************************
EFI_STATUS
+EFIAPI
Progress (
IN UINTN Completion
)
@@ -209,7 +226,7 @@ CheckForSupportGetImage (
TestGuid = gFirmwareManagementBBTestConformanceSupportGuid001;
ResultMessageLabel = L"GetImage, function support check";
- ImageIndex = 1;
+ ImageIndex = 1;
Image = NULL;
ImageSize = 0;
@@ -284,7 +301,7 @@ CheckForSupportSetImage (
TestGuid = gFirmwareManagementBBTestConformanceSupportGuid002;
ResultMessageLabel = L"SetImage, function support check";
- ImageIndex = 1;
+ ImageIndex = 1;
Image = NULL;
ImageSize = 0;
AbortReason = NULL;
@@ -363,7 +380,7 @@ CheckForSupportCheckImage (
TestGuid = gFirmwareManagementBBTestConformanceSupportGuid003;
ResultMessageLabel = L"CheckImage, function support check";
- ImageIndex = 1;
+ ImageIndex = 1;
Image = NULL;
ImageSize = 0;
@@ -489,6 +506,7 @@ CheckForSupportSetPackageInfo (
/*
EFI_STATUS
+EFIAPI
BBTestUnitTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -505,6 +523,7 @@ BBTestUnitTest (
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -546,6 +565,7 @@ BBTestGetImageInfoConformanceTest (
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -598,6 +618,7 @@ BBTestGetImageConformanceTest (
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -650,6 +671,7 @@ BBTestSetImageConformanceTest (
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestCheckImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -700,6 +722,7 @@ BBTestCheckImageConformanceTest (
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -764,6 +787,7 @@ BBTestSetPackageInfoConformanceTest (
**/
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -871,6 +895,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -972,6 +997,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -1193,6 +1219,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -1391,6 +1418,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -1591,6 +1619,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -1808,6 +1837,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -2013,6 +2043,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -2237,6 +2268,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -2449,6 +2481,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -2672,6 +2705,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestCheckImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -2873,6 +2907,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestCheckImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -2902,8 +2937,8 @@ BBTestCheckImageConformanceTestCheckpoint2 (
UINTN i;
EFI_FIRMWARE_IMAGE_DESCRIPTOR *p;
UINTN FunctionTested;
- EFI_FIRMWARE_IMAGE_AUTHENTICATION *EFIA;
- EFI_GUID gEfiCertPkcs7Guid;
+ EFI_FIRMWARE_IMAGE_AUTHENTICATION *EFIA;
+ EFI_GUID gEfiCertPkcs7Guid;
//
// Init
//
@@ -2911,7 +2946,7 @@ BBTestCheckImageConformanceTestCheckpoint2 (
Status = EFI_SUCCESS;
AssertionType = EFI_TEST_ASSERTION_PASSED;
TestGuid = gFirmwareManagementBBTestConformanceAssertionGuid012;
- gEfiCertPkcs7Guid = gFirmwareManagementBBTestConformanceSupportGuid005;
+ gEfiCertPkcs7Guid = gFirmwareManagementBBTestConformanceSupportGuid005;
ResultMessageLabel = L"CheckImage, conformance checkpoint #2";
BufferImageInfo = NULL;
@@ -3023,13 +3058,13 @@ BBTestCheckImageConformanceTestCheckpoint2 (
ResultMessageData = L"test case initialization failure.";
goto Exit;
}
-
- EFIA = Image;
- EFIA->AuthInfo.Hdr.dwLength = sizeof(WIN_CERTIFICATE_UEFI_GUID)+0x10;
- EFIA->AuthInfo.Hdr.wRevision = 0x0200;
- EFIA->AuthInfo.Hdr.wCertificateType = WIN_CERT_TYPE_EFI_GUID;
- for (i=0; i<sizeof(EFI_GUID); ((UINT8*)&EFIA->AuthInfo.CertType)[i]=((UINT8*)&gEfiCertPkcs7Guid)[i], i++);
-
+
+ EFIA = Image;
+ EFIA->AuthInfo.Hdr.dwLength = sizeof(WIN_CERTIFICATE_UEFI_GUID)+0x10;
+ EFIA->AuthInfo.Hdr.wRevision = 0x0200;
+ EFIA->AuthInfo.Hdr.wCertificateType = WIN_CERT_TYPE_EFI_GUID;
+ for (i=0; i<sizeof(EFI_GUID); ((UINT8*)&EFIA->AuthInfo.CertType)[i]=((UINT8*)&gEfiCertPkcs7Guid)[i], i++);
+
BufferImage = Image;
FunctionTested++;
Status = FirmwareManagement->CheckImage (
@@ -3101,6 +3136,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -3250,6 +3286,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -3375,6 +3412,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -3514,6 +3552,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestSetPackageInfoConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestFunction.c
index 99eede473b14..37485e0b8f9b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTestFunction.c
@@ -28,7 +28,7 @@ Abstract:
#define DEBUG_GET_PACKAGE_INFO 1
-#include "SctLib.h"
+#include "SctLib.h"
#include "FirmwareManagementBBTestMain.h"
// ****************************************************************************
@@ -36,18 +36,21 @@ Abstract:
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestGetImageInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestGetImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
);
EFI_STATUS
+EFIAPI
BBTestGetPackageInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -61,6 +64,7 @@ BBTestGetPackageInfoFunctionTestCheckpoint1 (
/*
EFI_STATUS
+EFIAPI
BBTestUnitTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -77,6 +81,7 @@ BBTestUnitTest (
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestGetImageInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +122,7 @@ BBTestGetImageInfoFunctionTest (
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestGetImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -157,6 +163,7 @@ BBTestGetImageFunctionTest (
// ****************************************************************************
EFI_STATUS
+EFIAPI
BBTestGetPackageInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -216,6 +223,7 @@ BBTestGetPackageInfoFunctionTest (
**/
EFI_STATUS
+EFIAPI
BBTestGetImageInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -507,6 +515,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestGetImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
@@ -746,6 +755,7 @@ Exit:
**/
EFI_STATUS
+EFIAPI
BBTestGetPackageInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_FIRMWARE_MANAGEMENT_PROTOCOL *FirmwareManagement
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestConformance.c
index 13e7227f5845..3801036a6ef5 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestConformance.c
@@ -30,13 +30,14 @@ References:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "GraphicsOutputBBTest.h"
//
// TDS 4.2.1
//
EFI_STATUS
+EFIAPI
BBTestQueryModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -263,6 +264,7 @@ Returns:
// TDS 4.2.3
//
EFI_STATUS
+EFIAPI
BBTestBltConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -404,6 +406,7 @@ Returns:
// TDS 4.2.2
//
EFI_STATUS
+EFIAPI
BBTestSetModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c
index da51fbc44596..bec5d15fa1d8 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c
@@ -29,13 +29,14 @@ References:
UEFI/Tiano DXE Test Case Writer's Guide
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "GraphicsOutputBBTest.h"
//
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputQueryModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -172,7 +173,7 @@ Returns:
AssertionType,
gEfiGraphicsOutputQueryModeBBTestFunctionAssertionGuid,
L"EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode - SetMode() then QueryMode(), compare Info structure",
- L"%a:%d: Status - %r",
+ L"%a:%d: Status - %r",
(UINTN) __FILE__,
(UINTN) (UINTN)__LINE__,
Status
@@ -248,6 +249,7 @@ Returns:
// TDS 4.1.2
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputSetModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -664,6 +666,7 @@ Returns:
// TDS 4.1.3
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoFillFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -753,8 +756,8 @@ Returns:
L"%a:%d:Status:%r, Expected:%r",
(UINTN) __FILE__,
(UINTN) (UINTN)__LINE__,
- (UINTN) Status,
- EFI_SUCCESS
+ (UINTN) Status,
+ EFI_SUCCESS
);
return Status;
}
@@ -983,6 +986,7 @@ Returns:
// TDS 4.1.4
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoBltBufferFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1391,6 +1395,7 @@ Returns:
// TDS 4.1.5
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoToVideoFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1475,8 +1480,8 @@ Returns:
L"%a:%d:Status:%r, Expected:%r",
(UINTN) __FILE__,
(UINTN) (UINTN)__LINE__,
- (UINTN) Status,
- EFI_SUCCESS
+ (UINTN) Status,
+ EFI_SUCCESS
);
continue;
}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestStress.c
index d0c967e93fa0..8ad070fbba98 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestStress.c
@@ -30,13 +30,14 @@ References:
Revision History
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "GraphicsOutputBBTest.h"
//
// TDS 4.3.1
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoFillStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -425,6 +426,7 @@ Returns:
// TDS 4.3.2
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoBltBufferStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -962,6 +964,7 @@ Returns:
// TDS 4.3.3
//
EFI_STATUS
+EFIAPI
BBTestEfiGraphicsOutputBltVideoToVideoStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1479,6 +1482,7 @@ Returns:
// TDS 4.3.4
//
EFI_STATUS
+EFIAPI
BBTestVideoFillBufferToVideoManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2109,6 +2113,7 @@ Returns:
// TDS 4.3.5
//
EFI_STATUS
+EFIAPI
BBTestVideoFillVideoToVideoManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2784,6 +2789,7 @@ Returns:
// TDS 4.3.6
//
EFI_STATUS
+EFIAPI
BBTestVideoToBltBufferExtensiveAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestConformance.c
index 0a0810c5bd5f..964a64cd1d34 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestConformance.c
@@ -27,12 +27,14 @@ Abstract:
EFI_BROWSER_ACTION EFI_BROWSER_ACTION_UNSUPPORTED = 2;
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
);
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -40,6 +42,7 @@ BBTestExtractConfigConformanceTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -47,18 +50,21 @@ BBTestExtractConfigConformanceTestCheckpoint3 (
);
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -66,30 +72,35 @@ BBTestRouteConfigConformanceTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
);
/*
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
);
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
);
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
);
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
@@ -97,6 +108,7 @@ BBTestCallBackConformanceTestCheckpoint4 (
*/
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -146,6 +158,7 @@ BBTestExtractConfigConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -195,6 +208,7 @@ BBTestRouteConfigConformanceTest (
/*
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -240,6 +254,7 @@ BBTestCallBackConformanceTest (
//
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
@@ -325,6 +340,7 @@ BBTestExtractConfigConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -403,6 +419,7 @@ BBTestExtractConfigConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -481,6 +498,7 @@ BBTestExtractConfigConformanceTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
@@ -527,6 +545,7 @@ BBTestExtractConfigConformanceTestCheckpoint4 (
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
@@ -566,6 +585,7 @@ BBTestRouteConfigConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -642,6 +662,7 @@ BBTestRouteConfigConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
@@ -686,6 +707,7 @@ BBTestRouteConfigConformanceTestCheckpoint3 (
/*
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
@@ -741,6 +763,7 @@ BBTestCallBackConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
@@ -794,6 +817,7 @@ BBTestCallBackConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
@@ -850,6 +874,7 @@ BBTestCallBackConformanceTestCheckpoint3(
}
EFI_STATUS
+EFIAPI
BBTestCallBackConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestFunction.c
index b3276487bb3c..c43dbb078440 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestFunction.c
@@ -26,6 +26,7 @@ Abstract:
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -33,6 +34,7 @@ BBTestExtractConfigFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -40,6 +42,7 @@ BBTestExtractConfigFunctionTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -47,6 +50,7 @@ BBTestRouteConfigFunctionTestCheckpoint1 (
);
/*
EFI_STATUS
+EFIAPI
BBTestCallBackFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
@@ -58,6 +62,7 @@ BBTestCallBackFunctionTestCheckpoint1 (
//
/*
EFI_STATUS
+EFIAPI
BBTestUnitTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -107,6 +112,7 @@ BBTestUnitTest (
*/
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -155,6 +161,7 @@ BBTestExtractConfigFunctionTest (
EFI_STATUS
+EFIAPI
BBTestRouteConfigFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -202,6 +209,7 @@ BBTestRouteConfigFunctionTest (
/*
EFI_STATUS
+EFIAPI
BBTestCallBackFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -243,6 +251,7 @@ BBTestCallBackFunctionTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -389,6 +398,7 @@ BBTestExtractConfigFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -467,6 +477,7 @@ BBTestExtractConfigFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestRouteConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting,
@@ -546,6 +557,7 @@ BBTestRouteConfigFunctionTestCheckpoint1 (
/*
EFI_STATUS
+EFIAPI
BBTestCallBackFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ACCESS_PROTOCOL *HIIConfigAccess
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.c
index cfb5fb1d4c18..099b10f7a38a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTestMain.c
@@ -124,7 +124,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_STATUS
-EFIAPI
+EFIAPI
InitializeHIIConfigAccessBBTest (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
@@ -151,6 +151,7 @@ InitializeHIIConfigAccessBBTest (
EFI_STATUS
+EFIAPI
UnloadHIIConfigAccessBBTest (
IN EFI_HANDLE ImageHandle
)
@@ -653,4 +654,4 @@ MultiAltRespToMultiReq (
SctFreePool (FreePtr);
return EFI_SUCCESS;
-}
+}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestConformance.c
index fe9c74087ce7..bc9423c30c0e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestConformance.c
@@ -26,102 +26,119 @@ Abstract:
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
/*
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
*/
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestExportConfigConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestGetAltCfgConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -165,6 +182,7 @@ BBTestExtractConfigConformanceAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestExportConfigConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -202,6 +220,7 @@ BBTestExportConfigConformanceAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -241,6 +260,7 @@ BBTestRouteConfigConformanceAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -284,6 +304,7 @@ BBTestBlockToConfigConformanceAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -327,6 +348,7 @@ BBTestConfigToBlockConformanceAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestGetAltCfgConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -373,6 +395,7 @@ BBTestGetAltCfgConformanceAutoTest (
// Call ExtractConfig with Request or Progress being NULL, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -467,6 +490,7 @@ BBTestExtractConfigConformanceTestCheckpoint1 (
// Call ExtractConfig with Illegal Syntax, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -577,6 +601,7 @@ BBTestExtractConfigConformanceTestCheckpoint2(
// Call ExtractConfig with unknown driver, EFI_NOT_FOUND should be returned.
//
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -622,6 +647,7 @@ BBTestExtractConfigConformanceTestCheckpoint3(
// Call ExtractConfig with unknown name, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestExtractConfigConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -707,6 +733,7 @@ BBTestExtractConfigConformanceTestCheckpoint4(
// Call ExportConfig with Results being NULL, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestExportConfigConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -744,6 +771,7 @@ BBTestExportConfigConformanceTestCheckpoint1(
// Call RouteConfig with Configuration being NULL, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -785,6 +813,7 @@ BBTestRouteConfigConformanceTestCheckpoint1(
// Call RouteConfig with no found target for the routing data, EFI_NOT_FOUND should be returned.
//
EFI_STATUS
+EFIAPI
BBTestRouteConfigConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -827,6 +856,7 @@ BBTestRouteConfigConformanceTestCheckpoint2(
// Call BlockToConfig with ConfigRequest being NULL, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -875,6 +905,7 @@ BBTestBlockToConfigConformanceTestCheckpoint1(
// Call BlockToConfig with Block being NULL, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -925,6 +956,7 @@ BBTestBlockToConfigConformanceTestCheckpoint2(
// Call BlockToConfig with ConfigRequest being not <BlockName> format, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -980,6 +1012,7 @@ BBTestBlockToConfigConformanceTestCheckpoint3(
// Call BlockToConfig with not large Block, EFI_DEVICE_ERROR should be returned.
//
EFI_STATUS
+EFIAPI
BBTestBlockToConfigConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -1033,6 +1066,7 @@ BBTestBlockToConfigConformanceTestCheckpoint4(
// Call ConfigToBlock with ConfigResp being NULL, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -1078,6 +1112,7 @@ BBTestConfigToBlockConformanceTestCheckpoint1(
// Call ConfigToBlock with Block being NULL, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -1125,6 +1160,7 @@ BBTestConfigToBlockConformanceTestCheckpoint2(
// Call BlockToConfig with ConfigRequest being not <BlockName> format, EFI_INVALID_PARAMETER should be returned.
//
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -1174,6 +1210,7 @@ BBTestConfigToBlockConformanceTestCheckpoint3(
// Call ConfigToBlock with Block being not large enough, EFI_DEVICE_ERROR should be returned.
//
EFI_STATUS
+EFIAPI
BBTestConfigToBlockConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -1219,6 +1256,7 @@ BBTestConfigToBlockConformanceTestCheckpoint4(
}
EFI_STATUS
+EFIAPI
BBTestGetAltCfgConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestFunction.c
index d4bd23d1fd82..cbd4f5bcddc0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestFunction.c
@@ -25,36 +25,42 @@ Abstract:
#include "HIIConfigRoutingBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestExportConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestRouteConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestBlockToConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestConfigToBlockFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
);
EFI_STATUS
+EFIAPI
BBTestGetAltCfgFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -62,6 +68,7 @@ BBTestGetAltCfgFunctionTestCheckpoint1 (
/*
EFI_STATUS
+EFIAPI
BBTestUnitAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -131,6 +138,7 @@ BBTestUnitAutoTest (
*/
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -168,6 +176,7 @@ BBTestExtractConfigFunctionAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestExportConfigFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -205,6 +214,7 @@ BBTestExportConfigFunctionAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestRouteConfigFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -243,6 +253,7 @@ BBTestRouteConfigFunctionAutoTest (
EFI_STATUS
+EFIAPI
BBTestBlockToConfigFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -281,6 +292,7 @@ BBTestBlockToConfigFunctionAutoTest (
EFI_STATUS
+EFIAPI
BBTestConfigToBlockFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -318,6 +330,7 @@ BBTestConfigToBlockFunctionAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestGetAltCfgFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -355,6 +368,7 @@ BBTestGetAltCfgFunctionAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestExtractConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -438,6 +452,7 @@ FUNC_EXIT:
EFI_STATUS
+EFIAPI
BBTestExportConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -499,6 +514,7 @@ BBTestExportConfigFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRouteConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -571,6 +587,7 @@ BBTestRouteConfigFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestBlockToConfigFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -626,6 +643,7 @@ BBTestBlockToConfigFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestConfigToBlockFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
@@ -676,6 +694,7 @@ BBTestConfigToBlockFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetAltCfgFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_CONFIG_ROUTING_PROTOCOL *HIIConfigRouting
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.c
index 6949c0241be0..69f99b451c0b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTestMain.c
@@ -211,6 +211,7 @@ InitializeBBTestHIIConfigRouting (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestHIIConfigRoutingProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestConformance.c
index 6458329f4740..4c3174bed206 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestConformance.c
@@ -51,234 +51,273 @@ ReleaseDeviceHandle (
);
EFI_STATUS
+EFIAPI
BBTestNewPackageListConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestNewPackageListConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestRemovePackageListConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestRemovePackageListConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestRemovePackageListConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -288,6 +327,7 @@ BBTestGetPackageListHandleConformanceTestCheckpoint4 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewPackageListConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -327,6 +367,7 @@ BBTestNewPackageListConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestRemovePackageListConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -368,6 +409,7 @@ BBTestRemovePackageListConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -411,6 +453,7 @@ BBTestUpdatePackageListConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -458,6 +501,7 @@ BBTestListPackageListsConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -503,6 +547,7 @@ BBTestExportPackageListsConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -544,6 +589,7 @@ BBTestRegisterPackageNotifyConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -585,6 +631,7 @@ BBTestUnregisterPackageNotifyConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -626,6 +673,7 @@ BBTestFindKeyboardLayoutsConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -669,6 +717,7 @@ BBTestGetKeyboardLayoutConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -708,6 +757,7 @@ BBTestSetKeyboardLayoutConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -755,6 +805,7 @@ BBTestGetPackageListHandleConformanceTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestNewPackageListConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -795,6 +846,7 @@ BBTestNewPackageListConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestNewPackageListConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -838,6 +890,7 @@ BBTestNewPackageListConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestRemovePackageListConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -875,6 +928,7 @@ BBTestRemovePackageListConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestRemovePackageListConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -939,6 +993,7 @@ BBTestRemovePackageListConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestRemovePackageListConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1009,6 +1064,7 @@ BBTestRemovePackageListConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1049,6 +1105,7 @@ BBTestUpdatePackageListConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1117,6 +1174,7 @@ BBTestUpdatePackageListConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1190,6 +1248,7 @@ BBTestUpdatePackageListConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1257,6 +1316,7 @@ BBTestUpdatePackageListConformanceTestCheckpoint4 (
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1341,6 +1401,7 @@ BBTestListPackageListsConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1421,6 +1482,7 @@ BBTestListPackageListsConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1497,6 +1559,7 @@ BBTestListPackageListsConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1619,6 +1682,7 @@ BBTestListPackageListsConformanceTestCheckpoint4 (
}
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1695,6 +1759,7 @@ BBTestListPackageListsConformanceTestCheckpoint5 (
}
EFI_STATUS
+EFIAPI
BBTestListPackageListsConformanceTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1769,6 +1834,7 @@ BBTestListPackageListsConformanceTestCheckpoint6 (
}
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1840,6 +1906,7 @@ BBTestExportPackageListsConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1915,6 +1982,7 @@ BBTestExportPackageListsConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1991,6 +2059,7 @@ BBTestExportPackageListsConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2072,6 +2141,7 @@ BBTestExportPackageListsConformanceTestCheckpoint4 (
}
EFI_STATUS
+EFIAPI
BBTestExportPackageListsConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2160,6 +2230,7 @@ BBTestExportPackageListsConformanceTestCheckpoint5 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2215,6 +2286,7 @@ BBTestRegisterPackageNotifyConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2276,6 +2348,7 @@ BBTestRegisterPackageNotifyConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2336,6 +2409,7 @@ BBTestRegisterPackageNotifyConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2413,6 +2487,7 @@ BBTestUnregisterPackageNotifyConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2497,6 +2572,7 @@ BBTestUnregisterPackageNotifyConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2546,6 +2622,7 @@ BBTestUnregisterPackageNotifyConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2585,6 +2662,7 @@ BBTestFindKeyboardLayoutsConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2636,6 +2714,7 @@ BBTestFindKeyboardLayoutsConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2711,6 +2790,7 @@ BBTestFindKeyboardLayoutsConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2751,6 +2831,7 @@ BBTestGetKeyboardLayoutConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2793,6 +2874,7 @@ BBTestGetKeyboardLayoutConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2871,6 +2953,7 @@ BBTestGetKeyboardLayoutConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2946,6 +3029,7 @@ BBTestGetKeyboardLayoutConformanceTestCheckpoint4 (
}
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -2982,6 +3066,7 @@ BBTestSetKeyboardLayoutConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -3046,6 +3131,7 @@ BBTestSetKeyboardLayoutConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -3114,6 +3200,7 @@ BBTestGetPackageListHandleConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -3199,6 +3286,7 @@ BBTestGetPackageListHandleConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -3284,6 +3372,7 @@ BBTestGetPackageListHandleConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestFunction.c
index 84553543468a..7f574f21f2eb 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestFunction.c
@@ -52,60 +52,70 @@ ReleaseDeviceHandle (
);
EFI_STATUS
+EFIAPI
BBTestNewPackageListFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestRemovePackageListFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestListPackageListsFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestExportPackageListsFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestExportPackageListsFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
);
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -115,6 +125,7 @@ BBTestGetPackageListHandleFunctionTestCheckpoint1 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewPackageListFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -152,6 +163,7 @@ BBTestNewPackageListFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestRemovePackageListFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -189,6 +201,7 @@ BBTestRemovePackageListFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -226,6 +239,7 @@ BBTestUpdatePackageListFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestListPackageListsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -263,6 +277,7 @@ BBTestListPackageListsFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestExportPackageListsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -302,6 +317,7 @@ BBTestExportPackageListsFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestRegisterPackageNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -339,6 +355,7 @@ BBTestRegisterPackageNotifyFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterPackageNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -376,6 +393,7 @@ BBTestUnregisterPackageNotifyFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -413,6 +431,7 @@ BBTestFindKeyboardLayoutsFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -450,6 +469,7 @@ BBTestGetKeyboardLayoutFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -487,6 +507,7 @@ BBTestSetKeyboardLayoutFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -528,6 +549,7 @@ BBTestGetPackageListHandleFunctionTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestNewPackageListFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -581,6 +603,7 @@ BBTestNewPackageListFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRemovePackageListFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -670,6 +693,7 @@ BBTestRemovePackageListFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestUpdatePackageListFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -741,6 +765,7 @@ BBTestUpdatePackageListFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestListPackageListsFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -842,6 +867,7 @@ BBTestListPackageListsFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestExportPackageListsFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -922,6 +948,7 @@ BBTestExportPackageListsFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestExportPackageListsFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1020,6 +1047,7 @@ BBTestExportPackageListsFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestFindKeyboardLayoutsFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1105,6 +1133,7 @@ BBTestFindKeyboardLayoutsFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetKeyboardLayoutFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1196,6 +1225,7 @@ BBTestGetKeyboardLayoutFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestSetKeyboardLayoutFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
@@ -1303,6 +1333,7 @@ BBTestSetKeyboardLayoutFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetPackageListHandleFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.c
index 691785859f71..02434b964707 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTestMain.c
@@ -301,6 +301,7 @@ UnloadHIIDatabaseBBTest (
EFI_STATUS
+EFIAPI
DoNothingPackageNotifyFn (
IN UINT8 PackageType,
IN CONST EFI_GUID *PackageGuid,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestConformance.c
index 71d3e97a5333..ac457605cba5 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestConformance.c
@@ -27,12 +27,14 @@ Abstract:
extern UINT8 mPackageList1[];
EFI_STATUS
+EFIAPI
BBTestStringToImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -41,6 +43,7 @@ BBTestStringIdToImageConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
@@ -48,6 +51,7 @@ BBTestGetGlyphConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
@@ -57,6 +61,7 @@ BBTestGetFontInfoConformanceTestCheckpoint1 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestStringToImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -95,6 +100,7 @@ BBTestStringToImageConformanceTest (
EFI_STATUS
+EFIAPI
BBTestStringIdToImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -145,6 +151,7 @@ BBTestStringIdToImageConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetGlyphConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -183,6 +190,7 @@ BBTestGetGlyphConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -223,6 +231,7 @@ BBTestGetFontInfoConformanceTest (
//Check Points:
//
EFI_STATUS
+EFIAPI
BBTestStringToImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
@@ -415,6 +424,7 @@ BBTestStringToImageConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestStringIdToImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -602,7 +612,7 @@ BBTestStringIdToImageConformanceTestCheckpoint1 (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
//
// Call StringIdToImage with StringId not in PackageList, EFI_NOT_FOUND should be returned.
//
@@ -735,6 +745,7 @@ BBTestStringIdToImageConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetGlyphConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
@@ -832,6 +843,7 @@ BBTestGetGlyphConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestFunction.c
index 9d5a68aab6c3..d4e7b01fd2fb 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestFunction.c
@@ -44,12 +44,14 @@ StrCpy (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
);
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont,
@@ -57,6 +59,7 @@ BBTestStringToImageFunctionTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont,
@@ -64,6 +67,7 @@ BBTestStringToImageFunctionTestCheckpoint3 (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -72,6 +76,7 @@ BBTestStringToImageFunctionTestCheckpoint4 (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont,
@@ -79,6 +84,7 @@ BBTestStringToImageFunctionTestCheckpoint5 (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -87,6 +93,7 @@ BBTestStringToImageFunctionTestCheckpoint6 (
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -95,6 +102,7 @@ BBTestStringIdToImageFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -104,24 +112,28 @@ BBTestStringIdToImageFunctionTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
);
EFI_STATUS
+EFIAPI
BBTestGetFontInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
);
EFI_STATUS
+EFIAPI
BBTestGetFontInfoFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
);
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -199,6 +211,7 @@ BBTestStringToImageFunctionTest (
EFI_STATUS
+EFIAPI
BBTestStringIdToImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -257,6 +270,7 @@ BBTestStringIdToImageFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetGlyphFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -296,6 +310,7 @@ BBTestGetGlyphFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -337,6 +352,7 @@ BBTestGetFontInfoFunctionTest (
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
@@ -433,6 +449,7 @@ BBTestStringToImageFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont,
@@ -534,6 +551,7 @@ BBTestStringToImageFunctionTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont,
@@ -708,6 +726,7 @@ BBTestStringToImageFunctionTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -953,6 +972,7 @@ EXIT:
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont,
@@ -1672,6 +1692,7 @@ EXIT:
EFI_STATUS
+EFIAPI
BBTestStringToImageFunctionTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2601,6 +2622,7 @@ EXIT:
EFI_STATUS
+EFIAPI
BBTestStringIdToImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2748,6 +2770,7 @@ BBTestStringIdToImageFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestStringIdToImageFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2902,6 +2925,7 @@ BBTestStringIdToImageFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetGlyphFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
@@ -2957,6 +2981,7 @@ BBTestGetGlyphFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
@@ -3032,6 +3057,7 @@ BBTestGetFontInfoFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_PROTOCOL *HIIFont
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestConformance.c
index 929bae168ea6..37df618bf73a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestConformance.c
@@ -27,12 +27,14 @@ Abstract:
extern UINT8 mPackageList1[];
EFI_STATUS
+EFIAPI
BBTestStringToImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -41,6 +43,7 @@ BBTestStringIdToImageExConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -48,12 +51,14 @@ BBTestGetGlyphExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -63,6 +68,7 @@ BBTestGetGlyphInfoConformanceTestCheckpoint1 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestStringToImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -101,6 +107,7 @@ BBTestStringToImageExConformanceTest (
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -151,6 +158,7 @@ BBTestStringIdToImageExConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetGlyphExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -189,6 +197,7 @@ BBTestGetGlyphExConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -226,6 +235,7 @@ BBTestGetFontInfoExConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetGlyphInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -267,6 +277,7 @@ BBTestGetGlyphInfoConformanceTest (
//Check Points:
//
EFI_STATUS
+EFIAPI
BBTestStringToImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -459,6 +470,7 @@ BBTestStringToImageExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -779,6 +791,7 @@ BBTestStringIdToImageExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetGlyphExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -875,6 +888,7 @@ BBTestGetGlyphExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -968,6 +982,7 @@ BBTestGetFontInfoExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetGlyphInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestFunction.c
index e214f9f3bdb1..8b2a1f64df7f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestFunction.c
@@ -44,12 +44,14 @@ StrCpy (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
);
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx,
@@ -57,6 +59,7 @@ BBTestStringToImageExFunctionTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx,
@@ -64,6 +67,7 @@ BBTestStringToImageExFunctionTestCheckpoint3 (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -72,6 +76,7 @@ BBTestStringToImageExFunctionTestCheckpoint4 (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx,
@@ -79,6 +84,7 @@ BBTestStringToImageExFunctionTestCheckpoint5 (
);
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -87,6 +93,7 @@ BBTestStringToImageExFunctionTestCheckpoint6 (
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -95,6 +102,7 @@ BBTestStringIdToImageExFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -104,24 +112,28 @@ BBTestStringIdToImageExFunctionTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
);
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
);
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
);
EFI_STATUS
+EFIAPI
BBTestGetGlyphInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -129,6 +141,7 @@ BBTestGetGlyphInfoFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -206,6 +219,7 @@ BBTestStringToImageExFunctionTest (
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -264,6 +278,7 @@ BBTestStringIdToImageExFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetGlyphExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -303,6 +318,7 @@ BBTestGetGlyphExFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -343,6 +359,7 @@ BBTestGetFontInfoExFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetGlyphInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -383,6 +400,7 @@ BBTestGetGlyphInfoFunctionTest (
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -479,6 +497,7 @@ BBTestStringToImageExFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx,
@@ -580,6 +599,7 @@ BBTestStringToImageExFunctionTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx,
@@ -754,6 +774,7 @@ BBTestStringToImageExFunctionTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -999,6 +1020,7 @@ EXIT:
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx,
@@ -1718,6 +1740,7 @@ EXIT:
EFI_STATUS
+EFIAPI
BBTestStringToImageExFunctionTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2647,6 +2670,7 @@ EXIT:
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2794,6 +2818,7 @@ BBTestStringIdToImageExFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestStringIdToImageExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2948,6 +2973,7 @@ BBTestStringIdToImageExFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetGlyphExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -3003,6 +3029,7 @@ BBTestGetGlyphExFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -3078,6 +3105,7 @@ BBTestGetFontInfoExFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetFontInfoExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
@@ -3138,6 +3166,7 @@ BBTestGetFontInfoExFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetGlyphInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_FONT_EX_PROTOCOL *HIIFontEx
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.c
index 82d67e0718dd..bf146c819272 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTestMain.c
@@ -172,6 +172,7 @@ InitializeHIIFontExBBTest (
EFI_STATUS
+EFIAPI
UnloadHIIFontExBBTest (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestConformance.c
index 5f55cdaf2a85..caec922a92ed 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestConformance.c
@@ -31,6 +31,7 @@ extern UINT8 mImage[];
#define mImage1 ((EFI_IMAGE_INPUT*)(mImage))
EFI_STATUS
+EFIAPI
BBTestNewImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -38,6 +39,7 @@ BBTestNewImageConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -45,6 +47,7 @@ BBTestGetImageConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -52,6 +55,7 @@ BBTestGetImageConformanceTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -59,6 +63,7 @@ BBTestGetImageConformanceTestCheckpoint3 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -66,6 +71,7 @@ BBTestGetImageConformanceTestCheckpoint4 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -73,6 +79,7 @@ BBTestGetImageConformanceTestCheckpoint5 (
);
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -80,6 +87,7 @@ BBTestSetImageConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -87,6 +95,7 @@ BBTestSetImageConformanceTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -94,36 +103,42 @@ BBTestSetImageConformanceTestCheckpoint3 (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
);
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
);
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
);
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
);
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDataBase,
@@ -131,6 +146,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDataBase,
@@ -138,6 +154,7 @@ BBTestDrawImageIdConformanceTestCheckpoint2(
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDataBase,
@@ -145,6 +162,7 @@ BBTestDrawImageIdConformanceTestCheckpoint3(
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDataBase,
@@ -152,6 +170,7 @@ BBTestDrawImageIdConformanceTestCheckpoint4(
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint5(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDataBase,
@@ -161,6 +180,7 @@ BBTestDrawImageIdConformanceTestCheckpoint5(
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -204,6 +224,7 @@ BBTestNewImageConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -255,6 +276,7 @@ BBTestGetImageConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -302,6 +324,7 @@ BBTestSetImageConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -353,6 +376,7 @@ BBTestDrawImageConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -407,6 +431,7 @@ BBTestDrawImageIdConformanceTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestNewImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -564,6 +589,7 @@ BBTestNewImageConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -696,6 +722,7 @@ BBTestGetImageConformanceTestCheckpoint1 (
//
/*
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -858,6 +885,7 @@ BBTestGetImageConformanceTestCheckpoint2 (
*/
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -988,6 +1016,7 @@ BBTestGetImageConformanceTestCheckpoint3 (
//
/*
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1148,6 +1177,7 @@ BBTestGetImageConformanceTestCheckpoint4 (
*/
EFI_STATUS
+EFIAPI
BBTestGetImageConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1303,6 +1333,7 @@ BBTestGetImageConformanceTestCheckpoint5 (
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1470,6 +1501,7 @@ BBTestSetImageConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1598,6 +1630,7 @@ BBTestSetImageConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestSetImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1789,6 +1822,7 @@ BBTestSetImageConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
@@ -1858,6 +1892,7 @@ BBTestDrawImageConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
@@ -1930,6 +1965,7 @@ BBTestDrawImageConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
@@ -2025,6 +2061,7 @@ BBTestDrawImageConformanceTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
@@ -2101,6 +2138,7 @@ BBTestDrawImageConformanceTestCheckpoint4(
}
EFI_STATUS
+EFIAPI
BBTestDrawImageConformanceTestCheckpoint5(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
@@ -2178,6 +2216,7 @@ BBTestDrawImageConformanceTestCheckpoint5(
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2333,7 +2372,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
//
// Call DrawImageId with PackageList been NULL
@@ -2362,7 +2401,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
//
// Call DrawImageId with invalid ImageId
@@ -2440,6 +2479,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2577,6 +2617,7 @@ BBTestDrawImageIdConformanceTestCheckpoint2(
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2752,6 +2793,7 @@ BBTestDrawImageIdConformanceTestCheckpoint3(
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2889,6 +2931,7 @@ BBTestDrawImageIdConformanceTestCheckpoint4(
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdConformanceTestCheckpoint5(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestFunction.c
index 063ddc8523aa..59fbd60c6da7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestFunction.c
@@ -36,6 +36,7 @@ extern UINT8 mSetNewImage[];
#define Image2Length 1
EFI_STATUS
+EFIAPI
BBTestNewImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -43,6 +44,7 @@ BBTestNewImageFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -50,6 +52,7 @@ BBTestGetImageFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestSetImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -57,18 +60,21 @@ BBTestSetImageFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
);
EFI_STATUS
+EFIAPI
BBTestDrawImageFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
);
EFI_STATUS
+EFIAPI
BBTestDrawImageFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput,
@@ -76,6 +82,7 @@ BBTestDrawImageFunctionTestCheckpoint3 (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -83,6 +90,7 @@ BBTestDrawImageIdFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -90,6 +98,7 @@ BBTestDrawImageIdFunctionTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -102,6 +111,7 @@ BBTestDrawImageIdFunctionTestCheckpoint3 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -145,6 +155,7 @@ BBTestNewImageFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -188,6 +199,7 @@ BBTestGetImageFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestSetImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -231,6 +243,7 @@ BBTestSetImageFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -278,6 +291,7 @@ BBTestDrawImageFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -336,6 +350,7 @@ BBTestDrawImageIdFunctionTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestNewImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -440,6 +455,7 @@ BBTestNewImageFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -568,6 +584,7 @@ BBTestGetImageFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -737,6 +754,7 @@ BBTestSetImageFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestDrawImageFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
@@ -810,6 +828,7 @@ BBTestDrawImageFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestDrawImageFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_PROTOCOL *HIIImage
@@ -912,6 +931,7 @@ BBTestDrawImageFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestDrawImageFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput,
@@ -1016,6 +1036,7 @@ BBTestDrawImageFunctionTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestDrawImageIdFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1144,6 +1165,7 @@ BBTestDrawImageIdFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1327,6 +1349,7 @@ BBTestDrawImageIdFunctionTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.c
index 4bb1f43a4c80..58234e9b828c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestMain.c
@@ -171,6 +171,7 @@ InitializeHIIImageBBTest (
EFI_STATUS
+EFIAPI
UnloadHIIImageBBTest (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestConformance.c
index dc97bfacd255..deec99aa696c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestConformance.c
@@ -31,6 +31,7 @@ extern UINT8 mImage[];
#define mImage1 ((EFI_IMAGE_INPUT*)(mImage))
EFI_STATUS
+EFIAPI
BBTestNewImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -38,6 +39,7 @@ BBTestNewImageExConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -45,6 +47,7 @@ BBTestGetImageExConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageExConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -52,6 +55,7 @@ BBTestGetImageExConformanceTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageExConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -59,6 +63,7 @@ BBTestGetImageExConformanceTestCheckpoint3 (
);
EFI_STATUS
+EFIAPI
BBTestSetImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -66,6 +71,7 @@ BBTestSetImageExConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestSetImageExConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -73,6 +79,7 @@ BBTestSetImageExConformanceTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestSetImageExConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -80,36 +87,42 @@ BBTestSetImageExConformanceTestCheckpoint3 (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
);
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
);
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
);
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
);
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDataBase,
@@ -117,6 +130,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint1(
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDataBase,
@@ -124,6 +138,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint2(
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDataBase,
@@ -131,6 +146,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint3(
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDataBase,
@@ -138,6 +154,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint4(
);
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -149,6 +166,7 @@ BBTestGetImageInfoConformanceTestCheckpoint1 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -192,6 +210,7 @@ BBTestNewImageExConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -239,6 +258,7 @@ BBTestGetImageExConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestSetImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -286,6 +306,7 @@ BBTestSetImageExConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -337,6 +358,7 @@ BBTestDrawImageExConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -385,6 +407,7 @@ BBTestDrawImageIdExConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -432,6 +455,7 @@ BBTestGetImageInfoConformanceTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestNewImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -589,6 +613,7 @@ BBTestNewImageExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -718,6 +743,7 @@ BBTestGetImageExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetImageExConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -845,6 +871,7 @@ BBTestGetImageExConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetImageExConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1000,6 +1027,7 @@ BBTestGetImageExConformanceTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestSetImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1167,6 +1195,7 @@ BBTestSetImageExConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetImageExConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1295,6 +1324,7 @@ BBTestSetImageExConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestSetImageExConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1486,6 +1516,7 @@ BBTestSetImageExConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
@@ -1555,6 +1586,7 @@ BBTestDrawImageExConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
@@ -1627,6 +1659,7 @@ BBTestDrawImageExConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
@@ -1722,6 +1755,7 @@ BBTestDrawImageExConformanceTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
@@ -1798,6 +1832,7 @@ BBTestDrawImageExConformanceTestCheckpoint4(
}
EFI_STATUS
+EFIAPI
BBTestDrawImageExConformanceTestCheckpoint5(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
@@ -1875,6 +1910,7 @@ BBTestDrawImageExConformanceTestCheckpoint5(
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTestCheckpoint1(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2137,6 +2173,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint1(
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTestCheckpoint2(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2275,6 +2312,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint2(
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2412,6 +2450,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint3(
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExConformanceTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -2551,6 +2590,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint4(
EFI_STATUS
+EFIAPI
BBTestGetImageInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestFunction.c
index e95d6022facb..c9c3a859dee1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestFunction.c
@@ -36,6 +36,7 @@ extern UINT8 mSetNewImage[];
#define Image2Length 1
EFI_STATUS
+EFIAPI
BBTestNewImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -43,6 +44,7 @@ BBTestNewImageExFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -50,6 +52,7 @@ BBTestGetImageExFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestSetImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -57,12 +60,14 @@ BBTestSetImageExFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
);
EFI_STATUS
+EFIAPI
BBTestDrawImageExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
@@ -70,6 +75,7 @@ BBTestDrawImageExFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -77,6 +83,7 @@ BBTestDrawImageIdExFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -85,6 +92,7 @@ BBTestDrawImageIdExFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetImageInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -95,6 +103,7 @@ BBTestGetImageInfoFunctionTestCheckpoint1 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -138,6 +147,7 @@ BBTestNewImageExFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -181,6 +191,7 @@ BBTestGetImageExFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestSetImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -224,6 +235,7 @@ BBTestSetImageExFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -269,6 +281,7 @@ BBTestDrawImageExFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -321,6 +334,7 @@ BBTestDrawImageIdExFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetImageInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -369,6 +383,7 @@ BBTestGetImageInfoFunctionTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestNewImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -473,6 +488,7 @@ BBTestNewImageExFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -601,6 +617,7 @@ BBTestGetImageExFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -770,6 +787,7 @@ BBTestSetImageExFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestDrawImageExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
@@ -843,6 +861,7 @@ BBTestDrawImageExFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestDrawImageExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_IMAGE_EX_PROTOCOL *HIIImageEx
@@ -945,6 +964,7 @@ BBTestDrawImageExFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1073,6 +1093,7 @@ BBTestDrawImageIdExFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestDrawImageIdExFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1258,6 +1279,7 @@ BBTestDrawImageIdExFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetImageInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.c
index 8a860a89a318..0e3f8a5d9add 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestMain.c
@@ -189,6 +189,7 @@ InitializeHIIImageExBBTest (
EFI_STATUS
+EFIAPI
UnloadHIIImageExBBTest (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c
index 783524468a80..d341ebaa985f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c
@@ -31,6 +31,7 @@ extern UINT8 mPackageList1[];
#endif
EFI_STATUS
+EFIAPI
BBTestNewStringConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -38,6 +39,7 @@ BBTestNewStringConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -45,6 +47,7 @@ BBTestGetStringConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -52,6 +55,7 @@ BBTestGetStringConformanceTestCheckpoint2 (
);
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -59,6 +63,7 @@ BBTestGetStringConformanceTestCheckpoint3 (
);
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -66,6 +71,7 @@ BBTestGetStringConformanceTestCheckpoint4 (
);
EFI_STATUS
+EFIAPI
BBTestSetStringConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -73,6 +79,7 @@ BBTestSetStringConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetLanguagesConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -80,6 +87,7 @@ BBTestGetLanguagesConformanceTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetSecondaryLanguagesConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -135,6 +143,7 @@ BBTestNewStringConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -186,6 +195,7 @@ BBTestGetStringConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestSetStringConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -230,6 +240,7 @@ BBTestSetStringConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetLanguagesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -275,6 +286,7 @@ BBTestGetLanguagesConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetSecondaryLanguagesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -323,6 +335,7 @@ BBTestGetSecondaryLanguagesConformanceTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestNewStringConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -492,6 +505,7 @@ BBTestNewStringConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -608,7 +622,7 @@ BBTestGetStringConformanceTestCheckpoint1 (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
//
// Remove the PackageList from the HII database
//
@@ -621,6 +635,7 @@ BBTestGetStringConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -732,6 +747,7 @@ BBTestGetStringConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -902,6 +918,7 @@ BBTestGetStringConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestGetStringConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1099,6 +1116,7 @@ BBTestGetStringConformanceTestCheckpoint4 (
}
EFI_STATUS
+EFIAPI
BBTestSetStringConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1312,6 +1330,7 @@ BBTestSetStringConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetLanguagesConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -1501,6 +1520,7 @@ BBTestGetLanguagesConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetSecondaryLanguagesConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestFunction.c
index 39919bf0ac40..0fa1c35a486f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestFunction.c
@@ -27,6 +27,7 @@ Abstract:
extern UINT8 mPackageList1[];
EFI_STATUS
+EFIAPI
BBTestNewStringFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -34,6 +35,7 @@ BBTestNewStringFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetStringFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -41,6 +43,7 @@ BBTestGetStringFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestSetStringFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -48,6 +51,7 @@ BBTestSetStringFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetLanguagesFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -55,6 +59,7 @@ BBTestGetLanguagesFunctionTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestGetSecondaryLanguagesFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -65,6 +70,7 @@ BBTestGetSecondaryLanguagesFunctionTestCheckpoint1 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestNewStringFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -109,6 +115,7 @@ BBTestNewStringFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetStringFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -153,6 +160,7 @@ BBTestGetStringFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestSetStringFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -197,6 +205,7 @@ BBTestSetStringFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetLanguagesFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -241,6 +250,7 @@ BBTestGetLanguagesFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetSecondaryLanguagesFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -288,6 +298,7 @@ BBTestGetSecondaryLanguagesFunctionTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestNewStringFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -419,6 +430,7 @@ BBTestNewStringFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetStringFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -532,6 +544,7 @@ BBTestGetStringFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetStringFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -683,6 +696,7 @@ BBTestSetStringFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetLanguagesFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
@@ -768,6 +782,7 @@ BBTestGetLanguagesFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetSecondaryLanguagesFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_HII_DATABASE_PROTOCOL *HIIDatabase,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestConformance.c
index 494e34514e1d..94db2f37791c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestConformance.c
@@ -42,6 +42,7 @@ EFI_GUID gBlackBoxEfiHash2AlgorithmSha256NoPadGuid = HASH2_SHA256_NOPAD_ALGO_GUI
extern EFI_GUID gHashAlgorithmGuids[6];
EFI_STATUS
+EFIAPI
BBTestGetHashSizeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -65,11 +66,11 @@ BBTestGetHashSizeConformanceTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -128,6 +129,7 @@ BBTestGetHashSizeConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestHashConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -155,11 +157,11 @@ BBTestHashConformanceTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -219,6 +221,7 @@ BBTestHashConformanceTest (
EFI_STATUS
+EFIAPI
BBTestHashInitConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -245,11 +248,11 @@ BBTestHashInitConformanceTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -330,6 +333,7 @@ BBTestHashInitConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestHashUpdateConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -357,11 +361,11 @@ BBTestHashUpdateConformanceTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -437,6 +441,7 @@ BBTestHashUpdateConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestHashFinalConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -464,11 +469,11 @@ BBTestHashFinalConformanceTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestFunction.c
index 310fc258f16c..aa7884d04be3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTestFunction.c
@@ -54,6 +54,7 @@ Hash2OutMD5
UINTN Length[6] = {20, 28, 32, 48, 64, 16};
EFI_STATUS
+EFIAPI
BBTestGetHashSizeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -77,11 +78,11 @@ BBTestGetHashSizeFunctionTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -119,6 +120,7 @@ BBTestGetHashSizeFunctionTest (
EFI_STATUS
+EFIAPI
BBTestHashFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -146,11 +148,11 @@ BBTestHashFunctionTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
@@ -190,6 +192,7 @@ BBTestHashFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestHashMultiBlocksFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -218,11 +221,11 @@ BBTestHashMultiBlocksFunctionTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR(Status)) {
return Status;
}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestConformance.c
index 46d61942e996..183cf18bcfc0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestConformance.c
@@ -21,10 +21,11 @@ Abstract:
for EFI Driver IPsec2 Protocol's conformance Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "IPsec2BBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestProcessExtConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
@@ -34,6 +35,7 @@ BBTestProcessExtConformanceTestCheckpoint1 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestProcessExtConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -128,6 +130,7 @@ BBTestProcessExtConformanceTest (
EFI_STATUS
+EFIAPI
BBTestProcessExtConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestFunction.c
index 84dc8e3efe7b..813005130b6d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTestFunction.c
@@ -21,7 +21,7 @@ Abstract:
for EFI Driver IPsec2 Protocol's function Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "IPsec2BBTestMain.h"
static IP_PACKET IP6PacketBuffer[] = {
@@ -31,48 +31,56 @@ static IP_PACKET IP6PacketBuffer[] = {
};
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
);
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
);
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
);
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
);
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
);
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
);
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint7 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
);
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint8 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
@@ -83,6 +91,7 @@ BBTestProcessExtFunctionTestCheckpoint8 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -761,6 +770,7 @@ BBTestProcessExtFunctionTest (
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
@@ -1098,6 +1108,7 @@ FUNC_EXIT:
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
@@ -1437,6 +1448,7 @@ FUNC_EXIT:
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint3(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
@@ -1856,6 +1868,7 @@ FUNC_EXIT:
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint4(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
@@ -2270,6 +2283,7 @@ FUNC_EXIT:
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
@@ -2643,6 +2657,7 @@ FUNC_EXIT:
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
@@ -3014,6 +3029,7 @@ FUNC_EXIT:
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint7(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
@@ -3475,6 +3491,7 @@ FUNC_EXIT:
EFI_STATUS
+EFIAPI
BBTestProcessExtFunctionTestCheckpoint8(
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC2_PROTOCOL *IPsec2
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c
index 50f6a648a4eb..2eae9936739e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c
@@ -21,83 +21,96 @@ Abstract:
for EFI Driver IPsec Config Protocol's conformance Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "IPsecConfigBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestSetDataConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -105,12 +118,14 @@ BBTestRegisterDataNotifyConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -120,6 +135,7 @@ BBTestUnregisterDataNotifyConformanceTestCheckpoint2 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestSetDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -157,6 +173,7 @@ BBTestSetDataConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -202,6 +219,7 @@ BBTestGetDataConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -247,6 +265,7 @@ BBTestGetNextSelectorConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -286,6 +305,7 @@ BBTestRegisterDataNotifyConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -329,6 +349,7 @@ BBTestUnregisterDataNotifyConformanceTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestSetDataConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -422,6 +443,7 @@ BBTestSetDataConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -471,6 +493,7 @@ BBTestGetDataConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -518,6 +541,7 @@ BBTestGetDataConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -693,7 +717,7 @@ BBTestGetDataConformanceTestCheckpoint3 (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
//
// Clean Environment: Call IPsec->SetData with the same DataType(0)/Selector.
@@ -722,6 +746,7 @@ BBTestGetDataConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -902,7 +927,7 @@ BBTestGetDataConformanceTestCheckpoint4 (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
//
// Clean Environment: Call IPsec->SetData with the same DataType(1)/Selector.
@@ -1066,7 +1091,7 @@ BBTestGetDataConformanceTestCheckpoint4 (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
//
// Clean Environment: Call IPsec->SetData with the same DataType(1)/Selector.
@@ -1097,6 +1122,7 @@ BBTestGetDataConformanceTestCheckpoint4 (
EFI_STATUS
+EFIAPI
BBTestGetDataConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1244,7 +1270,7 @@ BBTestGetDataConformanceTestCheckpoint5 (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
//
// Clean Environment: Call IPsec->SetData with the same DataType(2)/Selector.
@@ -1274,6 +1300,7 @@ BBTestGetDataConformanceTestCheckpoint5 (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1320,6 +1347,7 @@ BBTestGetNextSelectorConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1394,6 +1422,7 @@ BBTestGetNextSelectorConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1544,6 +1573,7 @@ BBTestGetNextSelectorConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1698,6 +1728,7 @@ BBTestGetNextSelectorConformanceTestCheckpoint4 (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorConformanceTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1824,6 +1855,7 @@ BBTestGetNextSelectorConformanceTestCheckpoint5 (
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1867,6 +1899,7 @@ BBTestRegisterDataNotifyConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1931,6 +1964,7 @@ BBTestRegisterDataNotifyConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1974,6 +2008,7 @@ BBTestUnregisterDataNotifyConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestFunction.c
index c463c4266498..cf3fed01e9c2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestFunction.c
@@ -21,88 +21,102 @@ Abstract:
for EFI Driver IPsec Config Protocol's function Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "IPsecConfigBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
);
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -112,6 +126,7 @@ BBTestUnregisterDataNotifyFunctionTestCheckpoint1 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -159,6 +174,7 @@ BBTestSetDataFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -200,6 +216,7 @@ BBTestGetDataFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -241,6 +258,7 @@ BBTestGetNextSelectorFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -278,6 +296,7 @@ BBTestRegisterDataNotifyFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -319,6 +338,7 @@ BBTestUnregisterDataNotifyFunctionTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -469,6 +489,7 @@ BBTestSetDataFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -735,6 +756,7 @@ BBTestSetDataFunctionTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -858,6 +880,7 @@ BBTestSetDataFunctionTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1008,6 +1031,7 @@ BBTestSetDataFunctionTestCheckpoint4 (
}
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint5 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1161,6 +1185,7 @@ BBTestSetDataFunctionTestCheckpoint5 (
}
EFI_STATUS
+EFIAPI
BBTestSetDataFunctionTestCheckpoint6 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1283,6 +1308,7 @@ BBTestSetDataFunctionTestCheckpoint6 (
}
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1460,6 +1486,7 @@ BBTestGetDataFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1815,6 +1842,7 @@ BBTestGetDataFunctionTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetDataFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -1978,6 +2006,7 @@ BBTestGetDataFunctionTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -2170,6 +2199,7 @@ BBTestGetNextSelectorFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -2357,6 +2387,7 @@ BBTestGetNextSelectorFunctionTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSelectorFunctionTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -2515,6 +2546,7 @@ BBTestGetNextSelectorFunctionTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestRegisterDataNotifyFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
@@ -2678,6 +2710,7 @@ BBTestRegisterDataNotifyFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterDataNotifyFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_IPSEC_CONFIG_PROTOCOL *IPsecConfig
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.c
index 003a303a1119..ef1a01a236da 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTestMain.c
@@ -124,6 +124,7 @@ UnloadLoadFileTest (
* @return EFI_SUCCESS Finish the test successfully.
*/
EFI_STATUS
+EFIAPI
BBTestLoadFileFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTestMain.c
index b3b5afd19a41..94755efc75c3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTestMain.c
@@ -108,6 +108,7 @@ InitializeBBTestLoadedImageProtocol (
* @return EFI_SUCCESS Indicates the interface was Uninstalled
*/
EFI_STATUS
+EFIAPI
BBTestLoadedImageProtocolUnload (
IN EFI_HANDLE ImageHandle
)
@@ -119,6 +120,7 @@ BBTestLoadedImageProtocolUnload (
}
EFI_STATUS
+EFIAPI
BBTestLoadedImageTest1 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -809,6 +811,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestLoadedImageTest2 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestConformance.c
index c89e1f09630e..eee6b84e07af 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestConformance.c
@@ -27,6 +27,7 @@ Abstract:
#include "NVMEPassThruBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestGetNextNamespaceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -112,6 +113,7 @@ BBTestGetNextNamespaceConformanceTest (
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -214,6 +216,7 @@ BBTestBuildDevicePathConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetNamespaceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -352,6 +355,7 @@ BBTestGetNamespaceConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestFunction.c
index 5c5a7fc98853..9203555a46af 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestFunction.c
@@ -29,6 +29,7 @@ Abstract:
extern UINT8 EnterEvent;
EFI_STATUS
+EFIAPI
BBTestGetNextNamespaceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -105,6 +106,7 @@ BBTestGetNextNamespaceFunctionTest (
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -180,6 +182,7 @@ BBTestBuildDevicePathFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetNamespaceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -258,6 +261,7 @@ BBTestGetNamespaceFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestConformance.c
index ce7d5bb21d01..c74968a735ef 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestConformance.c
@@ -37,6 +37,7 @@ extern EFI_SIGNATURE_LIST *RevokedDb[3];
extern EFI_SIGNATURE_LIST *TimestampDb[3];
EFI_STATUS
+EFIAPI
BBTestVerifyBufferConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -504,6 +505,7 @@ BBTestVerifyBufferConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestVerifySignatureConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestFunction.c
index e252dc713e81..f40fcee1a551 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestFunction.c
@@ -37,6 +37,7 @@ extern EFI_SIGNATURE_LIST *RevokedDb[3];
extern EFI_SIGNATURE_LIST *TimestampDb[3];
EFI_STATUS
+EFIAPI
BBTestVerifyBufferFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -238,6 +239,7 @@ BBTestVerifyBufferFunctionTest (
EFI_STATUS
+EFIAPI
BBTestVerifySignatureFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestFunction.c
index 076cf194b05e..018e850c7d16 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestFunction.c
@@ -30,6 +30,7 @@ EFI_GUID gPartitionInfoEFISystemPartitionGuid = EFI_SYSTEM_PARTITIO
EFI_GUID gPartitionInfoEFIPartitionContainingLegacyMBRGuid = EFI_PARTITION_CONTAINING_LEGACY_MBR_GUID;
EFI_STATUS
+EFIAPI
BBTestPartitionInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.c
index fc49266fce29..31b7dc687c23 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTestMain.c
@@ -95,6 +95,7 @@ InitializePartitionInfoBBTest (
EFI_STATUS
+EFIAPI
UnloadPartitionInfoBBTest (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestConformance.c
index 16547323772e..b9dab72dd378 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciIoBBTestMain.h"
#include "PciIoBBTestSupport.h"
@@ -50,6 +50,7 @@ Abstract:
//TDS 4.2.1
//
EFI_STATUS
+EFIAPI
PollMem_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -676,6 +677,7 @@ PollMem_Conf (
//TDS 4.2.2
//
EFI_STATUS
+EFIAPI
PollIo_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1303,6 +1305,7 @@ PollIo_Conf (
//TDS 4.2.3
//
EFI_STATUS
+EFIAPI
MemRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1866,6 +1869,7 @@ MemRead_Conf (
//TDS 4.2.4
//
EFI_STATUS
+EFIAPI
MemWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2429,6 +2433,7 @@ MemWrite_Conf (
//TDS 4.2.5
//
EFI_STATUS
+EFIAPI
IoRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2990,6 +2995,7 @@ IoRead_Conf (
//TDS 4.2.6
//
EFI_STATUS
+EFIAPI
IoWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3552,6 +3558,7 @@ IoWrite_Conf (
//TDS 4.2.7
//
EFI_STATUS
+EFIAPI
PciRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4001,6 +4008,7 @@ PciRead_Conf (
//TDS 4.2.8
//
EFI_STATUS
+EFIAPI
PciWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4450,6 +4458,7 @@ PciWrite_Conf (
//TDS 4.2.9
//
EFI_STATUS
+EFIAPI
CopyMem_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -5155,6 +5164,7 @@ CopyMem_Conf (
//TDS 4.2.10
//
EFI_STATUS
+EFIAPI
Map_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -5475,6 +5485,7 @@ Map_Conf (
//TDS 4.2.11
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -5697,6 +5708,7 @@ AllocateBuffer_Conf (
//TDS 4.2.12
//
EFI_STATUS
+EFIAPI
GetLocation_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -5865,6 +5877,7 @@ GetLocation_Conf (
//TDS 4.2.13
//
EFI_STATUS
+EFIAPI
Attributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -6182,6 +6195,7 @@ Attributes_Conf (
//TDS 4.2.14
//
EFI_STATUS
+EFIAPI
GetBarAttributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -6319,6 +6333,7 @@ GetBarAttributes_Conf (
//TDS 4.2.15
//
EFI_STATUS
+EFIAPI
SetBarAttributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_1.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_1.c
index 7451b9a4245c..a4fc90792d7c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_1.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_1.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciIoBBTestMain.h"
#include "PciIoBBTestSupport.h"
@@ -48,6 +48,7 @@ Abstract:
//TDS 4.1.1
//
EFI_STATUS
+EFIAPI
PollMem_Func_Manual (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -274,6 +275,7 @@ PollMem_Func_Manual (
* @return EFI_SUCCESS the check point was checked successfully.
*/
EFI_STATUS
+EFIAPI
PollMemCheckPoint (
IN EFI_PCI_IO_PROTOCOL *PciIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -672,6 +674,7 @@ PollMemCheckPoint (
//
EFI_STATUS
+EFIAPI
PollMem_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1053,6 +1056,7 @@ PollMem_Func (
//TDS 4.1.3
//
EFI_STATUS
+EFIAPI
PollIo_Func_Manual (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1277,6 +1281,7 @@ PollIo_Func_Manual (
* @return EFI_SUCCESS the check point was checked successfully.
*/
EFI_STATUS
+EFIAPI
PollIoCheckPoint (
IN EFI_PCI_IO_PROTOCOL *PciIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1674,6 +1679,7 @@ PollIoCheckPoint (
//
EFI_STATUS
+EFIAPI
PollIo_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2057,6 +2063,7 @@ PollIo_Func (
//
EFI_STATUS
+EFIAPI
MemRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2732,6 +2739,7 @@ MemRead_Func (
//TDS 4.1.6
//
EFI_STATUS
+EFIAPI
MemWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3388,6 +3396,7 @@ MemWrite_Func (
//TDS 4.1.7
//
EFI_STATUS
+EFIAPI
IoRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4054,6 +4063,7 @@ IoRead_Func (
//TDS 4.1.8
//
EFI_STATUS
+EFIAPI
IoWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4480,7 +4490,7 @@ IoWrite_Func (
//
//then read out the data in destination address range.
//
- Status = PciIo->Io.Read (
+ Status = PciIo->Io.Read (
PciIo,
PciIoWidth,
BarIndex,
@@ -4508,8 +4518,8 @@ IoWrite_Func (
L"EFI_PCI_IO_PROTOCOL.Io.Write - the data read must equal with the data written",
L"%a:%d:Status - %r",
__FILE__,
- (UINTN)__LINE__,
- Status
+ (UINTN)__LINE__,
+ Status
);
//
//write the data using EfiPciIoWidthFifoUintX.
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_2.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_2.c
index ec69e43c4fd7..bfc6057cc696 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_2.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_2.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciIoBBTestMain.h"
#include "PciIoBBTestSupport.h"
@@ -45,6 +45,7 @@ Abstract:
//TDS 4.1.9
//
EFI_STATUS
+EFIAPI
PciRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -678,6 +679,7 @@ PciRead_Func (
//TDS 4.1.10
//
EFI_STATUS
+EFIAPI
PciWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1309,6 +1311,7 @@ PciWrite_Func (
//TDS 4.1.11
//
EFI_STATUS
+EFIAPI
CopyMem_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2140,6 +2143,7 @@ CopyMem_Func (
//TDS 4.1.12
//
EFI_STATUS
+EFIAPI
Map_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2669,6 +2673,7 @@ Map_Func (
//TDS 4.1.13
//
EFI_STATUS
+EFIAPI
Unmap_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3137,6 +3142,7 @@ Unmap_Func (
//TDS 4.1.14
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3276,6 +3282,7 @@ AllocateBuffer_Func (
//TDS 4.1.15
//
EFI_STATUS
+EFIAPI
FreeBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3417,6 +3424,7 @@ FreeBuffer_Func (
//TDS 4.1.16
//
EFI_STATUS
+EFIAPI
Flush_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3507,6 +3515,7 @@ Flush_Func (
//TDS 4.1.17
//
EFI_STATUS
+EFIAPI
GetLocation_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3664,6 +3673,7 @@ GetLocation_Func (
//TDS 4.1.18
//
EFI_STATUS
+EFIAPI
Attributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4175,6 +4185,7 @@ Attributes_Func (
//TDS 4.1.19
//
EFI_STATUS
+EFIAPI
GetBarAttributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4440,6 +4451,7 @@ GetBarAttributes_Func (
//TDS 4.1.20
//
EFI_STATUS
+EFIAPI
SetBarAttributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestStress.c
index 225724ae3a35..a7974295a536 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestStress.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciIoBBTestMain.h"
#include "PciIoBBTestSupport.h"
@@ -40,6 +40,7 @@ Abstract:
//TDS 4.3.1
//
EFI_STATUS
+EFIAPI
Attributes_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -840,6 +841,7 @@ Attributes_Stress (
//TDS 4.3.2
//
EFI_STATUS
+EFIAPI
GetAndSetBarAttributes_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.c
index 4bbb1931044d..cd2784d579bc 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestSupport.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciIoBBTestMain.h"
#include "PciIoBBTestSupport.h"
#include <IndustryStandard/Acpi.h>
@@ -1699,6 +1699,7 @@ CheckBarAndRange (
* into the destinaiton address.
*/
VOID
+EFIAPI
EventNotifyWriteMem (
IN EFI_EVENT Event,
IN VOID *Context
@@ -1774,6 +1775,7 @@ EventNotifyWriteMem (
* into the destinaiton address.
*/
VOID
+EFIAPI
EventNotifyWriteIo (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestConformance.c
index 8c1804f38f4e..c21f42745ca6 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciRootBridgeIoBBTestMain.h"
#include "PciRootBridgeIoBBTestSupport.h"
@@ -66,6 +66,7 @@ STATIC CONST UINT64 mAllAttributes[14] = {
//TDS 4.2.1
//
EFI_STATUS
+EFIAPI
PollMem_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -389,6 +390,7 @@ PollMem_Conf (
//TDS 4.2.2
//
EFI_STATUS
+EFIAPI
PollIo_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -712,6 +714,7 @@ PollIo_Conf (
//TDS 4.2.3
//
EFI_STATUS
+EFIAPI
MemRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1087,6 +1090,7 @@ MemRead_Conf (
//TDS 4.2.4
//
EFI_STATUS
+EFIAPI
MemWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1461,6 +1465,7 @@ MemWrite_Conf (
//TDS 4.2.5
//
EFI_STATUS
+EFIAPI
IoRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1834,6 +1839,7 @@ IoRead_Conf (
//TDS 4.2.6
//
EFI_STATUS
+EFIAPI
IoWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2206,6 +2212,7 @@ IoWrite_Conf (
//TDS 4.2.7
//
EFI_STATUS
+EFIAPI
PciRead_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2568,6 +2575,7 @@ PciRead_Conf (
//TDS 4.2.8
//
EFI_STATUS
+EFIAPI
PciWrite_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2932,6 +2940,7 @@ PciWrite_Conf (
//TDS 4.2.9
//
EFI_STATUS
+EFIAPI
CopyMem_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3390,6 +3399,7 @@ CopyMem_Conf (
//TDS 4.2.10
//
EFI_STATUS
+EFIAPI
Map_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3698,6 +3708,7 @@ Map_Conf (
//TDS 4.2.11
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3974,6 +3985,7 @@ AllocateBuffer_Conf (
//TDS 4.2.14
//
EFI_STATUS
+EFIAPI
GetAttributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4058,6 +4070,7 @@ GetAttributes_Conf (
//TDS 4.2.13
//
EFI_STATUS
+EFIAPI
SetAttributes_Conf (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_1.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_1.c
index d9894fdd4d1c..dcc9cfed56ee 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_1.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_1.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciRootBridgeIoBBTestMain.h"
#include "PciRootBridgeIoBBTestSupport.h"
@@ -51,6 +51,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
PollMem_Func_Manual (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -261,6 +262,7 @@ PollMem_Func_Manual (
* @return EFI_SUCCESS the check point was checked successfully.
*/
EFI_STATUS
+EFIAPI
PollMemCheckPoint (
IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *RootBridgeIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -673,6 +675,7 @@ PollMemCheckPoint (
//
EFI_STATUS
+EFIAPI
PollMem_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1053,6 +1056,7 @@ PollMem_Func (
//TDS 4.1.3
//
EFI_STATUS
+EFIAPI
PollIo_Func_Manual (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1266,6 +1270,7 @@ PollIo_Func_Manual (
* @return EFI_SUCCESS the check point was checked successfully.
*/
EFI_STATUS
+EFIAPI
PollIoCheckPoint (
IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *RootBridgeIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1678,6 +1683,7 @@ PollIoCheckPoint (
//TDS 4.1.4
//
EFI_STATUS
+EFIAPI
PollIo_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2048,6 +2054,7 @@ PollIo_Func (
//TDS 4.1.5
//
EFI_STATUS
+EFIAPI
MemRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2719,6 +2726,7 @@ MemRead_Func (
//TDS 4.1.6
//
EFI_STATUS
+EFIAPI
MemWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3445,6 +3453,7 @@ MemWrite_Func (
//TDS 4.1.7
//
EFI_STATUS
+EFIAPI
IoRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4111,6 +4120,7 @@ IoRead_Func (
//TDS 4.1.8
//
EFI_STATUS
+EFIAPI
IoWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
index 89adcba91e70..7bbc832b4212 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciRootBridgeIoBBTestMain.h"
#include "PciRootBridgeIoBBTestSupport.h"
@@ -49,6 +49,7 @@ Abstract:
//TDS 4.1.9
//
EFI_STATUS
+EFIAPI
PciRead_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -734,6 +735,7 @@ PciRead_Func (
//TDS 4.1.10
//
EFI_STATUS
+EFIAPI
PciWrite_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1479,6 +1481,7 @@ PciWrite_Func (
//TDS 4.1.11
//
EFI_STATUS
+EFIAPI
CopyMem_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2236,6 +2239,7 @@ CopyMem_Func (
//TDS 4.1.12
//
EFI_STATUS
+EFIAPI
Map_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4099,6 +4103,7 @@ Unmap_Func (
//TDS 4.1.14
//
EFI_STATUS
+EFIAPI
AllocateBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4279,6 +4284,7 @@ AllocateBuffer_Func (
//TDS 4.1.15
//
EFI_STATUS
+EFIAPI
FreeBuffer_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4462,6 +4468,7 @@ FreeBuffer_Func (
//TDS 4.1.16
//
EFI_STATUS
+EFIAPI
Flush_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4557,6 +4564,7 @@ Flush_Func (
//TDS 4.1.17
//
EFI_STATUS
+EFIAPI
GetAttributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4784,6 +4792,7 @@ GetAttributes_Func (
//TDS 4.1.18
//
EFI_STATUS
+EFIAPI
SetAttributes_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -5123,6 +5132,7 @@ SetAttributes_Func (
//TDS 4.1.23
//
EFI_STATUS
+EFIAPI
Configuration_Func (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestStress.c
index e018296f52a4..3812ba22ccd2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestStress.c
@@ -23,7 +23,7 @@ Abstract:
Stress test case source file for Pci Root Bridge Io Protocol
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciRootBridgeIoBBTestMain.h"
#include "PciRootBridgeIoBBTestSupport.h"
@@ -42,6 +42,7 @@ Abstract:
//TDS 4.3.1
//
EFI_STATUS
+EFIAPI
SetAttributes_Stress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.c
index 04bcff463ab6..2e5369e14104 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestSupport.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PciRootBridgeIoBBTestMain.h"
#include "PciRootBridgeIoBBTestSupport.h"
#include <IndustryStandard/Acpi.h>
@@ -1512,6 +1512,7 @@ GetSystemDevicePathAndFilePath (
* @param Contex the Event context.
*/
VOID
+EFIAPI
EventNotifyWriteMem (
IN EFI_EVENT Event,
IN VOID *Context
@@ -1592,6 +1593,7 @@ EventNotifyWriteMem (
* @param Contex the Event context.
*/
VOID
+EFIAPI
EventNotifyWriteIo (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestConformance.c
index 0cd9d7ddc8b4..db4ddbd488f7 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PlatformDriverOverrideBBTestMain.h"
/**
@@ -40,6 +40,7 @@ Abstract:
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -171,6 +172,7 @@ BBTestGetDriverConformanceAutoTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestGetDriverPathConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -302,6 +304,7 @@ BBTestGetDriverPathConformanceAutoTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestDriverLoadedConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestFunction.c
index 8cb7107dafec..2f339e8ac91c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PlatformDriverOverrideBBTestMain.h"
UINT8 EnterEvent;
@@ -42,6 +42,7 @@ UINT8 EnterEvent;
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestGetDriverFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -138,6 +139,7 @@ BBTestGetDriverFunctionAutoTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestGetDriverPathFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -235,6 +237,7 @@ BBTestGetDriverPathFunctionAutoTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestDriverLoadedFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/ConfigureClpParameterBlkBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/ConfigureClpParameterBlkBBTestFunction.c
index a20dd33419a3..62b3c1a47d12 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/ConfigureClpParameterBlkBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/ConfigureClpParameterBlkBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PlatformToDriverConfigurationBBTestMain.h"
@@ -155,6 +155,7 @@ ParseCLPCommandLine(
*/
EFI_STATUS
+EFIAPI
BBTestCLPCommandAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -413,6 +414,7 @@ BBTestCLPCommandAutoTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestCLPReturnStringAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -687,6 +689,7 @@ BBTestCLPReturnStringAutoTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestCLPCmdStatusAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -906,6 +909,7 @@ BBTestCLPCmdStatusAutoTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestCLPErrorValueAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1168,6 +1172,7 @@ BBTestCLPErrorValueAutoTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestCLPMessageCodeAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestConformance.c
index ffd5ac863ff0..2c9c9f6de306 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PlatformToDriverConfigurationBBTestMain.h"
/**
@@ -40,6 +40,7 @@ Abstract:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestQueryConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -280,6 +281,7 @@ BBTestQueryConformanceAutoTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestResponseConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestFunction.c
index 183c9dbd7b7a..c19dbe9c4c8c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PlatformToDriverConfigurationBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestQueryFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -202,6 +203,7 @@ BBTestQueryFunctionAutoTest (
// TDS
//
EFI_STATUS
+EFIAPI
BBTestResponseFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestConformance.c
index e50f4b9e1600..d03eb850c5ad 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PxeBaseCodeBBTestMain.h"
#include "PxeBaseCodeBBTestSupport.h"
@@ -38,6 +38,7 @@ Abstract:
* @return EFI_SUCCESS Finish the test successfully.
*/
EFI_STATUS
+EFIAPI
BBTestNewStartConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -224,6 +225,7 @@ BBTestNewStartConformanceTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestNewStopConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -404,6 +406,7 @@ BBTestNewStopConformanceTest (
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestStartConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -507,6 +510,7 @@ BBTestStartConformanceTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestStopConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -590,6 +594,7 @@ BBTestStopConformanceTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestDhcpConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -774,6 +779,7 @@ BBTestDhcpConformanceTest (
// TDS 5.4
//
EFI_STATUS
+EFIAPI
BBTestDiscoverConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -969,6 +975,7 @@ BBTestDiscoverConformanceTest (
// TDS 5.5
//
EFI_STATUS
+EFIAPI
BBTestMtftpConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1454,6 +1461,7 @@ BBTestMtftpConformanceTest (
// TDS 5.6
//
EFI_STATUS
+EFIAPI
BBTestUdpWriteConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1669,6 +1677,7 @@ BBTestUdpWriteConformanceTest (
// TDS 5.7
//
EFI_STATUS
+EFIAPI
BBTestUdpReadConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1983,6 +1992,7 @@ BBTestUdpReadConformanceTest (
// TDS 5.8
//
EFI_STATUS
+EFIAPI
BBTestSetIpFilterConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2060,6 +2070,7 @@ BBTestSetIpFilterConformanceTest (
// TDS 5.9
//
EFI_STATUS
+EFIAPI
BBTestArpConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2207,6 +2218,7 @@ BBTestArpConformanceAutoTest (
// TDS 5.9
//
EFI_STATUS
+EFIAPI
BBTestArpConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2428,6 +2440,7 @@ BBTestArpConformanceManualTest (
// TDS 5.10
//
EFI_STATUS
+EFIAPI
BBTestSetParametersConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2506,6 +2519,7 @@ BBTestSetParametersConformanceTest (
// TDS 5.11
//
EFI_STATUS
+EFIAPI
BBTestSetStationIpConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2577,6 +2591,7 @@ BBTestSetStationIpConformanceTest (
// TDS 5.12
//
EFI_STATUS
+EFIAPI
BBTestSetPacketsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c
index 27508d0ad172..38368b521fce 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c
@@ -2,16 +2,16 @@
Copyright 2006 - 2016 Unified EFI, Inc.<BR>
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
- Copyright (c) 2022, ARM Limited. All rights reserved.<BR>
+ Copyright (c) 2022, ARM Limited. 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
+ which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -25,11 +25,12 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "PxeBaseCodeBBTestMain.h"
#include "PxeBaseCodeBBTestSupport.h"
EFI_STATUS
+EFIAPI
BBTestTftpGetFileSize (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -40,6 +41,7 @@ BBTestTftpGetFileSize (
);
EFI_STATUS
+EFIAPI
BBTestTftpReadFile (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -51,6 +53,7 @@ BBTestTftpReadFile (
EFI_STATUS
+EFIAPI
BBTestTftpWriteFile (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -61,6 +64,7 @@ BBTestTftpWriteFile (
EFI_STATUS
+EFIAPI
BBTestTftpGetDirectorySize (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -73,6 +77,7 @@ BBTestTftpGetDirectorySize (
EFI_STATUS
+EFIAPI
BBTestTftpReadDirectory (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -84,6 +89,7 @@ BBTestTftpReadDirectory (
EFI_STATUS
+EFIAPI
BBTestMtftpReadFile (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -95,6 +101,7 @@ BBTestMtftpReadFile (
EFI_STATUS
+EFIAPI
BBTestMtftpReadDirectory (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -105,6 +112,7 @@ BBTestMtftpReadDirectory (
);
EFI_STATUS
+EFIAPI
BBTestMtftpGetFileSize (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -115,6 +123,7 @@ BBTestMtftpGetFileSize (
);
EFI_STATUS
+EFIAPI
BBTestSetStationIp (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -126,6 +135,7 @@ BBTestSetStationIp (
);
EFI_STATUS
+EFIAPI
BBTestUdpWriteFuncBasic (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -135,6 +145,7 @@ BBTestUdpWriteFuncBasic (
);
EFI_STATUS
+EFIAPI
BBTestUdpWriteFuncFrag (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -144,6 +155,7 @@ BBTestUdpWriteFuncFrag (
);
EFI_STATUS
+EFIAPI
BBTestUdpWriteFuncPrependHeader (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -153,6 +165,7 @@ BBTestUdpWriteFuncPrependHeader (
);
EFI_STATUS
+EFIAPI
BBTestUdpWriteFuncThrGateway (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -162,6 +175,7 @@ BBTestUdpWriteFuncThrGateway (
);
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncBasic (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -170,6 +184,7 @@ BBTestUdpReadFuncBasic (
);
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncDesIpFilter (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -178,6 +193,7 @@ BBTestUdpReadFuncDesIpFilter (
);
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncDestPortFilter (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -186,6 +202,7 @@ BBTestUdpReadFuncDestPortFilter (
);
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncSrcIpFilter (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -195,6 +212,7 @@ BBTestUdpReadFuncSrcIpFilter (
);
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncSrcPortFilter (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -204,7 +222,7 @@ BBTestUdpReadFuncSrcPortFilter (
/**
* Entrypoint for EFI_PXE_BASE_CODE_PROTOCOL.Start() Function Test.
- * It is the new case to add IPv6 into the test scope. The original test case is switched off.
+ * It is the new case to add IPv6 into the test scope. The original test case is switched off.
* @param This a pointer of EFI_BB_TEST_PROTOCOL.
* @param ClientInterface a pointer to the interface to be tested.
* @param TestLevel test "thoroughness" control.
@@ -212,6 +230,7 @@ BBTestUdpReadFuncSrcPortFilter (
* @return EFI_SUCCESS Finish the test successfully.
*/
EFI_STATUS
+EFIAPI
BBTestNewStartFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -381,7 +400,7 @@ BBTestNewStartFunctionTest (
L"Mode->PxeBisReplyReceived - %s\r\n",
BcInterface->Mode->PxeBisReplyReceived ? L"TRUE" : L"FALSE"
);
- }
+ }
if (BcInterface->Mode->IcmpErrorReceived != FALSE) {
AssertionType = EFI_TEST_ASSERTION_FAILED;
StandardLib->RecordMessage (
@@ -606,7 +625,7 @@ BBTestNewStartFunctionTest (
return Status;
}
}
-
+
//
// Enable EFI_PXE_BASE_CODE_PROTOCOL Protocol interface in IPv6
//
@@ -628,8 +647,8 @@ BBTestNewStartFunctionTest (
(UINTN)__LINE__,
Status
);
-
-
+
+
if (AssertionType == EFI_TEST_ASSERTION_PASSED) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
if (BcInterface->Mode->Started != TRUE) {
@@ -721,7 +740,7 @@ BBTestNewStartFunctionTest (
L"Mode->PxeBisReplyReceived - %s\r\n",
BcInterface->Mode->PxeBisReplyReceived ? L"TRUE" : L"FALSE"
);
- }
+ }
if (BcInterface->Mode->IcmpErrorReceived != FALSE) {
AssertionType = EFI_TEST_ASSERTION_FAILED;
StandardLib->RecordMessage (
@@ -798,7 +817,7 @@ BBTestNewStartFunctionTest (
L"IS_PXE_PACKET_ZEROED(Mode->ProxyOffer) - Fail\r\n"
);
}
-
+
if (IS_PXE_PACKET_ZEROED(&BcInterface->Mode->PxeDiscover) == FALSE) {
AssertionType = EFI_TEST_ASSERTION_FAILED;
StandardLib->RecordMessage (
@@ -945,13 +964,13 @@ BBTestNewStartFunctionTest (
);
}
}
-
+
return Status;
}
/**
* Entrypoint for EFI_PXE_BASE_CODE_PROTOCOL.Statistics() Function Test.
- * It is the new case to add IPv6 into the test scope. The original test case is switched off.
+ * It is the new case to add IPv6 into the test scope. The original test case is switched off.
* @param This a pointer of EFI_BB_TEST_PROTOCOL.
* @param ClientInterface a pointer to the interface to be tested.
* @param TestLevel test "thoroughness" control.
@@ -959,6 +978,7 @@ BBTestNewStartFunctionTest (
* @return EFI_SUCCESS Finish the test successfully.
*/
EFI_STATUS
+EFIAPI
BBTestNewSetIpFilterFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -975,7 +995,7 @@ BBTestNewSetIpFilterFunctionTest (
UINT8 Index;
Index = 0;
-
+
//
// Get the Standard Library Interface
//
@@ -1092,7 +1112,7 @@ BBTestNewSetIpFilterFunctionTest (
return Status;
}
}
-
+
//
// Enable EFI_PXE_BASE_CODE_PROTOCOL Protocol interface in IPv6
//
@@ -1110,16 +1130,16 @@ BBTestNewSetIpFilterFunctionTest (
);
return Status;
}
-
+
SctSetMem (&BcIpFilter, sizeof (BcIpFilter), 0);
BcIpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;
BcIpFilter.IpCnt = 2;
-
+
for (Index = 0; Index < 16; Index++) {
BcIpFilter.IpList[0].v6.Addr[Index] = Index;
BcIpFilter.IpList[1].v6.Addr[Index] = 16 - Index;
}
-
+
Status = BcInterface->SetIpFilter (BcInterface, &BcIpFilter);
if (Status == EFI_SUCCESS) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -1136,7 +1156,7 @@ BBTestNewSetIpFilterFunctionTest (
(UINTN)__LINE__,
Status
);
-
+
if (TRUE == IsIpFilterEqual (&BcIpFilter, &(BcInterface->Mode->IpFilter))){
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
@@ -1159,7 +1179,7 @@ BBTestNewSetIpFilterFunctionTest (
/**
* Entrypoint for EFI_PXE_BASE_CODE_PROTOCOL.Stop() Function Test.
- * It is the new case to add IPv6 into the test scope. The original test case is switched off.
+ * It is the new case to add IPv6 into the test scope. The original test case is switched off.
* @param This a pointer of EFI_BB_TEST_PROTOCOL.
* @param ClientInterface a pointer to the interface to be tested.
* @param TestLevel test "thoroughness" control.
@@ -1167,6 +1187,7 @@ BBTestNewSetIpFilterFunctionTest (
* @return EFI_SUCCESS Finish the test successfully.
*/
EFI_STATUS
+EFIAPI
BBTestNewStopFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1253,7 +1274,7 @@ BBTestNewStopFunctionTest (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
}
//
@@ -1291,7 +1312,7 @@ BBTestNewStopFunctionTest (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
return Status;
}
@@ -1308,6 +1329,7 @@ BBTestNewStopFunctionTest (
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestStartFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1608,8 +1630,8 @@ BBTestStartFunctionTest (
);
}
if ((0 != BcInterface->Mode->IpFilter.Filters) || (0 != BcInterface->Mode->IpFilter.IpCnt)) {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- StandardLib->RecordMessage (
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ StandardLib->RecordMessage (
StandardLib,
EFI_VERBOSE_LEVEL_DEFAULT,
L"The Mode->IpFilter.Filters or Mode->IpFilter.IpCnt field is not 0\r\n");
@@ -1677,6 +1699,7 @@ BBTestStartFunctionTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestStopFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1748,6 +1771,7 @@ BBTestStopFunctionTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestDhcpFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1881,6 +1905,7 @@ BBTestDhcpFunctionTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestDiscoverFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2018,6 +2043,7 @@ BBTestDiscoverFunctionTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestMtftpFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2033,7 +2059,7 @@ BBTestMtftpFunctionTest (
EFI_PXE_BASE_CODE_PROTOCOL *BcInterface;
EFI_SIMPLE_NETWORK_PROTOCOL *SnpInterface;
UINTN FileSize;
- EFI_TEST_ASSERTION AssertionType;
+ EFI_TEST_ASSERTION AssertionType;
//
// Get support library (Standard Lib, Profile Lib, Logging Lib)
@@ -2100,15 +2126,15 @@ BBTestMtftpFunctionTest (
}
Status = SnpInterface->StationAddress (SnpInterface, TRUE, NULL);
- if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_ERROR(Status)) {
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
- AssertionType,
+ AssertionType,
gTestGenericFailureGuid,
L"EFI_PXE_BASE_CODE_PROTOCOL.ARP - Reset Current MAC",
L"%a:%d:Status - %r",
@@ -2200,6 +2226,7 @@ BBTestMtftpFunctionTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestUdpWriteFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2214,7 +2241,7 @@ BBTestUdpWriteFunctionTest (
EFI_STATUS Status;
EFI_PXE_BASE_CODE_PROTOCOL *BcInterface;
EFI_SIMPLE_NETWORK_PROTOCOL *SnpInterface;
- EFI_TEST_ASSERTION AssertionType;
+ EFI_TEST_ASSERTION AssertionType;
//
// Get the Standard Library Interface
@@ -2303,15 +2330,15 @@ BBTestUdpWriteFunctionTest (
}
Status = SnpInterface->StationAddress (SnpInterface, TRUE, NULL);
- if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_ERROR(Status)) {
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
- AssertionType,
+ AssertionType,
gTestGenericFailureGuid,
L"EFI_PXE_BASE_CODE_PROTOCOL.ARP - Reset Current MAC",
L"%a:%d:Status - %r",
@@ -2374,6 +2401,7 @@ BBTestUdpWriteFunctionTest (
// TDS 4.7
//
EFI_STATUS
+EFIAPI
BBTestUdpReadFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2389,7 +2417,7 @@ BBTestUdpReadFunctionTest (
EFI_PXE_BASE_CODE_PROTOCOL *BcInterface;
EFI_PXE_BASE_CODE_IP_FILTER BcIpFilter;
EFI_SIMPLE_NETWORK_PROTOCOL *SnpInterface;
- EFI_TEST_ASSERTION AssertionType;
+ EFI_TEST_ASSERTION AssertionType;
//
// Get the Support Library Interface
@@ -2485,12 +2513,12 @@ BBTestUdpReadFunctionTest (
}
Status = SnpInterface->StationAddress (SnpInterface, TRUE, NULL);
- if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_ERROR(Status)) {
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
EFI_TEST_ASSERTION_FAILED,
@@ -2544,6 +2572,7 @@ BBTestUdpReadFunctionTest (
// TDS 4.8
//
EFI_STATUS
+EFIAPI
BBTestSetIpFilterFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2652,6 +2681,7 @@ BBTestSetIpFilterFunctionTest (
// TDS 4.9
//
EFI_STATUS
+EFIAPI
BBTestArpFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2771,12 +2801,12 @@ BBTestArpFunctionTest (
}
Status = SnpInterface->StationAddress (SnpInterface, TRUE, NULL);
- if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_ERROR(Status)) {
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
EFI_TEST_ASSERTION_FAILED,
@@ -2897,6 +2927,7 @@ BBTestArpFunctionTest (
// TDS 4.10
//
EFI_STATUS
+EFIAPI
BBTestSetParametersFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3106,6 +3137,7 @@ BBTestSetParametersFunctionTest (
// TDS 4.11
//
EFI_STATUS
+EFIAPI
BBTestSetStationIpFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3237,6 +3269,7 @@ BBTestSetStationIpFunctionTest (
// TDS 4.12
//
EFI_STATUS
+EFIAPI
BBTestSetPacketsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3457,6 +3490,7 @@ BBTestSetPacketsFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestMtftpGetInfoParam (
IN EFI_INI_FILE_HANDLE FileHandle,
IN EFI_PXE_BASE_CODE_MTFTP_INFO *Info
@@ -3491,6 +3525,7 @@ BBTestMtftpGetInfoParam (
}
EFI_STATUS
+EFIAPI
BBTestTftpGetFileSize (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3590,6 +3625,7 @@ BBTestTftpGetFileSize (
}
EFI_STATUS
+EFIAPI
BBTestTftpReadFile (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3737,6 +3773,7 @@ BBTestTftpReadFile (
}
EFI_STATUS
+EFIAPI
BBTestTftpWriteFile (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3868,6 +3905,7 @@ BBTestTftpWriteFile (
}
EFI_STATUS
+EFIAPI
BBTestTftpReadDirectory (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3982,6 +4020,7 @@ BBTestTftpReadDirectory (
}
EFI_STATUS
+EFIAPI
BBTestMtftpGetFileSize (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4091,6 +4130,7 @@ BBTestMtftpGetFileSize (
}
EFI_STATUS
+EFIAPI
BBTestMtftpReadFile (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4221,6 +4261,7 @@ BBTestMtftpReadFile (
EFI_STATUS
+EFIAPI
BBTestMtftpReadDirectory (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4354,6 +4395,7 @@ BBTestMtftpReadDirectory (
}
EFI_STATUS
+EFIAPI
BBTestUdpWriteGetConfPara (
IN EFI_INI_FILE_HANDLE FileHandle,
IN EFI_IP_ADDRESS *DestIp,
@@ -4454,6 +4496,7 @@ BBTestUdpWriteGetConfPara (
}
EFI_STATUS
+EFIAPI
BBTestUdpWriteFuncThrGateway (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4528,6 +4571,7 @@ BBTestUdpWriteFuncThrGateway (
EFI_STATUS
+EFIAPI
BBTestUdpWriteFuncPrependHeader (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4603,6 +4647,7 @@ BBTestUdpWriteFuncPrependHeader (
}
EFI_STATUS
+EFIAPI
BBTestUdpWriteFuncFrag (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4679,6 +4724,7 @@ BBTestUdpWriteFuncFrag (
EFI_STATUS
+EFIAPI
BBTestUdpWriteFuncBasic (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4757,6 +4803,7 @@ BBTestUdpWriteFuncBasic (
EFI_STATUS
+EFIAPI
BBTestSetStationIp (
IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4806,6 +4853,7 @@ BBTestSetStationIp (
}
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncBasic (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4960,6 +5008,7 @@ BBTestUdpReadFuncBasic (
}
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncDesIpFilter (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5100,6 +5149,7 @@ BBTestUdpReadFuncDesIpFilter (
}
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncDestPortFilter (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5241,6 +5291,7 @@ BBTestUdpReadFuncDestPortFilter (
}
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncSrcIpFilter (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5384,6 +5435,7 @@ BBTestUdpReadFuncSrcIpFilter (
}
EFI_STATUS
+EFIAPI
BBTestUdpReadFuncSrcPortFilter (
IN EFI_PXE_BASE_CODE_PROTOCOL *BcInterface,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.c
index 744533ad68e4..a2db1fb77e51 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestMain.c
@@ -591,6 +591,7 @@ WaitForUserCheck ()
}
EFI_PXE_BASE_CODE_CALLBACK_STATUS
+EFIAPI
NewCallBack (
IN EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL *This,
IN EFI_PXE_BASE_CODE_FUNCTION Function,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestConformance.c
index 2b454882f693..10c1c923521d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestConformance.c
@@ -48,6 +48,7 @@ WriteUnaligned64 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterRamDiskConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RAM_DISK_PROTOCOL *RamDisk
@@ -101,6 +102,7 @@ BBTestRegisterRamDiskConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterRamDiskConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RAM_DISK_PROTOCOL *RamDisk
@@ -152,6 +154,7 @@ BBTestRegisterRamDiskConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterRamDiskConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RAM_DISK_PROTOCOL *RamDisk
@@ -205,6 +208,7 @@ BBTestRegisterRamDiskConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterRamDiskConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RAM_DISK_PROTOCOL *RamDisk
@@ -272,6 +276,7 @@ BBTestRegisterRamDiskConformanceTestCheckpoint4 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterRamDiskConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -312,6 +317,7 @@ BBTestRegisterRamDiskConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterRamDiskConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RAM_DISK_PROTOCOL *RamDisk
@@ -387,6 +393,7 @@ BBTestUnregisterRamDiskConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterRamDiskConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RAM_DISK_PROTOCOL *RamDisk
@@ -421,6 +428,7 @@ BBTestUnregisterRamDiskConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterRamDiskConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RAM_DISK_PROTOCOL *RamDisk
@@ -479,6 +487,7 @@ BBTestUnregisterRamDiskConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterRamDiskConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestFunction.c
index 3dd70aaafe42..bc68976407a9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTestFunction.c
@@ -24,6 +24,7 @@ Abstract:
#include "RamDiskProtocolBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestRegisterRamDiskFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RAM_DISK_PROTOCOL *RamDisk
@@ -87,6 +88,7 @@ BBTestRegisterRamDiskFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRegisterRamDiskFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -121,6 +123,7 @@ BBTestRegisterRamDiskFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestUnregisterRamDiskFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RAM_DISK_PROTOCOL *RamDisk
@@ -183,6 +186,7 @@ BBTestUnregisterRamDiskFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestUnregisterRamDiskFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestConformance.c
index 2738a4899457..a85a523715b6 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestConformance.c
@@ -43,6 +43,7 @@ EFI_GUID UnsupportedAlgoGuid = UNSUPPORTED_ALGO_GUID;
*/
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -91,6 +92,7 @@ BBTestGetInfoConformanceTest (
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestGetRNGConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -134,6 +136,7 @@ BBTestGetRNGConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
@@ -169,8 +172,8 @@ BBTestGetInfoConformanceTestCheckpoint1 (
return Status;
}
- if (EFI_BUFFER_TOO_SMALL == Status && RNGAlgorithmListSize &&
- RNGAlgorithmListSize % sizeof(EFI_RNG_ALGORITHM) == 0) {
+ if (EFI_BUFFER_TOO_SMALL == Status && RNGAlgorithmListSize &&
+ RNGAlgorithmListSize % sizeof(EFI_RNG_ALGORITHM) == 0) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -194,6 +197,7 @@ BBTestGetInfoConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetRNGConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
@@ -386,6 +390,7 @@ BBTestGetRNGConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetRNGConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestFunction.c
index 3d41085d2243..9c893d4bb464 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTestFunction.c
@@ -70,6 +70,7 @@ EFI_GUID Algos[6] = {
*/
EFI_STATUS
+EFIAPI
BBTestGetInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +119,7 @@ BBTestGetInfoFunctionTest (
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestGetRNGFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -161,6 +163,7 @@ BBTestGetRNGFunctionTest (
EFI_STATUS
+EFIAPI
BBTestGetInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
@@ -287,6 +290,7 @@ BBTestGetInfoFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestGetRNGFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
@@ -415,6 +419,7 @@ BBTestGetRNGFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetRNGFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_RNG_PROTOCOL *RandomNumber
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestConformance.c
index 01d682993c2e..24025e81dabf 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestConformance.c
@@ -50,6 +50,7 @@ MATCHSTRING_TEST_DATA_FIELD MatchStringSampleTestData[] ={
*/
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -97,6 +98,7 @@ BBTestGetInfoConformanceTest (
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestMatchStringConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -140,6 +142,7 @@ BBTestMatchStringConformanceTest (
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -239,6 +242,7 @@ BBTestGetInfoConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestMatchStringConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -459,6 +463,7 @@ BBTestMatchStringConformanceTestCheckpoint1 (
//REGULAR_EXPRESSION_PROTOCOL.MatchString() with unsupported SyntaxType should return EFI_UNSUPPORTED.
//
EFI_STATUS
+EFIAPI
BBTestMatchStringConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestFunction.c
index 2bfcf901ca22..e4e9a3a00f95 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestFunction.c
@@ -140,6 +140,7 @@ EFI_REGEX_CAPTURE MatchStringGenericTestCaptures[2][4] = {
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestRegExGetInfoFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -159,11 +160,11 @@ BBTestRegExGetInfoFunctionTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR (Status)) {
return Status;
}
@@ -187,6 +188,7 @@ BBTestRegExGetInfoFunctionTest (
* @return EFI_NOT_FOUND
*/
EFI_STATUS
+EFIAPI
BBTestMatchStringFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -206,11 +208,11 @@ BBTestMatchStringFunctionTest (
//
// Get the Standard Library Interface
//
- Status = gtBS->HandleProtocol (
- SupportHandle,
- &gEfiStandardTestLibraryGuid,
- (VOID **) &StandardLib
- );
+ Status = gtBS->HandleProtocol (
+ SupportHandle,
+ &gEfiStandardTestLibraryGuid,
+ (VOID **) &StandardLib
+ );
if (EFI_ERROR (Status)) {
return Status;
}
@@ -230,6 +232,7 @@ BBTestMatchStringFunctionTest (
EFI_STATUS
+EFIAPI
BBTestRegExGetInfoFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -281,11 +284,11 @@ BBTestRegExGetInfoFunctionTestCheckpoint1 (
}
//Allocate buffer with obtained size SyntaxTypeListSize for holding RegExSyntaxTypes.
- Status = gtBS->AllocatePool (
- EfiBootServicesData,
- SyntaxTypeListSize,
- (VOID **) &RegExSyntaxTypeList2
- );
+ Status = gtBS->AllocatePool (
+ EfiBootServicesData,
+ SyntaxTypeListSize,
+ (VOID **) &RegExSyntaxTypeList2
+ );
if (EFI_ERROR (Status)) {
StandardLib->RecordAssertion (
StandardLib,
@@ -338,6 +341,7 @@ BBTestRegExGetInfoFunctionTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestMatchStringFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -403,11 +407,11 @@ BBTestMatchStringFunctionTestCheckpoint1 (
//
//Allocate a list buffer for holding RegExSyntaxTypes.
//
- Status = gtBS->AllocatePool (
- EfiBootServicesData,
- SyntaxTypeListSize,
- (VOID **) &RegExSyntaxTypeList2
- );
+ Status = gtBS->AllocatePool (
+ EfiBootServicesData,
+ SyntaxTypeListSize,
+ (VOID **) &RegExSyntaxTypeList2
+ );
if (EFI_ERROR (Status)) {
StandardLib->RecordAssertion (
StandardLib,
@@ -568,6 +572,7 @@ BBTestMatchStringFunctionTestCheckpoint1 (
//
//REGULAR_EXPRESSION_PROTOCOL.MatchString() returns EFI_SUCCESS with default SyntaxType.
EFI_STATUS
+EFIAPI
BBTestMatchStringFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_REGULAR_EXPRESSION_PROTOCOL *RegularExpression
@@ -629,11 +634,11 @@ BBTestMatchStringFunctionTestCheckpoint2 (
//
//Allocate buffer for holding RegExSyntaxTypeList and call GetInfo() to get SyntaxTypes.
//
- Status1 = gtBS->AllocatePool (
- EfiBootServicesData,
- SyntaxTypeListSize,
- (VOID **)&RegExSyntaxTypeList2
- );
+ Status1 = gtBS->AllocatePool (
+ EfiBootServicesData,
+ SyntaxTypeListSize,
+ (VOID **)&RegExSyntaxTypeList2
+ );
if (EFI_ERROR (Status1)) {
StandardLib->RecordAssertion (
StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestConformance.c
index 0be5dc268f21..71d289b37523 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestConformance.c
@@ -26,6 +26,7 @@ Abstract:
#include "ResetNotificationBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestRegisterResetNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -90,6 +91,7 @@ BBTestRegisterResetNotifyConformanceTest (
EFI_STATUS
+EFIAPI
BBTestUnregisterResetNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestFunction.c
index b13e9346b659..eb377b06c720 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestFunction.c
@@ -28,6 +28,7 @@ Abstract:
extern UINT8 EnterEvent;
EFI_STATUS
+EFIAPI
BBTestRegisterResetNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -221,6 +222,7 @@ step3:
}
EFI_STATUS
+EFIAPI
BBTestUnregisterResetNotifyFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.c
index 9e0233e62cbe..e57abc00b6ba 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTestMain.c
@@ -127,6 +127,7 @@ InitializeResetNotificationBBTest (
EFI_STATUS
+EFIAPI
UnloadResetNotificationBBTest (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestConformance.c
index f28aaeb46d71..99dd4f9033e2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestConformance.c
@@ -27,6 +27,7 @@ Abstract:
#include "SDMMCPassThruBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -88,6 +89,7 @@ BBTestPassThruConformanceTest (
EFI_TEST_ASSERTION_FAILED,
gTestGenericFailureGuid,
L"SctAllocateZeroPooll - SctAllocateZeroPool fails",
+ L" - %a:%d",
__FILE__,
(UINTN)__LINE__
);
@@ -249,6 +251,7 @@ BBTestPassThruConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSlotConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -321,6 +324,7 @@ BBTestGetNextSlotConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestResetDeviceConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -393,6 +397,7 @@ BBTestResetDeviceConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -486,6 +491,7 @@ BBTestBuildDevicePathConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestGetSlotNumberConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestFunction.c
index 05005a049928..d8eb75856c2b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTestFunction.c
@@ -29,6 +29,7 @@ Abstract:
extern UINT8 EnterEvent;
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -105,6 +106,7 @@ BBTestPassThruFunctionTest (
EFI_TEST_ASSERTION_FAILED,
gTestGenericFailureGuid,
L"AllocateAlignedPool - AllocateAlignedPool fails",
+ L"%a:%d\n",
__FILE__,
(UINTN)__LINE__
);
@@ -220,6 +222,7 @@ BBTestPassThruFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetNextSlotFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -286,6 +289,7 @@ BBTestGetNextSlotFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestResetDeviceFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -356,6 +360,7 @@ BBTestResetDeviceFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -442,6 +447,7 @@ BBTestBuildDevicePathFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestGetSlotNumberFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestConformance.c
index a18d7de042d4..839be2dd4b9f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ScsiIoBBTestMain.h"
extern UINT8 EnterEvent;
@@ -41,6 +41,7 @@ extern UINT8 EnterEvent;
// TDS 3.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetDeviceTypeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +118,7 @@ BBTestGetDeviceTypeConformanceAutoTest (
// TDS 3.2.2
//
EFI_STATUS
+EFIAPI
BBTestGetDeviceLocationConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -220,6 +222,7 @@ BBTestGetDeviceLocationConformanceAutoTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestExecuteScsiCommandConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestFunction.c
index a9355f81ff62..9be02ec71212 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ScsiIoBBTestMain.h"
extern UINT8 EnterEvent;
@@ -42,6 +42,7 @@ extern UINT8 EnterEvent;
// TDS 3.1.1
//
EFI_STATUS
+EFIAPI
BBTestGetDeviceTypeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -118,6 +119,7 @@ BBTestGetDeviceTypeFunctionAutoTest (
// TDS 3.1.2
//
EFI_STATUS
+EFIAPI
BBTestGetDeviceLocationFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -197,6 +199,7 @@ BBTestGetDeviceLocationFunctionAutoTest (
// TDS 3.1.3
//
EFI_STATUS
+EFIAPI
BBTestResetBusFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -272,6 +275,7 @@ BBTestResetBusFunctionAutoTest (
// TDS 3.1.4
//
EFI_STATUS
+EFIAPI
BBTestResetDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -348,6 +352,7 @@ BBTestResetDeviceFunctionAutoTest (
// TDS 3.1.5
//
EFI_STATUS
+EFIAPI
BBTestExecuteScsiCommandFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestConformance.c
index f101050c290d..cfe69397c59b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ScsiPassThruBBTestMain.h"
extern UINT8 EnterEvent;
@@ -42,6 +42,7 @@ extern UINT8 EnterEvent;
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestGetNextDeviceConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -189,6 +190,7 @@ BBTestGetNextDeviceConformanceAutoTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -375,6 +377,7 @@ BBTestBuildDevicePathConformanceAutoTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestGetTargetLunConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -569,6 +572,7 @@ BBTestGetTargetLunConformanceAutoTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestResetTargetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -712,6 +716,7 @@ BBTestResetTargetConformanceAutoTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestPassThruConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestFunction.c
index 401b77a8d8a3..2e2abd4eb019 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ScsiPassThruBBTestMain.h"
extern UINT8 EnterEvent;
@@ -42,6 +42,7 @@ extern UINT8 EnterEvent;
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestGetNextDeviceFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -132,6 +133,7 @@ BBTestGetNextDeviceFunctionAutoTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestBuildDevicePathFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -229,6 +231,7 @@ BBTestBuildDevicePathFunctionAutoTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestGetTargetLunFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -352,6 +355,7 @@ BBTestGetTargetLunFunctionAutoTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestResetChannelFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -427,6 +431,7 @@ BBTestResetChannelFunctionAutoTest (
// TDS 3.5
//
EFI_STATUS
+EFIAPI
BBTestResetTargetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -522,6 +527,7 @@ BBTestResetTargetFunctionAutoTest (
// TDS 3.6
//
EFI_STATUS
+EFIAPI
BBTestPassThruFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.c
index d01df65581b8..30bb4d814c69 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ScsiPassThru/BlackBoxTest/ScsiPassThruBBTestMain.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "ScsiPassThruBBTestMain.h"
UINT8 EnterEvent;
@@ -194,6 +194,7 @@ InitializeBBTestScsiPassThru (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestScsiPassThruProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestConformance.c
index 42c50d1aae5d..b2b084aefcd4 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestConformance.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "SerialIoBBTestMain.h"
//
@@ -30,6 +30,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
SetAttributesConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -38,6 +39,7 @@ SetAttributesConfTest (
);
EFI_STATUS
+EFIAPI
SetControlConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -46,6 +48,7 @@ SetControlConfTest (
);
EFI_STATUS
+EFIAPI
ReadConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -58,6 +61,7 @@ ReadConfTest (
//
EFI_STATUS
+EFIAPI
SetAttributesConfTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -65,6 +69,7 @@ SetAttributesConfTestSub1 (
);
EFI_STATUS
+EFIAPI
SetControlConfTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -72,6 +77,7 @@ SetControlConfTestSub1 (
);
EFI_STATUS
+EFIAPI
ReadConfTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -79,6 +85,7 @@ ReadConfTestSub1 (
);
EFI_STATUS
+EFIAPI
ReadConfTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -99,6 +106,7 @@ ReadConfTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetAttributesConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -148,6 +156,7 @@ SetAttributesConfTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetControlConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -202,6 +211,7 @@ SetControlConfTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -266,6 +276,7 @@ ReadConfTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetAttributesConfTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -395,6 +406,7 @@ SetAttributesConfTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetControlConfTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -493,6 +505,7 @@ SetControlConfTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadConfTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -774,6 +787,7 @@ ReadConfTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadConfTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestFunction.c
index e01c7f353633..bf0f83741046 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestFunction.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "SerialIoBBTestMain.h"
//
@@ -30,6 +30,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
ResetFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -38,6 +39,7 @@ ResetFuncTest (
);
EFI_STATUS
+EFIAPI
SetAttributesFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -46,6 +48,7 @@ SetAttributesFuncTest (
);
EFI_STATUS
+EFIAPI
SetControlFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -54,6 +57,7 @@ SetControlFuncTest (
);
EFI_STATUS
+EFIAPI
GetControlFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -62,6 +66,7 @@ GetControlFuncTest (
);
EFI_STATUS
+EFIAPI
WriteFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -70,6 +75,7 @@ WriteFuncTest (
);
EFI_STATUS
+EFIAPI
ReadFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -82,6 +88,7 @@ ReadFuncTest (
//
EFI_STATUS
+EFIAPI
ResetFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -89,6 +96,7 @@ ResetFuncTestSub1 (
);
EFI_STATUS
+EFIAPI
SetAttributesFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -96,6 +104,7 @@ SetAttributesFuncTestSub1 (
);
EFI_STATUS
+EFIAPI
SetAttributesFuncTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -103,6 +112,7 @@ SetAttributesFuncTestSub2 (
);
EFI_STATUS
+EFIAPI
SetAttributesFuncTestSub3 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -110,6 +120,7 @@ SetAttributesFuncTestSub3 (
);
EFI_STATUS
+EFIAPI
SetControlFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -117,6 +128,7 @@ SetControlFuncTestSub1 (
);
EFI_STATUS
+EFIAPI
GetControlFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -124,6 +136,7 @@ GetControlFuncTestSub1 (
);
EFI_STATUS
+EFIAPI
WriteFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -131,6 +144,7 @@ WriteFuncTestSub1 (
);
EFI_STATUS
+EFIAPI
WriteFuncTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -138,6 +152,7 @@ WriteFuncTestSub2 (
);
EFI_STATUS
+EFIAPI
WriteFuncTestSub3 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -145,6 +160,7 @@ WriteFuncTestSub3 (
);
EFI_STATUS
+EFIAPI
ReadFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -152,6 +168,7 @@ ReadFuncTestSub1 (
);
EFI_STATUS
+EFIAPI
ReadFuncTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -172,6 +189,7 @@ ReadFuncTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ResetFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -221,6 +239,7 @@ ResetFuncTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetAttributesFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -289,6 +308,7 @@ SetAttributesFuncTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetControlFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -338,6 +358,7 @@ SetControlFuncTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetControlFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -387,6 +408,7 @@ GetControlFuncTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
WriteFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -454,6 +476,7 @@ WriteFuncTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -516,6 +539,7 @@ ReadFuncTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ResetFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -591,6 +615,7 @@ ResetFuncTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetAttributesFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -918,6 +943,7 @@ SetAttributesFuncTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetAttributesFuncTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1029,6 +1055,7 @@ SetAttributesFuncTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetAttributesFuncTestSub3 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1123,6 +1150,7 @@ SetAttributesFuncTestSub3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetControlFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1267,6 +1295,7 @@ SetControlFuncTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetControlFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1460,6 +1489,7 @@ GetControlFuncTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
WriteFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1625,6 +1655,7 @@ WriteFuncTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
WriteFuncTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1790,6 +1821,7 @@ WriteFuncTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
WriteFuncTestSub3 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1898,6 +1930,7 @@ WriteFuncTestSub3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadFuncTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2062,6 +2095,7 @@ ReadFuncTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadFuncTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.c
index 55c857ffe454..397ae5ee7974 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestMain.c
@@ -281,6 +281,7 @@ UnloadSerialIoBbTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetTestSupportLibrary (
IN EFI_HANDLE SupportHandle,
OUT EFI_STANDARD_TEST_LIBRARY_PROTOCOL **StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestStress.c
index 3e3581ff48c0..ada1857f06e0 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTestStress.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "SerialIoBBTestMain.h"
#define MULTIPLE_TEST_TIMES 5
@@ -32,6 +32,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
ResetStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -40,6 +41,7 @@ ResetStressTest (
);
EFI_STATUS
+EFIAPI
SetAttributesStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -48,6 +50,7 @@ SetAttributesStressTest (
);
EFI_STATUS
+EFIAPI
SetControlStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -56,6 +59,7 @@ SetControlStressTest (
);
EFI_STATUS
+EFIAPI
GetControlStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -64,6 +68,7 @@ GetControlStressTest (
);
EFI_STATUS
+EFIAPI
WriteStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -72,6 +77,7 @@ WriteStressTest (
);
EFI_STATUS
+EFIAPI
ReadStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -84,6 +90,7 @@ ReadStressTest (
//
EFI_STATUS
+EFIAPI
ResetStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -91,6 +98,7 @@ ResetStressTestSub1 (
);
EFI_STATUS
+EFIAPI
SetAttributesStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -98,6 +106,7 @@ SetAttributesStressTestSub1 (
);
EFI_STATUS
+EFIAPI
SetControlStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -105,6 +114,7 @@ SetControlStressTestSub1 (
);
EFI_STATUS
+EFIAPI
GetControlStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -112,6 +122,7 @@ GetControlStressTestSub1 (
);
EFI_STATUS
+EFIAPI
WriteStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -119,6 +130,7 @@ WriteStressTestSub1 (
);
EFI_STATUS
+EFIAPI
WriteStressTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -126,6 +138,7 @@ WriteStressTestSub2 (
);
EFI_STATUS
+EFIAPI
WriteStressTestSub3 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -133,6 +146,7 @@ WriteStressTestSub3 (
);
EFI_STATUS
+EFIAPI
ReadStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -140,6 +154,7 @@ ReadStressTestSub1 (
);
EFI_STATUS
+EFIAPI
ReadStressTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -147,6 +162,7 @@ ReadStressTestSub2 (
);
EFI_STATUS
+EFIAPI
ReadStressTestSub3 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -167,6 +183,7 @@ ReadStressTestSub3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ResetStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -216,6 +233,7 @@ ResetStressTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetAttributesStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -265,6 +283,7 @@ SetAttributesStressTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetControlStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -314,6 +333,7 @@ SetControlStressTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetControlStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -363,6 +383,7 @@ GetControlStressTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
WriteStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -430,6 +451,7 @@ WriteStressTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -501,6 +523,7 @@ ReadStressTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ResetStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -588,6 +611,7 @@ ResetStressTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetAttributesStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -722,6 +746,7 @@ SetAttributesStressTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetControlStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -867,6 +892,7 @@ SetControlStressTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetControlStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1009,6 +1035,7 @@ GetControlStressTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
WriteStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1141,6 +1168,7 @@ WriteStressTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
WriteStressTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1299,6 +1327,7 @@ WriteStressTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
WriteStressTestSub3 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1438,6 +1467,7 @@ WriteStressTestSub3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadStressTestSub1 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1586,6 +1616,7 @@ ReadStressTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadStressTestSub2 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1763,6 +1794,7 @@ ReadStressTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
ReadStressTestSub3 (
IN EFI_SERIAL_IO_PROTOCOL *SerialIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestConformance.c
index 38b06c7b5c88..360f5434bf57 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestConformance.c
@@ -106,6 +106,7 @@ UpdateInfoFileName (EFI_FILE_INFO **InfoBuffer, CHAR16* ChangeFileName)
// TDS 5.2.1
//
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -180,6 +181,7 @@ BBTestOpenConformanceTest (
// TDS 5.2.2
//
EFI_STATUS
+EFIAPI
BBTestDeleteConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -229,6 +231,7 @@ BBTestDeleteConformanceTest (
// TDS 5.2.3
//
EFI_STATUS
+EFIAPI
BBTestWriteConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -297,6 +300,7 @@ BBTestWriteConformanceTest (
// TDS 5.2.4
//
EFI_STATUS
+EFIAPI
BBTestFlushConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -360,6 +364,7 @@ BBTestFlushConformanceTest (
// TDS 5.2.5
//
EFI_STATUS
+EFIAPI
BBTestSetPositionConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -410,6 +415,7 @@ BBTestSetPositionConformanceTest (
// TDS 5.2.6
//
EFI_STATUS
+EFIAPI
BBTestGetPositionConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -460,6 +466,7 @@ BBTestGetPositionConformanceTest (
// TDS 5.2.7
//
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -515,6 +522,7 @@ BBTestGetInfoConformanceTest (
// TDS 5.2.8
//
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -588,6 +596,7 @@ BBTestSetInfoConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -677,6 +686,7 @@ BBTestOpenConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -799,6 +809,7 @@ BBTestOpenConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -988,6 +999,7 @@ CHAR16 UnacceptableFileName[][100] = {
};
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1113,6 +1125,7 @@ BBTestOpenConformanceTestCheckpoint4 (
}
EFI_STATUS
+EFIAPI
BBTestOpenConformanceTestCheckpoint5 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1211,6 +1224,7 @@ BBTestOpenConformanceTestCheckpoint5 (
}
EFI_STATUS
+EFIAPI
BBTestDeleteConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1277,6 +1291,7 @@ BBTestDeleteConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestWriteConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1359,6 +1374,7 @@ BBTestWriteConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestWriteConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1461,6 +1477,7 @@ BBTestWriteConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestWriteConformanceTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1572,6 +1589,7 @@ BBTestWriteConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestFlushConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1671,6 +1689,7 @@ BBTestFlushConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestFlushConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1779,6 +1798,7 @@ BBTestFlushConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestSetPositionConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1858,6 +1878,7 @@ BBTestSetPositionConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetPositionConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1938,6 +1959,7 @@ BBTestGetPositionConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -2022,6 +2044,7 @@ BBTestGetInfoConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetInfoConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -2172,6 +2195,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -2285,6 +2309,7 @@ BBTestSetInfoConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -2550,6 +2575,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -2792,6 +2818,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -3224,6 +3251,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint5 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -3360,6 +3388,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint6 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -3663,6 +3692,7 @@ NextLoop:
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint7 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -3824,6 +3854,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestSetInfoConformanceTestCheckpoint8 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c
index 77d04ce2d8fa..838dd7f60976 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c
@@ -73,6 +73,7 @@ ComposeFileNameArray (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -82,6 +83,7 @@ BBTestOpenBasicTestCheckpoint1_Test1 (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -91,6 +93,7 @@ BBTestOpenBasicTestCheckpoint1_Test2 (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -100,6 +103,7 @@ BBTestOpenBasicTestCheckpoint1_Test3 (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -109,6 +113,7 @@ BBTestOpenBasicTestCheckpoint1_Test4 (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test5 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -118,6 +123,7 @@ BBTestOpenBasicTestCheckpoint1_Test5 (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -127,6 +133,7 @@ BBTestOpenBasicTestCheckpoint2_Test1 (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -136,6 +143,7 @@ BBTestOpenBasicTestCheckpoint2_Test2 (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -145,6 +153,7 @@ BBTestOpenBasicTestCheckpoint2_Test3 (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -154,6 +163,7 @@ BBTestOpenBasicTestCheckpoint2_Test4 (
);
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test5 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -182,6 +192,7 @@ InvertFileAttributes (
// TDS 5.1.1
//
EFI_STATUS
+EFIAPI
BBTestOpenVolumeBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -232,6 +243,7 @@ BBTestOpenVolumeBasicTest (
// TDS 5.1.2
//
EFI_STATUS
+EFIAPI
BBTestOpenBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -288,6 +300,7 @@ BBTestOpenBasicTest (
// TDS 5.1.3
//
EFI_STATUS
+EFIAPI
BBTestCloseBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -339,6 +352,7 @@ BBTestCloseBasicTest (
// TDS 5.1.4
//
EFI_STATUS
+EFIAPI
BBTestDeleteBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -399,6 +413,7 @@ BBTestDeleteBasicTest (
// TDS 5.1.5
//
EFI_STATUS
+EFIAPI
BBTestReadBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -454,6 +469,7 @@ BBTestReadBasicTest (
// TDS 5.1.6
//
EFI_STATUS
+EFIAPI
BBTestWriteBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -504,6 +520,7 @@ BBTestWriteBasicTest (
// TDS 5.1.7
//
EFI_STATUS
+EFIAPI
BBTestFlushBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -559,6 +576,7 @@ BBTestFlushBasicTest (
// TDS 5.1.8
//
EFI_STATUS
+EFIAPI
BBTestSetPositionBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -614,6 +632,7 @@ BBTestSetPositionBasicTest (
// TDS 5.1.9
//
EFI_STATUS
+EFIAPI
BBTestGetPositionBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -665,6 +684,7 @@ BBTestGetPositionBasicTest (
// TDS 5.1.10
//
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -734,6 +754,7 @@ BBTestGetInfoBasicTest (
// TDS 5.1.11
//
EFI_STATUS
+EFIAPI
BBTestSetInfoBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1608,7 +1629,7 @@ BBTestReadOnlyTestCheckPoints (
AssertionType,
gReadOnlyFileSystemBBTestAssertionGuid005,
L"ReadOnly System: Dir SetInfo should return EFI_WRITE_PROTECTED",
- L"%a:%d: Status1 - %r Status2 - %r",
+ L"%a:%d: Status1 - %r Status2 - %r",
__FILE__,
(UINTN)__LINE__,
Status1,
@@ -1732,6 +1753,7 @@ BBTestReadOnlyTestCheckPoints (
}
EFI_STATUS
+EFIAPI
BBTestOpenVolumeBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1991,6 +2013,7 @@ BBTestOpenVolumeBasicTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -2115,6 +2138,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -2202,6 +2226,7 @@ BBTestOpenBasicTestCheckpoint1_Test1 (
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -2408,6 +2433,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -2567,6 +2593,7 @@ DirClean:
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -2825,6 +2852,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint1_Test5 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -3113,6 +3141,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -3240,6 +3269,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -3545,6 +3575,7 @@ FileClean:
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -3945,6 +3976,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -4296,6 +4328,7 @@ DirClean:
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -4730,6 +4763,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenBasicTestCheckpoint2_Test5 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -5197,6 +5231,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestCloseBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -5777,6 +5812,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestDeleteBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -5891,6 +5927,7 @@ BBTestDeleteBasicTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestDeleteBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -6005,6 +6042,7 @@ BBTestDeleteBasicTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestDeleteBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -6151,6 +6189,7 @@ BBTestDeleteBasicTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestReadBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -6517,6 +6556,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestReadBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -6797,6 +6837,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestWriteBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -7188,6 +7229,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestFlushBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -7349,6 +7391,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestFlushBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -7473,6 +7516,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestSetPositionBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -7754,6 +7798,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestSetPositionBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -7846,6 +7891,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestGetPositionBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -8101,6 +8147,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -8319,6 +8366,7 @@ BBTestGetInfoBasicTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -8419,6 +8467,7 @@ BBTestGetInfoBasicTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -8666,6 +8715,7 @@ NextTpl:
}
EFI_STATUS
+EFIAPI
BBTestGetInfoBasicTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -8820,6 +8870,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestSetInfoBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -9195,6 +9246,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestSetInfoBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -9398,6 +9450,7 @@ NextLoop:
}
EFI_STATUS
+EFIAPI
BBTestSetInfoBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestMain.c
index 1cc7f12d4c65..f288398f9a5d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestMain.c
@@ -429,6 +429,7 @@ InitializeBBTestSimpleFileSystem (
* @return EFI_SUCCESS Indicates the interface was Uninstalled
*/
EFI_STATUS
+EFIAPI
BBTestSimpleFileSystemUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Auto.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Auto.c
index 8517425c90f1..face41669a64 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Auto.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Auto.c
@@ -51,6 +51,7 @@ BBTestSimpleFileSytemExtensiveTest6_ReadWriteInternal (
// TDS 5.3.5
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest5 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -540,6 +541,7 @@ Done:
// TDS 5.3.6
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest6 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -613,6 +615,7 @@ BBTestSimpleFileSytemExtensiveTest6 (
// TDS 5.3.7
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemOpenStress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -669,6 +672,7 @@ BBTestSimpleFileSytemOpenStress (
// TDS 5.3.8
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemGetInfoStress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -719,6 +723,7 @@ BBTestSimpleFileSytemGetInfoStress (
// TDS 5.3.9
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemSetInfoStress (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Manual.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Manual.c
index 35080a93a833..35a6e118e06a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Manual.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestStress_Manual.c
@@ -120,6 +120,7 @@ IsMediaReadOnly (
// TDS 5.3.1
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest1 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -777,6 +778,7 @@ Done:
// TDS 5.3.2
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest2 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1402,6 +1404,7 @@ Done:
// TDS 5.3.3
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest3 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1706,6 +1709,7 @@ Done:
// TDS 5.3.4
//
EFI_STATUS
+EFIAPI
BBTestSimpleFileSytemExtensiveTest4 (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestConformance.c
index 010195b48282..de8919da2aee 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestConformance.c
@@ -50,6 +50,7 @@ CreateRandomValueFileIo2 (
// TDS 5.2.9.2.1
EFI_STATUS
+EFIAPI
BBTestOpenExConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -57,6 +58,7 @@ BBTestOpenExConformanceTestCheckpoint1 (
// TDS 5.2.9.2.2
EFI_STATUS
+EFIAPI
BBTestOpenExConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -64,6 +66,7 @@ BBTestOpenExConformanceTestCheckpoint2 (
// TDS 5.2.9.2.3
EFI_STATUS
+EFIAPI
BBTestOpenExConformanceTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -72,6 +75,7 @@ BBTestOpenExConformanceTestCheckpoint3 (
// TDS 5.2.10.2.1
EFI_STATUS
+EFIAPI
BBTestWriteExConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -80,6 +84,7 @@ BBTestWriteExConformanceTestCheckpoint1 (
// TDS 5.2.10.2.2
EFI_STATUS
+EFIAPI
BBTestWriteExConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -88,6 +93,7 @@ BBTestWriteExConformanceTestCheckpoint2 (
// TDS 5.2.11.2.1
EFI_STATUS
+EFIAPI
BBTestWriteExConformanceTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -97,6 +103,7 @@ BBTestWriteExConformanceTestCheckpoint3 (
// TDS 5.2.11.2.1
//
EFI_STATUS
+EFIAPI
BBTestFlushExConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -106,6 +113,7 @@ BBTestFlushExConformanceTestCheckpoint1 (
// TDS 5.2.12.2.1
//
EFI_STATUS
+EFIAPI
BBTestReadExConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -115,6 +123,7 @@ BBTestReadExConformanceTestCheckpoint1 (
// TDS 5.2.12.2.2
//
EFI_STATUS
+EFIAPI
BBTestReadExConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -135,6 +144,7 @@ BBTestReadExConformanceTestCheckpoint2 (
// TDS 5.2.9
//
EFI_STATUS
+EFIAPI
BBTestOpenExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -195,6 +205,7 @@ BBTestOpenExConformanceTest (
// TDS 5.2.10
//
EFI_STATUS
+EFIAPI
BBTestWriteExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -257,6 +268,7 @@ BBTestWriteExConformanceTest (
// TDS 5.2.11
//
EFI_STATUS
+EFIAPI
BBTestFlushExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -309,6 +321,7 @@ BBTestFlushExConformanceTest (
// TDS 5.2.12
//
EFI_STATUS
+EFIAPI
BBTestReadExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -351,6 +364,7 @@ BBTestReadExConformanceTest (
EFI_STATUS
+EFIAPI
BBTestOpenExConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -535,6 +549,7 @@ BBTestOpenExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestOpenExConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -746,6 +761,7 @@ BBTestOpenExConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestOpenExConformanceTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -945,6 +961,7 @@ BBTestOpenExConformanceTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestWriteExConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1112,6 +1129,7 @@ BBTestWriteExConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestWriteExConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1326,6 +1344,7 @@ BBTestWriteExConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestWriteExConformanceTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1525,6 +1544,7 @@ BBTestWriteExConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestFlushExConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1737,6 +1757,7 @@ BBTestFlushExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestReadExConformanceTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1957,6 +1978,7 @@ BBTestReadExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestReadExConformanceTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_FlushEx.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_FlushEx.c
index 4a3c73e9661a..337332c69ec4 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_FlushEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_FlushEx.c
@@ -44,24 +44,28 @@ typedef struct {
//CheckPoints
//
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
);
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
);
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
);
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -336,6 +340,7 @@ FileIoAsyncFlushDirData (
// TDS 5.1.15
//
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -391,6 +396,7 @@ BBTestFlushExBasicTest (
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -695,6 +701,7 @@ BBTestFlushExBasicTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -879,6 +886,7 @@ BBTestFlushExBasicTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1145,6 +1153,7 @@ BBTestFlushExBasicTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestFlushExBasicTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
index 25f70533e226..188af5c68e26 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
@@ -154,6 +154,7 @@ InternalGetInfoFileIo2 (
//
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test1_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -163,6 +164,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
);
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test1_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -172,6 +174,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Sync (
);
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test2_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -181,6 +184,7 @@ BBTestOpenExBasicTestCheckpoint1_Test2_Async (
);
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test2_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -191,6 +195,7 @@ BBTestOpenExBasicTestCheckpoint1_Test2_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test3_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -201,6 +206,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test3_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -210,6 +216,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Sync (
);
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test4_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -220,6 +227,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test4_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -230,6 +238,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test5_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -241,6 +250,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test5_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -251,6 +261,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test1_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -260,6 +271,7 @@ BBTestOpenExBasicTestCheckpoint2_Test1_Async (
);
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test1_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -271,6 +283,7 @@ BBTestOpenExBasicTestCheckpoint2_Test1_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test2_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -282,6 +295,7 @@ BBTestOpenExBasicTestCheckpoint2_Test2_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test2_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -292,6 +306,7 @@ BBTestOpenExBasicTestCheckpoint2_Test2_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test3_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -302,6 +317,7 @@ BBTestOpenExBasicTestCheckpoint2_Test3_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test3_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -311,6 +327,7 @@ BBTestOpenExBasicTestCheckpoint2_Test3_Sync (
);
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test4_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -320,6 +337,7 @@ BBTestOpenExBasicTestCheckpoint2_Test4_Async (
);
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test4_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -330,6 +348,7 @@ BBTestOpenExBasicTestCheckpoint2_Test4_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test5_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -340,6 +359,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test5_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -349,6 +369,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync (
);
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -356,6 +377,7 @@ BBTestOpenExBasicTestCheckpoint1 (
);
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -696,6 +718,7 @@ FileIoAsyncOpenDir (
// TDS 5.1.12
//
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -743,6 +766,7 @@ BBTestOpenExBasicTest (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -961,6 +985,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test1_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -1155,7 +1180,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid027,
L"OpenEx() Basic Test - checkpoint1 ----Test1----Async",
- L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -1176,6 +1201,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test1_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -1266,6 +1292,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test2_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -1687,6 +1714,7 @@ BBTestOpenExBasicTestCheckpoint1_Test2_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test2_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -1899,6 +1927,7 @@ Done:
}
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test3_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -2152,7 +2181,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid039,
L"OpenEx() Basic Test - checkpoint1 ---Async",
- L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -2177,6 +2206,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (
}
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test3_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -2325,6 +2355,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test4_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -2656,7 +2687,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid043,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test4----Open File",
- L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -2690,6 +2721,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test4_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -2937,6 +2969,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test5_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -3302,7 +3335,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (
EFI_TEST_ASSERTION_FAILED,
gSimpleFileSystemExBBTestFunctionAssertionGuid047,
L"OpenEx() Basic Test - checkpoint1 ---Async -- Test5---Open File",
- L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+ L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
__FILE__,
(UINTN)__LINE__,
FileIoEntity->Tpl,
@@ -3338,6 +3371,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint1_Test5_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -3737,6 +3771,7 @@ FileIoAsyncOpenExistingFile (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem,
@@ -3953,6 +3988,7 @@ Done:
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test1_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -4513,6 +4549,7 @@ BBTestOpenExBasicTestCheckpoint2_Test1_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test1_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -4989,6 +5026,7 @@ BBTestOpenExBasicTestCheckpoint2_Test1_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test2_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -5657,6 +5695,7 @@ BBTestOpenExBasicTestCheckpoint2_Test2_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test2_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -6253,6 +6292,7 @@ BBTestOpenExBasicTestCheckpoint2_Test2_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test3_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -6849,6 +6889,7 @@ BBTestOpenExBasicTestCheckpoint2_Test3_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test3_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -7374,6 +7415,7 @@ BBTestOpenExBasicTestCheckpoint2_Test3_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test4_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -8114,6 +8156,7 @@ BBTestOpenExBasicTestCheckpoint2_Test4_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test4_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -8778,6 +8821,7 @@ BBTestOpenExBasicTestCheckpoint2_Test4_Sync (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test5_Async (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -9558,6 +9602,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Async (
EFI_STATUS
+EFIAPI
BBTestOpenExBasicTestCheckpoint2_Test5_Sync (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_FILE *Root,
@@ -10216,7 +10261,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync (
FileIoEntity->StatusAsync,
FileIoEntity->OpenMode,
FileIoEntity->Name
- );
+ );
if (FileIoEntity->OpenMode == EFI_FILE_MODE_READ){
DirHandle2->Open (
DirHandle2,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_ReadEx.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_ReadEx.c
index 5540e168a9f1..8366172b4eba 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_ReadEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_ReadEx.c
@@ -31,18 +31,21 @@ Abstract:
//checkpoint
//
EFI_STATUS
+EFIAPI
BBTestReadExBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
);
EFI_STATUS
+EFIAPI
BBTestReadExBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
);
EFI_STATUS
+EFIAPI
BBTestReadExBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -50,6 +53,7 @@ BBTestReadExBasicTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestReadExBasicTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -361,6 +365,7 @@ FileIoAsyncReadDir (
// TDS 5.1.13
//
EFI_STATUS
+EFIAPI
BBTestReadExBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -413,6 +418,7 @@ BBTestReadExBasicTest (
}
EFI_STATUS
+EFIAPI
BBTestReadExBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -790,6 +796,7 @@ BBTestReadExBasicTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestReadExBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1055,6 +1062,7 @@ BBTestReadExBasicTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestReadExBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1445,6 +1453,7 @@ BBTestReadExBasicTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestReadExBasicTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_WriteEx.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_WriteEx.c
index 60bacede9bfb..ce5738fc7a27 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_WriteEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_WriteEx.c
@@ -63,24 +63,28 @@ InternalSetFileSizeFileIo2 (
//
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
);
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
);
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
);
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -390,6 +394,7 @@ FileIoAsyncWriteMultiFiles (
// TDS 5.1.14
//
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -444,6 +449,7 @@ BBTestWriteExBasicTest (
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTestCheckpoint1 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -852,6 +858,7 @@ BBTestWriteExBasicTestCheckpoint1 (
//CheckPoint2 --------Sync WriteEx
//
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTestCheckpoint2 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1168,6 +1175,7 @@ BBTestWriteExBasicTestCheckpoint2 (
//checkpoint3 ----Async Write Multi Files
//
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTestCheckpoint3 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
@@ -1604,6 +1612,7 @@ BBTestWriteExBasicTestCheckpoint3 (
//CheckPoint4 --------Sync WriteEx Multi Files
//
EFI_STATUS
+EFIAPI
BBTestWriteExBasicTestCheckpoint4 (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFileSystem
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
index 6dcc1e887c1e..e73c7cebcbcf 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
@@ -2,16 +2,16 @@
Copyright 2006 - 2016 Unified EFI, Inc.<BR>
Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
- Copyright (c) 2022, ARM Limited. All rights reserved.<BR>
+ Copyright (c) 2022, ARM Limited. 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
+ which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "SimpleNetworkBBTestMain.h"
/**
@@ -40,6 +40,7 @@ Abstract:
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestStartConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -101,7 +102,7 @@ BBTestStartConformanceTest (
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// restore SNP status
//
@@ -109,7 +110,7 @@ BBTestStartConformanceTest (
Status1 = SnpInterface->Initialize(SnpInterface, 0, 0);
if (EFI_ERROR(Status1)) {
return Status1;
- }
+ }
}
StandardLib->RecordAssertion (
@@ -146,6 +147,7 @@ BBTestStartConformanceTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestStopConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -207,7 +209,7 @@ BBTestStopConformanceTest (
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// Restore SNP status
//
@@ -251,6 +253,7 @@ BBTestStopConformanceTest (
// TDS 5.3
//
EFI_STATUS
+EFIAPI
BBTestInitializeConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -312,10 +315,10 @@ BBTestInitializeConformanceTest (
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// Restore SNP status
- //
+ //
if (State1 != EfiSimpleNetworkStopped) {
Status1 = SnpInterface->Start (SnpInterface);
if (EFI_ERROR(Status1)) {
@@ -333,7 +336,7 @@ BBTestInitializeConformanceTest (
}
}
-
+
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -361,6 +364,7 @@ BBTestInitializeConformanceTest (
// TDS 5.4
//
EFI_STATUS
+EFIAPI
BBTestResetConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -420,16 +424,16 @@ BBTestResetConformanceTest (
if ((Status == EFI_NOT_STARTED) && (SnpInterface->Mode->State == EfiSimpleNetworkStopped)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
}
-
+
//
// Restore SNP status
- //
+ //
if (State1 != EfiSimpleNetworkStopped) {
Status1 = SnpInterface->Start (SnpInterface);
if (EFI_ERROR(Status1)) {
@@ -454,7 +458,7 @@ BBTestResetConformanceTest (
(UINTN)__LINE__,
Status
);
-
+
return EFI_SUCCESS;
}
@@ -471,6 +475,7 @@ BBTestResetConformanceTest (
// TDS 5.5
//
EFI_STATUS
+EFIAPI
BBTestShutdownConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -532,7 +537,7 @@ BBTestShutdownConformanceTest (
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// Restore SNP status
//
@@ -576,6 +581,7 @@ BBTestShutdownConformanceTest (
// TDS 5.6
//
EFI_STATUS
+EFIAPI
BBTestReceiveFilterConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -630,26 +636,26 @@ BBTestReceiveFilterConformanceTest (
// Call ReceiveFilters() function if network interface not start.
//
Status = SnpInterface->ReceiveFilters (SnpInterface, 0, 0, FALSE, 0, NULL);
- if ((Status == EFI_NOT_STARTED) && (SnpInterface->Mode->State == EfiSimpleNetworkStopped)) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ if ((Status == EFI_NOT_STARTED) && (SnpInterface->Mode->State == EfiSimpleNetworkStopped)) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
+ if (EFI_UNSUPPORTED == Status) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid006,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() when network interface not start.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- Status
- );
-
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid006,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() when network interface not start.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ Status
+ );
+
//
// Assertion Point 5.6.2.2
@@ -661,25 +667,25 @@ BBTestReceiveFilterConformanceTest (
}
Status = SnpInterface->ReceiveFilters (SnpInterface, 0, 0, FALSE, 0, NULL);
- if (Status == EFI_DEVICE_ERROR) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ if (Status == EFI_DEVICE_ERROR) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
+ if (EFI_UNSUPPORTED == Status) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid007,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() when network interface not initialized.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- Status
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid007,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() when network interface not initialized.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ Status
+ );
//
// Assertion Point 5.6.2.3
@@ -694,25 +700,25 @@ BBTestReceiveFilterConformanceTest (
// Call ReceiveFilters with invalide Enable
//
Status = SnpInterface->ReceiveFilters (SnpInterface, ~(SnpInterface->Mode->ReceiveFilterMask), 0, FALSE, 0, NULL);
- if (Status == EFI_INVALID_PARAMETER) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ if (Status == EFI_INVALID_PARAMETER) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
+ if (EFI_UNSUPPORTED == Status) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid008,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid Enable.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- Status
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid008,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid Enable.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ Status
+ );
//
// Call ReceiveFilters with invalide MCastFilterCnt
@@ -727,67 +733,67 @@ BBTestReceiveFilterConformanceTest (
MAC.Addr[5] = 0x02;
Status = SnpInterface->ReceiveFilters (SnpInterface, EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST, 0, FALSE, SnpInterface->Mode->MaxMCastFilterCount + 1, &MAC);
- if (Status == EFI_INVALID_PARAMETER) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ if (Status == EFI_INVALID_PARAMETER) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
+ if (EFI_UNSUPPORTED == Status) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid009,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid MCastFilterCnt is greater than Snp->Mode->MaxMCastFilterCount.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- Status
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid009,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid MCastFilterCnt is greater than Snp->Mode->MaxMCastFilterCount.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ Status
+ );
Status = SnpInterface->ReceiveFilters (SnpInterface, EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST, 0, FALSE, 0, &MAC);
- if (Status == EFI_INVALID_PARAMETER) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ if (Status == EFI_INVALID_PARAMETER) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
+ if (EFI_UNSUPPORTED == Status) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid043,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid MCastFilterCnt is 0.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- Status
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid043,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with invalid MCastFilterCnt is 0.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ Status
+ );
Status = SnpInterface->ReceiveFilters (SnpInterface, EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST, 0, FALSE, 1, NULL);
- if (Status == EFI_INVALID_PARAMETER) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ if (Status == EFI_INVALID_PARAMETER) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
+ if (EFI_UNSUPPORTED == Status) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid010,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with MCastFilterCnt not match MCastFilter.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- Status
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid010,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke ReceiveFilters() with MCastFilterCnt not match MCastFilter.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ Status
+ );
}
//
@@ -820,6 +826,7 @@ BBTestReceiveFilterConformanceTest (
// TDS 5.7
//
EFI_STATUS
+EFIAPI
BBTestStationAddressConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -881,7 +888,7 @@ BBTestStationAddressConformanceTest (
// save current snp state
//
State2 = SnpInterface->Mode->State;
-
+
//
// Assertion Point 5.7.2.2
// Call StationAddress() function if network interface not initialized.
@@ -892,60 +899,60 @@ BBTestStationAddressConformanceTest (
}
StatusBuf[1] = SnpInterface->StationAddress (SnpInterface, TRUE, NULL);
-
+
//
// Restore SNP Status
//
if (State1 == EfiSimpleNetworkInitialized) {
- Status = SnpInterface->Initialize(SnpInterface, 0, 0);
+ Status = SnpInterface->Initialize(SnpInterface, 0, 0);
if (EFI_ERROR(Status)){
return Status;
}
}
-
- if ((StatusBuf[0] == EFI_NOT_STARTED) && (State2 == EfiSimpleNetworkStopped)) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+
+ if ((StatusBuf[0] == EFI_NOT_STARTED) && (State2 == EfiSimpleNetworkStopped)) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if ((StatusBuf[0] == EFI_INVALID_PARAMETER) || (StatusBuf[0] == EFI_UNSUPPORTED)) {
+ if ((StatusBuf[0] == EFI_INVALID_PARAMETER) || (StatusBuf[0] == EFI_UNSUPPORTED)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid011,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.StationAddress - Invoke StationAddress() when network interface not start.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- StatusBuf[0]
- );
-
-
- if (StatusBuf[1] == EFI_DEVICE_ERROR) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid011,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.StationAddress - Invoke StationAddress() when network interface not start.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ StatusBuf[0]
+ );
+
+
+ if (StatusBuf[1] == EFI_DEVICE_ERROR) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if ((StatusBuf[1] == EFI_INVALID_PARAMETER) || (StatusBuf[1] == EFI_UNSUPPORTED)) {
+ if ((StatusBuf[1] == EFI_INVALID_PARAMETER) || (StatusBuf[1] == EFI_UNSUPPORTED)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid012,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.StationAddress - Invoke StationAddress() when network interface not initialized.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- StatusBuf[1]
- );
-
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid012,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.StationAddress - Invoke StationAddress() when network interface not initialized.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ StatusBuf[1]
+ );
+
if (State1 == EfiSimpleNetworkStopped) {
- Status = SnpInterface->Stop (SnpInterface);
+ Status = SnpInterface->Stop (SnpInterface);
if (EFI_ERROR(Status)){
return Status;
}
@@ -966,6 +973,7 @@ BBTestStationAddressConformanceTest (
// TDS 5.8
//
EFI_STATUS
+EFIAPI
BBTestStatisticsConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1025,25 +1033,25 @@ BBTestStatisticsConformanceTest (
// Call Statistics() function while network interface is not started.
//
Status = SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSize, &StatisticsTable);
- if ((Status == EFI_NOT_STARTED) && (SnpInterface->Mode->State == EfiSimpleNetworkStopped)) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ if ((Status == EFI_NOT_STARTED) && (SnpInterface->Mode->State == EfiSimpleNetworkStopped)) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
+ if (EFI_UNSUPPORTED == Status) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid014,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() while network interface not started.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- Status
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid014,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() while network interface not started.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ Status
+ );
//
// Assertion Point 5.8.2.2
@@ -1055,25 +1063,25 @@ BBTestStatisticsConformanceTest (
}
Status = SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSize, &StatisticsTable);
- if (Status == EFI_DEVICE_ERROR) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ if (Status == EFI_DEVICE_ERROR) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
+ if (EFI_UNSUPPORTED == Status) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid015,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() while network interface is not initialized.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- Status
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid015,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() while network interface is not initialized.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ Status
+ );
//
// Assertion Point 5.8.2.3
@@ -1091,25 +1099,25 @@ BBTestStatisticsConformanceTest (
StatisticsSize = 0;
Status = SnpInterface->Statistics (SnpInterface, FALSE, &StatisticsSize, &StatisticsTable);
- if (Status == EFI_BUFFER_TOO_SMALL) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
+ if (Status == EFI_BUFFER_TOO_SMALL) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == Status) {
+ if (EFI_UNSUPPORTED == Status) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType,
- gSimpleNetworkBBTestConformanceAssertionGuid017,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() with small buffer.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- Status
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType,
+ gSimpleNetworkBBTestConformanceAssertionGuid017,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.Statistics - Invoke Statistics() with small buffer.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ Status
+ );
//
// Restore SNP State
@@ -1125,7 +1133,7 @@ BBTestStatisticsConformanceTest (
return Status;
}
}
-
+
return EFI_SUCCESS;
}
@@ -1141,6 +1149,7 @@ BBTestStatisticsConformanceTest (
// TDS 5.9
//
EFI_STATUS
+EFIAPI
BBTestMCastIpToMacConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1210,7 +1219,7 @@ BBTestMCastIpToMacConformanceTest (
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// Restore SNP status
//
@@ -1254,6 +1263,7 @@ BBTestMCastIpToMacConformanceTest (
// TDS 5.10
//
EFI_STATUS
+EFIAPI
BBTestNVDataConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1348,7 +1358,7 @@ BBTestNVDataConformanceTest (
StatusBuf[0] = SnpInterface->NvData (SnpInterface, TRUE, 0, SnpInterface->Mode->NvRamAccessSize, Buffer);
CheckPoint1State = SnpInterface->Mode->State;
-
+
//
// Assertion Point 5.10.2.2
@@ -1368,102 +1378,102 @@ BBTestNVDataConformanceTest (
// Check Point A: "Offset" not be a multiple of NvRamAccessSize
//
StatusBuf[1] = SnpInterface->NvData (SnpInterface, TRUE, (SnpInterface->Mode->NvRamAccessSize/2), SnpInterface->Mode->NvRamAccessSize, Buffer);
-
+
//
// Check Point B: "BufferSize" not be a multiple of NvRamAccessSize
//
StatusBuf[2] = SnpInterface->NvData (SnpInterface, TRUE, 0, (SnpInterface->Mode->NvRamAccessSize/2), Buffer);
-
+
//
// Check Point C: "BufferSize" + "Offset" exceeds "NvRamSize"
//
- StatusBuf[3] = SnpInterface->NvData (SnpInterface, TRUE, 0, SnpInterface->Mode->NvRamSize+100, Buffer);
+ StatusBuf[3] = SnpInterface->NvData (SnpInterface, TRUE, 0, SnpInterface->Mode->NvRamSize+100, Buffer);
-
- if ((StatusBuf[0] == EFI_NOT_STARTED) && (CheckPoint1State == EfiSimpleNetworkStopped)) {
- AssertionType[0] = EFI_TEST_ASSERTION_PASSED;
+
+ if ((StatusBuf[0] == EFI_NOT_STARTED) && (CheckPoint1State == EfiSimpleNetworkStopped)) {
+ AssertionType[0] = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == StatusBuf[0]) {
+ if (EFI_UNSUPPORTED == StatusBuf[0]) {
AssertionType[0] = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType[0] = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType[0],
- gSimpleNetworkBBTestConformanceAssertionGuid020,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.NvData - Invoke NvData() when network interface not start.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- StatusBuf[0]
- );
-
-
- if (StatusBuf[1] == EFI_INVALID_PARAMETER) {
- AssertionType[1] = EFI_TEST_ASSERTION_PASSED;
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType[0],
+ gSimpleNetworkBBTestConformanceAssertionGuid020,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.NvData - Invoke NvData() when network interface not start.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ StatusBuf[0]
+ );
+
+
+ if (StatusBuf[1] == EFI_INVALID_PARAMETER) {
+ AssertionType[1] = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == StatusBuf[1]) {
+ if (EFI_UNSUPPORTED == StatusBuf[1]) {
AssertionType[1] = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType[1] = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType[1],
- gSimpleNetworkBBTestConformanceAssertionGuid021,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.NvData - Invoke NvData() with Offset not be a multiple of NvRamAccessSize.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- StatusBuf[1]
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType[1],
+ gSimpleNetworkBBTestConformanceAssertionGuid021,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.NvData - Invoke NvData() with Offset not be a multiple of NvRamAccessSize.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ StatusBuf[1]
+ );
-
- if (StatusBuf[2] == EFI_INVALID_PARAMETER) {
- AssertionType[2] = EFI_TEST_ASSERTION_PASSED;
+
+ if (StatusBuf[2] == EFI_INVALID_PARAMETER) {
+ AssertionType[2] = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == StatusBuf[2]) {
+ if (EFI_UNSUPPORTED == StatusBuf[2]) {
AssertionType[2] = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType[2] = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType[2],
- gSimpleNetworkBBTestConformanceAssertionGuid022,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.NvData - Invoke NvData() with BufferSize not be a multiple of NvRamAccessSize.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- StatusBuf[2]
- );
-
- if (StatusBuf[3] == EFI_INVALID_PARAMETER) {
- AssertionType[3] = EFI_TEST_ASSERTION_PASSED;
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType[2],
+ gSimpleNetworkBBTestConformanceAssertionGuid022,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.NvData - Invoke NvData() with BufferSize not be a multiple of NvRamAccessSize.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ StatusBuf[2]
+ );
+
+ if (StatusBuf[3] == EFI_INVALID_PARAMETER) {
+ AssertionType[3] = EFI_TEST_ASSERTION_PASSED;
} else {
- if (EFI_UNSUPPORTED == StatusBuf[3]) {
+ if (EFI_UNSUPPORTED == StatusBuf[3]) {
AssertionType[3] = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType[3] = EFI_TEST_ASSERTION_FAILED;
}
}
- StandardLib->RecordAssertion (
- StandardLib,
- AssertionType[3],
- gSimpleNetworkBBTestConformanceAssertionGuid023,
- L"EFI_SIMPLE_NETWORK_PROTOCOL.NvData - Invoke NvData() with BufferSize + Offset exceeds NvRamSize.",
- L"%a:%d:Status - %r",
- __FILE__,
- (UINTN)__LINE__,
- StatusBuf[3]
- );
+ StandardLib->RecordAssertion (
+ StandardLib,
+ AssertionType[3],
+ gSimpleNetworkBBTestConformanceAssertionGuid023,
+ L"EFI_SIMPLE_NETWORK_PROTOCOL.NvData - Invoke NvData() with BufferSize + Offset exceeds NvRamSize.",
+ L"%a:%d:Status - %r",
+ __FILE__,
+ (UINTN)__LINE__,
+ StatusBuf[3]
+ );
//
// Restore SNP Status
@@ -1478,8 +1488,8 @@ BBTestNVDataConformanceTest (
if (EFI_ERROR(Status)) {
return Status;
}
- }
-
+ }
+
Status = gtBS->FreePool (Buffer);
if (EFI_ERROR(Status)) {
return Status;
@@ -1499,6 +1509,7 @@ BBTestNVDataConformanceTest (
// TDS 5.11
//
EFI_STATUS
+EFIAPI
BBTestGetStatusConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1567,7 +1578,7 @@ BBTestGetStatusConformanceTest (
} else {
AssertionType[0] = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// Assertion Point 5.11.2.2
// Call GetStatus () function if network interface not initialized.
@@ -1593,7 +1604,7 @@ BBTestGetStatusConformanceTest (
} else {
AssertionType[1] = EFI_TEST_ASSERTION_FAILED;
}
-
+
/*
//
// Assertion Point 5.11.2.3
@@ -1622,7 +1633,7 @@ BBTestGetStatusConformanceTest (
AssertionType[2] = EFI_TEST_ASSERTION_FAILED;
}
*/
-
+
StandardLib->RecordAssertion (
StandardLib,
AssertionType[0],
@@ -1633,7 +1644,7 @@ BBTestGetStatusConformanceTest (
(UINTN)__LINE__,
StatusBuf[0]
);
-
+
StandardLib->RecordAssertion (
StandardLib,
AssertionType[1],
@@ -1644,7 +1655,7 @@ BBTestGetStatusConformanceTest (
(UINTN)__LINE__,
StatusBuf[1]
);
-/*
+/*
StandardLib->RecordAssertion (
StandardLib,
AssertionType[2],
@@ -1655,7 +1666,7 @@ BBTestGetStatusConformanceTest (
(UINTN)__LINE__,
StatusBuf[2]
);
-*/
+*/
//
// Restore SNP State
//
@@ -1686,6 +1697,7 @@ BBTestGetStatusConformanceTest (
// TDS 5.12
//
EFI_STATUS
+EFIAPI
BBTestTransmitConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1828,7 +1840,7 @@ BBTestTransmitConformanceTest (
} else {
AssertionType[4] = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// Check Point D: HeaderSize is nonzero and DestAddr is NULL.
@@ -1839,7 +1851,7 @@ BBTestTransmitConformanceTest (
} else {
AssertionType[5] = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// Check Point E: HeaderSize is nonzero and Protocol is NULL.
@@ -1861,7 +1873,7 @@ BBTestTransmitConformanceTest (
(UINTN)__LINE__,
StatusBuf[0]
);
-
+
StandardLib->RecordAssertion (
StandardLib,
AssertionType[1],
@@ -1871,7 +1883,7 @@ BBTestTransmitConformanceTest (
__FILE__,
(UINTN)__LINE__,
StatusBuf[1]
- );
+ );
StandardLib->RecordAssertion (
StandardLib,
@@ -1883,7 +1895,7 @@ BBTestTransmitConformanceTest (
(UINTN)__LINE__,
StatusBuf[2]
);
-
+
StandardLib->RecordAssertion (
StandardLib,
AssertionType[3],
@@ -1904,7 +1916,7 @@ BBTestTransmitConformanceTest (
(UINTN)__LINE__,
StatusBuf[4]
);
-
+
StandardLib->RecordAssertion (
StandardLib,
AssertionType[5],
@@ -1915,7 +1927,7 @@ BBTestTransmitConformanceTest (
(UINTN)__LINE__,
StatusBuf[5]
);
-
+
StandardLib->RecordAssertion (
StandardLib,
AssertionType[6],
@@ -1960,6 +1972,7 @@ BBTestTransmitConformanceTest (
// TDS 5.13
//
EFI_STATUS
+EFIAPI
BBTestReceiveConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2045,7 +2058,7 @@ BBTestReceiveConformanceTest (
} else {
AssertionType[0] = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// Assertion Point 5.13.2.2
@@ -2062,7 +2075,7 @@ BBTestReceiveConformanceTest (
} else {
AssertionType[1] = EFI_TEST_ASSERTION_FAILED;
}
-
+
//
// Assertion Point 5.13.2.3
// Call Receive() function with invalid parameters.
@@ -2097,7 +2110,7 @@ BBTestReceiveConformanceTest (
(UINTN)__LINE__,
StatusBuf[0]
);
-
+
StandardLib->RecordAssertion (
StandardLib,
AssertionType[1],
@@ -2134,22 +2147,22 @@ BBTestReceiveConformanceTest (
return Status;
}
}
-
+
#if 0
//
// Assertion Point 5.13.2.4
// No Packet Received in the Network Interface when Receive().
//
// We should disable the muticast and broadcast receive filters first. because
- // some muticast or broadcast packets maybe on the LAN
+ // some muticast or broadcast packets maybe on the LAN
//
Status = SnpInterface->ReceiveFilters (
- SnpInterface,
- 0,
- EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST | EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST,
- TRUE,
- 0,
- NULL);
+ SnpInterface,
+ 0,
+ EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST | EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST,
+ TRUE,
+ 0,
+ NULL);
if (EFI_ERROR(Status)) {
StandardLib->RecordAssertion (
StandardLib,
@@ -2161,7 +2174,7 @@ BBTestReceiveConformanceTest (
(UINTN)__LINE__,
Status
);
- return Status;
+ return Status;
}
Status = EFI_SUCCESS;
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c
index 697a7a0348cc..1259c42611fa 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c
@@ -40,6 +40,7 @@ Abstract:
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestStartFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -147,6 +148,7 @@ BBTestStartFunctionTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestStopFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -252,6 +254,7 @@ BBTestStopFunctionTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestInitializeFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -392,6 +395,7 @@ BBTestInitializeFunctionTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -580,6 +584,7 @@ BBTestResetFunctionTest (
// TDS 4.5
//
EFI_STATUS
+EFIAPI
BBTestShutdownFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -687,6 +692,7 @@ BBTestShutdownFunctionTest (
// TDS 4.6
//
EFI_STATUS
+EFIAPI
BBTestReceiveFilterFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -947,6 +953,7 @@ BBTestReceiveFilterFunctionTest (
// TDS 4.7
//
EFI_STATUS
+EFIAPI
BBTestStationAddressFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1105,6 +1112,7 @@ BBTestStationAddressFunctionTest (
// TDS 4.8
//
EFI_STATUS
+EFIAPI
BBTestStatisticsFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1275,6 +1283,7 @@ BBTestStatisticsFunctionTest (
// TDS 4.9
//
EFI_STATUS
+EFIAPI
BBTestMCastIpToMacFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1409,6 +1418,7 @@ BBTestMCastIpToMacFunctionTest (
// TDS 4.10
//
EFI_STATUS
+EFIAPI
BBTestNVDataFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1647,6 +1657,7 @@ End:
// TDS 4.11
//
EFI_STATUS
+EFIAPI
BBTestGetStatusFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1944,6 +1955,7 @@ BBTestGetStatusFunctionTest (
// TDS 4.12
//
EFI_STATUS
+EFIAPI
BBTestTransmitFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2222,6 +2234,7 @@ BBTestTransmitFunctionTest (
// TDS 4.13
//
EFI_STATUS
+EFIAPI
BBTestReceiveFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestConformance.c
index 2dc8a917a7ce..4607ef962fda 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "SimplePointerBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -68,6 +69,7 @@ BBTestGetStateConformanceAutoTest (
// TDS 4.2.2
//
EFI_STATUS
+EFIAPI
BBTestGetStateConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -95,6 +97,7 @@ BBTestGetStateConformanceManualTest (
// TDS 4.2.3
//
EFI_STATUS
+EFIAPI
BBTestWaitForInputConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestFunction.c
index f54ab74e12fa..102cd0b96992 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "SimplePointerBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -320,6 +321,7 @@ BBTestResetFunctionAutoTest (
// TDS 4.1.2
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1070,6 +1072,7 @@ AssertionPoints2:
// TDS 4.1.3
//
EFI_STATUS
+EFIAPI
BBTestGetStateFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1361,6 +1364,7 @@ BBTestGetStateFunctionAutoTest (
// TDS 4.1.4
//
EFI_STATUS
+EFIAPI
BBTestGetStateFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2100,6 +2104,7 @@ Step13:
// TDS 4.1.5
//
EFI_STATUS
+EFIAPI
BBTestWaitForInputFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestStress.c
index ed6c2d9c7b90..fe30e6f15b07 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTestStress.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "SimplePointerBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.3.1
//
EFI_STATUS
+EFIAPI
BBTestResetClearanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -516,6 +517,7 @@ BBTestResetClearanceManualTest (
// TDS 4.3.2
//
EFI_STATUS
+EFIAPI
BBTestGetStateExtensiveManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestConformance.c
index 975fa7d9a4b2..50a439c6d170 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestConformance.c
@@ -40,6 +40,7 @@ Abstract:
// TDS 4.2.1
//
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -286,6 +287,7 @@ BBTestReadKeyStrokeConformanceManualTest (
// TDS 4.2.2
//
EFI_STATUS
+EFIAPI
BBTestWaitForKeyConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestFunction.c
index 509813147f79..8b28c445c4e1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestFunction.c
@@ -40,6 +40,7 @@ Abstract:
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -270,6 +271,7 @@ BBTestResetFunctionAutoTest (
// TDS 4.1.2
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -528,6 +530,7 @@ BBTestResetFunctionManualTest (
// TDS 4.1.3
//
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -710,6 +713,7 @@ BBTestReadKeyStrokeFunctionManualTest (
// TDS 4.1.4
//
EFI_STATUS
+EFIAPI
BBTestWaitForKeyFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.c
index fe847f8f98eb..566cba282aec 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestMain.c
@@ -130,6 +130,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
EFI_STATUS
+EFIAPI
BBTestSimpleTextInProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -168,6 +169,7 @@ InitializeBBTestSimpleTextIn (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestSimpleTextInProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestStress.c
index 106496bae92d..4e581b7110f1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTestStress.c
@@ -39,6 +39,7 @@ Abstract:
// TDS 4.3.1
//
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestConformance.c
index f1afdc0371c9..47c8177f2597 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestConformance.c
@@ -26,6 +26,7 @@ Abstract:
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -99,6 +100,7 @@ BBTestReadKeyStrokeExConformanceTest (
EFI_STATUS
+EFIAPI
BBTestSetStateConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -177,6 +179,7 @@ BBTestSetStateConformanceTest (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -253,6 +256,7 @@ BBTestRegisterKeyNotifyConformanceTest (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -331,6 +335,7 @@ BBTestUnregisterKeyNotifyConformanceTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -391,6 +396,7 @@ BBTestReadKeyStrokeExConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -452,6 +458,7 @@ BBTestReadKeyStrokeExConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestSetStateConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -507,6 +514,7 @@ BBTestSetStateConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestSetStateConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -582,6 +590,7 @@ BBTestSetStateConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -640,6 +649,7 @@ BBTestRegisterKeyNotifyConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -702,6 +712,7 @@ BBTestRegisterKeyNotifyConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -762,6 +773,7 @@ BBTestRegisterKeyNotifyConformanceTestCheckpoint3 (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -814,6 +826,7 @@ BBTestUnregisterKeyNotifyConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -898,6 +911,7 @@ BBTestUnregisterKeyNotifyConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestFunction.c
index 0398bc268640..388f1049ea03 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestFunction.c
@@ -32,6 +32,7 @@ Abstract:
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -103,6 +104,7 @@ BBTestResetFunctionAutoTest (
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -174,6 +176,7 @@ BBTestResetFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -245,6 +248,7 @@ BBTestReadKeyStrokeExFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestSetStateFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -317,6 +321,7 @@ BBTestSetStateFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -388,6 +393,7 @@ BBTestRegisterKeyNotifyFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -459,6 +465,7 @@ BBTestUnregisterKeyNotifyFunctionManualTest (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -535,6 +542,7 @@ BBTestReadKeyStrokeExFunctionAutoTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -637,6 +645,7 @@ BBTestResetFunctionAutoTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -725,6 +734,7 @@ BBTestResetFunctionManualTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -825,6 +835,7 @@ BBTestReadKeyStrokeExFunctionManualTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestSetStateFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -914,6 +925,7 @@ BBTestSetStateFunctionManualTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestRegisterKeyNotifyFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -1022,6 +1034,7 @@ BBTestRegisterKeyNotifyFunctionManualTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestUnregisterKeyNotifyFunctionManualTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -1138,6 +1151,7 @@ BBTestUnregisterKeyNotifyFunctionManualTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestReadKeyStrokeExFunctionAutoTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleTextInputEx
@@ -1182,9 +1196,9 @@ BBTestReadKeyStrokeExFunctionAutoTestCheckpoint1 (
SimpleTextInputEx,
&State
);
- if (Status == EFI_UNSUPPORTED) {
- return EFI_UNSUPPORTED;
- }
+ if (Status == EFI_UNSUPPORTED) {
+ return EFI_UNSUPPORTED;
+ }
if (EFI_ERROR(Status)) {
StandardLib->RecordAssertion (
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.c
index dc1550934d0e..d5e47702a41b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTestMain.c
@@ -506,6 +506,7 @@ KeyStatePrint (
EFI_STATUS
+EFIAPI
TestRegisterNotifyFunction (
IN EFI_KEY_DATA *KeyData
)
@@ -515,6 +516,7 @@ TestRegisterNotifyFunction (
EFI_STATUS
+EFIAPI
FunctionTestNotifyFunction (
IN EFI_KEY_DATA *KeyData
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_efi.c
index c2f61433a02e..077f687b8340 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_efi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_efi.c
@@ -2,16 +2,16 @@
Copyright 2006 - 2016 Unified EFI, Inc.<BR>
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
- Copyright (c) 2022, ARM Limited. All rights reserved.<BR>
+ Copyright (c) 2022, ARM Limited. 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
+ which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.2.3
//
EFI_STATUS
+EFIAPI
BBTestQueryModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -237,6 +238,7 @@ BBTestQueryModeConformanceAutoTest (
// TDS 4.2.4
//
EFI_STATUS
+EFIAPI
BBTestSetModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -445,6 +447,7 @@ BBTestSetModeConformanceAutoTest (
// TDS 4.2.5
//
EFI_STATUS
+EFIAPI
BBTestSetAttributeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -647,6 +650,7 @@ BBTestSetAttributeConformanceAutoTest (
// TDS 4.2.6
//
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -762,11 +766,11 @@ BBTestSetCursorPositionConformanceAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_uefi.c
index 16edc7ad69c5..ecde15fec0dd 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_uefi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestConformance_uefi.c
@@ -2,16 +2,16 @@
Copyright 2006 - 2016 Unified EFI, Inc.<BR>
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
- Copyright (c) 2022, ARM Limited. All rights reserved.<BR>
+ Copyright (c) 2022, ARM Limited. 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
+ which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.2.3
//
EFI_STATUS
+EFIAPI
BBTestQueryModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -83,7 +84,7 @@ BBTestQueryModeConformanceAutoTest (
);
return Status;
}
-
+
SimpleOut = (EFI_SIMPLE_TEXT_OUT_PROTOCOL *)ClientInterface;
//
@@ -235,6 +236,7 @@ BBTestQueryModeConformanceAutoTest (
// TDS 4.2.4
//
EFI_STATUS
+EFIAPI
BBTestSetModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -443,6 +445,7 @@ BBTestSetModeConformanceAutoTest (
// TDS 4.2.5
//
EFI_STATUS
+EFIAPI
BBTestSetAttributeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -645,6 +648,7 @@ BBTestSetAttributeConformanceAutoTest (
// TDS 4.2.6
//
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -760,11 +764,11 @@ BBTestSetCursorPositionConformanceAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_efi.c
index 121a73698975..6ba171f2ffc5 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_efi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_efi.c
@@ -2,16 +2,16 @@
Copyright 2006 - 2016 Unified EFI, Inc.<BR>
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
- Copyright (c) 2022, ARM Limited. All rights reserved.<BR>
+ Copyright (c) 2022, ARM Limited. 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
+ which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -535,6 +536,7 @@ BBTestResetFunctionManualTest (
// TDS 4.1.2
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -648,11 +650,11 @@ BBTestResetFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -1010,6 +1012,7 @@ BBTestResetFunctionAutoTest (
// TDS 4.1.3
//
EFI_STATUS
+EFIAPI
BBTestOutputStringFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1625,6 +1628,7 @@ BBTestOutputStringFunctionAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestOutputStringFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2461,6 +2465,7 @@ RestoreEnvironment:
// TDS 4.1.4
//
EFI_STATUS
+EFIAPI
BBTestTestStringFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2671,6 +2676,7 @@ BBTestTestStringFunctionAutoTest (
// TDS 4.1.5
//
EFI_STATUS
+EFIAPI
BBTestQueryModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2953,6 +2959,7 @@ BBTestQueryModeFunctionAutoTest (
// TDS 4.1.6
//
EFI_STATUS
+EFIAPI
BBTestSetModeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3155,11 +3162,11 @@ BBTestSetModeFunctionManualTest (
// Return status check
//
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
} else {
AssertionType = EFI_TEST_ASSERTION_PASSED;
}
@@ -3297,6 +3304,7 @@ BBTestSetModeFunctionManualTest (
// TDS 4.1.7
//
EFI_STATUS
+EFIAPI
BBTestSetModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3587,6 +3595,7 @@ BBTestSetModeFunctionAutoTest (
// TDS 4.1.8
//
EFI_STATUS
+EFIAPI
BBTestSetAttributeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3880,6 +3889,7 @@ BBTestSetAttributeFunctionManualTest (
// TDS 4.1.9
//
EFI_STATUS
+EFIAPI
BBTestSetAttributeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3997,11 +4007,11 @@ BBTestSetAttributeFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -4177,6 +4187,7 @@ BBTestSetAttributeFunctionAutoTest (
// TDS 4.1.10
//
EFI_STATUS
+EFIAPI
BBTestClearScreenFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4446,6 +4457,7 @@ BBTestClearScreenFunctionManualTest (
// TDS 4.1.11
//
EFI_STATUS
+EFIAPI
BBTestClearScreenFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4559,11 +4571,11 @@ BBTestClearScreenFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -4663,6 +4675,7 @@ BBTestClearScreenFunctionAutoTest (
// TDS 4.1.12
//
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4962,6 +4975,7 @@ BBTestSetCursorPositionFunctionManualTest (
// TDS 4.1.13
//
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -5078,11 +5092,11 @@ BBTestSetCursorPositionFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -5175,7 +5189,7 @@ BBTestSetCursorPositionFunctionAutoTest (
BackupMode (SimpleOut, &ModeExpected);
//
- // Set cursor position to (IndexRow * IndexColumn)
+ // Set cursor position to (IndexRow * IndexColumn)
//
Status = SimpleOut->SetCursorPosition (SimpleOut, IndexColumn, IndexRow);
@@ -5261,6 +5275,7 @@ BBTestSetCursorPositionFunctionAutoTest (
// TDS 4.1.14
//
EFI_STATUS
+EFIAPI
BBTestEnableCursorFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -5726,6 +5741,7 @@ RestoreEnvironment:
// TDS 4.1.15
//
EFI_STATUS
+EFIAPI
BBTestEnableCursorFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -5838,11 +5854,11 @@ BBTestEnableCursorFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c
index 275fba34ace8..4ae91639f341 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c
@@ -2,16 +2,16 @@
Copyright 2006 - 2016 Unified EFI, Inc.<BR>
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
- Copyright (c) 2022, ARM Limited. All rights reserved.<BR>
+ Copyright (c) 2022, ARM Limited. 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
+ which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -51,7 +52,7 @@ BBTestResetFunctionManualTest (
EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib;
EFI_STATUS Status;
EFI_SIMPLE_TEXT_OUT_PROTOCOL *SimpleOut;
-
+
EFI_TEST_ASSERTION AssertionType;
EFI_SIMPLE_TEXT_OUTPUT_MODE ModeOrg, ModeExpected;
EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;
@@ -147,7 +148,7 @@ BBTestResetFunctionManualTest (
//
SctPrint (L"\n\rVGA Reset without extended verification start...\n\r");
WaitTimeOrKey (5);
-
+
//
// Prepare expected Mode after call Reset.
//
@@ -273,12 +274,12 @@ BBTestResetFunctionManualTest (
L" Expected:Cursor Position(%d x %d), MaxMode=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.MaxMode
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.MaxMode
);
//
@@ -347,6 +348,7 @@ BBTestResetFunctionManualTest (
// TDS 4.1.2
//
EFI_STATUS
+EFIAPI
BBTestResetFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -456,11 +458,11 @@ BBTestResetFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -587,12 +589,12 @@ BBTestResetFunctionAutoTest (
L" Expected:Cursor Position(%d x %d), MaxMode=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.MaxMode
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.MaxMode
);
//
@@ -645,6 +647,7 @@ BBTestResetFunctionAutoTest (
// TDS 4.1.3
//
EFI_STATUS
+EFIAPI
BBTestOutputStringFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -992,18 +995,18 @@ BBTestOutputStringFunctionAutoTest (
L" Expected:Cursor Position(%d x %d), Mode=%d, MaxMode=%d, Attribute=%d, CursorVisible=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
//
@@ -1222,18 +1225,18 @@ BBTestOutputStringFunctionAutoTest (
L" Expected:Cursor Position(%d x %d), Mode=%d, MaxMode=%d, Attribute=%d, CursorVisible=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
//
@@ -1260,6 +1263,7 @@ BBTestOutputStringFunctionAutoTest (
}
EFI_STATUS
+EFIAPI
BBTestOutputStringFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1631,18 +1635,18 @@ BBTestOutputStringFunctionManualTest (
L" Expected:Cursor Position(%d x %d), Mode=%d, MaxMode=%d, Attribute=%d, CursorVisible=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
//
@@ -1902,18 +1906,18 @@ BBTestOutputStringFunctionManualTest (
L" Expected:Cursor Position(%d x %d), Mode=%d, MaxMode=%d, Attribute=%d, CursorVisible=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
//
@@ -2096,6 +2100,7 @@ RestoreEnvironment:
// TDS 4.1.4
//
EFI_STATUS
+EFIAPI
BBTestTestStringFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2306,6 +2311,7 @@ BBTestTestStringFunctionAutoTest (
// TDS 4.1.5
//
EFI_STATUS
+EFIAPI
BBTestQueryModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2438,18 +2444,18 @@ BBTestQueryModeFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
Index,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
if ( EFI_UNSUPPORTED == Status && 1 == Index ) {
@@ -2558,6 +2564,7 @@ BBTestQueryModeFunctionAutoTest (
// TDS 4.1.6
//
EFI_STATUS
+EFIAPI
BBTestSetModeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2743,11 +2750,11 @@ BBTestSetModeFunctionManualTest (
// Return status check
//
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
} else {
AssertionType = EFI_TEST_ASSERTION_PASSED;
}
@@ -2813,6 +2820,7 @@ BBTestSetModeFunctionManualTest (
// TDS 4.1.7
//
EFI_STATUS
+EFIAPI
BBTestSetModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2977,18 +2985,18 @@ BBTestSetModeFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
Index,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
//
@@ -3012,7 +3020,7 @@ BBTestSetModeFunctionAutoTest (
);
}
-
+
Status = RestoreMode (SimpleOut, &ModeOrg, StandardLib);
if (EFI_ERROR(Status)) {
StandardLib->RecordAssertion (
@@ -3042,6 +3050,7 @@ BBTestSetModeFunctionAutoTest (
// TDS 4.1.8
//
EFI_STATUS
+EFIAPI
BBTestSetAttributeFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3161,17 +3170,17 @@ BBTestSetAttributeFunctionManualTest (
for (IndexFore = 0; IndexFore < 16; IndexFore++) {
Attribute = EFI_TEXT_ATTR(IndexFore, IndexBack);
-
+
BackupMode (SimpleOut, &ModeExpected);
ModeExpected.Attribute = (INT32)Attribute;
-
+
Status = SimpleOut->SetAttribute (SimpleOut, Attribute);
-
+
//
// Wait for some time to change next background color
//
gtBS->Stall (100000);
-
+
if (EFI_ERROR(Status)) {
AssertionType = EFI_TEST_ASSERTION_FAILED;
StandardLib->RecordAssertion (
@@ -3215,7 +3224,7 @@ BBTestSetAttributeFunctionManualTest (
(UINTN)ModeExpected.Attribute,
(UINTN)ModeExpected.CursorVisible
);
- Result = FALSE;
+ Result = FALSE;
}
}
}
@@ -3284,6 +3293,7 @@ BBTestSetAttributeFunctionManualTest (
// TDS 4.1.9
//
EFI_STATUS
+EFIAPI
BBTestSetAttributeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3397,11 +3407,11 @@ BBTestSetAttributeFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -3447,7 +3457,7 @@ BBTestSetAttributeFunctionAutoTest (
Status,
Attribute
);
- Result = FALSE;
+ Result = FALSE;
}
if (EFI_ERROR(Status)) {
continue;
@@ -3477,12 +3487,12 @@ BBTestSetAttributeFunctionAutoTest (
(UINTN)ModeExpected.Attribute,
(UINTN)ModeExpected.CursorVisible
);
- Result = FALSE;
+ Result = FALSE;
}
}
}
- if ( Result == TRUE ) {
+ if ( Result == TRUE ) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
StandardLib->RecordAssertion (
StandardLib,
@@ -3529,6 +3539,7 @@ BBTestSetAttributeFunctionAutoTest (
// TDS 4.1.10
//
EFI_STATUS
+EFIAPI
BBTestClearScreenFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3642,7 +3653,7 @@ BBTestClearScreenFunctionManualTest (
//
BackupMode (SimpleOut, &ModeExpected);
ModeExpected.CursorRow = 0;
- ModeExpected.CursorColumn = 0;
+ ModeExpected.CursorColumn = 0;
//
// Clear screen with current background color
@@ -3747,6 +3758,7 @@ BBTestClearScreenFunctionManualTest (
// TDS 4.1.11
//
EFI_STATUS
+EFIAPI
BBTestClearScreenFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3859,11 +3871,11 @@ BBTestClearScreenFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -3913,18 +3925,18 @@ BBTestClearScreenFunctionAutoTest (
L"Expected:Cursor Position(%d x %d), Mode=%d, MaxMode=%d, Attribute=%d, CursorVisible=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
//
@@ -3946,7 +3958,7 @@ BBTestClearScreenFunctionAutoTest (
Status
);
}
-
+
Status = RestoreMode (SimpleOut, &ModeOrg, StandardLib);
if (EFI_ERROR(Status)) {
StandardLib->RecordAssertion (
@@ -3977,6 +3989,7 @@ BBTestClearScreenFunctionAutoTest (
// TDS 4.1.12
//
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4175,7 +4188,7 @@ BBTestSetCursorPositionFunctionManualTest (
);
Result = FALSE;
}
-
+
//
// Returned status check
//
@@ -4194,7 +4207,7 @@ BBTestSetCursorPositionFunctionManualTest (
IndexRow
);
Result = FALSE;
- }
+ }
//
// Wait for a little time
//
@@ -4265,6 +4278,7 @@ BBTestSetCursorPositionFunctionManualTest (
// TDS 4.1.13
//
EFI_STATUS
+EFIAPI
BBTestSetCursorPositionFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4379,11 +4393,11 @@ BBTestSetCursorPositionFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -4435,7 +4449,7 @@ BBTestSetCursorPositionFunctionAutoTest (
BackupMode (SimpleOut, &ModeExpected);
//
- // Set cursor position to (IndexRow * IndexColumn)
+ // Set cursor position to (IndexRow * IndexColumn)
//
Status = SimpleOut->SetCursorPosition (SimpleOut, IndexColumn, IndexRow);
@@ -4468,7 +4482,7 @@ BBTestSetCursorPositionFunctionAutoTest (
(UINTN)ModeExpected.Attribute,
(UINTN)ModeExpected.CursorVisible
);
- Result = FALSE;
+ Result = FALSE;
}
//
@@ -4488,7 +4502,7 @@ BBTestSetCursorPositionFunctionAutoTest (
IndexColumn,
IndexRow
);
- Result = FALSE;
+ Result = FALSE;
}
}
}
@@ -4522,7 +4536,7 @@ BBTestSetCursorPositionFunctionAutoTest (
Status
);
}
-
+
return Status;
}
@@ -4539,6 +4553,7 @@ BBTestSetCursorPositionFunctionAutoTest (
// TDS 4.1.14
//
EFI_STATUS
+EFIAPI
BBTestEnableCursorFunctionManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4760,18 +4775,18 @@ BBTestEnableCursorFunctionManualTest (
L"Expected:Cursor Position(%d x %d), Mode=%d, MaxMode=%d, Attribute=%d, CursorVisible=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
} else {
//
@@ -4909,18 +4924,18 @@ BBTestEnableCursorFunctionManualTest (
L"Expected:Cursor Position(%d x %d), Mode=%d, MaxMode=%d, Attribute=%d, CursorVisible=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
} else {
//
@@ -4952,7 +4967,7 @@ BBTestEnableCursorFunctionManualTest (
Status
);
}
-
+
return Status;
}
@@ -4969,6 +4984,7 @@ BBTestEnableCursorFunctionManualTest (
// TDS 4.1.15
//
EFI_STATUS
+EFIAPI
BBTestEnableCursorFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -5079,11 +5095,11 @@ BBTestEnableCursorFunctionAutoTest (
//
Status = SimpleOut->SetMode (SimpleOut, Mode);
if (EFI_ERROR(Status)) {
- if (EFI_UNSUPPORTED == Status) {
- AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
- AssertionType = EFI_TEST_ASSERTION_FAILED;
- }
+ if (EFI_UNSUPPORTED == Status) {
+ AssertionType = EFI_TEST_ASSERTION_PASSED;
+ } else {
+ AssertionType = EFI_TEST_ASSERTION_FAILED;
+ }
StandardLib->RecordAssertion (
StandardLib,
AssertionType,
@@ -5237,18 +5253,18 @@ BBTestEnableCursorFunctionAutoTest (
L" Expected:Cursor Position(%d x %d), Mode=%d, MaxMode=%d, Attribute=%d, CursorVisible=%d.",
__FILE__,
(UINTN)__LINE__,
- (UINTN)SimpleOut->Mode->CursorColumn,
- (UINTN)SimpleOut->Mode->CursorRow,
- (UINTN)SimpleOut->Mode->Mode,
- (UINTN)SimpleOut->Mode->MaxMode,
- (UINTN)SimpleOut->Mode->Attribute,
- (UINTN)SimpleOut->Mode->CursorVisible,
- (UINTN)ModeExpected.CursorColumn,
- (UINTN)ModeExpected.CursorRow,
- (UINTN)ModeExpected.Mode,
- (UINTN)ModeExpected.MaxMode,
- (UINTN)ModeExpected.Attribute,
- (UINTN)ModeExpected.CursorVisible
+ (UINTN)SimpleOut->Mode->CursorColumn,
+ (UINTN)SimpleOut->Mode->CursorRow,
+ (UINTN)SimpleOut->Mode->Mode,
+ (UINTN)SimpleOut->Mode->MaxMode,
+ (UINTN)SimpleOut->Mode->Attribute,
+ (UINTN)SimpleOut->Mode->CursorVisible,
+ (UINTN)ModeExpected.CursorColumn,
+ (UINTN)ModeExpected.CursorRow,
+ (UINTN)ModeExpected.Mode,
+ (UINTN)ModeExpected.MaxMode,
+ (UINTN)ModeExpected.Attribute,
+ (UINTN)ModeExpected.CursorVisible
);
@@ -5279,6 +5295,6 @@ BBTestEnableCursorFunctionAutoTest (
Status
);
}
-
+
return Status;
}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.c
index ca2c3a083324..953420b64db8 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_efi.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "SimpleTextOutBBTestMain_efi.h"
EFI_EVENT TimerEvent;
@@ -237,6 +237,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
EFI_STATUS
+EFIAPI
BBTestSimpleTextOutputProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -275,6 +276,7 @@ InitializeBBTestSimpleTextOutput (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestSimpleTextOutputProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.c
index 2419ed8bbc68..f03d46b93733 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestMain_uefi.c
@@ -245,6 +245,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
EFI_STATUS
+EFIAPI
BBTestSimpleTextOutputProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -283,6 +284,7 @@ InitializeBBTestSimpleTextOutput (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestSimpleTextOutputProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestConformance.c
index 8545088b8925..8e0909f9428b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "StorageSecurityCommandBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestReceiveDataConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -404,6 +405,7 @@ EXIT:
// TDS
//
EFI_STATUS
+EFIAPI
BBTestSendDataConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.c
index 9a807fafac27..759c8c6cafed 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeTest.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "TapeBBTestMain.h"
#include "TapeTest.h"
@@ -151,7 +151,9 @@ prepareTapeTestEnd:
*********************************************************/
-EFI_STATUS BBTestTapeFunctionRead(
+EFI_STATUS
+EFIAPI
+BBTestTapeFunctionRead(
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
IN EFI_TEST_LEVEL TestLevel,
@@ -304,6 +306,7 @@ BBTestTapeFunctionReadEnd:
***********************************************************/
EFI_STATUS
+EFIAPI
BBTestTapeFunctionWrite (
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
@@ -445,6 +448,7 @@ BBTestTapeFunctionWriteEnd:
***********************************************************/
EFI_STATUS
+EFIAPI
BBTestTapeFunctionRewind (
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
@@ -529,6 +533,7 @@ BBTestTapeFunctionRewindEnd:
***********************************************************/
EFI_STATUS
+EFIAPI
BBTestTapeFunctionSpace (
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
@@ -694,6 +699,7 @@ BBTestTapeFunctionSpaceEnd:
***********************************************************/
EFI_STATUS
+EFIAPI
BBTestTapeFunctionWriteFM (
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
@@ -781,6 +787,7 @@ BBTestTapeFunctionWriteFMEnd:
***********************************************************/
EFI_STATUS
+EFIAPI
BBTestTapeFunctionReset (
IN EFI_BB_TEST_PROTOCOL *_This,
IN VOID *ClientInterface,
@@ -995,4 +1002,4 @@ void dumpTapeHeaderInfo(tape_header *tapeHdr)
"TapeTitle",
tapeHdr->TapeTitle
));
-}
+}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestConformance.c
index 6c4a82a0d92f..3e5c0c4aa53d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestConformance.c
@@ -25,6 +25,7 @@ Abstract:
EFI_STATUS
+EFIAPI
BBTestGetPropertiesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -58,7 +59,8 @@ BBTestGetPropertiesConformanceTest (
if (Status == EFI_INVALID_PARAMETER) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
- } else {
+ } else {
+
AssertionType = EFI_TEST_ASSERTION_FAILED;
}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestFunction.c
index 5e76a378fcd2..e68818c19671 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampBBTestFunction.c
@@ -28,6 +28,7 @@ Abstract:
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestGetTimestampFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -99,6 +100,7 @@ BBTestGetTimestampFunctionAutoTest (
EFI_STATUS
+EFIAPI
BBTestGetPropertiesFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -135,7 +137,8 @@ BBTestGetPropertiesFunctionAutoTest (
if (Status != EFI_SUCCESS) {
AssertionType = EFI_TEST_ASSERTION_FAILED;
- } else {
+ } else {
+
AssertionType = EFI_TEST_ASSERTION_PASSED;
}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformance.c
index c3d88ce4ce17..a992e76c75d3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformance.c
@@ -26,6 +26,7 @@ Abstract:
#include "UFSDeviceConfigBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestRwUfsDescriptorConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -81,7 +82,7 @@ BBTestRwUfsDescriptorConfTest (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
Status = UFSDeviceConfig->RwUfsDescriptor(UFSDeviceConfig, TRUE, 0, 0, 0, &Descriptor, NULL);
if (Status == EFI_INVALID_PARAMETER)
@@ -105,6 +106,7 @@ BBTestRwUfsDescriptorConfTest (
}
EFI_STATUS
+EFIAPI
BBTestRwUfsFlagConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -159,7 +161,7 @@ BBTestRwUfsFlagConfTest (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
Status = UFSDeviceConfig->RwUfsFlag(UFSDeviceConfig, TRUE, 1, NULL);
if (Status == EFI_INVALID_PARAMETER)
@@ -182,6 +184,7 @@ BBTestRwUfsFlagConfTest (
}
EFI_STATUS
+EFIAPI
BBTestRwUfsAttributeConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -237,7 +240,7 @@ BBTestRwUfsAttributeConfTest (
__FILE__,
(UINTN)__LINE__,
Status
- );
+ );
Status = UFSDeviceConfig->RwUfsAttribute(UFSDeviceConfig, TRUE, 0, 0, 0, &Attribute, NULL);
if (Status == EFI_INVALID_PARAMETER)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.c
index e3b96f857825..6f537f7762dd 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestMain.c
@@ -111,6 +111,7 @@ InitializeUFSDeviceConfigBBTest (
EFI_STATUS
+EFIAPI
UnloadUFSDeviceConfigBBTest (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestConformance.c
index 85e5018ec4fd..0a92be86e3bf 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestConformance.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UgaDrawBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.2.1
//
EFI_STATUS
+EFIAPI
BBTestGetModeConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -263,6 +264,7 @@ BBTestGetModeConformanceAutoTest (
// TDS 4.2.2
//
EFI_STATUS
+EFIAPI
BBTestBltConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestFunction.c
index 3fe0fd5f7667..9bba4c0e2f50 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UgaDrawBBTestMain.h"
@@ -45,6 +45,7 @@ UINTN DemoColorDepthMax ;
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
BBTestGetModeFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -726,6 +727,7 @@ BBTestGetModeFunctionAutoTest (
// TDS 4.1.2
//
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoFillFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1321,6 +1323,7 @@ BBTestEfiUgaVideoFillFunctionAutoTest (
// TDS 4.1.3
//
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoBltBufferFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2029,6 +2032,7 @@ BBTestEfiUgaVideoBltBufferFunctionAutoTest (
// TDS 4.1.4
//
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoToVideoFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.c
index afbf299f7b30..84b645210fdf 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestMain.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UgaDrawBBTestMain.h"
#define NEED_MORE_STRESS_TEST
@@ -192,6 +192,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
EFI_STATUS
+EFIAPI
BBTestUgaDrawProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -237,6 +238,7 @@ InitializeBBTestUgaDraw (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestUgaDrawProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestStress.c
index 4ce4f9dfb3e4..ec67886f4e05 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UgaDraw/BlackBoxTest/UgaDrawBBTestStress.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UgaDrawBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.3.1
//
EFI_STATUS
+EFIAPI
BBTestVideoFillBufferToVideoManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -875,6 +876,7 @@ BBTestVideoFillBufferToVideoManualTest (
// TDS 4.3.2
//
EFI_STATUS
+EFIAPI
BBTestVideoFillVideoToVideoManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1770,6 +1772,7 @@ BBTestVideoFillVideoToVideoManualTest (
// TDS 4.3.3
//
EFI_STATUS
+EFIAPI
BBTestVideoToBltBufferAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2514,6 +2517,7 @@ BBTestVideoToBltBufferAutoTest (
// TDS 4.3.4
//
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoFillStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3134,6 +3138,7 @@ BBTestEfiUgaVideoFillStressAutoTest (
// TDS 4.3.5
//
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoBltBufferStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -4070,6 +4075,7 @@ BBTestEfiUgaVideoBltBufferStressAutoTest (
// TDS 4.3.6
//
EFI_STATUS
+EFIAPI
BBTestEfiUgaVideoToVideoStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestFunction.c
index 88425ec172e6..402ca97c3635 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UnicodeCollationBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
BBTestStriCollFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -170,6 +171,7 @@ BBTestStriCollFunctionAutoTest (
// TDS 4.1.2
//
EFI_STATUS
+EFIAPI
BBTestMetaiMatchFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -310,6 +312,7 @@ BBTestMetaiMatchFunctionAutoTest (
// TDS 4.1.3
//
EFI_STATUS
+EFIAPI
BBTestStrLwrFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -337,7 +340,7 @@ BBTestStrLwrFunctionAutoTest (
};
CHAR16 TestDataSav[MAX_SIZE_OF_STRING + 1];
- CHAR16 TestDataRw[MAX_SIZE_OF_STRING + 1];
+ CHAR16 TestDataRw[MAX_SIZE_OF_STRING + 1];
@@ -369,15 +372,15 @@ BBTestStrLwrFunctionAutoTest (
//
// Backup current test data
//
- CopyUnicodeString (TestDataRw, TestData[Index]);
+ CopyUnicodeString (TestDataRw, TestData[Index]);
CopyUnicodeString (TestDataSav, TestData[Index]);
//
// For each test data, test the StrLwr functionality.
//
- UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
+ UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
- if (CheckStrLwr (TestDataSav, TestDataRw)) {
+ if (CheckStrLwr (TestDataSav, TestDataRw)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -392,15 +395,15 @@ BBTestStrLwrFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
TestDataSav,
- TestDataRw
+ TestDataRw
);
- CopyUnicodeString (TestDataSav, TestDataRw);
- UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
- UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
+ CopyUnicodeString (TestDataSav, TestDataRw);
+ UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
+ UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
- if (CheckStrEql (TestDataSav, TestDataRw)) {
+ if (CheckStrEql (TestDataSav, TestDataRw)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -415,7 +418,7 @@ BBTestStrLwrFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
TestDataSav,
- TestDataRw
+ TestDataRw
);
};
@@ -434,6 +437,7 @@ BBTestStrLwrFunctionAutoTest (
// TDS 4.1.4
//
EFI_STATUS
+EFIAPI
BBTestStrUprFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -460,7 +464,7 @@ BBTestStrUprFunctionAutoTest (
};
CHAR16 TestDataSav[MAX_SIZE_OF_STRING + 1];
- CHAR16 TestDataRw[MAX_SIZE_OF_STRING + 1];
+ CHAR16 TestDataRw[MAX_SIZE_OF_STRING + 1];
@@ -493,14 +497,14 @@ BBTestStrUprFunctionAutoTest (
// Backup current test data
//
CopyUnicodeString (TestDataSav, TestData[Index]);
- CopyUnicodeString (TestDataRw, TestData[Index]);
+ CopyUnicodeString (TestDataRw, TestData[Index]);
//
// For each test data, test the StrUpr functionality.
//
- UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
+ UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
- if (CheckStrUpr (TestDataSav, TestDataRw)) {
+ if (CheckStrUpr (TestDataSav, TestDataRw)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -515,14 +519,14 @@ BBTestStrUprFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
TestDataSav,
- TestDataRw
+ TestDataRw
);
- CopyUnicodeString (TestDataSav, TestDataRw);
- UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
- UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
+ CopyUnicodeString (TestDataSav, TestDataRw);
+ UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
+ UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
- if (CheckStrEql (TestDataSav, TestDataRw)) {
+ if (CheckStrEql (TestDataSav, TestDataRw)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -537,7 +541,7 @@ BBTestStrUprFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
TestDataSav,
- TestDataRw
+ TestDataRw
);
};
@@ -556,6 +560,7 @@ BBTestStrUprFunctionAutoTest (
// TDS 4.1.5
//
EFI_STATUS
+EFIAPI
BBTestFatToStrFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -729,6 +734,7 @@ BBTestFatToStrFunctionAutoTest (
// TDS 4.1.6
//
EFI_STATUS
+EFIAPI
BBTestStrToFatFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.c
index 513ef60440ff..94fa798da415 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestMain.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UnicodeCollationBBTestMain.h"
CHAR8 EngUpperMap[0x100];
@@ -130,6 +130,7 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
EFI_STATUS
+EFIAPI
BBTestUnicodeCollationProtocolUnload (
IN EFI_HANDLE ImageHandle
);
@@ -166,6 +167,7 @@ InitializeBBTestUnicodeCollation (
* @return EFI_SUCCESS unload successfully.
*/
EFI_STATUS
+EFIAPI
BBTestUnicodeCollationProtocolUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestStress.c
index d22b63afe037..baa2bb1ab5f8 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation/BlackBoxTest/UnicodeCollationBBTestStress.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UnicodeCollationBBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.2.1
//
EFI_STATUS
+EFIAPI
BBTestStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestFunction.c
index 22b57f21fb35..85edafc4dae3 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestFunction.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UnicodeCollation2BBTestMain.h"
STATIC CONST STRICOLL_TEST_DATA_FIELD mStriCollTestData[] ={
@@ -78,6 +78,7 @@ STATIC CONST STRICOLL_TEST_DATA_FIELD mStriCollTestData[] ={
// TDS 4.1.1
//
EFI_STATUS
+EFIAPI
BBTestStriCollFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -222,6 +223,7 @@ STATIC CONST METAIMATCH_TEST_DATA_FIELD mMetaiMatchTestData[] ={
// TDS 4.1.2
//
EFI_STATUS
+EFIAPI
BBTestMetaiMatchFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -308,6 +310,7 @@ BBTestMetaiMatchFunctionAutoTest (
// TDS 4.1.3
//
EFI_STATUS
+EFIAPI
BBTestStrLwrFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -335,7 +338,7 @@ BBTestStrLwrFunctionAutoTest (
};
CHAR16 TestDataSav[MAX_SIZE_OF_STRING + 1];
- CHAR16 TestDataRw[MAX_SIZE_OF_STRING + 1];
+ CHAR16 TestDataRw[MAX_SIZE_OF_STRING + 1];
@@ -368,14 +371,14 @@ BBTestStrLwrFunctionAutoTest (
// Backup current test data
//
CopyUnicodeString (TestDataSav, TestData[Index]);
- CopyUnicodeString (TestDataRw, TestData[Index]);
+ CopyUnicodeString (TestDataRw, TestData[Index]);
//
// For each test data, test the StrLwr functionality.
//
- UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
+ UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
- if (CheckStrLwr (TestDataSav, TestDataRw)) {
+ if (CheckStrLwr (TestDataSav, TestDataRw)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -390,15 +393,15 @@ BBTestStrLwrFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
TestDataSav,
- TestDataRw
+ TestDataRw
);
- CopyUnicodeString (TestDataSav, TestDataRw);
- UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
- UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
+ CopyUnicodeString (TestDataSav, TestDataRw);
+ UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
+ UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
- if (CheckStrEql (TestDataSav, TestDataRw)) {
+ if (CheckStrEql (TestDataSav, TestDataRw)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -413,7 +416,7 @@ BBTestStrLwrFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
TestDataSav,
- TestDataRw
+ TestDataRw
);
};
@@ -432,6 +435,7 @@ BBTestStrLwrFunctionAutoTest (
// TDS 4.1.4
//
EFI_STATUS
+EFIAPI
BBTestStrUprFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -458,7 +462,7 @@ BBTestStrUprFunctionAutoTest (
};
CHAR16 TestDataSav[MAX_SIZE_OF_STRING + 1];
- CHAR16 TestDataRw[MAX_SIZE_OF_STRING + 1];
+ CHAR16 TestDataRw[MAX_SIZE_OF_STRING + 1];
@@ -491,14 +495,14 @@ BBTestStrUprFunctionAutoTest (
// Backup current test data
//
CopyUnicodeString (TestDataSav, TestData[Index]);
- CopyUnicodeString (TestDataRw, TestData[Index]);
+ CopyUnicodeString (TestDataRw, TestData[Index]);
//
// For each test data, test the StrUpr functionality.
//
- UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
+ UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
- if (CheckStrUpr (TestDataSav, TestDataRw)) {
+ if (CheckStrUpr (TestDataSav, TestDataRw)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -513,14 +517,14 @@ BBTestStrUprFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
TestDataSav,
- TestDataRw
+ TestDataRw
);
- CopyUnicodeString (TestDataSav, TestDataRw);
- UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
- UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
+ CopyUnicodeString (TestDataSav, TestDataRw);
+ UnicodeCollation->StrLwr (UnicodeCollation, TestDataRw);
+ UnicodeCollation->StrUpr (UnicodeCollation, TestDataRw);
- if (CheckStrEql (TestDataSav, TestDataRw)) {
+ if (CheckStrEql (TestDataSav, TestDataRw)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
} else {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -535,7 +539,7 @@ BBTestStrUprFunctionAutoTest (
__FILE__,
(UINTN)__LINE__,
TestDataSav,
- TestDataRw
+ TestDataRw
);
};
@@ -554,6 +558,7 @@ BBTestStrUprFunctionAutoTest (
// TDS 4.1.5
//
EFI_STATUS
+EFIAPI
BBTestFatToStrFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -727,6 +732,7 @@ BBTestFatToStrFunctionAutoTest (
// TDS 4.1.6
//
EFI_STATUS
+EFIAPI
BBTestStrToFatFunctionAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestStress.c
index 9a164b3eafb0..2e893180a338 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTestStress.c
@@ -25,7 +25,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UnicodeCollation2BBTestMain.h"
@@ -41,6 +41,7 @@ Abstract:
// TDS 4.2.1
//
EFI_STATUS
+EFIAPI
BBTestStressAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestBasic.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestBasic.c
index f83bf020ee5d..a36b204b1e02 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestBasic.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestBasic.c
@@ -21,13 +21,14 @@ Abstract:
Source file for Usb2 Hc Basic testing.
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "Usb2HcTest.h"
//
// Prototypes
//
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilitySubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -35,6 +36,7 @@ Usb2HcGetCapabilitySubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -42,6 +44,7 @@ Usb2HcResetBasicSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -49,6 +52,7 @@ Usb2HcResetBasicSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -56,6 +60,7 @@ Usb2HcResetBasicSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -63,6 +68,7 @@ Usb2HcResetBasicSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -70,6 +76,7 @@ Usb2HcResetBasicSubTest5 (
);
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -77,6 +84,7 @@ Usb2HcResetBasicSubTest6 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetStateBasicSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -84,6 +92,7 @@ Usb2HcGetStateBasicSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetStateBasicSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -91,6 +100,7 @@ Usb2HcGetStateBasicSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetStateBasicSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -98,6 +108,7 @@ Usb2HcGetStateBasicSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -105,6 +116,7 @@ Usb2HcSetStateBasicSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -112,6 +124,7 @@ Usb2HcSetStateBasicSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -119,6 +132,7 @@ Usb2HcSetStateBasicSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -126,6 +140,7 @@ Usb2HcSetStateBasicSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -133,6 +148,7 @@ Usb2HcSetStateBasicSubTest5 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -140,6 +156,7 @@ Usb2HcSetStateBasicSubTest6 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest7 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -147,6 +164,7 @@ Usb2HcSetStateBasicSubTest7 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest8 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -154,6 +172,7 @@ Usb2HcSetStateBasicSubTest8 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest9 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -161,6 +180,7 @@ Usb2HcSetStateBasicSubTest9 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -168,6 +188,7 @@ Usb2HcGetRootHubPortStatusSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -175,6 +196,7 @@ Usb2HcGetRootHubPortStatusSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -182,6 +204,7 @@ Usb2HcGetRootHubPortStatusSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -189,6 +212,7 @@ Usb2HcGetRootHubPortStatusSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -196,6 +220,7 @@ Usb2HcGetRootHubPortStatusSubTest5 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -203,6 +228,7 @@ Usb2HcGetRootHubPortStatusSubTest6 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest7 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -210,6 +236,7 @@ Usb2HcGetRootHubPortStatusSubTest7 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -217,6 +244,7 @@ Usb2HcSetRootHubPortFeatureSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -224,6 +252,7 @@ Usb2HcSetRootHubPortFeatureSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -231,6 +260,7 @@ Usb2HcSetRootHubPortFeatureSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -238,6 +268,7 @@ Usb2HcSetRootHubPortFeatureSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -245,6 +276,7 @@ Usb2HcClearRootHubPortFeatureSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -252,6 +284,7 @@ Usb2HcClearRootHubPortFeatureSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -259,6 +292,7 @@ Usb2HcClearRootHubPortFeatureSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -266,6 +300,7 @@ Usb2HcClearRootHubPortFeatureSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -273,6 +308,7 @@ Usb2HcClearRootHubPortFeatureSubTest5 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -280,6 +316,7 @@ Usb2HcClearRootHubPortFeatureSubTest6 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest7 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -287,12 +324,14 @@ Usb2HcClearRootHubPortFeatureSubTest7 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest8 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_TEST_LOGGING_LIBRARY_PROTOCOL *LoggingLib
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest9 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -303,6 +342,7 @@ Usb2HcClearRootHubPortFeatureSubTest9 (
// Functions
//
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -375,6 +415,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcResetBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -471,6 +512,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetStateBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -553,6 +595,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -665,6 +708,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -752,6 +796,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -834,6 +879,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -921,6 +967,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1018,6 +1065,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1101,6 +1149,7 @@ Returns:
// Sub functions
//
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilitySubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1193,6 +1242,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1270,6 +1320,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1347,6 +1398,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1424,6 +1476,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1501,6 +1554,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1578,6 +1632,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcResetBasicSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1655,6 +1710,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetStateBasicSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1760,6 +1816,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcGetStateBasicSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1864,6 +1921,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcGetStateBasicSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1968,6 +2026,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2074,6 +2133,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2179,6 +2239,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2285,6 +2346,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2390,6 +2452,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2496,6 +2559,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2601,6 +2665,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest7 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2706,6 +2771,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest8 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2811,6 +2877,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateBasicSubTest9 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2918,6 +2985,7 @@ record:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3131,6 +3199,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3343,6 +3412,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3556,6 +3626,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3750,6 +3821,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3969,6 +4041,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4000,6 +4073,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusSubTest7 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4224,6 +4298,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4412,6 +4487,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4591,6 +4667,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4776,6 +4853,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4952,6 +5030,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5131,6 +5210,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5310,6 +5390,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5486,6 +5567,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5662,6 +5744,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5844,6 +5927,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -6025,6 +6109,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest7 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -6224,6 +6309,7 @@ done:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest8 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -6255,6 +6341,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureSubTest9 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestConformance.c
index d7d8d2e065b1..33031de44d26 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTestConformance.c
@@ -21,13 +21,14 @@ Abstract:
Source file for USB2 host controller conformance testing.
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "Usb2HcTest.h"
//
// Prototypes
//
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -35,6 +36,7 @@ Usb2HcGetCapabilityConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -42,6 +44,7 @@ Usb2HcGetCapabilityConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -49,6 +52,7 @@ Usb2HcGetCapabilityConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcResetConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -56,6 +60,7 @@ Usb2HcResetConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetStateConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -63,6 +68,7 @@ Usb2HcGetStateConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetStateConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -70,6 +76,7 @@ Usb2HcSetStateConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -77,6 +84,7 @@ Usb2HcControlTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -84,6 +92,7 @@ Usb2HcControlTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -91,6 +100,7 @@ Usb2HcControlTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -98,6 +108,7 @@ Usb2HcControlTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -105,6 +116,7 @@ Usb2HcControlTransferConformanceSubTest5 (
);
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -112,6 +124,7 @@ Usb2HcControlTransferConformanceSubTest6 (
);
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -119,6 +132,7 @@ Usb2HcBulkTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -126,6 +140,7 @@ Usb2HcBulkTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -133,6 +148,7 @@ Usb2HcBulkTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -140,6 +156,7 @@ Usb2HcBulkTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -147,6 +164,7 @@ Usb2HcBulkTransferConformanceSubTest5 (
);
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -154,6 +172,7 @@ Usb2HcAsyncInterruptTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -161,6 +180,7 @@ Usb2HcAsyncInterruptTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -168,6 +188,7 @@ Usb2HcAsyncInterruptTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -175,6 +196,7 @@ Usb2HcAsyncInterruptTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -182,6 +204,7 @@ Usb2HcSyncInterruptTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -189,6 +212,7 @@ Usb2HcSyncInterruptTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -196,6 +220,7 @@ Usb2HcSyncInterruptTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -203,6 +228,7 @@ Usb2HcSyncInterruptTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -210,6 +236,7 @@ Usb2HcSyncInterruptTransferConformanceSubTest5 (
);
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -217,6 +244,7 @@ Usb2HcSyncInterruptTransferConformanceSubTest6 (
);
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -224,6 +252,7 @@ Usb2HcAsyncIsochronousTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -231,6 +260,7 @@ Usb2HcAsyncIsochronousTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -238,6 +268,7 @@ Usb2HcAsyncIsochronousTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -245,6 +276,7 @@ Usb2HcAsyncIsochronousTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -252,6 +284,7 @@ Usb2HcIsochronousTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -259,6 +292,7 @@ Usb2HcIsochronousTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -266,6 +300,7 @@ Usb2HcIsochronousTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -273,6 +308,7 @@ Usb2HcIsochronousTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -280,6 +316,7 @@ Usb2HcIsochronousTransferConformanceSubTest5 (
);
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -287,6 +324,7 @@ Usb2HcGetRootHubPortStatusConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -294,6 +332,7 @@ Usb2HcSetRootHubPortFeatureConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -301,6 +340,7 @@ Usb2HcSetRootHubPortFeatureConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -308,6 +348,7 @@ Usb2HcClearRootHubPortFeatureConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -315,6 +356,7 @@ Usb2HcClearRootHubPortFeatureConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
Usb2HcInterruptCallBack (
IN VOID *Data,
IN UINTN DataLength,
@@ -323,6 +365,7 @@ Usb2HcInterruptCallBack (
);
EFI_STATUS
+EFIAPI
Usb2HcIsochronousCallBack (
IN VOID *Data,
IN UINTN DataLength,
@@ -336,6 +379,7 @@ Usb2HcIsochronousCallBack (
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -419,6 +463,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcResetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -493,6 +538,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -568,6 +614,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -643,6 +690,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -752,6 +800,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -829,6 +878,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -935,6 +985,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1033,6 +1084,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1146,6 +1198,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1244,6 +1297,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1349,6 +1403,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1424,6 +1479,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1504,6 +1560,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1586,6 +1643,7 @@ Returns:
// Sub functions
//
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1662,6 +1720,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1738,6 +1797,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetCapabilityConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1814,6 +1874,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcResetConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1889,6 +1950,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetStateConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1963,6 +2025,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSetStateConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2061,6 +2124,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2191,6 +2255,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2363,6 +2428,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2452,6 +2518,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2664,6 +2731,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2760,6 +2828,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcControlTransferConformanceSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2793,6 +2862,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2885,6 +2955,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2978,6 +3049,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3071,6 +3143,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3240,6 +3313,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3333,6 +3407,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcBulkTransferConformanceSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3425,6 +3500,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3514,6 +3590,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3603,6 +3680,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3692,6 +3770,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncInterruptTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3819,6 +3898,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3911,6 +3991,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4002,6 +4083,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4094,6 +4176,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4267,6 +4350,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4359,6 +4443,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSyncInterruptTransferConformanceSubTest6 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4451,6 +4536,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4539,6 +4625,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4628,6 +4715,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4791,6 +4879,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcAsyncIsochronousTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4880,6 +4969,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4968,6 +5058,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5057,6 +5148,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest3 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5218,6 +5310,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest4 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5306,6 +5399,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcIsochronousTransferConformanceSubTest5 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5395,6 +5489,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcGetRootHubPortStatusConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5489,6 +5584,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5583,6 +5679,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcSetRootHubPortFeatureConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5688,6 +5785,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureConformanceSubTest1 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5782,6 +5880,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcClearRootHubPortFeatureConformanceSubTest2 (
IN EFI_USB2_HC_PROTOCOL *Usb2Hc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -5882,6 +5981,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcInterruptCallBack (
IN VOID *Data,
IN UINTN DataLength,
@@ -5911,6 +6011,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
Usb2HcIsochronousCallBack (
IN VOID *Data,
IN UINTN DataLength,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestBasic.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestBasic.c
index 9d3b5cae8cdb..165ce9e5760c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestBasic.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestBasic.c
@@ -22,13 +22,14 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UsbHcTest.h"
//
// Prototypes (internal)
//
EFI_STATUS
+EFIAPI
UsbHcResetBasicSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -36,6 +37,7 @@ UsbHcResetBasicSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcResetBasicSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -44,6 +46,7 @@ UsbHcResetBasicSubTest2 (
EFI_STATUS
+EFIAPI
UsbHcResetBasicSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -51,6 +54,7 @@ UsbHcResetBasicSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcGetStateBasicSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -58,6 +62,7 @@ UsbHcGetStateBasicSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcGetStateBasicSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -65,6 +70,7 @@ UsbHcGetStateBasicSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcGetStateBasicSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -72,6 +78,7 @@ UsbHcGetStateBasicSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -79,6 +86,7 @@ UsbHcSetStateBasicSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -86,6 +94,7 @@ UsbHcSetStateBasicSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -93,6 +102,7 @@ UsbHcSetStateBasicSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -100,6 +110,7 @@ UsbHcSetStateBasicSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -107,6 +118,7 @@ UsbHcSetStateBasicSubTest5 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest6 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -114,6 +126,7 @@ UsbHcSetStateBasicSubTest6 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest7 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -121,6 +134,7 @@ UsbHcSetStateBasicSubTest7 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest8 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -128,6 +142,7 @@ UsbHcSetStateBasicSubTest8 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest9 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -135,6 +150,7 @@ UsbHcSetStateBasicSubTest9 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortNumberSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -142,6 +158,7 @@ UsbHcGetRootHubPortNumberSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -149,6 +166,7 @@ UsbHcGetRootHubPortStatusSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -156,6 +174,7 @@ UsbHcGetRootHubPortStatusSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -163,6 +182,7 @@ UsbHcGetRootHubPortStatusSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -170,6 +190,7 @@ UsbHcGetRootHubPortStatusSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -177,6 +198,7 @@ UsbHcGetRootHubPortStatusSubTest5 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest6 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -184,6 +206,7 @@ UsbHcGetRootHubPortStatusSubTest6 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest7 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -191,6 +214,7 @@ UsbHcGetRootHubPortStatusSubTest7 (
);
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -198,6 +222,7 @@ UsbHcSetRootHubPortFeatureSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -205,6 +230,7 @@ UsbHcSetRootHubPortFeatureSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -212,6 +238,7 @@ UsbHcSetRootHubPortFeatureSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -219,6 +246,7 @@ UsbHcSetRootHubPortFeatureSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -226,6 +254,7 @@ UsbHcClearRootHubPortFeatureSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -233,6 +262,7 @@ UsbHcClearRootHubPortFeatureSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -240,6 +270,7 @@ UsbHcClearRootHubPortFeatureSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -247,6 +278,7 @@ UsbHcClearRootHubPortFeatureSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -254,6 +286,7 @@ UsbHcClearRootHubPortFeatureSubTest5 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest6 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -261,6 +294,7 @@ UsbHcClearRootHubPortFeatureSubTest6 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest7 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -268,6 +302,7 @@ UsbHcClearRootHubPortFeatureSubTest7 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest8 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -289,6 +324,7 @@ UsbHcClearRootHubPortFeatureSubTest8 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcResetBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -362,6 +398,7 @@ UsbHcResetBasicAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetStateBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -435,6 +472,7 @@ UsbHcGetStateBasicAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -539,6 +577,7 @@ UsbHcSetStateBasicAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortNumberBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -602,6 +641,7 @@ UsbHcGetRootHubPortNumberBasicManualTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -681,6 +721,7 @@ UsbHcGetRootHubPortStatusBasicAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -755,6 +796,7 @@ UsbHcGetRootHubPortStatusBasicManualTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -833,6 +875,7 @@ UsbHcSetRootHubPortFeatureBasicAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureBasicAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -922,6 +965,7 @@ UsbHcClearRootHubPortFeatureBasicAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureBasicManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -992,6 +1036,7 @@ UsbHcClearRootHubPortFeatureBasicManualTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcResetBasicSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1063,6 +1108,7 @@ UsbHcResetBasicSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcResetBasicSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1134,6 +1180,7 @@ UsbHcResetBasicSubTest2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcResetBasicSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1205,6 +1252,7 @@ UsbHcResetBasicSubTest3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetStateBasicSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1304,6 +1352,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetStateBasicSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1401,6 +1450,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetStateBasicSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1499,6 +1549,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1599,6 +1650,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1695,6 +1747,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1792,6 +1845,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1888,6 +1942,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1985,6 +2040,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest6 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2081,6 +2137,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest7 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2177,6 +2234,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest8 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2272,6 +2330,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateBasicSubTest9 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2370,6 +2429,7 @@ record:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortNumberSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2443,6 +2503,7 @@ UsbHcGetRootHubPortNumberSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2598,6 +2659,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2753,6 +2815,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2909,6 +2972,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3057,6 +3121,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3185,6 +3250,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest6 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3205,6 +3271,7 @@ UsbHcGetRootHubPortStatusSubTest6 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusSubTest7 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3330,6 +3397,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3474,6 +3542,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3615,6 +3684,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3760,6 +3830,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3903,6 +3974,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4044,6 +4116,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4187,6 +4260,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4328,6 +4402,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4468,6 +4543,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4615,6 +4691,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest6 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4761,6 +4838,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest7 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4886,6 +4964,7 @@ done:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureSubTest8 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestConformance.c
index d55ff20c0362..cc395a6ed62b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestConformance.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UsbHcTest.h"
//
@@ -30,6 +30,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
UsbHcResetConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -37,6 +38,7 @@ UsbHcResetConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcGetStateConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -44,6 +46,7 @@ UsbHcGetStateConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcSetStateConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -51,6 +54,7 @@ UsbHcSetStateConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -58,6 +62,7 @@ UsbHcControlTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -65,6 +70,7 @@ UsbHcControlTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -72,6 +78,7 @@ UsbHcControlTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -79,6 +86,7 @@ UsbHcControlTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -86,6 +94,7 @@ UsbHcControlTransferConformanceSubTest5 (
);
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -93,6 +102,7 @@ UsbHcBulkTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -100,6 +110,7 @@ UsbHcBulkTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -107,6 +118,7 @@ UsbHcBulkTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -114,6 +126,7 @@ UsbHcBulkTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -121,6 +134,7 @@ UsbHcBulkTransferConformanceSubTest5 (
);
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -128,6 +142,7 @@ UsbHcAsyncInterruptTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -135,6 +150,7 @@ UsbHcAsyncInterruptTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -142,6 +158,7 @@ UsbHcAsyncInterruptTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -149,6 +166,7 @@ UsbHcAsyncInterruptTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -156,6 +174,7 @@ UsbHcSyncInterruptTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -163,6 +182,7 @@ UsbHcSyncInterruptTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -170,6 +190,7 @@ UsbHcSyncInterruptTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -177,6 +198,7 @@ UsbHcSyncInterruptTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -184,6 +206,7 @@ UsbHcSyncInterruptTransferConformanceSubTest5 (
);
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest6 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -191,6 +214,7 @@ UsbHcSyncInterruptTransferConformanceSubTest6 (
);
EFI_STATUS
+EFIAPI
UsbHcAsyncIsochronousTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -198,6 +222,7 @@ UsbHcAsyncIsochronousTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcAsyncIsochronousTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -205,6 +230,7 @@ UsbHcAsyncIsochronousTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcAsyncIsochronousTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -212,6 +238,7 @@ UsbHcAsyncIsochronousTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -219,6 +246,7 @@ UsbHcIsochronousTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -226,6 +254,7 @@ UsbHcIsochronousTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -233,6 +262,7 @@ UsbHcIsochronousTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -240,6 +270,7 @@ UsbHcIsochronousTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortNumberConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -247,6 +278,7 @@ UsbHcGetRootHubPortNumberConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -254,6 +286,7 @@ UsbHcGetRootHubPortStatusConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -261,6 +294,7 @@ UsbHcSetRootHubPortFeatureConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -268,6 +302,7 @@ UsbHcSetRootHubPortFeatureConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -275,6 +310,7 @@ UsbHcClearRootHubPortFeatureConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -282,6 +318,7 @@ UsbHcClearRootHubPortFeatureConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbHcInterruptCallBack (
IN VOID *Data,
IN UINTN DataLength,
@@ -290,6 +327,7 @@ UsbHcInterruptCallBack (
);
EFI_STATUS
+EFIAPI
UsbHcIsochronousCallBack (
IN VOID *Data,
IN UINTN DataLength,
@@ -311,6 +349,7 @@ UsbHcIsochronousCallBack (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcResetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -378,6 +417,7 @@ UsbHcResetConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -445,6 +485,7 @@ UsbHcGetStateConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -512,6 +553,7 @@ UsbHcSetStateConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -613,6 +655,7 @@ UsbHcControlTransferConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -711,6 +754,7 @@ UsbHcBulkTransferConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -801,6 +845,7 @@ UsbHcAsyncInterruptTransferConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -908,6 +953,7 @@ UsbHcSyncInterruptTransferConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcAsyncIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -992,6 +1038,7 @@ UsbHcAsyncIsochronousTransferConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1083,6 +1130,7 @@ UsbHcIsochronousTransferConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortNumberConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1150,6 +1198,7 @@ UsbHcGetRootHubPortNumberConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1217,6 +1266,7 @@ UsbHcGetRootHubPortStatusConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1289,6 +1339,7 @@ UsbHcSetRootHubPortFeatureConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1363,6 +1414,7 @@ UsbHcClearRootHubPortFeatureConformanceAutoTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcResetConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1429,6 +1481,7 @@ UsbHcResetConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetStateConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1495,6 +1548,7 @@ UsbHcGetStateConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetStateConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1586,6 +1640,7 @@ UsbHcSetStateConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1706,6 +1761,7 @@ UsbHcControlTransferConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1868,6 +1924,7 @@ UsbHcControlTransferConformanceSubTest2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1948,6 +2005,7 @@ UsbHcControlTransferConformanceSubTest3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2148,6 +2206,7 @@ UsbHcControlTransferConformanceSubTest4 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcControlTransferConformanceSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2234,6 +2293,7 @@ UsbHcControlTransferConformanceSubTest5 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2315,6 +2375,7 @@ UsbHcBulkTransferConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2397,6 +2458,7 @@ UsbHcBulkTransferConformanceSubTest2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2479,6 +2541,7 @@ UsbHcBulkTransferConformanceSubTest3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2561,6 +2624,7 @@ UsbHcBulkTransferConformanceSubTest4 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcBulkTransferConformanceSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2642,6 +2706,7 @@ UsbHcBulkTransferConformanceSubTest5 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2727,6 +2792,7 @@ UsbHcAsyncInterruptTransferConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2812,6 +2878,7 @@ UsbHcAsyncInterruptTransferConformanceSubTest2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2897,6 +2964,7 @@ UsbHcAsyncInterruptTransferConformanceSubTest3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcAsyncInterruptTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3025,6 +3093,7 @@ UsbHcAsyncInterruptTransferConformanceSubTest4 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3113,6 +3182,7 @@ UsbHcSyncInterruptTransferConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3200,6 +3270,7 @@ UsbHcSyncInterruptTransferConformanceSubTest2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3288,6 +3359,7 @@ UsbHcSyncInterruptTransferConformanceSubTest3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3425,6 +3497,7 @@ UsbHcSyncInterruptTransferConformanceSubTest4 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest5 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3513,6 +3586,7 @@ UsbHcSyncInterruptTransferConformanceSubTest5 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSyncInterruptTransferConformanceSubTest6 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3600,6 +3674,7 @@ UsbHcSyncInterruptTransferConformanceSubTest6 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcAsyncIsochronousTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3682,6 +3757,7 @@ UsbHcAsyncIsochronousTransferConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcAsyncIsochronousTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3765,6 +3841,7 @@ UsbHcAsyncIsochronousTransferConformanceSubTest2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcAsyncIsochronousTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3787,6 +3864,7 @@ UsbHcAsyncIsochronousTransferConformanceSubTest3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3869,6 +3947,7 @@ UsbHcIsochronousTransferConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3952,6 +4031,7 @@ UsbHcIsochronousTransferConformanceSubTest2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceSubTest3 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3974,6 +4054,7 @@ UsbHcIsochronousTransferConformanceSubTest3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcIsochronousTransferConformanceSubTest4 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4056,6 +4137,7 @@ UsbHcIsochronousTransferConformanceSubTest4 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortNumberConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4122,6 +4204,7 @@ UsbHcGetRootHubPortNumberConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcGetRootHubPortStatusConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4207,6 +4290,7 @@ UsbHcGetRootHubPortStatusConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4291,6 +4375,7 @@ UsbHcSetRootHubPortFeatureConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcSetRootHubPortFeatureConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4386,6 +4471,7 @@ UsbHcSetRootHubPortFeatureConformanceSubTest2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureConformanceSubTest1 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4470,6 +4556,7 @@ UsbHcClearRootHubPortFeatureConformanceSubTest1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
UsbHcClearRootHubPortFeatureConformanceSubTest2 (
IN EFI_USB_HC_PROTOCOL *UsbHc,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4552,6 +4639,7 @@ UsbHcClearRootHubPortFeatureConformanceSubTest2 (
}
EFI_STATUS
+EFIAPI
UsbHcInterruptCallBack (
IN VOID *Data,
IN UINTN DataLength,
@@ -4563,6 +4651,7 @@ UsbHcInterruptCallBack (
}
EFI_STATUS
+EFIAPI
UsbHcIsochronousCallBack (
IN VOID *Data,
IN UINTN DataLength,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestMain.c
index c9aaf2483032..4148a188082a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTestMain.c
@@ -26,7 +26,7 @@ Abstract:
// Includes
//
-#include "SctLib.h"
+#include "SctLib.h"
#include "UsbHcTest.h"
//
@@ -216,6 +216,7 @@ InitializeBBTestUsbHc (
* @return EFI_SUCCESS The interface was uninstalled successfully.
*/
EFI_STATUS
+EFIAPI
BBTestUsbHcUnload (
IN EFI_HANDLE ImageHandle
)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTestConformance.c
index 57391af71bed..f01755fa769d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTestConformance.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "UsbIoTest.h"
//
@@ -30,6 +30,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -37,6 +38,7 @@ UsbControlTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -44,6 +46,7 @@ UsbControlTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceSubTest3 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -51,6 +54,7 @@ UsbControlTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceSubTest4 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -58,6 +62,7 @@ UsbControlTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -65,6 +70,7 @@ UsbBulkTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -72,6 +78,7 @@ UsbBulkTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest3 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -79,6 +86,7 @@ UsbBulkTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest4 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -86,6 +94,7 @@ UsbBulkTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest5 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -93,6 +102,7 @@ UsbBulkTransferConformanceSubTest5 (
);
EFI_STATUS
+EFIAPI
UsbAsyncInterruptTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -100,6 +110,7 @@ UsbAsyncInterruptTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbAsyncInterruptTransferConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -107,6 +118,7 @@ UsbAsyncInterruptTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -114,6 +126,7 @@ UsbSyncInterruptTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -121,6 +134,7 @@ UsbSyncInterruptTransferConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceSubTest3 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -128,6 +142,7 @@ UsbSyncInterruptTransferConformanceSubTest3 (
);
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceSubTest4 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -135,6 +150,7 @@ UsbSyncInterruptTransferConformanceSubTest4 (
);
EFI_STATUS
+EFIAPI
UsbAsyncIsochronousTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -142,6 +158,7 @@ UsbAsyncIsochronousTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbIsochronousTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -149,6 +166,7 @@ UsbIsochronousTransferConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbGetDeviceDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -156,6 +174,7 @@ UsbGetDeviceDescriptorConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbGetConfigDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -163,6 +182,7 @@ UsbGetConfigDescriptorConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbGetInterfaceDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -170,6 +190,7 @@ UsbGetInterfaceDescriptorConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbGetEndpointDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -177,6 +198,7 @@ UsbGetEndpointDescriptorConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbGetEndpointDescriptorConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -184,6 +206,7 @@ UsbGetEndpointDescriptorConformanceSubTest2 (
);
EFI_STATUS
+EFIAPI
UsbPortResetConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -191,6 +214,7 @@ UsbPortResetConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbGetStringDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -198,6 +222,7 @@ UsbGetStringDescriptorConformanceSubTest1 (
);
EFI_STATUS
+EFIAPI
UsbGetStringDescriptorConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -223,6 +248,7 @@ GetUsbEndpointOfAttr (
);
EFI_STATUS
+EFIAPI
UsbInterruptCallBack (
IN VOID *Data,
IN UINTN DataLength,
@@ -231,6 +257,7 @@ UsbInterruptCallBack (
);
EFI_STATUS
+EFIAPI
UsbIsochronousCallBack (
IN VOID *Data,
IN UINTN DataLength,
@@ -242,6 +269,7 @@ UsbIsochronousCallBack (
// Functions
//
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -334,6 +362,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -431,6 +460,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbAsyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -513,6 +543,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -605,6 +636,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbAsyncIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -682,6 +714,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbIsochronousTransferConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -759,6 +792,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetDeviceDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -836,6 +870,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetConfigDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -913,6 +948,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetInterfaceDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -990,6 +1026,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetEndpointDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1076,6 +1113,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbPortResetConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1153,6 +1191,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetStringDescriptorConformanceAutoTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -1243,6 +1282,7 @@ Returns:
// Sub functions
//
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1364,6 +1404,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1445,6 +1486,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceSubTest3 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1536,6 +1578,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbControlTransferConformanceSubTest4 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1630,6 +1673,7 @@ Returns:
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1862,6 +1906,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1975,6 +2020,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest3 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2087,6 +2133,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest4 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2200,6 +2247,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbBulkTransferConformanceSubTest5 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2563,6 +2611,7 @@ Returns:
EFI_STATUS
+EFIAPI
UsbAsyncInterruptTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2819,6 +2868,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbAsyncInterruptTransferConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2971,6 +3021,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3228,6 +3279,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3345,6 +3397,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceSubTest3 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3461,6 +3514,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbSyncInterruptTransferConformanceSubTest4 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3579,6 +3633,7 @@ Returns:
EFI_STATUS
+EFIAPI
UsbAsyncIsochronousTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -3831,6 +3886,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbIsochronousTransferConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4079,6 +4135,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetDeviceDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4154,6 +4211,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetConfigDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4229,6 +4287,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetInterfaceDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4304,6 +4363,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetEndpointDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4404,6 +4464,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetEndpointDescriptorConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4526,6 +4587,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbPortResetConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4648,6 +4710,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetStringDescriptorConformanceSubTest1 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4722,6 +4785,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbGetStringDescriptorConformanceSubTest2 (
IN EFI_USB_IO_PROTOCOL *UsbIo,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -4956,6 +5020,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbInterruptCallBack (
IN VOID *Data,
IN UINTN DataLength,
@@ -4985,6 +5050,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UsbIsochronousCallBack (
IN VOID *Data,
IN UINTN DataLength,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestConformance.c
index c00c301ddf3e..8a69ecbdf7e9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestConformance.c
@@ -21,53 +21,61 @@ Abstract:
for EFI Driver Vlan Config Protocol's conformance Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "VlanConfigBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestSetConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestSetConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestFindConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestFindConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestFindConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestFindConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestRemoveConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestRemoveConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -78,6 +86,7 @@ BBTestRemoveConformanceTestCheckpoint2 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestSetConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -117,6 +126,7 @@ BBTestSetConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestFindConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -160,6 +170,7 @@ BBTestFindConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestRemoveConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -203,6 +214,7 @@ BBTestRemoveConformanceTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestSetConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -246,6 +258,7 @@ BBTestSetConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestSetConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -288,6 +301,7 @@ BBTestSetConformanceTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestFindConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -333,6 +347,7 @@ BBTestFindConformanceTestCheckpoint1 (
EFI_STATUS
+EFIAPI
BBTestFindConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -373,6 +388,7 @@ BBTestFindConformanceTestCheckpoint2 (
}
EFI_STATUS
+EFIAPI
BBTestFindConformanceTestCheckpoint3 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -413,6 +429,7 @@ BBTestFindConformanceTestCheckpoint3 (
}
EFI_STATUS
+EFIAPI
BBTestFindConformanceTestCheckpoint4 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -480,6 +497,7 @@ BBTestFindConformanceTestCheckpoint4 (
EFI_STATUS
+EFIAPI
BBTestRemoveConformanceTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -520,6 +538,7 @@ BBTestRemoveConformanceTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestRemoveConformanceTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestFunction.c
index 720d1456c5e2..1308641354db 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTestFunction.c
@@ -21,28 +21,32 @@ Abstract:
for EFI Driver Vlan Config Protocol's function Test
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "VlanConfigBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestSetFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestFindFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestFindFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
);
EFI_STATUS
+EFIAPI
BBTestRemoveFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -51,6 +55,7 @@ BBTestRemoveFunctionTestCheckpoint1 (
//Test Cases
//
EFI_STATUS
+EFIAPI
BBTestSetFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -88,6 +93,7 @@ BBTestSetFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestFindFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -127,6 +133,7 @@ BBTestFindFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestRemoveFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -168,6 +175,7 @@ BBTestRemoveFunctionTest (
//Check Points
//
EFI_STATUS
+EFIAPI
BBTestSetFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -336,6 +344,7 @@ BBTestSetFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestFindFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -382,6 +391,7 @@ BBTestFindFunctionTestCheckpoint1 (
}
EFI_STATUS
+EFIAPI
BBTestFindFunctionTestCheckpoint2 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
@@ -532,6 +542,7 @@ BBTestFindFunctionTestCheckpoint2 (
EFI_STATUS
+EFIAPI
BBTestRemoveFunctionTestCheckpoint1 (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN EFI_VLAN_CONFIG_PROTOCOL *VlanConfig
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestConformance.c
index 6fc5c8b112d1..d72ab3eadc0e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestConformance.c
@@ -26,10 +26,11 @@ Revision History
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "iScsiInitiatorNameBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestGetConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -121,6 +122,7 @@ BBTestGetConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestSetConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestFunction.c
index 87394f51a4bf..847c8a9e5a5f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTestFunction.c
@@ -26,10 +26,11 @@ Revision History
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "iScsiInitiatorNameBBTestMain.h"
EFI_STATUS
+EFIAPI
BBTestGetFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -143,6 +144,7 @@ BBTestGetFunctionTest (
}
EFI_STATUS
+EFIAPI
BBTestSetFunctionTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestConformance.c
index b590154cb675..e685fac083fc 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestConformance.c
@@ -24,12 +24,13 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MiscRuntimeServicesBBTestMain.h"
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
EFI_STATUS
+EFIAPI
BBTestUpdateCapsuleConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -216,6 +217,7 @@ BBTestUpdateCapsuleConformanceTest (
}
EFI_STATUS
+EFIAPI
BBTestQueryCapsuleCapabilitiesConformanceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestFunction.c
index b4ebb8068bf5..1341874f673b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestFunction.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MiscRuntimeServicesBBTestMain.h"
/**
@@ -39,6 +39,7 @@ Abstract:
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestResetSystemInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -260,6 +261,7 @@ ResetSystemStep3:
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestResetSystemManualTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -410,6 +412,7 @@ ManualTestStep2:
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
EFI_STATUS
+EFIAPI
BBTestQueryCapsuleCapabilitiesTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestStress.c
index ef0e1148cfea..84f30a86265b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestStress.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "MiscRuntimeServicesBBTestMain.h"
#define MAX_REPEAT_TIMES 2
@@ -41,6 +41,7 @@ Abstract:
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestResetSystemStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -262,6 +263,7 @@ StressTestStep3:
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestResetSystemManualStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestConformance.c
index 4dc7c2060445..d263514227c5 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestConformance.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "TimeServicesBBTestMain.h"
/**
@@ -39,6 +39,7 @@ Abstract:
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestGetTimeConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -102,6 +103,7 @@ BBTestGetTimeConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestSetTimeConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -614,6 +616,7 @@ BBTestSetTimeConsistencyTest (
// TDS 3.3
//
EFI_STATUS
+EFIAPI
BBTestGetWakeupTimeConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -770,6 +773,7 @@ BBTestGetWakeupTimeConsistencyTest (
// TDS 3.4
//
EFI_STATUS
+EFIAPI
BBTestSetWakeupTimeConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -817,7 +821,7 @@ BBTestSetWakeupTimeConsistencyTest (
);
} else {
Time = OldTime;
- Time.Year = 1899;
+ Time.Year = 1899;
Status = gtRT->SetWakeupTime (
TRUE,
&Time
@@ -844,7 +848,7 @@ BBTestSetWakeupTimeConsistencyTest (
StandardLib,
AssertionType,
gTimeServicesBBTestConformanceAssertionGuid026,
- L"RT.SetWakeupTime - Time.Year is 1899",
+ L"RT.SetWakeupTime - Time.Year is 1899",
L"%a:%d:Status - %r",
__FILE__,
(UINTN)__LINE__,
@@ -852,7 +856,7 @@ BBTestSetWakeupTimeConsistencyTest (
);
Time = OldTime;
- Time.Year = 10000;
+ Time.Year = 10000;
Status = gtRT->SetWakeupTime (
TRUE,
&Time
@@ -866,7 +870,7 @@ BBTestSetWakeupTimeConsistencyTest (
StandardLib,
AssertionType,
gTimeServicesBBTestConformanceAssertionGuid027,
- L"RT.SetWakeupTime - Time.Year is 10000",
+ L"RT.SetWakeupTime - Time.Year is 10000",
L"%a:%d:Status - %r",
__FILE__,
(UINTN)__LINE__,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestFunction.c
index 41894bcf00e8..caaf0d4ed245 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestFunction.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "TimeServicesBBTestMain.h"
/**
@@ -39,6 +39,7 @@ Abstract:
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestGetTimeInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -184,6 +185,7 @@ BBTestGetTimeInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestSetTimeInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -379,7 +381,7 @@ step1:
(Index == 1? \
gTimeServicesBBTestFunctionAssertionGuid017: \
gTimeServicesBBTestFunctionAssertionGuid018),
- L"RT.SetTime - Verify year after change",
+ L"RT.SetTime - Verify year after change",
L"%a:%d:Status - %r, TPL - %d",
__FILE__,
(UINTN)__LINE__,
@@ -491,7 +493,7 @@ step2:
(Index == 1? \
gTimeServicesBBTestFunctionAssertionGuid023: \
gTimeServicesBBTestFunctionAssertionGuid024),
- L"RT.SetTime - Verify month after change",
+ L"RT.SetTime - Verify month after change",
L"%a:%d:Status - %r, TPL - %d",
__FILE__,
(UINTN)__LINE__,
@@ -600,7 +602,7 @@ step3:
(Index == 1? \
gTimeServicesBBTestFunctionAssertionGuid029: \
gTimeServicesBBTestFunctionAssertionGuid030),
- L"RT.SetTime - Verify daylight after change",
+ L"RT.SetTime - Verify daylight after change",
L"%a:%d:Status - %r, TPL - %d",
__FILE__,
(UINTN)__LINE__,
@@ -708,7 +710,7 @@ step4:
(Index == 1? \
gTimeServicesBBTestFunctionAssertionGuid035: \
gTimeServicesBBTestFunctionAssertionGuid036),
- L"RT.SetTime - Verify time zone after change",
+ L"RT.SetTime - Verify time zone after change",
L"%a:%d:Status - %r, TPL - %d",
__FILE__,
(UINTN)__LINE__,
@@ -756,6 +758,7 @@ step5:
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestGetWakeupTimeInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -870,6 +873,7 @@ BBTestGetWakeupTimeInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestSetWakeupTimeInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestStress.c
index 26cbe03f2819..3ffd2cf55f56 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTestStress.c
@@ -24,7 +24,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "TimeServicesBBTestMain.h"
#define MAX_REPEAT_TIMES 100
@@ -41,6 +41,7 @@ Abstract:
// TDS 5.1
//
EFI_STATUS
+EFIAPI
BBTestGetTimeStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -133,6 +134,7 @@ BBTestGetTimeStressTest (
// TDS 5.2
//
EFI_STATUS
+EFIAPI
BBTestGetWakeupTimeStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c
index a415111e4fb5..03d5006660d1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestConformance.c
@@ -137,6 +137,7 @@ STATIC UINT8 mValidAuthVarDERCreate[] = {
STATIC EFI_GUID mVarVendorGuid = {0x15EDF297, 0xE832, 0x4d30, {0x82, 0x00, 0xA5, 0x25, 0xA9, 0x31, 0xE3, 0x3E}};
EFI_STATUS
+EFIAPI
AuthVariableDERConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestFunction.c
index 3c922c456732..19a94dd0e743 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/AuthVariableServicesBBTestFunction.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "VariableServicesBBTestMain.h"
#include "AuthVariableServicesBBTest.h"
@@ -577,6 +577,7 @@ STATIC UINT8 mAuthVarDERDelKey1[] = {
STATIC EFI_GUID mVarVendorGuid = {0x15EDF297, 0xE832, 0x4d30, {0x82, 0x00, 0xA5, 0x25, 0xA9, 0x31, 0xE3, 0x3E}};
EFI_STATUS
+EFIAPI
AuthVariableDERFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestConformance.c
index f4406824627b..72a0774204f1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestConformance.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "VariableServicesBBTestMain.h"
@@ -36,6 +36,7 @@ extern EFI_GUID gHwErrRecGuid;
//
EFI_STATUS
+EFIAPI
GetVariableConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -44,6 +45,7 @@ GetVariableConfTest (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -52,6 +54,7 @@ GetNextVariableNameConfTest (
);
EFI_STATUS
+EFIAPI
SetVariableConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -64,6 +67,7 @@ SetVariableConfTest (
//
EFI_STATUS
+EFIAPI
GetVariableConfTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -71,6 +75,7 @@ GetVariableConfTestSub1 (
);
EFI_STATUS
+EFIAPI
GetVariableConfTestSub2 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -78,6 +83,7 @@ GetVariableConfTestSub2 (
);
EFI_STATUS
+EFIAPI
GetVariableConfTestSub3 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -85,6 +91,7 @@ GetVariableConfTestSub3 (
);
EFI_STATUS
+EFIAPI
GetVariableConfTestSub4 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -92,6 +99,7 @@ GetVariableConfTestSub4 (
);
EFI_STATUS
+EFIAPI
GetVariableConfTestSub5 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -99,6 +107,7 @@ GetVariableConfTestSub5 (
);
EFI_STATUS
+EFIAPI
GetVariableConfTestSub6 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -106,6 +115,7 @@ GetVariableConfTestSub6 (
);
EFI_STATUS
+EFIAPI
GetVariableConfTestSub7 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -113,6 +123,7 @@ GetVariableConfTestSub7 (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -120,6 +131,7 @@ GetNextVariableNameConfTestSub1 (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub2 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -127,6 +139,7 @@ GetNextVariableNameConfTestSub2 (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub3 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -134,6 +147,7 @@ GetNextVariableNameConfTestSub3 (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub4 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -141,6 +155,7 @@ GetNextVariableNameConfTestSub4 (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub5 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -148,6 +163,7 @@ GetNextVariableNameConfTestSub5 (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub6 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -155,6 +171,7 @@ GetNextVariableNameConfTestSub6 (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub7 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -162,6 +179,7 @@ GetNextVariableNameConfTestSub7 (
);
EFI_STATUS
+EFIAPI
SetVariableConfTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -169,6 +187,7 @@ SetVariableConfTestSub1 (
);
EFI_STATUS
+EFIAPI
SetVariableConfTestSub2 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -176,6 +195,7 @@ SetVariableConfTestSub2 (
);
EFI_STATUS
+EFIAPI
SetVariableConfTestSub3 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -183,6 +203,7 @@ SetVariableConfTestSub3 (
);
EFI_STATUS
+EFIAPI
SetVariableConfTestSub4 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -191,6 +212,7 @@ SetVariableConfTestSub4 (
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
EFI_STATUS
+EFIAPI
QueryVariableInfoConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -273,6 +295,7 @@ QueryVariableInfoConfTestSub5 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -353,6 +376,7 @@ GetVariableConfTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -432,6 +456,7 @@ GetNextVariableNameConfTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -501,6 +526,7 @@ SetVariableConfTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableConfTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -582,6 +608,7 @@ GetVariableConfTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableConfTestSub2 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -663,6 +690,7 @@ GetVariableConfTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableConfTestSub3 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -791,6 +819,7 @@ GetVariableConfTestSub3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableConfTestSub4 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -921,6 +950,7 @@ GetVariableConfTestSub4 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableConfTestSub5 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1190,6 +1220,7 @@ GetVariableConfTestSub5 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableConfTestSub6 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1319,6 +1350,7 @@ GetVariableConfTestSub6 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableConfTestSub7 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1532,6 +1564,7 @@ GetVariableConfTestSub7 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1611,6 +1644,7 @@ GetNextVariableNameConfTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub2 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1690,6 +1724,7 @@ GetNextVariableNameConfTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub3 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1770,6 +1805,7 @@ GetNextVariableNameConfTestSub3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub4 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1903,6 +1939,7 @@ GetNextVariableNameConfTestSub4 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub5 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2067,6 +2104,7 @@ GetNextVariableNameConfTestSub5 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub6 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2228,6 +2266,7 @@ GetNextVariableNameConfTestSub6 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameConfTestSub7 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2430,6 +2469,7 @@ GetNextVariableNameConfTestSub7 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableConfTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2514,6 +2554,7 @@ SetVariableConfTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableConfTestSub2 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2756,6 +2797,7 @@ SetVariableConfTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableConfTestSub3 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2836,6 +2878,7 @@ SetVariableConfTestSub3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableConfTestSub4 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2988,6 +3031,7 @@ SetVariableConfTestSub4 (
// QueryVariableInfo test case
//
EFI_STATUS
+EFIAPI
QueryVariableInfoConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3399,7 +3443,7 @@ QueryVariableInfoConfTestSub5 (
{
EFI_STATUS Status;
UINT32 InvalidAttributes[] = {
- EFI_VARIABLE_NON_VOLATILE,
+ EFI_VARIABLE_NON_VOLATILE,
EFI_VARIABLE_RUNTIME_ACCESS,
EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_RUNTIME_ACCESS,
0
@@ -3475,6 +3519,7 @@ QueryVariableInfoConfTestSub5 (
#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
EFI_STATUS
+EFIAPI
HardwareErrorRecordConfTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -3654,10 +3699,10 @@ HardwareErrorRecordConfTest (
L"RT.SetVariable - Retrive the Hardware Error Record variables, check the name of them",
L"%a:%d:Status - %r, Expected - %r",
__FILE__,
- (UINTN)__LINE__,
- Status,
- EFI_SUCCESS
- );
+ (UINTN)__LINE__,
+ Status,
+ EFI_SUCCESS
+ );
if (AssertionType == EFI_TEST_ASSERTION_FAILED)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c
index 015a78a332dd..e584e69f1abb 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestFunction.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "VariableServicesBBTestMain.h"
//
@@ -30,6 +30,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
GetVariableFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -38,6 +39,7 @@ GetVariableFuncTest (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -46,6 +48,7 @@ GetNextVariableNameFuncTest (
);
EFI_STATUS
+EFIAPI
SetVariableFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -58,6 +61,7 @@ SetVariableFuncTest (
//
EFI_STATUS
+EFIAPI
GetVariableFuncTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -65,6 +69,7 @@ GetVariableFuncTestSub1 (
);
EFI_STATUS
+EFIAPI
GetNextVariableNameFuncTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -72,6 +77,7 @@ GetNextVariableNameFuncTestSub1 (
);
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -79,6 +85,7 @@ SetVariableFuncTestSub1 (
);
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub2 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -86,6 +93,7 @@ SetVariableFuncTestSub2 (
);
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub3 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -93,6 +101,7 @@ SetVariableFuncTestSub3 (
);
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub4 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -100,6 +109,7 @@ SetVariableFuncTestSub4 (
);
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub5 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -107,6 +117,7 @@ SetVariableFuncTestSub5 (
);
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub6 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -115,6 +126,7 @@ SetVariableFuncTestSub6 (
);
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub7 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -124,6 +136,7 @@ SetVariableFuncTestSub7 (
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
EFI_STATUS
+EFIAPI
QueryVariableInfoFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -164,6 +177,7 @@ EFI_GUID gHwErrRecGuid = EFI_HARDWARE_ERROR_VARIABLE;
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -214,6 +228,7 @@ GetVariableFuncTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -264,6 +279,7 @@ GetNextVariableNameFuncTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -386,6 +402,7 @@ step8:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetVariableFuncTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -615,6 +632,7 @@ GetVariableFuncTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetNextVariableNameFuncTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -773,6 +791,7 @@ GetNextVariableNameFuncTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub1 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1020,6 +1039,7 @@ SetVariableFuncTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub2 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1400,6 +1420,7 @@ SetVariableFuncTestSub2 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub3 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1783,6 +1804,7 @@ SetVariableFuncTestSub3 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub4 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -1944,6 +1966,7 @@ SetVariableFuncTestSub4 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub5 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2108,6 +2131,7 @@ SetVariableFuncTestSub5 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub6 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2369,6 +2393,7 @@ step3:
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
SetVariableFuncTestSub7 (
IN EFI_RUNTIME_SERVICES *RT,
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
@@ -2609,6 +2634,7 @@ UnicodeStrLength (
}
EFI_STATUS
+EFIAPI
QueryVariableInfoFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -2829,6 +2855,7 @@ LoopEnd:
#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
EFI_STATUS
+EFIAPI
HardwareErrorRecordFuncTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.c
index 61e9c4a4f3df..2d7a8f94c8ad 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestMain.c
@@ -275,6 +275,7 @@ UnloadVariableServicesBbTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
GetTestSupportLibrary (
IN EFI_HANDLE SupportHandle,
OUT EFI_STANDARD_TEST_LIBRARY_PROTOCOL **StandardLib,
@@ -330,6 +331,7 @@ GetTestSupportLibrary (
#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
EFI_STATUS
+EFIAPI
Myitox (
IN UINTN Num,
OUT CHAR16 *StringNum
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestStress.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestStress.c
index c290a49704e2..09a81821dc23 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestStress.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestStress.c
@@ -22,7 +22,7 @@ Abstract:
--*/
-#include "SctLib.h"
+#include "SctLib.h"
#include "VariableServicesBBTestMain.h"
#define MULTIPLE_TEST_TIMES 50
@@ -32,6 +32,7 @@ Abstract:
//
EFI_STATUS
+EFIAPI
MultipleStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -40,6 +41,7 @@ MultipleStressTest (
);
EFI_STATUS
+EFIAPI
OverflowStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -94,6 +96,7 @@ OverflowStressTestSub1 (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
MultipleStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -154,6 +157,7 @@ MultipleStressTest (
* @return Other value Something failed.
*/
EFI_STATUS
+EFIAPI
OverflowStressTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Exec/EftpImplement.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Exec/EftpImplement.c
index 1ba9fc516239..78088c0f3ccc 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Exec/EftpImplement.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Exec/EftpImplement.c
@@ -418,6 +418,7 @@ Returns:
// External Function Implementation
//
EFI_STATUS
+EFIAPI
EftpDispatchFileTransferComd (
ENTS_CMD_TYPE Operation
)
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsStr.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsStr.c
index 5120acb85d62..6f0c8b2ceb76 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsStr.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsStr.c
@@ -307,6 +307,7 @@ EntsStrDuplicate (
}
INTN
+EFIAPI
EntsLibStubStriCmp (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *s1,
@@ -317,6 +318,7 @@ EntsLibStubStriCmp (
}
VOID
+EFIAPI
EntsLibStubStrLwrUpr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *Str
@@ -326,6 +328,7 @@ EntsLibStubStrLwrUpr (
}
BOOLEAN
+EFIAPI
EntsLibStubMetaiMatch (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/ComponentName.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/ComponentName.c
index eab7cee22af1..be73c1405ea3 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/ComponentName.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/ComponentName.c
@@ -28,6 +28,7 @@ Abstract:
// EFI Component Name Functions
//
EFI_STATUS
+EFIAPI
EftpComponentNameGetDriverName (
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
IN EFI_COMPONENT_NAME2_PROTOCOL *This,
@@ -39,6 +40,7 @@ EftpComponentNameGetDriverName (
);
EFI_STATUS
+EFIAPI
EftpComponentNameGetControllerName (
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
IN EFI_COMPONENT_NAME2_PROTOCOL *This,
@@ -84,6 +86,7 @@ static SCT_UNICODE_STRING_TABLE mEftpDriverNameTable[] = {
};
EFI_STATUS
+EFIAPI
EftpComponentNameGetDriverName (
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
IN EFI_COMPONENT_NAME2_PROTOCOL *This,
@@ -133,6 +136,7 @@ EftpComponentNameGetDriverName (
}
EFI_STATUS
+EFIAPI
EftpComponentNameGetControllerName (
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
IN EFI_COMPONENT_NAME2_PROTOCOL *This,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.c
index c8672c74d5b3..5423e3cfbcd9 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpDriver.c
@@ -119,6 +119,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpDriverBindingSupported (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
@@ -161,6 +162,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpDriverBindingStart (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
@@ -326,6 +328,7 @@ ReleaseSB:
}
EFI_STATUS
+EFIAPI
EftpDriverBindingStop (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
@@ -509,6 +512,7 @@ EftpDriverBindingStop (
}
EFI_STATUS
+EFIAPI
EftpServiceBindingCreateChild (
IN EFI_SERVICE_BINDING_PROTOCOL *This,
IN OUT EFI_HANDLE *ChildHandle
@@ -709,6 +713,7 @@ ReleaseIoPrivate:
}
EFI_STATUS
+EFIAPI
EftpServiceBindingDestroyChild (
IN EFI_SERVICE_BINDING_PROTOCOL *This,
IN EFI_HANDLE ChildHandle
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.c
index 5ef0877929e4..820842be6bfa 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpMain.c
@@ -40,6 +40,7 @@ CHAR8 *mUnsupportedOptions[EFTP_UNSUPPORTED_OPTIONS_COUNT] = {
STATIC
EFI_STATUS
+EFIAPI
EftpInitReadHandler (
IN EFTP_IO_PRIVATE *Private,
IN UINT16 OpCode
@@ -132,6 +133,7 @@ Returns:
STATIC
EFI_STATUS
+EFIAPI
EftpInitWriteHandler (
IN EFTP_IO_PRIVATE *Private
)
@@ -224,6 +226,7 @@ Returns:
STATIC
EFI_STATUS
+EFIAPI
EftpInitPrivate (
IN EFI_EFTP_PROTOCOL *This,
IN EFI_EFTP_TOKEN *Token,
@@ -813,6 +816,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpSetTimer (
IN EFTP_IO_PRIVATE *Private,
UINTN Sec,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.c
index 4f3233fc0485..037e62273992 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpOption.c
@@ -99,6 +99,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpGetOptions (
IN EFI_EFTP_PROTOCOL *This,
IN UINT32 PacketLen,
@@ -438,6 +439,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpCheckOption (
IN EFI_EFTP_OPTION *OptionList,
IN UINT32 OptionCount,
@@ -504,6 +506,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpExtractOptions (
IN EFI_EFTP_PROTOCOL *This,
IN EFTP_OPTION *Option,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.c
index 4203848e91ab..8a63245c8999 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpPacket.c
@@ -444,6 +444,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpSendPacket (
IN EFTP_IO_PRIVATE *Private,
IN EFTP_PACKET_BUFFER *Buf
@@ -507,6 +508,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpStartRcv (
IN EFTP_IO_PRIVATE*Private
)
@@ -796,6 +798,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpSendError (
IN EFTP_IO_PRIVATE *Private,
IN EFTP_ERRINFO *Err,
@@ -855,6 +858,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpResendPacket (
IN EFTP_IO_PRIVATE *Private,
IN EFTP_PACKET_BUFFER *Buf,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.c
index 5d329917ab37..e2a8be8b3d9c 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpRRQ.c
@@ -25,6 +25,7 @@ Abstract:
STATIC
EFI_STATUS
+EFIAPI
EftpRrqSendAck (
IN EFTP_IO_PRIVATE *Private,
IN UINT64 BlkNo
@@ -32,6 +33,7 @@ EftpRrqSendAck (
STATIC
EFI_STATUS
+EFIAPI
EftpRrqSaveBlk (
IN EFTP_IO_PRIVATE *Private,
IN EFI_EFTP_PACKET *Packet,
@@ -40,6 +42,7 @@ EftpRrqSaveBlk (
STATIC
EFI_STATUS
+EFIAPI
EftpRrqFlushLostBlock (
IN EFTP_IO_PRIVATE *Private
);
@@ -52,6 +55,7 @@ EftpListIntegrityCheck (
STATIC
VOID
+EFIAPI
EftpRrqTxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -471,6 +475,7 @@ CleanUp:
}
EFI_STATUS
+EFIAPI
EftpBuildRrq (
IN EFTP_IO_PRIVATE *Private,
IN UINT16 OpCode
@@ -662,6 +667,7 @@ Returns:
STATIC
VOID
+EFIAPI
EftpRrqTxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -736,7 +742,6 @@ Returns:
//
// The event process routines for EFTP_ROLE_INIT
//
-STATIC
EFI_STATUS
EftpRrqInitRcvData (
IN EFTP_IO_PRIVATE *Private,
@@ -1072,8 +1077,8 @@ Returns:
}
#endif
-STATIC
VOID
+EFIAPI
EftpRrqInitTimer (
IN EFI_EVENT Event,
IN VOID *Context
@@ -1493,6 +1498,7 @@ Returns:
STATIC
VOID
+EFIAPI
EftpRrqActiveTimer (
IN EFI_EVENT Event,
IN VOID *Context
@@ -1648,6 +1654,7 @@ Returns:
STATIC
EFI_STATUS
+EFIAPI
EftpRrqSaveBlk (
IN EFTP_IO_PRIVATE *Private,
IN EFI_EFTP_PACKET *Packet,
@@ -1833,6 +1840,7 @@ Returns:
STATIC
EFI_STATUS
+EFIAPI
EftpRrqSendAck (
IN EFTP_IO_PRIVATE *Private,
IN UINT64 BlkNo
@@ -1890,6 +1898,7 @@ Returns:
STATIC
EFI_STATUS
+EFIAPI
EftpRrqFlushLostBlock (
IN EFTP_IO_PRIVATE *Private
)
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.c
index 1593d59141ac..b75dec464146 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/EftpWRQ.c
@@ -23,8 +23,8 @@ Abstract:
#include "Efi.h"
#include "EftpMain.h"
-STATIC
VOID
+EFIAPI
EftpWrqTxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -32,6 +32,7 @@ EftpWrqTxCallback (
STATIC
EFI_STATUS
+EFIAPI
EftpWrqRcvAck (
IN EFTP_IO_PRIVATE *Private,
IN EFI_EFTP_PACKET *Packet,
@@ -40,6 +41,7 @@ EftpWrqRcvAck (
STATIC
EFI_STATUS
+EFIAPI
EftpWrqRcvError (
IN EFTP_IO_PRIVATE *Private,
IN EFI_EFTP_PACKET *Packet,
@@ -48,6 +50,7 @@ EftpWrqRcvError (
STATIC
EFI_STATUS
+EFIAPI
EftpWrqRcvOack (
IN EFTP_IO_PRIVATE *Private,
IN EFI_EFTP_PACKET *Packet,
@@ -98,6 +101,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpBuildWrq (
IN EFTP_IO_PRIVATE*Private
)
@@ -259,7 +263,8 @@ Returns:
if (EftpCkSum ((UINT16 *) Packet, PacketLen / 2) != 0) {
EFTP_DEBUG_ERROR (
(L"EftpRrqRxCallback: Get a packet with wrong checksum %d\n",
- EftpCkSum ((UINT16 *) Packet,
PacketLen / 2))
+ EftpCkSum ((UINT16 *) Packet,
+PacketLen / 2))
);
#ifdef _EFTP_STAT_
@@ -406,8 +411,8 @@ CleanUp:
}
-STATIC
VOID
+EFIAPI
EftpWrqTxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -625,8 +630,8 @@ SilentShutdown:
}
-STATIC
EFI_STATUS
+EFIAPI
EftpWrqRcvAck (
IN EFTP_IO_PRIVATE *Private,
IN EFI_EFTP_PACKET *Packet,
@@ -805,8 +810,8 @@ Returns:
}
-STATIC
EFI_STATUS
+EFIAPI
EftpWrqRcvError (
IN EFTP_IO_PRIVATE *Private,
IN EFI_EFTP_PACKET *Packet,
@@ -865,8 +870,8 @@ Returns:
return EFI_ABORTED;
}
-STATIC
EFI_STATUS
+EFIAPI
EftpWrqRcvOack (
IN EFTP_IO_PRIVATE *Private,
IN EFI_EFTP_PACKET *Packet,
@@ -964,8 +969,8 @@ Returns:
return EFI_ABORTED;
}
-STATIC
EFI_STATUS
+EFIAPI
EftpWrqReadBlk (
IN EFTP_IO_PRIVATE *Private,
IN EFTP_PACKET_BUFFER *Buf,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c
index c431085dafab..8727e52740dd 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c
@@ -307,6 +307,7 @@ Returns:
// External functions implementations
//
EFI_STATUS
+EFIAPI
InitIP4Network (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -415,6 +416,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ResetIP4Network (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -569,6 +571,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
IP4NetworkSaveContext(
EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -592,6 +595,7 @@ IP4NetworkSaveContext(
}
EFI_STATUS
+EFIAPI
IP4NetworkRestoreContext(
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -618,6 +622,7 @@ IP4NetworkRestoreContext(
}
EFI_STATUS
+EFIAPI
IP4NetworkListener (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN OUT UINTN *Size,
@@ -677,6 +682,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
IP4NetworkSender (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN CHAR16 *Buffer
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c
index cef4628b599e..189221267dcb 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c
@@ -319,6 +319,7 @@ Returns:
//
EFI_STATUS
+EFIAPI
InitManagedNetwork (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -430,6 +431,7 @@ InitError:
}
EFI_STATUS
+EFIAPI
ResetManagedNetwork (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -571,6 +573,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ManagedNetworkSaveContext (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -626,6 +629,7 @@ ManagedNetworkSaveContext (
}
EFI_STATUS
+EFIAPI
ManagedNetworkRestoreContext (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -685,6 +689,7 @@ ManagedNetworkRestoreContext (
}
EFI_STATUS
+EFIAPI
ManagedNetworkListener (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN OUT UINTN *Size,
@@ -732,6 +737,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ManagedNetworkSender (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN CHAR16 *Buffer
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.c
index eb0dcd3bd816..658265787966 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.c
@@ -186,6 +186,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
InitSerial (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -263,6 +264,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ResetSerial (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -309,6 +311,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
SerialListener (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN OUT UINTN *Size,
@@ -395,6 +398,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
SerialSender (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN CHAR16 *Buffer
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.c
index 13b986d5359b..5d4c66000df4 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Execute/ExecuteSupport.c
@@ -1013,6 +1013,7 @@ GatherConfigHandles (
}
BOOLEAN
+EFIAPI
IhvInterfaceFilter (
IN VOID *ClientInterface,
IN EFI_HANDLE SupportHandle,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Load/SupportFile.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Load/SupportFile.c
index ac12a7d786de..d25aff96236b 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Load/SupportFile.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/Load/SupportFile.c
@@ -395,8 +395,8 @@ Returns:
//
Status = OpenSingleSupportFile (
&gEfiStandardTestLibraryGuid,
- &gFT->StslProtocol,
- &gFT->StslInterface
+ (VOID **) &gFT->StslProtocol,
+ (VOID **) &gFT->StslInterface
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Open standard test - %r", Status));
@@ -409,7 +409,7 @@ Returns:
//
Status = OpenSingleSupportFile (
&gEfiTestProfileLibraryGuid,
- &gFT->TplProtocol,
+ (VOID **) &gFT->TplProtocol,
NULL
);
if (EFI_ERROR (Status)) {
@@ -423,8 +423,8 @@ Returns:
//
Status = OpenSingleSupportFile (
&gEfiTestRecoveryLibraryGuid,
- &gFT->TrlProtocol,
- &gFT->TrlInterface
+ (VOID **) &gFT->TrlProtocol,
+ (VOID **) &gFT->TrlInterface
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Open test recovery - %r", Status));
@@ -437,8 +437,8 @@ Returns:
//
Status = OpenSingleSupportFile (
&gEfiTestLoggingLibraryGuid,
- &gFT->TllProtocol,
- &gFT->TllInterface
+ (VOID **) &gFT->TllProtocol,
+ (VOID **) &gFT->TllInterface
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Open test logging - %r", Status));
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/ConfigMenu.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/ConfigMenu.c
index 2f419f990555..f93a11859647 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/ConfigMenu.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/ConfigMenu.c
@@ -55,16 +55,19 @@ DisplayConfigMenu (
);
EFI_STATUS
+EFIAPI
ConfigMenuEscFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
ConfigMenuSetDefaultFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
ConfigMenuDescPrintFunc (
IN EFI_MENU_ITEM *MenuItem,
IN VOID *Context,
@@ -524,6 +527,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ConfigMenuSetDefaultFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -771,6 +775,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ConfigMenuEscFunc (
IN EFI_MENU_PAGE *Page
)
@@ -911,6 +916,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ConfigMenuDescPrintFunc (
IN EFI_MENU_ITEM *MenuItem,
IN VOID *Context,
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/KeyFunction.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/KeyFunction.c
index c02fc58f935d..44becb727e65 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/KeyFunction.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/KeyFunction.c
@@ -48,11 +48,13 @@ DoDefault (
);
EFI_STATUS
+EFIAPI
UpFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
DownFunc (
IN EFI_MENU_PAGE *MenuPage
);
@@ -75,11 +77,13 @@ SpaceFunc (
);
EFI_STATUS
+EFIAPI
LeftArrowFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
RightArrowFunc (
IN EFI_MENU_PAGE *MenuPage
);
@@ -153,6 +157,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UpFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -249,6 +254,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
DownFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -371,6 +377,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
PageUpFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -481,6 +488,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
PageDownFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -1553,6 +1561,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
LeftArrowFunc(
IN EFI_MENU_PAGE *MenuPage
)
@@ -1646,6 +1655,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
RightArrowFunc(
IN EFI_MENU_PAGE *MenuPage
)
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/MainMenu.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/MainMenu.c
index cb119016eb56..3dac4127f28e 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/MainMenu.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/MainMenu.c
@@ -82,31 +82,37 @@ DisplayLog(
);
EFI_STATUS
-MainMenuEnterFunc (
+EFIAPI
+MainMenuEnterFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuEscFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuLoadSeqFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuSaveSeqFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuF9Func(
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuClearFunc (
IN EFI_MENU_PAGE *Page
);
@@ -456,7 +462,8 @@ Returns:
}
EFI_STATUS
-MainMenuEnterFunc (
+EFIAPI
+MainMenuEnterFunc (
IN EFI_MENU_PAGE *Page
)
/*++
@@ -512,6 +519,7 @@ Reutrns
EFI_STATUS
+EFIAPI
MainMenuEscFunc (
IN EFI_MENU_PAGE *Page
)
@@ -805,6 +813,7 @@ DisplayLog (
}
EFI_STATUS
+EFIAPI
MainMenuLoadSeqFunc (
IN EFI_MENU_PAGE *Page
)
@@ -891,6 +900,7 @@ MainMenuLoadSeqFunc (
EFI_STATUS
+EFIAPI
MainMenuSaveSeqFunc (
IN EFI_MENU_PAGE *Page
)
@@ -982,6 +992,7 @@ MainMenuSaveSeqFunc (
}
EFI_STATUS
+EFIAPI
MainMenuF9Func(
IN EFI_MENU_PAGE *Page
)
@@ -1042,6 +1053,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MainMenuClearFunc (
IN EFI_MENU_PAGE *Page
)
diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/TestNodeMenu.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/TestNodeMenu.c
index 07ae42ffc815..9aa8c8b98373 100644
--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/TestNodeMenu.c
+++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/UI/TestNodeMenu.c
@@ -55,26 +55,31 @@ DisplayTestNodeMenu (
// Prototypes (internal)
//
EFI_STATUS
+EFIAPI
TestNodeMenuEnterFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
TestNodeMenuEscFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
TestNodeMenuSpaceFunc(
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
TestNodeMenuF9Func(
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
TestNodeMenuF8Func(
IN EFI_MENU_PAGE *Page
);
@@ -102,6 +107,7 @@ UnSelectTestNode (
);
EFI_STATUS
+EFIAPI
TestNodeMenuDescPrintFunc (
IN EFI_MENU_ITEM *MenuItem,
IN VOID *Context,
@@ -403,6 +409,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
TestNodeMenuEnterFunc (
IN EFI_MENU_PAGE *Page
)
@@ -464,6 +471,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
TestNodeMenuEscFunc (
IN EFI_MENU_PAGE *Page
)
@@ -601,6 +609,7 @@ Returns:
EFI_STATUS
+EFIAPI
TestNodeMenuSpaceFunc(
IN EFI_MENU_PAGE *Page
)
@@ -676,6 +685,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
TestNodeMenuF9Func(
IN EFI_MENU_PAGE *Page
)
@@ -736,6 +746,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
TestNodeMenuF8Func(
IN EFI_MENU_PAGE *Page
)
@@ -944,6 +955,7 @@ Arguments:
}
EFI_STATUS
+EFIAPI
TestNodeMenuDescPrintFunc (
IN EFI_MENU_ITEM *MenuItem,
IN VOID *Context,
diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh
index 79cb69c093dc..43eb03452836 100755
--- a/uefi-sct/SctPkg/build.sh
+++ b/uefi-sct/SctPkg/build.sh
@@ -264,7 +264,8 @@ cp $EDK_TOOLS_PATH/Source/C/bin/GenBin $DEST_DIR/GenBin
# Build the packages needed for the SCT
# Set $DSC_EXTRA to any extra packages needed for the build
#
-for DSC in SctPkg/UEFI/UEFI_SCT.dsc SctPkg/UEFI/IHV_SCT.dsc $DSC_EXTRA
+#for DSC in SctPkg/UEFI/UEFI_SCT.dsc SctPkg/UEFI/IHV_SCT.dsc $DSC_EXTRA
+for DSC in SctPkg/UEFI/UEFI_SCT.dsc $DSC_EXTRA
do
build -p $DSC -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BUILD $@
# Check if there is any error
@@ -311,15 +312,15 @@ fi
cd ../../../
pwd
-cd Build/IhvSct/${SCT_BUILD}_${TARGET_TOOLS}
-pwd
-../../../SctPkg/CommonGenFramework.sh ihv_sct $SCT_TARGET_ARCH Install$SCT_TARGET_ARCH.efi
+#cd Build/IhvSct/${SCT_BUILD}_${TARGET_TOOLS}
+#pwd
+#../../../SctPkg/CommonGenFramework.sh ihv_sct $SCT_TARGET_ARCH Install$SCT_TARGET_ARCH.efi
-status=$?
-if test $status -ne 0
-then
- echo Could not generate IHV SCT binary
- exit -1
-else
-echo The IHV binary "SctPackage${SCT_TARGET_ARCH}" is located at "$EFI_SOURCE/Build/IhvSct/${SCT_BUILD}_${TARGET_TOOLS}"
-fi
+#status=$?
+#if test $status -ne 0
+#then
+# echo Could not generate IHV SCT binary
+# exit -1
+#else
+#echo The IHV binary "SctPackage${SCT_TARGET_ARCH}" is located at "$EFI_SOURCE/Build/IhvSct/${SCT_BUILD}_${TARGET_TOOLS}"
+#fi
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90397): https://edk2.groups.io/g/devel/message/90397
Mute This Topic: https://groups.io/mt/91642654/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list