From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: insyde.com, ip: 210.71.195.45, mailfrom: nick.wang@insyde.com) Received: from out01.hibox.biz (out01.hibox.biz [210.71.195.45]) by groups.io with SMTP; Tue, 07 May 2019 19:03:02 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2ADAADoNdJc/ww0GKxkGQEBAQEBAQE?= =?us-ascii?q?BAQEBAQcBAQEBAQGBUQQBAQEBAQsBhCWEEIgcn19jhRgUgWcQgXiCdYI7NAk?= =?us-ascii?q?OAQMBAQUBAQEBAoEJDIV0BFEBKBQWBAcCCwMCAQIBSwEMAQUCAQGyZnwlDho?= =?us-ascii?q?CA4UpgyGBRYEyAYFfiFCCdT+DdWyBDoJ7g0WCWASSWTo8k3MHAoILVQSRdhu?= =?us-ascii?q?MMQOJIy2DRYgyjRqIBIFPgg4zGiODPIIaARcUi2WCM2WRSAEB?= X-IronPort-AV: E=Sophos;i="5.60,444,1549900800"; d="scan'208,217";a="35791355" Received: from unknown (HELO hb3-BKT202.hibox.biz) ([172.24.52.12]) by out01.hibox.biz with ESMTP; 08 May 2019 10:03:00 +0800 Received: from unknown (HELO hb3-BKT102.hibox.biz) ([172.24.51.12]) by hb3-BKT202.hibox.biz with ESMTP; 08 May 2019 10:02:58 +0800 Received: from unknown (HELO hb3-IN03.hibox.biz) ([172.24.12.13]) by hb3-BKT102.hibox.biz with ESMTP; 08 May 2019 10:03:00 +0800 X-Remote-IP: 60.250.30.118 X-Remote-Host: 60-250-30-118.hinet-ip.hinet.net X-SBRS: 2.7 X-MID: 23889613 X-Auth-ID: nick.wang@insyde.com X-EnvelopeFrom: nick.wang@insyde.com Received: from 60-250-30-118.hinet-ip.hinet.net (HELO [127.0.0.1]) ([60.250.30.118]) by hb3-IN03.hibox.biz with ESMTP/TLS/AES128-SHA; 08 May 2019 10:03:00 +0800 Message-ID: <5CD238D2.3030909@insyde.com> Date: Wed, 08 May 2019 10:02:58 +0800 From: "Nick Wang" User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: devel@edk2.groups.io, supreeth.venkatesh@arm.com, "Jin, Eric" CC: IMCEAINVALID-+40intel+2Ecom+20+3E+3E+20Jin@arm.com, ruth.li@intel.com Subject: [edk2-devel][edk2-test][PATCH V2] EFI/Protocol: Fix to use VENDOR_DEVICE_PATH to create the Debug port device node for DevicePath related protocol tests. Content-Type: multipart/alternative; boundary="------------030504030502070108050402" --------------030504030502070108050402 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Follow edk2 tree hash: 9343d0a1cd09544686b14dba5b428d7bc811f6b9 to use VENDOR_DEVICE_PATH to create the Debug port device node. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Nick Wang --- .../DevicePathFromTextBBTestCoverage.c | 16 +++++++--------- .../BlackBoxTest/DevicePathToTextBBTestMain.c | 5 +++-- uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 11 deletions(-) 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 96cd84fd..98187a62 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 @@ -2,6 +2,7 @@ Copyright 2006 - 2017 Unified EFI, Inc. Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. + Copyright (c) 2019, Insyde Software Corp. All Rights Reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -1105,22 +1106,19 @@ CreateSASExDeviceNode ( return (EFI_DEVICE_PATH_PROTOCOL *) SasEx; } -#define DebugPortNodeType 3 -#define DebugPortNodeSubType 10 - STATIC EFI_DEVICE_PATH_PROTOCOL * CreateDebugPortDeviceNode ( IN CHAR16 *TextDeviceNode ) { - VENDOR_DEFINED_MESSAGING_DEVICE_PATH *Vend; + VENDOR_DEVICE_PATH *Vend; - Vend = (VENDOR_DEFINED_MESSAGING_DEVICE_PATH *) CreateDeviceNode ( - DebugPortNodeType, - DebugPortNodeSubType, - sizeof(VENDOR_DEFINED_MESSAGING_DEVICE_PATH) - ); + Vend = (VENDOR_DEVICE_PATH *) CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP, + sizeof(VENDOR_DEVICE_PATH) + ); Vend->Guid = gBlackBoxEfiDebugPortProtocolGuid; return (EFI_DEVICE_PATH_PROTOCOL *) Vend; 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 d0809776..32ce720d 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 @@ -2,6 +2,7 @@ Copyright 2006 - 2017 Unified EFI, Inc. Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved. + Copyright (c) 2019, Insyde Software Corp. All Rights Reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -1708,9 +1709,9 @@ BuildDebugPortDeviceNode ( IN CHAR16 *TextDeviceNode ) { - VENDOR_DEFINED_MESSAGING_DEVICE_PATH *Vend; + VENDOR_DEVICE_PATH *Vend; - Vend = (VENDOR_DEFINED_MESSAGING_DEVICE_PATH *) CreateDeviceNode (0x3, 0x0a, sizeof (VENDOR_DEFINED_MESSAGING_DEVICE_PATH)); + Vend = (VENDOR_DEVICE_PATH *) CreateDeviceNode (MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH)); Vend->Guid = gBlackBoxEfiDebugPortProtocolGuid; diff --git a/uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h b/uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h index f69dc761..8bce7f14 100644 --- a/uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h +++ b/uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h @@ -2,6 +2,7 @@ Copyright 2006 - 2017 Unified EFI, Inc. Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. + Copyright (c) 2019, Insyde Software Corp. All Rights Reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -502,6 +503,14 @@ typedef struct { // } ACPI_ADR_DEVICE_PATH; + +/// +/// Messaging Device Paths. +/// This Device Path is used to describe the connection of devices outside the resource domain of the +/// system. This Device Path can describe physical messaging information like SCSI ID, or abstract +/// information like networking protocol IP addresses. +/// +#define MESSAGING_DEVICE_PATH 0x03 /// /// SCSI Device Path SubType. /// @@ -662,6 +671,12 @@ typedef struct { UINT8 Lun; } DEVICE_LOGICAL_UNIT_DEVICE_PATH; +// +// Use VENDOR_DEVICE_PATH struct +// +#define MSG_VENDOR_DP 0x0a +typedef VENDOR_DEVICE_PATH VENDOR_DEFINED_DEVICE_PATH; + /// /// CD-ROM Media Device Path SubType. /// -- 2.19.1.windows.1 --------------030504030502070108050402 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit Follow edk2 tree hash: 9343d0a1cd09544686b14dba5b428d7bc811f6b9 to use VENDOR_DEVICE_PATH to create the Debug port device node.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Nick Wang <nick.wang@insyde.com>
---
.../DevicePathFromTextBBTestCoverage.c | 16 +++++++---------
.../BlackBoxTest/DevicePathToTextBBTestMain.c | 5 +++--
uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h | 15 +++++++++++++++
3 files changed, 25 insertions(+), 11 deletions(-)

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 96cd84fd..98187a62 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
@@ -2,6 +2,7 @@

Copyright 2006 - 2017 Unified EFI, Inc.

Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.

+ Copyright (c) 2019, Insyde Software Corp. All Rights Reserved.


This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -1105,22 +1106,19 @@ CreateSASExDeviceNode (
return (EFI_DEVICE_PATH_PROTOCOL *) SasEx;
}

-#define DebugPortNodeType 3
-#define DebugPortNodeSubType 10
-
STATIC
EFI_DEVICE_PATH_PROTOCOL *
CreateDebugPortDeviceNode (
IN CHAR16 *TextDeviceNode
)
{
- VENDOR_DEFINED_MESSAGING_DEVICE_PATH *Vend;
+ VENDOR_DEVICE_PATH *Vend;

- Vend = (VENDOR_DEFINED_MESSAGING_DEVICE_PATH *) CreateDeviceNode (
- DebugPortNodeType,
- DebugPortNodeSubType,
- sizeof(VENDOR_DEFINED_MESSAGING_DEVICE_PATH)
- );
+ Vend = (VENDOR_DEVICE_PATH *) CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_VENDOR_DP,
+ sizeof(VENDOR_DEVICE_PATH)
+ );
Vend->Guid = gBlackBoxEfiDebugPortProtocolGuid;

return (EFI_DEVICE_PATH_PROTOCOL *) Vend;
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 d0809776..32ce720d 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
@@ -2,6 +2,7 @@

Copyright 2006 - 2017 Unified EFI, Inc.

Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.

+ Copyright (c) 2019, Insyde Software Corp. All Rights Reserved.


This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -1708,9 +1709,9 @@ BuildDebugPortDeviceNode (
IN CHAR16 *TextDeviceNode
)
{
- VENDOR_DEFINED_MESSAGING_DEVICE_PATH *Vend;
+ VENDOR_DEVICE_PATH *Vend;

- Vend = (VENDOR_DEFINED_MESSAGING_DEVICE_PATH *) CreateDeviceNode (0x3, 0x0a, sizeof (VENDOR_DEFINED_MESSAGING_DEVICE_PATH));
+ Vend = (VENDOR_DEVICE_PATH *) CreateDeviceNode (MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH));

Vend->Guid = gBlackBoxEfiDebugPortProtocolGuid;

diff --git a/uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h b/uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h
index f69dc761..8bce7f14 100644
--- a/uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h
+++ b/uefi-sct/SctPkg/UEFI/Protocol/DevicePath.h
@@ -2,6 +2,7 @@

Copyright 2006 - 2017 Unified EFI, Inc.

Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.

+ Copyright (c) 2019, Insyde Software Corp. All Rights Reserved.


This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -502,6 +503,14 @@ typedef struct {
//
} ACPI_ADR_DEVICE_PATH;

+
+///
+/// Messaging Device Paths.
+/// This Device Path is used to describe the connection of devices outside the resource domain of the
+/// system. This Device Path can describe physical messaging information like SCSI ID, or abstract
+/// information like networking protocol IP addresses.
+///
+#define MESSAGING_DEVICE_PATH 0x03
///
/// SCSI Device Path SubType.
///
@@ -662,6 +671,12 @@ typedef struct {
UINT8 Lun;
} DEVICE_LOGICAL_UNIT_DEVICE_PATH;

+//
+// Use VENDOR_DEVICE_PATH struct
+//
+#define MSG_VENDOR_DP 0x0a
+typedef VENDOR_DEVICE_PATH VENDOR_DEFINED_DEVICE_PATH;
+
///
/// CD-ROM Media Device Path SubType.
///
--
2.19.1.windows.1

 --------------030504030502070108050402--