* [edk2-test][Patch] uefi-sct\SctPkg: Define new AIP info block for wireless NIC
@ 2018-10-12 2:42 Eric Jin
2018-10-12 8:43 ` Supreeth Venkatesh
0 siblings, 1 reply; 2+ messages in thread
From: Eric Jin @ 2018-10-12 2:42 UTC (permalink / raw)
To: edk2-devel; +Cc: Supreeth Venkatesh, Jiaxin Wu
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Jin <eric.jin@intel.com>
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
---
.../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.<BR>
- Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, 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
@@ -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.<BR>
- Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, 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
@@ -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.<BR>
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2013 - 2018, 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
@@ -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.<BR>
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, 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
@@ -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.<BR>
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, 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
@@ -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.<BR>
- Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, 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
@@ -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.<BR>
- Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, 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
@@ -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.<BR>
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, 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
@@ -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.<BR>
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, 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
@@ -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.<BR>
- Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2013 - 2018, 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
@@ -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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [edk2-test][Patch] uefi-sct\SctPkg: Define new AIP info block for wireless NIC
2018-10-12 2:42 [edk2-test][Patch] uefi-sct\SctPkg: Define new AIP info block for wireless NIC Eric Jin
@ 2018-10-12 8:43 ` Supreeth Venkatesh
0 siblings, 0 replies; 2+ messages in thread
From: Supreeth Venkatesh @ 2018-10-12 8:43 UTC (permalink / raw)
To: Eric Jin, edk2-devel; +Cc: Jiaxin Wu
Migrating over from
https://github.com/UEFI/UEFI-SCT/commit/7550cc65a81cc20267cfe9baa5c4f5189d9ea327
Reviewed-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
On 10/12/2018 03:42 AM, Eric Jin wrote:
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Jin <eric.jin@intel.com>
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> ---
> .../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.<BR>
> - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2013 - 2018, 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
> @@ -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.<BR>
> - Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2013 - 2018, 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
> @@ -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.<BR>
> -# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2013 - 2018, 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
> @@ -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.<BR>
> - Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2013 - 2018, 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
> @@ -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.<BR>
> - Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2013 - 2018, 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
> @@ -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.<BR>
> - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2013 - 2018, 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
> @@ -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.<BR>
> - Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2013 - 2018, 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
> @@ -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.<BR>
> - Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2013 - 2018, 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
> @@ -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.<BR>
> - Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2013 - 2018, 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
> @@ -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.<BR>
> - Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2013 - 2018, 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
> @@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-12 8:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-12 2:42 [edk2-test][Patch] uefi-sct\SctPkg: Define new AIP info block for wireless NIC Eric Jin
2018-10-12 8:43 ` Supreeth Venkatesh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox