tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SATA Device path updated. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8009 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
gikidy 2009-04-02 08:32:41 +00:00
parent 28d3e14ffb
commit 9aaaeb2804
1 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
IntelFrameworkModulePkg/Library/GenericBdsLib/DevicePath.c
View File

@ -140,7 +140,7 @@ DevPathMemMap (
CatPrint (
Str,
L"MemMap(%d:%lx-%lx)",
MemMap->MemoryType,
(UINTN) MemMap->MemoryType,
MemMap->StartingAddress,
MemMap->EndingAddress
);
@ -239,7 +239,7 @@ DevPathVendor (
L"SAS(%lx,%lx,%x,",
((SAS_DEVICE_PATH *) Vendor)->SasAddress,
((SAS_DEVICE_PATH *) Vendor)->Lun,
((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort
(UINTN) ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort
);
Info = (((SAS_DEVICE_PATH *) Vendor)->DeviceTopology);
if ((Info & 0x0f) == 0) {
@ -345,16 +345,12 @@ DevPathExtendedAcpi (
UINT16 Anchor;
CHAR8 *AsChar8Array;
ASSERT (Str != NULL);
ASSERT (DevPath != NULL);
HIDSTRIdx = 0;
UIDSTRIdx = 0;
CIDSTRIdx = 0;
ExtendedAcpi = DevPath;
Length = (UINT16) DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) ExtendedAcpi);
ASSERT (Length >= 19);
AsChar8Array = (CHAR8 *) ExtendedAcpi;
//
@ -560,7 +556,7 @@ DevPath1394 (
F1394_DEVICE_PATH *F1394Path;
F1394Path = DevPath;
CatPrint (Str, L"1394(%g)", &F1394Path->Guid);
CatPrint (Str, L"1394(%lx)", &F1394Path->Guid);
}
/**
@ -684,13 +680,22 @@ DevPathSata (
SATA_DEVICE_PATH *Sata;
Sata = DevPath;
CatPrint (
Str,
L"Sata(%x,%x,%x)",
(UINTN) Sata->HBAPortNumber,
(UINTN) Sata->PortMultiplierPortNumber,
(UINTN) Sata->Lun
);
if (Sata->PortMultiplierPortNumber & SATA_HBA_DIRECT_CONNECT_FLAG) {
CatPrint (
Str,
L"Sata(%x,%x)",
(UINTN) Sata->HBAPortNumber,
(UINTN) Sata->Lun
);
} else {
CatPrint (
Str,
L"Sata(%x,%x,%x)",
(UINTN) Sata->HBAPortNumber,
(UINTN) Sata->PortMultiplierPortNumber,
(UINTN) Sata->Lun
);
}
}
/**
@ -905,7 +910,7 @@ DevPathUart (
if (Uart->BaudRate == 0) {
CatPrint (Str, L"Uart(DEFAULT,%c,", Parity);
} else {
CatPrint (Str, L"Uart(%d,%c,", Uart->BaudRate, Parity);
CatPrint (Str, L"Uart(%ld,%c,", Uart->BaudRate, Parity);
}
if (Uart->DataBits == 0) {
@ -956,15 +961,12 @@ DevPathiSCSI (
ISCSI_DEVICE_PATH_WITH_NAME *IScsi;
UINT16 Options;
ASSERT (Str != NULL);
ASSERT (DevPath != NULL);
IScsi = DevPath;
CatPrint (
Str,
L"iSCSI(%s,%x,%lx,",
L"iSCSI(%a,%x,%lx,",
IScsi->iSCSITargetName,
IScsi->TargetPortalGroupTag,
(UINTN) IScsi->TargetPortalGroupTag,
IScsi->Lun
);
@ -1214,6 +1216,27 @@ DevPathNodeUnknown (
{
CatPrint (Str, L"?");
}
/**
Convert Device Path to a Unicode string for printing.
@param Str The buffer holding the output string.
This buffer contains the length of the
string and the maximum length reserved
for the string buffer.
@param DevPath The device path.
**/
VOID
DevPathFvPath (
IN OUT POOL_PRINT *Str,
IN VOID *DevPath
)
{
MEDIA_FW_VOL_DEVICE_PATH *FvPath;
FvPath = DevPath;
CatPrint (Str, L"Fv(%g)", &FvPath->FvName);
}
DEVICE_PATH_STRING_TABLE DevPathTable[] = {
{
@ -1366,6 +1389,11 @@ DEVICE_PATH_STRING_TABLE DevPathTable[] = {
MEDIA_PROTOCOL_DP,
DevPathMediaProtocol
},
{
MEDIA_DEVICE_PATH,
MEDIA_PIWG_FW_VOL_DP,
DevPathFvPath,
},
{
MEDIA_DEVICE_PATH,
MEDIA_PIWG_FW_FILE_DP,