From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 461AC211158DA for ; Sun, 7 Oct 2018 23:48:22 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Oct 2018 23:48:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,355,1534834800"; d="scan'208";a="79579716" Received: from ray-dev.ccr.corp.intel.com (HELO [10.239.9.11]) ([10.239.9.11]) by orsmga008.jf.intel.com with ESMTP; 07 Oct 2018 23:48:20 -0700 To: Dandan Bi , edk2-devel@lists.01.org Cc: Michael D Kinney , Liming Gao References: <20181008033158.10652-1-dandan.bi@intel.com> <20181008033158.10652-3-dandan.bi@intel.com> From: "Ni, Ruiyu" Message-ID: <8dbb53c9-1bb4-c7ef-a3b2-868bbabb3b9d@Intel.com> Date: Mon, 8 Oct 2018 14:49:28 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20181008033158.10652-3-dandan.bi@intel.com> Subject: Re: [patch 3/5] MdePkg: Correct condition check for AcpiExp text format 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: Mon, 08 Oct 2018 06:48:22 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 10/8/2018 11:31 AM, Dandan Bi wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1226 > > According to UEFI Spec, for ACPI Expanded Device Path, > when HIDSTR=empty, CIDSTR=empty, UID STR!=empty, > the ACPI Expanded Device Path node can be displayed as > AcpiExp(HID,CID,UIDSTR) format. > And if UID is 0 and UIDSTR is empty, then use AcpiEx format. > > This patch is to correct the condition check to follow UEFI > Spec when convert the device path node to the AcpiExp text > format. > > Cc: Ruiyu Ni > Cc: Michael D Kinney > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Dandan Bi > --- > MdePkg/Library/UefiDevicePathLib/DevicePathToText.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c > index 1c08a3ec2f..8e5efba1e8 100644 > --- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c > +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c > @@ -453,11 +453,11 @@ DevPathToTextAcpiEx ( > ((AcpiEx->CID >> 5) & 0x1f) + 'A' - 1, > ((AcpiEx->CID >> 0) & 0x1f) + 'A' - 1, > (AcpiEx->CID >> 16) & 0xFFFF > ); > > - if ((*HIDStr == '\0') && (*CIDStr == '\0') && (AcpiEx->UID == 0)) { > + if ((*HIDStr == '\0') && (*CIDStr == '\0') && (*UIDStr != '\0')) { > // > // use AcpiExp() > // > UefiDevicePathLibCatPrint ( > Str, > Reviewed-by: Ruiyu Ni -- Thanks, Ray