From 93e3992d1ea50fb30c48f498d257d4e66252dd9b Mon Sep 17 00:00:00 2001 From: qwang12 Date: Mon, 21 Jan 2008 14:39:56 +0000 Subject: UEFI HII: Merge UEFI HII support changes from branch. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4599 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c | 8 ++++---- MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'MdeModulePkg/Universal/DevicePathDxe') diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c index db93c6daa1..7055c74571 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c @@ -2359,14 +2359,14 @@ DevPathFromTextSata ( MSG_SATA_DP, sizeof (SATA_DEVICE_PATH) ); - Sata->HbaPortNumber = (UINT16) Xtoi (Param1); + Sata->HBAPortNumber = (UINT16) Xtoi (Param1); if (Param3 != NULL) { - Sata->PortMultiplierPort = (UINT16) Xtoi (Param2); + Sata->PortMultiplierPortNumber = (UINT16) Xtoi (Param2); Param2 = Param3; } else { - Sata->PortMultiplierPort = 0; + Sata->PortMultiplierPortNumber = 0; } - Sata->LogicalUnitNumber = (UINT16) Xtoi (Param2); + Sata->Lun = (UINT16) Xtoi (Param2); return (EFI_DEVICE_PATH_PROTOCOL *) Sata; } diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c index 546c4a40e3..78c95737a4 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c @@ -830,9 +830,9 @@ DevPathToTextSata ( CatPrint ( Str, L"Sata(0x%x,0x%x,0x%x)", - (UINTN) Sata->HbaPortNumber, - (UINTN) Sata->PortMultiplierPort, - (UINTN) Sata->LogicalUnitNumber + (UINTN) Sata->HBAPortNumber, + (UINTN) Sata->PortMultiplierPortNumber, + (UINTN) Sata->Lun ); } -- cgit v1.2.3