From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=eric.jin@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5D0A921962301 for ; Thu, 11 Oct 2018 19:43:22 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Oct 2018 19:43:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,370,1534834800"; d="scan'208";a="78167214" Received: from shwdeopenpsi175.ccr.corp.intel.com ([10.239.9.140]) by fmsmga008.fm.intel.com with ESMTP; 11 Oct 2018 19:43:03 -0700 From: Eric Jin To: edk2-devel@lists.01.org Cc: Supreeth Venkatesh , Jiaxin Wu Date: Fri, 12 Oct 2018 10:42:59 +0800 Message-Id: <20181012024259.2112-1-eric.jin@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 Subject: [edk2-test][Patch] uefi-sct\SctPkg: Define new AIP info block for wireless NIC X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Oct 2018 02:43:22 -0000 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Jin Cc: Supreeth Venkatesh Cc: Jiaxin Wu --- .../AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c | 5 +++-- .../Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c | 5 +++-- .../AdapterInfo/BlackBoxTest/AdapterInfoProtocolBBTest.inf | 4 ++-- .../TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.c | 3 ++- .../TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.h | 6 +++++- .../AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c | 9 +++++---- .../Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c | 5 +++-- .../TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.c | 4 +++- .../TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.h | 6 +++++- uefi-sct/SctPkg/UEFI/Protocol/AdapterInfo.h | 9 +++++++-- 10 files changed, 38 insertions(+), 18 deletions(-) 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 33eddaa..334bb9e 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 @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2016 Unified EFI, Inc.
- Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -512,7 +512,8 @@ BBTestGetSupportedTypesFunctionTestCheckpoint1 ( if (!GuidCmp (*InfoType, gEfiAdapterInfoMediaStateGuid) || !GuidCmp (*InfoType, gEfiAdapterInfoNetworkBootGuid) || !GuidCmp (*InfoType, gEfiAdapterInfoSanMacAddressGuid) || - !GuidCmp (*InfoType, gEfiAdapterInfoUndiIPv6SupportGuid)) + !GuidCmp (*InfoType, gEfiAdapterInfoUndiIPv6SupportGuid) || + !GuidCmp (*InfoType, gEfiAdapterInfoMediaTypeGuid)) AssertionType = EFI_TEST_ASSERTION_PASSED; else AssertionType = EFI_TEST_ASSERTION_WARNING; diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c index e533895..cc37a49 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2017 Unified EFI, Inc.
- Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -158,7 +158,8 @@ InfoTypeAndBlockSizeCmp( if ((!GuidCmp (InformationType,gEfiAdapterInfoMediaStateGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_MEDIA_STATE)) || (!GuidCmp (InformationType,gEfiAdapterInfoNetworkBootGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_NETWORK_BOOT)) || (!GuidCmp (InformationType,gEfiAdapterInfoSanMacAddressGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_SAN_MAC_ADDRESS)) || - (!GuidCmp (InformationType,gEfiAdapterInfoUndiIPv6SupportGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT)) ) + (!GuidCmp (InformationType,gEfiAdapterInfoUndiIPv6SupportGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT)) || + (!GuidCmp (InformationType,gEfiAdapterInfoMediaTypeGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_MEDIA_TYPE))) return FALSE; else return TRUE; diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoProtocolBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoProtocolBBTest.inf index 718faf0..b3bf994 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoProtocolBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoProtocolBBTest.inf @@ -1,7 +1,7 @@ ## @file # # Copyright 2006 - 2013 Unified EFI, Inc.
-# Copyright (c) 2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -20,7 +20,7 @@ # # Abstract: # -# Component description file for Acpi Table Protocol Black-Box Test. +# Component description file for Adapter Info Protocol Black-Box Test. # #--*/ diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.c index 82782d5..35b5f76 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.c @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2015 Unified EFI, Inc.
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -63,6 +63,7 @@ EFI_GUID gEfiAdapterInfoNetworkBootGuid = EFI_ADAPTER_INFO_NETWORK_B EFI_GUID gEfiAdapterInfoUndiIPv6SupportGuid = EFI_ADAPTER_INFO_NETWORK_BOOT_GUID; +EFI_GUID gEfiAdapterInfoMediaTypeGuid = EFI_ADAPTER_INFO_MEDIA_TYPE_GUID; EFI_GUID gEfiUnSupportedGuid = EFI_UNSUPPORTED_GUID; diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.h index 492708d..68b8db9 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.h +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/Guid.h @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2015 Unified EFI, Inc.
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -120,6 +120,10 @@ extern EFI_GUID gEfiAdapterInfoSanMacAddressGuid; extern EFI_GUID gEfiAdapterInfoUndiIPv6SupportGuid; +#define EFI_ADAPTER_INFO_MEDIA_TYPE_GUID \ +{ 0x8484472f, 0x71ec, 0x411a, { 0xb3, 0x9c, 0x62, 0xcd, 0x94, 0xd9, 0x91, 0x6e }} + +extern EFI_GUID gEfiAdapterInfoMediaTypeGuid; #define EFI_UNSUPPORTED_GUID \ { 0xa86aeb76, 0x3104, 0x45fb, { 0x8a, 0x9f, 0x72, 0x2d, 0x6e, 0x55, 0x3d, 0x74 }} diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c index de9b466..334bb9e 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestFunction.c @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2016 Unified EFI, Inc.
- Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -333,7 +333,7 @@ BBTestSetInformationFunctionTestCheckpoint1 ( Status = AdapterInfo->GetInformation( AdapterInfo, InfoType, - &InformationBlockGet1, + (VOID **) &InformationBlockGet1, &InformationBlockSize1 ); @@ -408,7 +408,7 @@ BBTestSetInformationFunctionTestCheckpoint1 ( Status = AdapterInfo->GetInformation( AdapterInfo, InfoType, - &InformationBlockGet2, + (VOID **) &InformationBlockGet2, &InformationBlockSize2 ); @@ -512,7 +512,8 @@ BBTestGetSupportedTypesFunctionTestCheckpoint1 ( if (!GuidCmp (*InfoType, gEfiAdapterInfoMediaStateGuid) || !GuidCmp (*InfoType, gEfiAdapterInfoNetworkBootGuid) || !GuidCmp (*InfoType, gEfiAdapterInfoSanMacAddressGuid) || - !GuidCmp (*InfoType, gEfiAdapterInfoUndiIPv6SupportGuid)) + !GuidCmp (*InfoType, gEfiAdapterInfoUndiIPv6SupportGuid) || + !GuidCmp (*InfoType, gEfiAdapterInfoMediaTypeGuid)) AssertionType = EFI_TEST_ASSERTION_PASSED; else AssertionType = EFI_TEST_ASSERTION_WARNING; diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c index 38a5e28..bcbed44 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoBBTestMain.c @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2017 Unified EFI, Inc.
- Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -158,7 +158,8 @@ InfoTypeAndBlockSizeCmp( if ((!GuidCmp (InformationType,gEfiAdapterInfoMediaStateGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_MEDIA_STATE)) || (!GuidCmp (InformationType,gEfiAdapterInfoNetworkBootGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_NETWORK_BOOT)) || (!GuidCmp (InformationType,gEfiAdapterInfoSanMacAddressGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_SAN_MAC_ADDRESS)) || - (!GuidCmp (InformationType,gEfiAdapterInfoUndiIPv6SupportGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT)) ) + (!GuidCmp (InformationType,gEfiAdapterInfoUndiIPv6SupportGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT)) || + (!GuidCmp (InformationType,gEfiAdapterInfoMediaTypeGuid) && InformationBlockSize != sizeof(EFI_ADAPTER_INFO_MEDIA_TYPE))) return FALSE; else return TRUE; diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.c index 82782d5..b58e8ac 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.c @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2015 Unified EFI, Inc.
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -63,6 +63,8 @@ EFI_GUID gEfiAdapterInfoNetworkBootGuid = EFI_ADAPTER_INFO_NETWORK_B EFI_GUID gEfiAdapterInfoUndiIPv6SupportGuid = EFI_ADAPTER_INFO_NETWORK_BOOT_GUID; +EFI_GUID gEfiAdapterInfoMediaTypeGuid = EFI_ADAPTER_INFO_MEDIA_TYPE_GUID; + EFI_GUID gEfiUnSupportedGuid = EFI_UNSUPPORTED_GUID; diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.h b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.h index 492708d..68b8db9 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.h +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/Guid.h @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2015 Unified EFI, Inc.
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -120,6 +120,10 @@ extern EFI_GUID gEfiAdapterInfoSanMacAddressGuid; extern EFI_GUID gEfiAdapterInfoUndiIPv6SupportGuid; +#define EFI_ADAPTER_INFO_MEDIA_TYPE_GUID \ +{ 0x8484472f, 0x71ec, 0x411a, { 0xb3, 0x9c, 0x62, 0xcd, 0x94, 0xd9, 0x91, 0x6e }} + +extern EFI_GUID gEfiAdapterInfoMediaTypeGuid; #define EFI_UNSUPPORTED_GUID \ { 0xa86aeb76, 0x3104, 0x45fb, { 0x8a, 0x9f, 0x72, 0x2d, 0x6e, 0x55, 0x3d, 0x74 }} diff --git a/uefi-sct/SctPkg/UEFI/Protocol/AdapterInfo.h b/uefi-sct/SctPkg/UEFI/Protocol/AdapterInfo.h index dbe1ad2..e84d143 100644 --- a/uefi-sct/SctPkg/UEFI/Protocol/AdapterInfo.h +++ b/uefi-sct/SctPkg/UEFI/Protocol/AdapterInfo.h @@ -1,7 +1,7 @@ /** @file Copyright 2006 - 2015 Unified EFI, Inc.
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -96,9 +96,14 @@ typedef struct { } EFI_ADAPTER_INFO_SAN_MAC_ADDRESS; typedef struct { -BOOLEAN Ipv6Support; + BOOLEAN Ipv6Support; } EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT; +typedef struct { + UINT8 MediaType; +} EFI_ADAPTER_INFO_MEDIA_TYPE; + + extern EFI_GUID gEfiAdapterInformationProtocolGuid; #endif -- 2.9.0.windows.1