[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.

[Nick Wang]

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 at 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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40162): https://edk2.groups.io/g/devel/message/40162
Mute This Topic: https://groups.io/mt/31539240/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20190508/d40490bc/attachment.htm>