Xianhui, The content is clear to me. Two comments: 1. The copyright year is not updated. I will help to update when I commit, but hold one day to wait for possible comments. Reviewed-by: Eric Jin <eric....@intel.com>
2. Could you please provide the patch on the IHV part? Thanks. Best Regards Eric -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of xianhui liu Sent: Monday, September 23, 2019 9:42 AM To: devel@edk2.groups.io Cc: Heinrich Schuchardt <xypron.g...@gmx.de>; Supreeth Venkatesh <supreeth.venkat...@arm.com>; Jin, Eric <eric....@intel.com> Subject: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Add MediaPresentSupported check REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2061 check MediaPresent while MediaPresentSupported is TRUE Cc: Heinrich Schuchardt <xypron.g...@gmx.de> Cc: Supreeth Venkatesh <supreeth.venkat...@arm.com> Cc: Eric Jin <eric....@intel.com> Signed-off-by: xianhui liu <xianhuix....@intel.com> --- .../BlackBoxTest/SimpleNetworkBBTestFunction.c | 64 +++++++++++----------- 1 file changed, 33 insertions(+), 31 deletions(-) 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 133ef8a9..563e5361 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 @@ -1888,38 +1888,40 @@ BBTestGetStatusFunctionTest ( Status = SnpInterface->GetStatus (SnpInterface, &InterruptStatus, &TxBuf); Status1 = SnpInterface->GetStatus (SnpInterface, &InterruptStatus, &TxBuf); - if (SnpInterface->Mode->MediaPresent == FALSE) { - if ((Status1 == EFI_SUCCESS) && (Status == EFI_SUCCESS) && (InterruptStatus == 0)) { - AssertionType = EFI_TEST_ASSERTION_PASSED; - } else { - AssertionType = EFI_TEST_ASSERTION_FAILED; - } - } else { - if ((Status1 == EFI_SUCCESS) && (Status == EFI_SUCCESS)) { - AssertionType = EFI_TEST_ASSERTION_PASSED; - if (InterruptStatus & - ~( EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT | - EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT | - EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT | - EFI_SIMPLE_NETWORK_SOFTWARE_INTERRUPT)) { - AssertionType = EFI_TEST_ASSERTION_FAILED; - } - } else { - AssertionType = EFI_TEST_ASSERTION_FAILED; - } + if (SnpInterface->Mode-> MediaPresentSupported == TRUE) { + if (SnpInterface->Mode->MediaPresent == FALSE) { + if ((Status1 == EFI_SUCCESS) && (Status == EFI_SUCCESS) && (InterruptStatus == 0)) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } + } else { + if ((Status1 == EFI_SUCCESS) && (Status == EFI_SUCCESS)) { + AssertionType = EFI_TEST_ASSERTION_PASSED; + if (InterruptStatus & + ~( EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT | + EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT | + EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT | + EFI_SIMPLE_NETWORK_SOFTWARE_INTERRUPT)) { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } + } else { + AssertionType = EFI_TEST_ASSERTION_FAILED; + } + } + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestFunctionAssertionGuid022, + L"EFI_SIMPLE_NETWORK_PROTOCOL.GetStatus - Invoke GetStatus() and verify interface correctness within test case", + L"%a:%d:Status - %r, Status1 - %r, InterruptStatus - %d", + __FILE__, + (UINTN)__LINE__, + Status, + Status1, + InterruptStatus + ); } - StandardLib->RecordAssertion ( - StandardLib, - AssertionType, - gSimpleNetworkBBTestFunctionAssertionGuid022, - L"EFI_SIMPLE_NETWORK_PROTOCOL.GetStatus - Invoke GetStatus() and verify interface correctness within test case", - L"%a:%d:Status - %r, Status1 - %r, InterruptStatus - %d", - __FILE__, - (UINTN)__LINE__, - Status, - Status1, - InterruptStatus - ); // // Restore SNP State -- 2.14.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#47907): https://edk2.groups.io/g/devel/message/47907 Mute This Topic: https://groups.io/mt/34258689/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
