From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.101.70, mailfrom: supreeth.venkatesh@arm.com) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by groups.io with SMTP; Wed, 08 May 2019 13:21:45 -0700 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5DE63374; Wed, 8 May 2019 13:21:45 -0700 (PDT) Received: from supven01-thinkstation-p720.austin.arm.com (supven01-thinkstation-p720.austin.arm.com [10.118.30.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1ADB33F575; Wed, 8 May 2019 13:21:45 -0700 (PDT) Message-ID: Subject: Re: [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. From: "Supreeth Venkatesh" To: Nick Wang , devel@edk2.groups.io, "Jin, Eric" Cc: ruth.li@intel.com Date: Wed, 08 May 2019 20:20:42 +0000 In-Reply-To: <5CD238D2.3030909@insyde.com> References: <5CD238D2.3030909@insyde.com> X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.1 Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Wed, 2019-05-08 at 10:02 +0800, Nick Wang wrote: > 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 Reviewed-by: Supreeth Venkatesh > --- > .../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/D > evicePathToTextBBTestMain.c b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/D > evicePathToTextBBTestMain.c > index d0809776..32ce720d 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/D > evicePathToTextBBTestMain.c > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/D > evicePathToTextBBTestMain.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 >