diff options
| author | Michael Kubacki <michael.kubacki@microsoft.com> | 2021-12-05 14:54:05 -0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-12-07 17:24:28 +0000 |
| commit | 2f88bd3a1296c522317f1c21377876de63de5be7 (patch) | |
| tree | ba47875489cc5698061275a495983e9dea3be098 /MdePkg/Library/UefiDevicePathLib | |
| parent | 1436aea4d5707e672672a11bda72be2c63c936c3 (diff) | |
| download | edk2-2f88bd3a1296c522317f1c21377876de63de5be7.tar.gz edk2-2f88bd3a1296c522317f1c21377876de63de5be7.tar.bz2 edk2-2f88bd3a1296c522317f1c21377876de63de5be7.zip | |
MdePkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737
Apply uncrustify changes to .c/.h files in the MdePkg package
Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Diffstat (limited to 'MdePkg/Library/UefiDevicePathLib')
8 files changed, 1549 insertions, 1503 deletions
diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c index 1515d2d590..1aaa968d6f 100644 --- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c @@ -38,8 +38,8 @@ UefiDevicePathLibStrDuplicate ( **/
CHAR16 *
GetParamByNodeName (
- IN CHAR16 *Str,
- IN CHAR16 *NodeName
+ IN CHAR16 *Str,
+ IN CHAR16 *NodeName
)
{
CHAR16 *ParamStr;
@@ -65,14 +65,16 @@ GetParamByNodeName ( //
ParamStr++;
ParameterLength = 0;
- StrPointer = ParamStr;
+ StrPointer = ParamStr;
while (!IS_NULL (*StrPointer)) {
if (IS_RIGHT_PARENTH (*StrPointer)) {
break;
}
+
StrPointer++;
ParameterLength++;
}
+
if (IS_NULL (*StrPointer)) {
//
// ')' not found
@@ -84,6 +86,7 @@ GetParamByNodeName ( if (ParamStr == NULL) {
return NULL;
}
+
//
// Terminate the parameter string
//
@@ -106,14 +109,14 @@ GetParamByNodeName ( **/
CHAR16 *
SplitStr (
- IN OUT CHAR16 **List,
- IN CHAR16 Separator
+ IN OUT CHAR16 **List,
+ IN CHAR16 Separator
)
{
CHAR16 *Str;
CHAR16 *ReturnStr;
- Str = *List;
+ Str = *List;
ReturnStr = Str;
if (IS_NULL (*Str)) {
@@ -127,6 +130,7 @@ SplitStr ( if (*Str == Separator) {
break;
}
+
Str++;
}
@@ -156,7 +160,7 @@ SplitStr ( **/
CHAR16 *
GetNextParamStr (
- IN OUT CHAR16 **List
+ IN OUT CHAR16 **List
)
{
//
@@ -196,9 +200,11 @@ GetNextDeviceNodeStr ( if (!IS_SLASH (*Str) &&
!IS_COMMA (*Str) &&
!IS_LEFT_PARENTH (*Str) &&
- !IS_RIGHT_PARENTH (*Str)) {
+ !IS_RIGHT_PARENTH (*Str))
+ {
break;
}
+
Str++;
}
@@ -231,7 +237,7 @@ GetNextDeviceNodeStr ( if (IS_COMMA (*Str)) {
*IsInstanceEnd = TRUE;
- *Str = L'\0';
+ *Str = L'\0';
Str++;
} else {
*IsInstanceEnd = FALSE;
@@ -246,7 +252,6 @@ GetNextDeviceNodeStr ( return ReturnStr;
}
-
/**
Return whether the integer string is a hex string.
@@ -258,23 +263,24 @@ GetNextDeviceNodeStr ( **/
BOOLEAN
IsHexStr (
- IN CHAR16 *Str
+ IN CHAR16 *Str
)
{
//
// skip preceeding white space
//
while ((*Str != 0) && *Str == L' ') {
- Str ++;
+ Str++;
}
+
//
// skip preceeding zeros
//
while ((*Str != 0) && *Str == L'0') {
- Str ++;
+ Str++;
}
- return (BOOLEAN) (*Str == L'x' || *Str == L'X');
+ return (BOOLEAN)(*Str == L'x' || *Str == L'X');
}
/**
@@ -329,16 +335,17 @@ Strtoi64 ( **/
VOID
StrToAscii (
- IN CHAR16 *Str,
- IN OUT CHAR8 **AsciiStr
+ IN CHAR16 *Str,
+ IN OUT CHAR8 **AsciiStr
)
{
- CHAR8 *Dest;
+ CHAR8 *Dest;
Dest = *AsciiStr;
while (!IS_NULL (*Str)) {
- *(Dest++) = (CHAR8) *(Str++);
+ *(Dest++) = (CHAR8)*(Str++);
}
+
*Dest = 0;
//
@@ -357,14 +364,14 @@ StrToAscii ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextGenericPath (
- IN UINT8 Type,
- IN CHAR16 *TextDeviceNode
+ IN UINT8 Type,
+ IN CHAR16 *TextDeviceNode
)
{
- EFI_DEVICE_PATH_PROTOCOL *Node;
- CHAR16 *SubtypeStr;
- CHAR16 *DataStr;
- UINTN DataLength;
+ EFI_DEVICE_PATH_PROTOCOL *Node;
+ CHAR16 *SubtypeStr;
+ CHAR16 *DataStr;
+ UINTN DataLength;
SubtypeStr = GetNextParamStr (&TextDeviceNode);
DataStr = GetNextParamStr (&TextDeviceNode);
@@ -374,13 +381,14 @@ DevPathFromTextGenericPath ( } else {
DataLength = StrLen (DataStr) / 2;
}
+
Node = CreateDeviceNode (
Type,
- (UINT8) Strtoi (SubtypeStr),
- (UINT16) (sizeof (EFI_DEVICE_PATH_PROTOCOL) + DataLength)
+ (UINT8)Strtoi (SubtypeStr),
+ (UINT16)(sizeof (EFI_DEVICE_PATH_PROTOCOL) + DataLength)
);
- StrHexToBytes (DataStr, DataLength * 2, (UINT8 *) (Node + 1), DataLength);
+ StrHexToBytes (DataStr, DataLength * 2, (UINT8 *)(Node + 1), DataLength);
return Node;
}
@@ -394,14 +402,14 @@ DevPathFromTextGenericPath ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextPath (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *TypeStr;
+ CHAR16 *TypeStr;
- TypeStr = GetNextParamStr (&TextDeviceNode);
+ TypeStr = GetNextParamStr (&TextDeviceNode);
- return DevPathFromTextGenericPath ((UINT8) Strtoi (TypeStr), TextDeviceNode);
+ return DevPathFromTextGenericPath ((UINT8)Strtoi (TypeStr), TextDeviceNode);
}
/**
@@ -414,7 +422,7 @@ DevPathFromTextPath ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextHardwarePath (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return DevPathFromTextGenericPath (HARDWARE_DEVICE_PATH, TextDeviceNode);
@@ -430,25 +438,25 @@ DevPathFromTextHardwarePath ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextPci (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *FunctionStr;
- CHAR16 *DeviceStr;
- PCI_DEVICE_PATH *Pci;
+ CHAR16 *FunctionStr;
+ CHAR16 *DeviceStr;
+ PCI_DEVICE_PATH *Pci;
DeviceStr = GetNextParamStr (&TextDeviceNode);
FunctionStr = GetNextParamStr (&TextDeviceNode);
- Pci = (PCI_DEVICE_PATH *) CreateDeviceNode (
- HARDWARE_DEVICE_PATH,
- HW_PCI_DP,
- (UINT16) sizeof (PCI_DEVICE_PATH)
- );
+ Pci = (PCI_DEVICE_PATH *)CreateDeviceNode (
+ HARDWARE_DEVICE_PATH,
+ HW_PCI_DP,
+ (UINT16)sizeof (PCI_DEVICE_PATH)
+ );
- Pci->Function = (UINT8) Strtoi (FunctionStr);
- Pci->Device = (UINT8) Strtoi (DeviceStr);
+ Pci->Function = (UINT8)Strtoi (FunctionStr);
+ Pci->Device = (UINT8)Strtoi (DeviceStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Pci;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Pci;
}
/**
@@ -461,22 +469,22 @@ DevPathFromTextPci ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextPcCard (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *FunctionNumberStr;
PCCARD_DEVICE_PATH *Pccard;
FunctionNumberStr = GetNextParamStr (&TextDeviceNode);
- Pccard = (PCCARD_DEVICE_PATH *) CreateDeviceNode (
- HARDWARE_DEVICE_PATH,
- HW_PCCARD_DP,
- (UINT16) sizeof (PCCARD_DEVICE_PATH)
- );
+ Pccard = (PCCARD_DEVICE_PATH *)CreateDeviceNode (
+ HARDWARE_DEVICE_PATH,
+ HW_PCCARD_DP,
+ (UINT16)sizeof (PCCARD_DEVICE_PATH)
+ );
- Pccard->FunctionNumber = (UINT8) Strtoi (FunctionNumberStr);
+ Pccard->FunctionNumber = (UINT8)Strtoi (FunctionNumberStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Pccard;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Pccard;
}
/**
@@ -489,7 +497,7 @@ DevPathFromTextPcCard ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextMemoryMapped (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *MemoryTypeStr;
@@ -500,17 +508,17 @@ DevPathFromTextMemoryMapped ( MemoryTypeStr = GetNextParamStr (&TextDeviceNode);
StartingAddressStr = GetNextParamStr (&TextDeviceNode);
EndingAddressStr = GetNextParamStr (&TextDeviceNode);
- MemMap = (MEMMAP_DEVICE_PATH *) CreateDeviceNode (
+ MemMap = (MEMMAP_DEVICE_PATH *)CreateDeviceNode (
HARDWARE_DEVICE_PATH,
HW_MEMMAP_DP,
- (UINT16) sizeof (MEMMAP_DEVICE_PATH)
+ (UINT16)sizeof (MEMMAP_DEVICE_PATH)
);
- MemMap->MemoryType = (UINT32) Strtoi (MemoryTypeStr);
+ MemMap->MemoryType = (UINT32)Strtoi (MemoryTypeStr);
Strtoi64 (StartingAddressStr, &MemMap->StartingAddress);
Strtoi64 (EndingAddressStr, &MemMap->EndingAddress);
- return (EFI_DEVICE_PATH_PROTOCOL *) MemMap;
+ return (EFI_DEVICE_PATH_PROTOCOL *)MemMap;
}
/**
@@ -526,9 +534,9 @@ DevPathFromTextMemoryMapped ( **/
EFI_DEVICE_PATH_PROTOCOL *
ConvertFromTextVendor (
- IN CHAR16 *TextDeviceNode,
- IN UINT8 Type,
- IN UINT8 SubType
+ IN CHAR16 *TextDeviceNode,
+ IN UINT8 Type,
+ IN UINT8 SubType
)
{
CHAR16 *GuidStr;
@@ -543,18 +551,18 @@ ConvertFromTextVendor ( //
// Two hex characters make up 1 buffer byte
//
- Length = (Length + 1) / 2;
+ Length = (Length + 1) / 2;
- Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (
- Type,
- SubType,
- (UINT16) (sizeof (VENDOR_DEVICE_PATH) + Length)
- );
+ Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (
+ Type,
+ SubType,
+ (UINT16)(sizeof (VENDOR_DEVICE_PATH) + Length)
+ );
StrToGuid (GuidStr, &Vendor->Guid);
- StrHexToBytes (DataStr, Length * 2, (UINT8 *) (Vendor + 1), Length);
+ StrHexToBytes (DataStr, Length * 2, (UINT8 *)(Vendor + 1), Length);
- return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;
}
/**
@@ -567,7 +575,7 @@ ConvertFromTextVendor ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVenHw (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return ConvertFromTextVendor (
@@ -587,21 +595,21 @@ DevPathFromTextVenHw ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextCtrl (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *ControllerStr;
CONTROLLER_DEVICE_PATH *Controller;
ControllerStr = GetNextParamStr (&TextDeviceNode);
- Controller = (CONTROLLER_DEVICE_PATH *) CreateDeviceNode (
- HARDWARE_DEVICE_PATH,
- HW_CONTROLLER_DP,
- (UINT16) sizeof (CONTROLLER_DEVICE_PATH)
- );
- Controller->ControllerNumber = (UINT32) Strtoi (ControllerStr);
+ Controller = (CONTROLLER_DEVICE_PATH *)CreateDeviceNode (
+ HARDWARE_DEVICE_PATH,
+ HW_CONTROLLER_DP,
+ (UINT16)sizeof (CONTROLLER_DEVICE_PATH)
+ );
+ Controller->ControllerNumber = (UINT32)Strtoi (ControllerStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Controller;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Controller;
}
/**
@@ -614,28 +622,28 @@ DevPathFromTextCtrl ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextBmc (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *InterfaceTypeStr;
- CHAR16 *BaseAddressStr;
- BMC_DEVICE_PATH *BmcDp;
+ CHAR16 *InterfaceTypeStr;
+ CHAR16 *BaseAddressStr;
+ BMC_DEVICE_PATH *BmcDp;
InterfaceTypeStr = GetNextParamStr (&TextDeviceNode);
BaseAddressStr = GetNextParamStr (&TextDeviceNode);
- BmcDp = (BMC_DEVICE_PATH *) CreateDeviceNode (
- HARDWARE_DEVICE_PATH,
- HW_BMC_DP,
- (UINT16) sizeof (BMC_DEVICE_PATH)
- );
+ BmcDp = (BMC_DEVICE_PATH *)CreateDeviceNode (
+ HARDWARE_DEVICE_PATH,
+ HW_BMC_DP,
+ (UINT16)sizeof (BMC_DEVICE_PATH)
+ );
- BmcDp->InterfaceType = (UINT8) Strtoi (InterfaceTypeStr);
+ BmcDp->InterfaceType = (UINT8)Strtoi (InterfaceTypeStr);
WriteUnaligned64 (
- (UINT64 *) (&BmcDp->BaseAddress),
+ (UINT64 *)(&BmcDp->BaseAddress),
StrHexToUint64 (BaseAddressStr)
);
- return (EFI_DEVICE_PATH_PROTOCOL *) BmcDp;
+ return (EFI_DEVICE_PATH_PROTOCOL *)BmcDp;
}
/**
@@ -648,7 +656,7 @@ DevPathFromTextBmc ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextAcpiPath (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return DevPathFromTextGenericPath (ACPI_DEVICE_PATH, TextDeviceNode);
@@ -663,14 +671,14 @@ DevPathFromTextAcpiPath ( **/
UINT32
EisaIdFromText (
- IN CHAR16 *Text
+ IN CHAR16 *Text
)
{
return (((Text[0] - 'A' + 1) & 0x1f) << 10)
- + (((Text[1] - 'A' + 1) & 0x1f) << 5)
- + (((Text[2] - 'A' + 1) & 0x1f) << 0)
- + (UINT32) (StrHexToUintn (&Text[3]) << 16)
- ;
+ + (((Text[1] - 'A' + 1) & 0x1f) << 5)
+ + (((Text[2] - 'A' + 1) & 0x1f) << 0)
+ + (UINT32)(StrHexToUintn (&Text[3]) << 16)
+ ;
}
/**
@@ -683,7 +691,7 @@ EisaIdFromText ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextAcpi (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *HIDStr;
@@ -692,16 +700,16 @@ DevPathFromTextAcpi ( HIDStr = GetNextParamStr (&TextDeviceNode);
UIDStr = GetNextParamStr (&TextDeviceNode);
- Acpi = (ACPI_HID_DEVICE_PATH *) CreateDeviceNode (
- ACPI_DEVICE_PATH,
- ACPI_DP,
- (UINT16) sizeof (ACPI_HID_DEVICE_PATH)
- );
+ Acpi = (ACPI_HID_DEVICE_PATH *)CreateDeviceNode (
+ ACPI_DEVICE_PATH,
+ ACPI_DP,
+ (UINT16)sizeof (ACPI_HID_DEVICE_PATH)
+ );
Acpi->HID = EisaIdFromText (HIDStr);
- Acpi->UID = (UINT32) Strtoi (UIDStr);
+ Acpi->UID = (UINT32)Strtoi (UIDStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Acpi;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Acpi;
}
/**
@@ -715,7 +723,7 @@ DevPathFromTextAcpi ( **/
EFI_DEVICE_PATH_PROTOCOL *
ConvertFromTextAcpi (
- IN CHAR16 *TextDeviceNode,
+ IN CHAR16 *TextDeviceNode,
IN UINT32 PnPId
)
{
@@ -723,16 +731,16 @@ ConvertFromTextAcpi ( ACPI_HID_DEVICE_PATH *Acpi;
UIDStr = GetNextParamStr (&TextDeviceNode);
- Acpi = (ACPI_HID_DEVICE_PATH *) CreateDeviceNode (
- ACPI_DEVICE_PATH,
- ACPI_DP,
- (UINT16) sizeof (ACPI_HID_DEVICE_PATH)
- );
+ Acpi = (ACPI_HID_DEVICE_PATH *)CreateDeviceNode (
+ ACPI_DEVICE_PATH,
+ ACPI_DP,
+ (UINT16)sizeof (ACPI_HID_DEVICE_PATH)
+ );
Acpi->HID = EFI_PNP_ID (PnPId);
- Acpi->UID = (UINT32) Strtoi (UIDStr);
+ Acpi->UID = (UINT32)Strtoi (UIDStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Acpi;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Acpi;
}
/**
@@ -745,7 +753,7 @@ ConvertFromTextAcpi ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextPciRoot (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return ConvertFromTextAcpi (TextDeviceNode, 0x0a03);
@@ -761,7 +769,7 @@ DevPathFromTextPciRoot ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextPcieRoot (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return ConvertFromTextAcpi (TextDeviceNode, 0x0a08);
@@ -777,7 +785,7 @@ DevPathFromTextPcieRoot ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextFloppy (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return ConvertFromTextAcpi (TextDeviceNode, 0x0604);
@@ -793,7 +801,7 @@ DevPathFromTextFloppy ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextKeyboard (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return ConvertFromTextAcpi (TextDeviceNode, 0x0301);
@@ -809,7 +817,7 @@ DevPathFromTextKeyboard ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextSerial (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return ConvertFromTextAcpi (TextDeviceNode, 0x0501);
@@ -825,7 +833,7 @@ DevPathFromTextSerial ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextParallelPort (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return ConvertFromTextAcpi (TextDeviceNode, 0x0401);
@@ -841,7 +849,7 @@ DevPathFromTextParallelPort ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextAcpiEx (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *HIDStr;
@@ -861,25 +869,25 @@ DevPathFromTextAcpiEx ( CIDSTRStr = GetNextParamStr (&TextDeviceNode);
UIDSTRStr = GetNextParamStr (&TextDeviceNode);
- Length = (UINT16) (sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (HIDSTRStr) + 1);
- Length = (UINT16) (Length + StrLen (UIDSTRStr) + 1);
- Length = (UINT16) (Length + StrLen (CIDSTRStr) + 1);
- AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *) CreateDeviceNode (
- ACPI_DEVICE_PATH,
- ACPI_EXTENDED_DP,
- Length
- );
+ Length = (UINT16)(sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (HIDSTRStr) + 1);
+ Length = (UINT16)(Length + StrLen (UIDSTRStr) + 1);
+ Length = (UINT16)(Length + StrLen (CIDSTRStr) + 1);
+ AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *)CreateDeviceNode (
+ ACPI_DEVICE_PATH,
+ ACPI_EXTENDED_DP,
+ Length
+ );
AcpiEx->HID = EisaIdFromText (HIDStr);
AcpiEx->CID = EisaIdFromText (CIDStr);
- AcpiEx->UID = (UINT32) Strtoi (UIDStr);
+ AcpiEx->UID = (UINT32)Strtoi (UIDStr);
- AsciiStr = (CHAR8 *) ((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));
+ AsciiStr = (CHAR8 *)((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));
StrToAscii (HIDSTRStr, &AsciiStr);
StrToAscii (UIDSTRStr, &AsciiStr);
StrToAscii (CIDSTRStr, &AsciiStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) AcpiEx;
+ return (EFI_DEVICE_PATH_PROTOCOL *)AcpiEx;
}
/**
@@ -892,7 +900,7 @@ DevPathFromTextAcpiEx ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextAcpiExp (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *HIDStr;
@@ -905,12 +913,12 @@ DevPathFromTextAcpiExp ( HIDStr = GetNextParamStr (&TextDeviceNode);
CIDStr = GetNextParamStr (&TextDeviceNode);
UIDSTRStr = GetNextParamStr (&TextDeviceNode);
- Length = (UINT16) (sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (UIDSTRStr) + 3);
- AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *) CreateDeviceNode (
- ACPI_DEVICE_PATH,
- ACPI_EXTENDED_DP,
- Length
- );
+ Length = (UINT16)(sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (UIDSTRStr) + 3);
+ AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *)CreateDeviceNode (
+ ACPI_DEVICE_PATH,
+ ACPI_EXTENDED_DP,
+ Length
+ );
AcpiEx->HID = EisaIdFromText (HIDStr);
//
@@ -918,14 +926,15 @@ DevPathFromTextAcpiExp ( // So when the CID parametr is not specified or specified as 0 in the text device node.
// Set the CID to 0 in the ACPI extension device path structure.
//
- if (*CIDStr == L'\0' || *CIDStr == L'0') {
+ if ((*CIDStr == L'\0') || (*CIDStr == L'0')) {
AcpiEx->CID = 0;
} else {
AcpiEx->CID = EisaIdFromText (CIDStr);
}
+
AcpiEx->UID = 0;
- AsciiStr = (CHAR8 *) ((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));
+ AsciiStr = (CHAR8 *)((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));
//
// HID string is NULL
//
@@ -940,7 +949,7 @@ DevPathFromTextAcpiExp ( //
*AsciiStr = '\0';
- return (EFI_DEVICE_PATH_PROTOCOL *) AcpiEx;
+ return (EFI_DEVICE_PATH_PROTOCOL *)AcpiEx;
}
/**
@@ -953,7 +962,7 @@ DevPathFromTextAcpiExp ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextAcpiAdr (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *DisplayDeviceStr;
@@ -961,11 +970,11 @@ DevPathFromTextAcpiAdr ( UINTN Index;
UINTN Length;
- AcpiAdr = (ACPI_ADR_DEVICE_PATH *) CreateDeviceNode (
- ACPI_DEVICE_PATH,
- ACPI_ADR_DP,
- (UINT16) sizeof (ACPI_ADR_DEVICE_PATH)
- );
+ AcpiAdr = (ACPI_ADR_DEVICE_PATH *)CreateDeviceNode (
+ ACPI_DEVICE_PATH,
+ ACPI_ADR_DP,
+ (UINT16)sizeof (ACPI_ADR_DEVICE_PATH)
+ );
ASSERT (AcpiAdr != NULL);
for (Index = 0; ; Index++) {
@@ -973,6 +982,7 @@ DevPathFromTextAcpiAdr ( if (IS_NULL (*DisplayDeviceStr)) {
break;
}
+
if (Index > 0) {
Length = DevicePathNodeLength (AcpiAdr);
AcpiAdr = ReallocatePool (
@@ -984,10 +994,10 @@ DevPathFromTextAcpiAdr ( SetDevicePathNodeLength (AcpiAdr, Length + sizeof (UINT32));
}
- (&AcpiAdr->ADR)[Index] = (UINT32) Strtoi (DisplayDeviceStr);
+ (&AcpiAdr->ADR)[Index] = (UINT32)Strtoi (DisplayDeviceStr);
}
- return (EFI_DEVICE_PATH_PROTOCOL *) AcpiAdr;
+ return (EFI_DEVICE_PATH_PROTOCOL *)AcpiAdr;
}
/**
@@ -1000,7 +1010,7 @@ DevPathFromTextAcpiAdr ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextMsg (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return DevPathFromTextGenericPath (MESSAGING_DEVICE_PATH, TextDeviceNode);
@@ -1016,19 +1026,19 @@ DevPathFromTextMsg ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextAta (
-IN CHAR16 *TextDeviceNode
-)
+ IN CHAR16 *TextDeviceNode
+ )
{
- CHAR16 *PrimarySecondaryStr;
- CHAR16 *SlaveMasterStr;
- CHAR16 *LunStr;
- ATAPI_DEVICE_PATH *Atapi;
+ CHAR16 *PrimarySecondaryStr;
+ CHAR16 *SlaveMasterStr;
+ CHAR16 *LunStr;
+ ATAPI_DEVICE_PATH *Atapi;
- Atapi = (ATAPI_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_ATAPI_DP,
- (UINT16) sizeof (ATAPI_DEVICE_PATH)
- );
+ Atapi = (ATAPI_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_ATAPI_DP,
+ (UINT16)sizeof (ATAPI_DEVICE_PATH)
+ );
PrimarySecondaryStr = GetNextParamStr (&TextDeviceNode);
SlaveMasterStr = GetNextParamStr (&TextDeviceNode);
@@ -1039,19 +1049,20 @@ IN CHAR16 *TextDeviceNode } else if (StrCmp (PrimarySecondaryStr, L"Secondary") == 0) {
Atapi->PrimarySecondary = 1;
} else {
- Atapi->PrimarySecondary = (UINT8) Strtoi (PrimarySecondaryStr);
+ Atapi->PrimarySecondary = (UINT8)Strtoi (PrimarySecondaryStr);
}
+
if (StrCmp (SlaveMasterStr, L"Master") == 0) {
- Atapi->SlaveMaster = 0;
+ Atapi->SlaveMaster = 0;
} else if (StrCmp (SlaveMasterStr, L"Slave") == 0) {
- Atapi->SlaveMaster = 1;
+ Atapi->SlaveMaster = 1;
} else {
- Atapi->SlaveMaster = (UINT8) Strtoi (SlaveMasterStr);
+ Atapi->SlaveMaster = (UINT8)Strtoi (SlaveMasterStr);
}
- Atapi->Lun = (UINT16) Strtoi (LunStr);
+ Atapi->Lun = (UINT16)Strtoi (LunStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Atapi;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Atapi;
}
/**
@@ -1064,7 +1075,7 @@ IN CHAR16 *TextDeviceNode **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextScsi (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *PunStr;
@@ -1073,16 +1084,16 @@ DevPathFromTextScsi ( PunStr = GetNextParamStr (&TextDeviceNode);
LunStr = GetNextParamStr (&TextDeviceNode);
- Scsi = (SCSI_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_SCSI_DP,
- (UINT16) sizeof (SCSI_DEVICE_PATH)
- );
+ Scsi = (SCSI_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_SCSI_DP,
+ (UINT16)sizeof (SCSI_DEVICE_PATH)
+ );
- Scsi->Pun = (UINT16) Strtoi (PunStr);
- Scsi->Lun = (UINT16) Strtoi (LunStr);
+ Scsi->Pun = (UINT16)Strtoi (PunStr);
+ Scsi->Lun = (UINT16)Strtoi (LunStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Scsi;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Scsi;
}
/**
@@ -1095,7 +1106,7 @@ DevPathFromTextScsi ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextFibre (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *WWNStr;
@@ -1104,17 +1115,17 @@ DevPathFromTextFibre ( WWNStr = GetNextParamStr (&TextDeviceNode);
LunStr = GetNextParamStr (&TextDeviceNode);
- Fibre = (FIBRECHANNEL_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_FIBRECHANNEL_DP,
- (UINT16) sizeof (FIBRECHANNEL_DEVICE_PATH)
- );
+ Fibre = (FIBRECHANNEL_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_FIBRECHANNEL_DP,
+ (UINT16)sizeof (FIBRECHANNEL_DEVICE_PATH)
+ );
Fibre->Reserved = 0;
Strtoi64 (WWNStr, &Fibre->WWN);
Strtoi64 (LunStr, &Fibre->Lun);
- return (EFI_DEVICE_PATH_PROTOCOL *) Fibre;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Fibre;
}
/**
@@ -1127,7 +1138,7 @@ DevPathFromTextFibre ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextFibreEx (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *WWNStr;
@@ -1136,20 +1147,20 @@ DevPathFromTextFibreEx ( WWNStr = GetNextParamStr (&TextDeviceNode);
LunStr = GetNextParamStr (&TextDeviceNode);
- FibreEx = (FIBRECHANNELEX_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_FIBRECHANNELEX_DP,
- (UINT16) sizeof (FIBRECHANNELEX_DEVICE_PATH)
- );
+ FibreEx = (FIBRECHANNELEX_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_FIBRECHANNELEX_DP,
+ (UINT16)sizeof (FIBRECHANNELEX_DEVICE_PATH)
+ );
FibreEx->Reserved = 0;
- Strtoi64 (WWNStr, (UINT64 *) (&FibreEx->WWN));
- Strtoi64 (LunStr, (UINT64 *) (&FibreEx->Lun));
+ Strtoi64 (WWNStr, (UINT64 *)(&FibreEx->WWN));
+ Strtoi64 (LunStr, (UINT64 *)(&FibreEx->Lun));
- *(UINT64 *) (&FibreEx->WWN) = SwapBytes64 (*(UINT64 *) (&FibreEx->WWN));
- *(UINT64 *) (&FibreEx->Lun) = SwapBytes64 (*(UINT64 *) (&FibreEx->Lun));
+ *(UINT64 *)(&FibreEx->WWN) = SwapBytes64 (*(UINT64 *)(&FibreEx->WWN));
+ *(UINT64 *)(&FibreEx->Lun) = SwapBytes64 (*(UINT64 *)(&FibreEx->Lun));
- return (EFI_DEVICE_PATH_PROTOCOL *) FibreEx;
+ return (EFI_DEVICE_PATH_PROTOCOL *)FibreEx;
}
/**
@@ -1162,23 +1173,23 @@ DevPathFromTextFibreEx ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromText1394 (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *GuidStr;
- F1394_DEVICE_PATH *F1394DevPath;
+ CHAR16 *GuidStr;
+ F1394_DEVICE_PATH *F1394DevPath;
- GuidStr = GetNextParamStr (&TextDeviceNode);
- F1394DevPath = (F1394_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_1394_DP,
- (UINT16) sizeof (F1394_DEVICE_PATH)
- );
+ GuidStr = GetNextParamStr (&TextDeviceNode);
+ F1394DevPath = (F1394_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_1394_DP,
+ (UINT16)sizeof (F1394_DEVICE_PATH)
+ );
F1394DevPath->Reserved = 0;
F1394DevPath->Guid = StrHexToUint64 (GuidStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) F1394DevPath;
+ return (EFI_DEVICE_PATH_PROTOCOL *)F1394DevPath;
}
/**
@@ -1191,25 +1202,25 @@ DevPathFromText1394 ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsb (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *PortStr;
- CHAR16 *InterfaceStr;
- USB_DEVICE_PATH *Usb;
+ CHAR16 *PortStr;
+ CHAR16 *InterfaceStr;
+ USB_DEVICE_PATH *Usb;
- PortStr = GetNextParamStr (&TextDeviceNode);
- InterfaceStr = GetNextParamStr (&TextDeviceNode);
- Usb = (USB_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_USB_DP,
- (UINT16) sizeof (USB_DEVICE_PATH)
- );
+ PortStr = GetNextParamStr (&TextDeviceNode);
+ InterfaceStr = GetNextParamStr (&TextDeviceNode);
+ Usb = (USB_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_USB_DP,
+ (UINT16)sizeof (USB_DEVICE_PATH)
+ );
- Usb->ParentPortNumber = (UINT8) Strtoi (PortStr);
- Usb->InterfaceNumber = (UINT8) Strtoi (InterfaceStr);
+ Usb->ParentPortNumber = (UINT8)Strtoi (PortStr);
+ Usb->InterfaceNumber = (UINT8)Strtoi (InterfaceStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Usb;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Usb;
}
/**
@@ -1222,22 +1233,22 @@ DevPathFromTextUsb ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextI2O (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *TIDStr;
- I2O_DEVICE_PATH *I2ODevPath;
+ CHAR16 *TIDStr;
+ I2O_DEVICE_PATH *I2ODevPath;
TIDStr = GetNextParamStr (&TextDeviceNode);
- I2ODevPath = (I2O_DEVICE_PATH *) CreateDeviceNode (
+ I2ODevPath = (I2O_DEVICE_PATH *)CreateDeviceNode (
MESSAGING_DEVICE_PATH,
MSG_I2O_DP,
- (UINT16) sizeof (I2O_DEVICE_PATH)
+ (UINT16)sizeof (I2O_DEVICE_PATH)
);
- I2ODevPath->Tid = (UINT32) Strtoi (TIDStr);
+ I2ODevPath->Tid = (UINT32)Strtoi (TIDStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) I2ODevPath;
+ return (EFI_DEVICE_PATH_PROTOCOL *)I2ODevPath;
}
/**
@@ -1250,7 +1261,7 @@ DevPathFromTextI2O ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextInfiniband (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *FlagsStr;
@@ -1265,19 +1276,19 @@ DevPathFromTextInfiniband ( SidStr = GetNextParamStr (&TextDeviceNode);
TidStr = GetNextParamStr (&TextDeviceNode);
DidStr = GetNextParamStr (&TextDeviceNode);
- InfiniBand = (INFINIBAND_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_INFINIBAND_DP,
- (UINT16) sizeof (INFINIBAND_DEVICE_PATH)
- );
+ InfiniBand = (INFINIBAND_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_INFINIBAND_DP,
+ (UINT16)sizeof (INFINIBAND_DEVICE_PATH)
+ );
- InfiniBand->ResourceFlags = (UINT32) Strtoi (FlagsStr);
- StrToGuid (GuidStr, (EFI_GUID *) InfiniBand->PortGid);
+ InfiniBand->ResourceFlags = (UINT32)Strtoi (FlagsStr);
+ StrToGuid (GuidStr, (EFI_GUID *)InfiniBand->PortGid);
Strtoi64 (SidStr, &InfiniBand->ServiceId);
Strtoi64 (TidStr, &InfiniBand->TargetPortId);
Strtoi64 (DidStr, &InfiniBand->DeviceId);
- return (EFI_DEVICE_PATH_PROTOCOL *) InfiniBand;
+ return (EFI_DEVICE_PATH_PROTOCOL *)InfiniBand;
}
/**
@@ -1290,14 +1301,14 @@ DevPathFromTextInfiniband ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVenMsg (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return ConvertFromTextVendor (
- TextDeviceNode,
- MESSAGING_DEVICE_PATH,
- MSG_VENDOR_DP
- );
+ TextDeviceNode,
+ MESSAGING_DEVICE_PATH,
+ MSG_VENDOR_DP
+ );
}
/**
@@ -1310,18 +1321,19 @@ DevPathFromTextVenMsg ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVenPcAnsi (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
VENDOR_DEVICE_PATH *Vendor;
- Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_VENDOR_DP,
- (UINT16) sizeof (VENDOR_DEVICE_PATH));
+ Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_VENDOR_DP,
+ (UINT16)sizeof (VENDOR_DEVICE_PATH)
+ );
CopyGuid (&Vendor->Guid, &gEfiPcAnsiGuid);
- return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;
}
/**
@@ -1334,18 +1346,19 @@ DevPathFromTextVenPcAnsi ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVenVt100 (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
VENDOR_DEVICE_PATH *Vendor;
- Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_VENDOR_DP,
- (UINT16) sizeof (VENDOR_DEVICE_PATH));
+ Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_VENDOR_DP,
+ (UINT16)sizeof (VENDOR_DEVICE_PATH)
+ );
CopyGuid (&Vendor->Guid, &gEfiVT100Guid);
- return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;
}
/**
@@ -1358,18 +1371,19 @@ DevPathFromTextVenVt100 ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVenVt100Plus (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
VENDOR_DEVICE_PATH *Vendor;
- Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_VENDOR_DP,
- (UINT16) sizeof (VENDOR_DEVICE_PATH));
+ Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_VENDOR_DP,
+ (UINT16)sizeof (VENDOR_DEVICE_PATH)
+ );
CopyGuid (&Vendor->Guid, &gEfiVT100PlusGuid);
- return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;
}
/**
@@ -1382,18 +1396,19 @@ DevPathFromTextVenVt100Plus ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVenUtf8 (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
VENDOR_DEVICE_PATH *Vendor;
- Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_VENDOR_DP,
- (UINT16) sizeof (VENDOR_DEVICE_PATH));
+ Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_VENDOR_DP,
+ (UINT16)sizeof (VENDOR_DEVICE_PATH)
+ );
CopyGuid (&Vendor->Guid, &gEfiVTUTF8Guid);
- return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;
}
/**
@@ -1406,18 +1421,18 @@ DevPathFromTextVenUtf8 ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUartFlowCtrl (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *ValueStr;
- UART_FLOW_CONTROL_DEVICE_PATH *UartFlowControl;
+ CHAR16 *ValueStr;
+ UART_FLOW_CONTROL_DEVICE_PATH *UartFlowControl;
ValueStr = GetNextParamStr (&TextDeviceNode);
- UartFlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_VENDOR_DP,
- (UINT16) sizeof (UART_FLOW_CONTROL_DEVICE_PATH)
- );
+ UartFlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_VENDOR_DP,
+ (UINT16)sizeof (UART_FLOW_CONTROL_DEVICE_PATH)
+ );
CopyGuid (&UartFlowControl->Guid, &gEfiUartDevicePathGuid);
if (StrCmp (ValueStr, L"XonXoff") == 0) {
@@ -1428,7 +1443,7 @@ DevPathFromTextUartFlowCtrl ( UartFlowControl->FlowControlMap = 0;
}
- return (EFI_DEVICE_PATH_PROTOCOL *) UartFlowControl;
+ return (EFI_DEVICE_PATH_PROTOCOL *)UartFlowControl;
}
/**
@@ -1441,20 +1456,20 @@ DevPathFromTextUartFlowCtrl ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextSAS (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *AddressStr;
- CHAR16 *LunStr;
- CHAR16 *RTPStr;
- CHAR16 *SASSATAStr;
- CHAR16 *LocationStr;
- CHAR16 *ConnectStr;
- CHAR16 *DriveBayStr;
- CHAR16 *ReservedStr;
- UINT16 Info;
- UINT16 Uint16;
- SAS_DEVICE_PATH *Sas;
+ CHAR16 *AddressStr;
+ CHAR16 *LunStr;
+ CHAR16 *RTPStr;
+ CHAR16 *SASSATAStr;
+ CHAR16 *LocationStr;
+ CHAR16 *ConnectStr;
+ CHAR16 *DriveBayStr;
+ CHAR16 *ReservedStr;
+ UINT16 Info;
+ UINT16 Uint16;
+ SAS_DEVICE_PATH *Sas;
AddressStr = GetNextParamStr (&TextDeviceNode);
LunStr = GetNextParamStr (&TextDeviceNode);
@@ -1464,27 +1479,25 @@ DevPathFromTextSAS ( ConnectStr = GetNextParamStr (&TextDeviceNode);
DriveBayStr = GetNextParamStr (&TextDeviceNode);
ReservedStr = GetNextParamStr (&TextDeviceNode);
- Sas = (SAS_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_VENDOR_DP,
- (UINT16) sizeof (SAS_DEVICE_PATH)
- );
+ Sas = (SAS_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_VENDOR_DP,
+ (UINT16)sizeof (SAS_DEVICE_PATH)
+ );
CopyGuid (&Sas->Guid, &gEfiSasDevicePathGuid);
Strtoi64 (AddressStr, &Sas->SasAddress);
Strtoi64 (LunStr, &Sas->Lun);
- Sas->RelativeTargetPort = (UINT16) Strtoi (RTPStr);
+ Sas->RelativeTargetPort = (UINT16)Strtoi (RTPStr);
if (StrCmp (SASSATAStr, L"NoTopology") == 0) {
Info = 0x0;
-
} else if ((StrCmp (SASSATAStr, L"SATA") == 0) || (StrCmp (SASSATAStr, L"SAS") == 0)) {
-
- Uint16 = (UINT16) Strtoi (DriveBayStr);
+ Uint16 = (UINT16)Strtoi (DriveBayStr);
if (Uint16 == 0) {
Info = 0x1;
} else {
- Info = (UINT16) (0x2 | ((Uint16 - 1) << 8));
+ Info = (UINT16)(0x2 | ((Uint16 - 1) << 8));
}
if (StrCmp (SASSATAStr, L"SATA") == 0) {
@@ -1500,8 +1513,9 @@ DevPathFromTextSAS ( } else if (StrCmp (LocationStr, L"Internal") == 0) {
Uint16 = 0;
} else {
- Uint16 = ((UINT16) Strtoi (LocationStr) & BIT0);
+ Uint16 = ((UINT16)Strtoi (LocationStr) & BIT0);
}
+
Info |= (Uint16 << 5);
//
@@ -1513,18 +1527,18 @@ DevPathFromTextSAS ( } else if (StrCmp (ConnectStr, L"Direct") == 0) {
Uint16 = 0;
} else {
- Uint16 = ((UINT16) Strtoi (ConnectStr) & (BIT0 | BIT1));
+ Uint16 = ((UINT16)Strtoi (ConnectStr) & (BIT0 | BIT1));
}
- Info |= (Uint16 << 6);
+ Info |= (Uint16 << 6);
} else {
- Info = (UINT16) Strtoi (SASSATAStr);
+ Info = (UINT16)Strtoi (SASSATAStr);
}
Sas->DeviceTopology = Info;
- Sas->Reserved = (UINT32) Strtoi (ReservedStr);
+ Sas->Reserved = (UINT32)Strtoi (ReservedStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Sas;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Sas;
}
/**
@@ -1537,21 +1551,21 @@ DevPathFromTextSAS ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextSasEx (
- IN CHAR16 *TextDeviceNode
- )
-{
- CHAR16 *AddressStr;
- CHAR16 *LunStr;
- CHAR16 *RTPStr;
- CHAR16 *SASSATAStr;
- CHAR16 *LocationStr;
- CHAR16 *ConnectStr;
- CHAR16 *DriveBayStr;
- UINT16 Info;
- UINT16 Uint16;
- UINT64 SasAddress;
- UINT64 Lun;
- SASEX_DEVICE_PATH *SasEx;
+ IN CHAR16 *TextDeviceNode
+ )
+{
+ CHAR16 *AddressStr;
+ CHAR16 *LunStr;
+ CHAR16 *RTPStr;
+ CHAR16 *SASSATAStr;
+ CHAR16 *LocationStr;
+ CHAR16 *ConnectStr;
+ CHAR16 *DriveBayStr;
+ UINT16 Info;
+ UINT16 Uint16;
+ UINT64 SasAddress;
+ UINT64 Lun;
+ SASEX_DEVICE_PATH *SasEx;
AddressStr = GetNextParamStr (&TextDeviceNode);
LunStr = GetNextParamStr (&TextDeviceNode);
@@ -1560,28 +1574,26 @@ DevPathFromTextSasEx ( LocationStr = GetNextParamStr (&TextDeviceNode);
ConnectStr = GetNextParamStr (&TextDeviceNode);
DriveBayStr = GetNextParamStr (&TextDeviceNode);
- SasEx = (SASEX_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_SASEX_DP,
- (UINT16) sizeof (SASEX_DEVICE_PATH)
- );
+ SasEx = (SASEX_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_SASEX_DP,
+ (UINT16)sizeof (SASEX_DEVICE_PATH)
+ );
Strtoi64 (AddressStr, &SasAddress);
- Strtoi64 (LunStr, &Lun);
- WriteUnaligned64 ((UINT64 *) &SasEx->SasAddress, SwapBytes64 (SasAddress));
- WriteUnaligned64 ((UINT64 *) &SasEx->Lun, SwapBytes64 (Lun));
- SasEx->RelativeTargetPort = (UINT16) Strtoi (RTPStr);
+ Strtoi64 (LunStr, &Lun);
+ WriteUnaligned64 ((UINT64 *)&SasEx->SasAddress, SwapBytes64 (SasAddress));
+ WriteUnaligned64 ((UINT64 *)&SasEx->Lun, SwapBytes64 (Lun));
+ SasEx->RelativeTargetPort = (UINT16)Strtoi (RTPStr);
if (StrCmp (SASSATAStr, L"NoTopology") == 0) {
Info = 0x0;
-
} else if ((StrCmp (SASSATAStr, L"SATA") == 0) || (StrCmp (SASSATAStr, L"SAS") == 0)) {
-
- Uint16 = (UINT16) Strtoi (DriveBayStr);
+ Uint16 = (UINT16)Strtoi (DriveBayStr);
if (Uint16 == 0) {
Info = 0x1;
} else {
- Info = (UINT16) (0x2 | ((Uint16 - 1) << 8));
+ Info = (UINT16)(0x2 | ((Uint16 - 1) << 8));
}
if (StrCmp (SASSATAStr, L"SATA") == 0) {
@@ -1597,8 +1609,9 @@ DevPathFromTextSasEx ( } else if (StrCmp (LocationStr, L"Internal") == 0) {
Uint16 = 0;
} else {
- Uint16 = ((UINT16) Strtoi (LocationStr) & BIT0);
+ Uint16 = ((UINT16)Strtoi (LocationStr) & BIT0);
}
+
Info |= (Uint16 << 5);
//
@@ -1610,17 +1623,17 @@ DevPathFromTextSasEx ( } else if (StrCmp (ConnectStr, L"Direct") == 0) {
Uint16 = 0;
} else {
- Uint16 = ((UINT16) Strtoi (ConnectStr) & (BIT0 | BIT1));
+ Uint16 = ((UINT16)Strtoi (ConnectStr) & (BIT0 | BIT1));
}
- Info |= (Uint16 << 6);
+ Info |= (Uint16 << 6);
} else {
- Info = (UINT16) Strtoi (SASSATAStr);
+ Info = (UINT16)Strtoi (SASSATAStr);
}
SasEx->DeviceTopology = Info;
- return (EFI_DEVICE_PATH_PROTOCOL *) SasEx;
+ return (EFI_DEVICE_PATH_PROTOCOL *)SasEx;
}
/**
@@ -1633,32 +1646,32 @@ DevPathFromTextSasEx ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextNVMe (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *NamespaceIdStr;
- CHAR16 *NamespaceUuidStr;
- NVME_NAMESPACE_DEVICE_PATH *Nvme;
- UINT8 *Uuid;
- UINTN Index;
+ CHAR16 *NamespaceIdStr;
+ CHAR16 *NamespaceUuidStr;
+ NVME_NAMESPACE_DEVICE_PATH *Nvme;
+ UINT8 *Uuid;
+ UINTN Index;
NamespaceIdStr = GetNextParamStr (&TextDeviceNode);
NamespaceUuidStr = GetNextParamStr (&TextDeviceNode);
- Nvme = (NVME_NAMESPACE_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_NVME_NAMESPACE_DP,
- (UINT16) sizeof (NVME_NAMESPACE_DEVICE_PATH)
- );
+ Nvme = (NVME_NAMESPACE_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_NVME_NAMESPACE_DP,
+ (UINT16)sizeof (NVME_NAMESPACE_DEVICE_PATH)
+ );
- Nvme->NamespaceId = (UINT32) Strtoi (NamespaceIdStr);
- Uuid = (UINT8 *) &Nvme->NamespaceUuid;
+ Nvme->NamespaceId = (UINT32)Strtoi (NamespaceIdStr);
+ Uuid = (UINT8 *)&Nvme->NamespaceUuid;
Index = sizeof (Nvme->NamespaceUuid) / sizeof (UINT8);
while (Index-- != 0) {
- Uuid[Index] = (UINT8) StrHexToUintn (SplitStr (&NamespaceUuidStr, L'-'));
+ Uuid[Index] = (UINT8)StrHexToUintn (SplitStr (&NamespaceUuidStr, L'-'));
}
- return (EFI_DEVICE_PATH_PROTOCOL *) Nvme;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Nvme;
}
/**
@@ -1671,25 +1684,25 @@ DevPathFromTextNVMe ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUfs (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *PunStr;
- CHAR16 *LunStr;
- UFS_DEVICE_PATH *Ufs;
+ CHAR16 *PunStr;
+ CHAR16 *LunStr;
+ UFS_DEVICE_PATH *Ufs;
PunStr = GetNextParamStr (&TextDeviceNode);
LunStr = GetNextParamStr (&TextDeviceNode);
- Ufs = (UFS_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_UFS_DP,
- (UINT16) sizeof (UFS_DEVICE_PATH)
- );
+ Ufs = (UFS_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_UFS_DP,
+ (UINT16)sizeof (UFS_DEVICE_PATH)
+ );
- Ufs->Pun = (UINT8) Strtoi (PunStr);
- Ufs->Lun = (UINT8) Strtoi (LunStr);
+ Ufs->Pun = (UINT8)Strtoi (PunStr);
+ Ufs->Lun = (UINT8)Strtoi (LunStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Ufs;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Ufs;
}
/**
@@ -1702,22 +1715,22 @@ DevPathFromTextUfs ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextSd (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *SlotNumberStr;
- SD_DEVICE_PATH *Sd;
+ CHAR16 *SlotNumberStr;
+ SD_DEVICE_PATH *Sd;
SlotNumberStr = GetNextParamStr (&TextDeviceNode);
- Sd = (SD_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_SD_DP,
- (UINT16) sizeof (SD_DEVICE_PATH)
- );
+ Sd = (SD_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_SD_DP,
+ (UINT16)sizeof (SD_DEVICE_PATH)
+ );
- Sd->SlotNumber = (UINT8) Strtoi (SlotNumberStr);
+ Sd->SlotNumber = (UINT8)Strtoi (SlotNumberStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Sd;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Sd;
}
/**
@@ -1730,22 +1743,22 @@ DevPathFromTextSd ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextEmmc (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *SlotNumberStr;
EMMC_DEVICE_PATH *Emmc;
SlotNumberStr = GetNextParamStr (&TextDeviceNode);
- Emmc = (EMMC_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_EMMC_DP,
- (UINT16) sizeof (EMMC_DEVICE_PATH)
- );
+ Emmc = (EMMC_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_EMMC_DP,
+ (UINT16)sizeof (EMMC_DEVICE_PATH)
+ );
- Emmc->SlotNumber = (UINT8) Strtoi (SlotNumberStr);
+ Emmc->SlotNumber = (UINT8)Strtoi (SlotNumberStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Emmc;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Emmc;
}
/**
@@ -1758,20 +1771,20 @@ DevPathFromTextEmmc ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextDebugPort (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
VENDOR_DEVICE_PATH *Vend;
- Vend = (VENDOR_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_VENDOR_DP,
- (UINT16) sizeof (VENDOR_DEVICE_PATH)
- );
+ Vend = (VENDOR_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_VENDOR_DP,
+ (UINT16)sizeof (VENDOR_DEVICE_PATH)
+ );
CopyGuid (&Vend->Guid, &gEfiDebugPortProtocolGuid);
- return (EFI_DEVICE_PATH_PROTOCOL *) Vend;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vend;
}
/**
@@ -1784,7 +1797,7 @@ DevPathFromTextDebugPort ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextMAC (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *AddressStr;
@@ -1792,27 +1805,26 @@ DevPathFromTextMAC ( UINTN Length;
MAC_ADDR_DEVICE_PATH *MACDevPath;
- AddressStr = GetNextParamStr (&TextDeviceNode);
- IfTypeStr = GetNextParamStr (&TextDeviceNode);
- MACDevPath = (MAC_ADDR_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_MAC_ADDR_DP,
- (UINT16) sizeof (MAC_ADDR_DEVICE_PATH)
- );
+ AddressStr = GetNextParamStr (&TextDeviceNode);
+ IfTypeStr = GetNextParamStr (&TextDeviceNode);
+ MACDevPath = (MAC_ADDR_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_MAC_ADDR_DP,
+ (UINT16)sizeof (MAC_ADDR_DEVICE_PATH)
+ );
- MACDevPath->IfType = (UINT8) Strtoi (IfTypeStr);
+ MACDevPath->IfType = (UINT8)Strtoi (IfTypeStr);
Length = sizeof (EFI_MAC_ADDRESS);
- if (MACDevPath->IfType == 0x01 || MACDevPath->IfType == 0x00) {
+ if ((MACDevPath->IfType == 0x01) || (MACDevPath->IfType == 0x00)) {
Length = 6;
}
StrHexToBytes (AddressStr, Length * 2, MACDevPath->MacAddress.Addr, Length);
- return (EFI_DEVICE_PATH_PROTOCOL *) MACDevPath;
+ return (EFI_DEVICE_PATH_PROTOCOL *)MACDevPath;
}
-
/**
Converts a text format to the network protocol ID.
@@ -1823,7 +1835,7 @@ DevPathFromTextMAC ( **/
UINTN
NetworkProtocolFromText (
- IN CHAR16 *Text
+ IN CHAR16 *Text
)
{
if (StrCmp (Text, L"UDP") == 0) {
@@ -1837,7 +1849,6 @@ NetworkProtocolFromText ( return Strtoi (Text);
}
-
/**
Converts a text device path node to IPV4 device path structure.
@@ -1848,7 +1859,7 @@ NetworkProtocolFromText ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextIPv4 (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *RemoteIPStr;
@@ -1859,20 +1870,20 @@ DevPathFromTextIPv4 ( CHAR16 *SubnetMaskStr;
IPv4_DEVICE_PATH *IPv4;
- RemoteIPStr = GetNextParamStr (&TextDeviceNode);
- ProtocolStr = GetNextParamStr (&TextDeviceNode);
- TypeStr = GetNextParamStr (&TextDeviceNode);
- LocalIPStr = GetNextParamStr (&TextDeviceNode);
- GatewayIPStr = GetNextParamStr (&TextDeviceNode);
- SubnetMaskStr = GetNextParamStr (&TextDeviceNode);
- IPv4 = (IPv4_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_IPv4_DP,
- (UINT16) sizeof (IPv4_DEVICE_PATH)
- );
+ RemoteIPStr = GetNextParamStr (&TextDeviceNode);
+ ProtocolStr = GetNextParamStr (&TextDeviceNode);
+ TypeStr = GetNextParamStr (&TextDeviceNode);
+ LocalIPStr = GetNextParamStr (&TextDeviceNode);
+ GatewayIPStr = GetNextParamStr (&TextDeviceNode);
+ SubnetMaskStr = GetNextParamStr (&TextDeviceNode);
+ IPv4 = (IPv4_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_IPv4_DP,
+ (UINT16)sizeof (IPv4_DEVICE_PATH)
+ );
StrToIpv4Address (RemoteIPStr, NULL, &IPv4->RemoteIpAddress, NULL);
- IPv4->Protocol = (UINT16) NetworkProtocolFromText (ProtocolStr);
+ IPv4->Protocol = (UINT16)NetworkProtocolFromText (ProtocolStr);
if (StrCmp (TypeStr, L"Static") == 0) {
IPv4->StaticIpAddress = TRUE;
} else {
@@ -1881,17 +1892,17 @@ DevPathFromTextIPv4 ( StrToIpv4Address (LocalIPStr, NULL, &IPv4->LocalIpAddress, NULL);
if (!IS_NULL (*GatewayIPStr) && !IS_NULL (*SubnetMaskStr)) {
- StrToIpv4Address (GatewayIPStr, NULL, &IPv4->GatewayIpAddress, NULL);
- StrToIpv4Address (SubnetMaskStr, NULL, &IPv4->SubnetMask, NULL);
+ StrToIpv4Address (GatewayIPStr, NULL, &IPv4->GatewayIpAddress, NULL);
+ StrToIpv4Address (SubnetMaskStr, NULL, &IPv4->SubnetMask, NULL);
} else {
ZeroMem (&IPv4->GatewayIpAddress, sizeof (IPv4->GatewayIpAddress));
- ZeroMem (&IPv4->SubnetMask, sizeof (IPv4->SubnetMask));
+ ZeroMem (&IPv4->SubnetMask, sizeof (IPv4->SubnetMask));
}
- IPv4->LocalPort = 0;
- IPv4->RemotePort = 0;
+ IPv4->LocalPort = 0;
+ IPv4->RemotePort = 0;
- return (EFI_DEVICE_PATH_PROTOCOL *) IPv4;
+ return (EFI_DEVICE_PATH_PROTOCOL *)IPv4;
}
/**
@@ -1904,7 +1915,7 @@ DevPathFromTextIPv4 ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextIPv6 (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *RemoteIPStr;
@@ -1915,20 +1926,20 @@ DevPathFromTextIPv6 ( CHAR16 *PrefixLengthStr;
IPv6_DEVICE_PATH *IPv6;
- RemoteIPStr = GetNextParamStr (&TextDeviceNode);
- ProtocolStr = GetNextParamStr (&TextDeviceNode);
- TypeStr = GetNextParamStr (&TextDeviceNode);
- LocalIPStr = GetNextParamStr (&TextDeviceNode);
- PrefixLengthStr = GetNextParamStr (&TextDeviceNode);
- GatewayIPStr = GetNextParamStr (&TextDeviceNode);
- IPv6 = (IPv6_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_IPv6_DP,
- (UINT16) sizeof (IPv6_DEVICE_PATH)
- );
+ RemoteIPStr = GetNextParamStr (&TextDeviceNode);
+ ProtocolStr = GetNextParamStr (&TextDeviceNode);
+ TypeStr = GetNextParamStr (&TextDeviceNode);
+ LocalIPStr = GetNextParamStr (&TextDeviceNode);
+ PrefixLengthStr = GetNextParamStr (&TextDeviceNode);
+ GatewayIPStr = GetNextParamStr (&TextDeviceNode);
+ IPv6 = (IPv6_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_IPv6_DP,
+ (UINT16)sizeof (IPv6_DEVICE_PATH)
+ );
StrToIpv6Address (RemoteIPStr, NULL, &IPv6->RemoteIpAddress, NULL);
- IPv6->Protocol = (UINT16) NetworkProtocolFromText (ProtocolStr);
+ IPv6->Protocol = (UINT16)NetworkProtocolFromText (ProtocolStr);
if (StrCmp (TypeStr, L"Static") == 0) {
IPv6->IpAddressOrigin = 0;
} else if (StrCmp (TypeStr, L"StatelessAutoConfigure") == 0) {
@@ -1940,16 +1951,16 @@ DevPathFromTextIPv6 ( StrToIpv6Address (LocalIPStr, NULL, &IPv6->LocalIpAddress, NULL);
if (!IS_NULL (*GatewayIPStr) && !IS_NULL (*PrefixLengthStr)) {
StrToIpv6Address (GatewayIPStr, NULL, &IPv6->GatewayIpAddress, NULL);
- IPv6->PrefixLength = (UINT8) Strtoi (PrefixLengthStr);
+ IPv6->PrefixLength = (UINT8)Strtoi (PrefixLengthStr);
} else {
ZeroMem (&IPv6->GatewayIpAddress, sizeof (IPv6->GatewayIpAddress));
IPv6->PrefixLength = 0;
}
- IPv6->LocalPort = 0;
- IPv6->RemotePort = 0;
+ IPv6->LocalPort = 0;
+ IPv6->RemotePort = 0;
- return (EFI_DEVICE_PATH_PROTOCOL *) IPv6;
+ return (EFI_DEVICE_PATH_PROTOCOL *)IPv6;
}
/**
@@ -1962,7 +1973,7 @@ DevPathFromTextIPv6 ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUart (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *BaudStr;
@@ -1971,65 +1982,66 @@ DevPathFromTextUart ( CHAR16 *StopBitsStr;
UART_DEVICE_PATH *Uart;
- BaudStr = GetNextParamStr (&TextDeviceNode);
- DataBitsStr = GetNextParamStr (&TextDeviceNode);
- ParityStr = GetNextParamStr (&TextDeviceNode);
- StopBitsStr = GetNextParamStr (&TextDeviceNode);
- Uart = (UART_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_UART_DP,
- (UINT16) sizeof (UART_DEVICE_PATH)
- );
+ BaudStr = GetNextParamStr (&TextDeviceNode);
+ DataBitsStr = GetNextParamStr (&TextDeviceNode);
+ ParityStr = GetNextParamStr (&TextDeviceNode);
+ StopBitsStr = GetNextParamStr (&TextDeviceNode);
+ Uart = (UART_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_UART_DP,
+ (UINT16)sizeof (UART_DEVICE_PATH)
+ );
if (StrCmp (BaudStr, L"DEFAULT") == 0) {
Uart->BaudRate = 115200;
} else {
Strtoi64 (BaudStr, &Uart->BaudRate);
}
- Uart->DataBits = (UINT8) ((StrCmp (DataBitsStr, L"DEFAULT") == 0) ? 8 : Strtoi (DataBitsStr));
+
+ Uart->DataBits = (UINT8)((StrCmp (DataBitsStr, L"DEFAULT") == 0) ? 8 : Strtoi (DataBitsStr));
switch (*ParityStr) {
- case L'D':
- Uart->Parity = 0;
- break;
+ case L'D':
+ Uart->Parity = 0;
+ break;
- case L'N':
- Uart->Parity = 1;
- break;
+ case L'N':
+ Uart->Parity = 1;
+ break;
- case L'E':
- Uart->Parity = 2;
- break;
+ case L'E':
+ Uart->Parity = 2;
+ break;
- case L'O':
- Uart->Parity = 3;
- break;
+ case L'O':
+ Uart->Parity = 3;
+ break;
- case L'M':
- Uart->Parity = 4;
- break;
+ case L'M':
+ Uart->Parity = 4;
+ break;
- case L'S':
- Uart->Parity = 5;
- break;
+ case L'S':
+ Uart->Parity = 5;
+ break;
- default:
- Uart->Parity = (UINT8) Strtoi (ParityStr);
- break;
+ default:
+ Uart->Parity = (UINT8)Strtoi (ParityStr);
+ break;
}
if (StrCmp (StopBitsStr, L"D") == 0) {
- Uart->StopBits = (UINT8) 0;
+ Uart->StopBits = (UINT8)0;
} else if (StrCmp (StopBitsStr, L"1") == 0) {
- Uart->StopBits = (UINT8) 1;
+ Uart->StopBits = (UINT8)1;
} else if (StrCmp (StopBitsStr, L"1.5") == 0) {
- Uart->StopBits = (UINT8) 2;
+ Uart->StopBits = (UINT8)2;
} else if (StrCmp (StopBitsStr, L"2") == 0) {
- Uart->StopBits = (UINT8) 3;
+ Uart->StopBits = (UINT8)3;
} else {
- Uart->StopBits = (UINT8) Strtoi (StopBitsStr);
+ Uart->StopBits = (UINT8)Strtoi (StopBitsStr);
}
- return (EFI_DEVICE_PATH_PROTOCOL *) Uart;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Uart;
}
/**
@@ -2043,41 +2055,42 @@ DevPathFromTextUart ( **/
EFI_DEVICE_PATH_PROTOCOL *
ConvertFromTextUsbClass (
- IN CHAR16 *TextDeviceNode,
- IN USB_CLASS_TEXT *UsbClassText
+ IN CHAR16 *TextDeviceNode,
+ IN USB_CLASS_TEXT *UsbClassText
)
{
- CHAR16 *VIDStr;
- CHAR16 *PIDStr;
- CHAR16 *ClassStr;
- CHAR16 *SubClassStr;
- CHAR16 *ProtocolStr;
- USB_CLASS_DEVICE_PATH *UsbClass;
+ CHAR16 *VIDStr;
+ CHAR16 *PIDStr;
+ CHAR16 *ClassStr;
+ CHAR16 *SubClassStr;
+ CHAR16 *ProtocolStr;
+ USB_CLASS_DEVICE_PATH *UsbClass;
- UsbClass = (USB_CLASS_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_USB_CLASS_DP,
- (UINT16) sizeof (USB_CLASS_DEVICE_PATH)
- );
+ UsbClass = (USB_CLASS_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_USB_CLASS_DP,
+ (UINT16)sizeof (USB_CLASS_DEVICE_PATH)
+ );
- VIDStr = GetNextParamStr (&TextDeviceNode);
- PIDStr = GetNextParamStr (&TextDeviceNode);
+ VIDStr = GetNextParamStr (&TextDeviceNode);
+ PIDStr = GetNextParamStr (&TextDeviceNode);
if (UsbClassText->ClassExist) {
ClassStr = GetNextParamStr (&TextDeviceNode);
if (*ClassStr == L'\0') {
UsbClass->DeviceClass = 0xFF;
} else {
- UsbClass->DeviceClass = (UINT8) Strtoi (ClassStr);
+ UsbClass->DeviceClass = (UINT8)Strtoi (ClassStr);
}
} else {
UsbClass->DeviceClass = UsbClassText->Class;
}
+
if (UsbClassText->SubClassExist) {
SubClassStr = GetNextParamStr (&TextDeviceNode);
if (*SubClassStr == L'\0') {
UsbClass->DeviceSubClass = 0xFF;
} else {
- UsbClass->DeviceSubClass = (UINT8) Strtoi (SubClassStr);
+ UsbClass->DeviceSubClass = (UINT8)Strtoi (SubClassStr);
}
} else {
UsbClass->DeviceSubClass = UsbClassText->SubClass;
@@ -2086,25 +2099,26 @@ ConvertFromTextUsbClass ( ProtocolStr = GetNextParamStr (&TextDeviceNode);
if (*VIDStr == L'\0') {
- UsbClass->VendorId = 0xFFFF;
+ UsbClass->VendorId = 0xFFFF;
} else {
- UsbClass->VendorId = (UINT16) Strtoi (VIDStr);
+ UsbClass->VendorId = (UINT16)Strtoi (VIDStr);
}
+
if (*PIDStr == L'\0') {
- UsbClass->ProductId = 0xFFFF;
+ UsbClass->ProductId = 0xFFFF;
} else {
- UsbClass->ProductId = (UINT16) Strtoi (PIDStr);
+ UsbClass->ProductId = (UINT16)Strtoi (PIDStr);
}
+
if (*ProtocolStr == L'\0') {
- UsbClass->DeviceProtocol = 0xFF;
+ UsbClass->DeviceProtocol = 0xFF;
} else {
- UsbClass->DeviceProtocol = (UINT8) Strtoi (ProtocolStr);
+ UsbClass->DeviceProtocol = (UINT8)Strtoi (ProtocolStr);
}
- return (EFI_DEVICE_PATH_PROTOCOL *) UsbClass;
+ return (EFI_DEVICE_PATH_PROTOCOL *)UsbClass;
}
-
/**
Converts a text device path node to USB class device path structure.
@@ -2115,7 +2129,7 @@ ConvertFromTextUsbClass ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbClass (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2136,7 +2150,7 @@ DevPathFromTextUsbClass ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbAudio (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2158,7 +2172,7 @@ DevPathFromTextUsbAudio ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbCDCControl (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2180,7 +2194,7 @@ DevPathFromTextUsbCDCControl ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbHID (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2202,7 +2216,7 @@ DevPathFromTextUsbHID ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbImage (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2224,7 +2238,7 @@ DevPathFromTextUsbImage ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbPrinter (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2246,7 +2260,7 @@ DevPathFromTextUsbPrinter ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbMassStorage (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2268,7 +2282,7 @@ DevPathFromTextUsbMassStorage ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbHub (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2290,7 +2304,7 @@ DevPathFromTextUsbHub ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbCDCData (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2312,7 +2326,7 @@ DevPathFromTextUsbCDCData ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbSmartCard (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2334,7 +2348,7 @@ DevPathFromTextUsbSmartCard ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbVideo (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2356,7 +2370,7 @@ DevPathFromTextUsbVideo ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbDiagnostic (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2378,7 +2392,7 @@ DevPathFromTextUsbDiagnostic ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbWireless (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2400,7 +2414,7 @@ DevPathFromTextUsbWireless ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbDeviceFirmwareUpdate (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2423,7 +2437,7 @@ DevPathFromTextUsbDeviceFirmwareUpdate ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbIrdaBridge (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2446,7 +2460,7 @@ DevPathFromTextUsbIrdaBridge ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbTestAndMeasurement (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
USB_CLASS_TEXT UsbClassText;
@@ -2469,7 +2483,7 @@ DevPathFromTextUsbTestAndMeasurement ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUsbWwid (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *VIDStr;
@@ -2479,39 +2493,41 @@ DevPathFromTextUsbWwid ( USB_WWID_DEVICE_PATH *UsbWwid;
UINTN SerialNumberStrLen;
- VIDStr = GetNextParamStr (&TextDeviceNode);
- PIDStr = GetNextParamStr (&TextDeviceNode);
- InterfaceNumStr = GetNextParamStr (&TextDeviceNode);
- SerialNumberStr = GetNextParamStr (&TextDeviceNode);
- SerialNumberStrLen = StrLen (SerialNumberStr);
- if (SerialNumberStrLen >= 2 &&
- SerialNumberStr[0] == L'\"' &&
- SerialNumberStr[SerialNumberStrLen - 1] == L'\"'
- ) {
+ VIDStr = GetNextParamStr (&TextDeviceNode);
+ PIDStr = GetNextParamStr (&TextDeviceNode);
+ InterfaceNumStr = GetNextParamStr (&TextDeviceNode);
+ SerialNumberStr = GetNextParamStr (&TextDeviceNode);
+ SerialNumberStrLen = StrLen (SerialNumberStr);
+ if ((SerialNumberStrLen >= 2) &&
+ (SerialNumberStr[0] == L'\"') &&
+ (SerialNumberStr[SerialNumberStrLen - 1] == L'\"')
+ )
+ {
SerialNumberStr[SerialNumberStrLen - 1] = L'\0';
SerialNumberStr++;
SerialNumberStrLen -= 2;
}
- UsbWwid = (USB_WWID_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_USB_WWID_DP,
- (UINT16) (sizeof (USB_WWID_DEVICE_PATH) + SerialNumberStrLen * sizeof (CHAR16))
- );
- UsbWwid->VendorId = (UINT16) Strtoi (VIDStr);
- UsbWwid->ProductId = (UINT16) Strtoi (PIDStr);
- UsbWwid->InterfaceNumber = (UINT16) Strtoi (InterfaceNumStr);
+
+ UsbWwid = (USB_WWID_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_USB_WWID_DP,
+ (UINT16)(sizeof (USB_WWID_DEVICE_PATH) + SerialNumberStrLen * sizeof (CHAR16))
+ );
+ UsbWwid->VendorId = (UINT16)Strtoi (VIDStr);
+ UsbWwid->ProductId = (UINT16)Strtoi (PIDStr);
+ UsbWwid->InterfaceNumber = (UINT16)Strtoi (InterfaceNumStr);
//
// There is no memory allocated in UsbWwid for the '\0' in SerialNumberStr.
// Therefore, the '\0' will not be copied.
//
CopyMem (
- (UINT8 *) UsbWwid + sizeof (USB_WWID_DEVICE_PATH),
+ (UINT8 *)UsbWwid + sizeof (USB_WWID_DEVICE_PATH),
SerialNumberStr,
SerialNumberStrLen * sizeof (CHAR16)
);
- return (EFI_DEVICE_PATH_PROTOCOL *) UsbWwid;
+ return (EFI_DEVICE_PATH_PROTOCOL *)UsbWwid;
}
/**
@@ -2524,22 +2540,22 @@ DevPathFromTextUsbWwid ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUnit (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *LunStr;
- DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;
+ CHAR16 *LunStr;
+ DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;
LunStr = GetNextParamStr (&TextDeviceNode);
- LogicalUnit = (DEVICE_LOGICAL_UNIT_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_DEVICE_LOGICAL_UNIT_DP,
- (UINT16) sizeof (DEVICE_LOGICAL_UNIT_DEVICE_PATH)
- );
+ LogicalUnit = (DEVICE_LOGICAL_UNIT_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_DEVICE_LOGICAL_UNIT_DP,
+ (UINT16)sizeof (DEVICE_LOGICAL_UNIT_DEVICE_PATH)
+ );
- LogicalUnit->Lun = (UINT8) Strtoi (LunStr);
+ LogicalUnit->Lun = (UINT8)Strtoi (LunStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) LogicalUnit;
+ return (EFI_DEVICE_PATH_PROTOCOL *)LogicalUnit;
}
/**
@@ -2552,20 +2568,20 @@ DevPathFromTextUnit ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextiSCSI (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- UINT16 Options;
- CHAR16 *NameStr;
- CHAR16 *PortalGroupStr;
- CHAR16 *LunStr;
- CHAR16 *HeaderDigestStr;
- CHAR16 *DataDigestStr;
- CHAR16 *AuthenticationStr;
- CHAR16 *ProtocolStr;
- CHAR8 *AsciiStr;
- ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath;
- UINT64 Lun;
+ UINT16 Options;
+ CHAR16 *NameStr;
+ CHAR16 *PortalGroupStr;
+ CHAR16 *LunStr;
+ CHAR16 *HeaderDigestStr;
+ CHAR16 *DataDigestStr;
+ CHAR16 *AuthenticationStr;
+ CHAR16 *ProtocolStr;
+ CHAR8 *AsciiStr;
+ ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath;
+ UINT64 Lun;
NameStr = GetNextParamStr (&TextDeviceNode);
PortalGroupStr = GetNextParamStr (&TextDeviceNode);
@@ -2574,18 +2590,18 @@ DevPathFromTextiSCSI ( DataDigestStr = GetNextParamStr (&TextDeviceNode);
AuthenticationStr = GetNextParamStr (&TextDeviceNode);
ProtocolStr = GetNextParamStr (&TextDeviceNode);
- ISCSIDevPath = (ISCSI_DEVICE_PATH_WITH_NAME *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_ISCSI_DP,
- (UINT16) (sizeof (ISCSI_DEVICE_PATH_WITH_NAME) + StrLen (NameStr))
- );
+ ISCSIDevPath = (ISCSI_DEVICE_PATH_WITH_NAME *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_ISCSI_DP,
+ (UINT16)(sizeof (ISCSI_DEVICE_PATH_WITH_NAME) + StrLen (NameStr))
+ );
AsciiStr = ISCSIDevPath->TargetName;
StrToAscii (NameStr, &AsciiStr);
- ISCSIDevPath->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr);
+ ISCSIDevPath->TargetPortalGroupTag = (UINT16)Strtoi (PortalGroupStr);
Strtoi64 (LunStr, &Lun);
- WriteUnaligned64 ((UINT64 *) &ISCSIDevPath->Lun, SwapBytes64 (Lun));
+ WriteUnaligned64 ((UINT64 *)&ISCSIDevPath->Lun, SwapBytes64 (Lun));
Options = 0x0000;
if (StrCmp (HeaderDigestStr, L"CRC32C") == 0) {
@@ -2604,7 +2620,7 @@ DevPathFromTextiSCSI ( Options |= 0x1000;
}
- ISCSIDevPath->LoginOption = (UINT16) Options;
+ ISCSIDevPath->LoginOption = (UINT16)Options;
if (IS_NULL (*ProtocolStr) || (StrCmp (ProtocolStr, L"TCP") == 0)) {
ISCSIDevPath->NetworkProtocol = 0;
@@ -2615,7 +2631,7 @@ DevPathFromTextiSCSI ( ISCSIDevPath->NetworkProtocol = 1;
}
- return (EFI_DEVICE_PATH_PROTOCOL *) ISCSIDevPath;
+ return (EFI_DEVICE_PATH_PROTOCOL *)ISCSIDevPath;
}
/**
@@ -2628,22 +2644,22 @@ DevPathFromTextiSCSI ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVlan (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *VlanStr;
VLAN_DEVICE_PATH *Vlan;
VlanStr = GetNextParamStr (&TextDeviceNode);
- Vlan = (VLAN_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_VLAN_DP,
- (UINT16) sizeof (VLAN_DEVICE_PATH)
- );
+ Vlan = (VLAN_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_VLAN_DP,
+ (UINT16)sizeof (VLAN_DEVICE_PATH)
+ );
- Vlan->VlanId = (UINT16) Strtoi (VlanStr);
+ Vlan->VlanId = (UINT16)Strtoi (VlanStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Vlan;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Vlan;
}
/**
@@ -2656,25 +2672,25 @@ DevPathFromTextVlan ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextBluetooth (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *BluetoothStr;
- BLUETOOTH_DEVICE_PATH *BluetoothDp;
+ CHAR16 *BluetoothStr;
+ BLUETOOTH_DEVICE_PATH *BluetoothDp;
BluetoothStr = GetNextParamStr (&TextDeviceNode);
- BluetoothDp = (BLUETOOTH_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_BLUETOOTH_DP,
- (UINT16) sizeof (BLUETOOTH_DEVICE_PATH)
- );
+ BluetoothDp = (BLUETOOTH_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_BLUETOOTH_DP,
+ (UINT16)sizeof (BLUETOOTH_DEVICE_PATH)
+ );
StrHexToBytes (
BluetoothStr,
sizeof (BLUETOOTH_ADDRESS) * 2,
BluetoothDp->BD_ADDR.Address,
sizeof (BLUETOOTH_ADDRESS)
);
- return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothDp;
+ return (EFI_DEVICE_PATH_PROTOCOL *)BluetoothDp;
}
/**
@@ -2687,20 +2703,20 @@ DevPathFromTextBluetooth ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextWiFi (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *SSIdStr;
- CHAR8 AsciiStr[33];
- UINTN DataLen;
- WIFI_DEVICE_PATH *WiFiDp;
+ CHAR16 *SSIdStr;
+ CHAR8 AsciiStr[33];
+ UINTN DataLen;
+ WIFI_DEVICE_PATH *WiFiDp;
SSIdStr = GetNextParamStr (&TextDeviceNode);
- WiFiDp = (WIFI_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_WIFI_DP,
- (UINT16) sizeof (WIFI_DEVICE_PATH)
- );
+ WiFiDp = (WIFI_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_WIFI_DP,
+ (UINT16)sizeof (WIFI_DEVICE_PATH)
+ );
if (NULL != SSIdStr) {
DataLen = StrLen (SSIdStr);
@@ -2713,7 +2729,7 @@ DevPathFromTextWiFi ( CopyMem (WiFiDp->SSId, AsciiStr, DataLen);
}
- return (EFI_DEVICE_PATH_PROTOCOL *) WiFiDp;
+ return (EFI_DEVICE_PATH_PROTOCOL *)WiFiDp;
}
/**
@@ -2726,27 +2742,29 @@ DevPathFromTextWiFi ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextBluetoothLE (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *BluetoothLeAddrStr;
- CHAR16 *BluetoothLeAddrTypeStr;
- BLUETOOTH_LE_DEVICE_PATH *BluetoothLeDp;
+ CHAR16 *BluetoothLeAddrStr;
+ CHAR16 *BluetoothLeAddrTypeStr;
+ BLUETOOTH_LE_DEVICE_PATH *BluetoothLeDp;
BluetoothLeAddrStr = GetNextParamStr (&TextDeviceNode);
BluetoothLeAddrTypeStr = GetNextParamStr (&TextDeviceNode);
- BluetoothLeDp = (BLUETOOTH_LE_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_BLUETOOTH_LE_DP,
- (UINT16) sizeof (BLUETOOTH_LE_DEVICE_PATH)
- );
+ BluetoothLeDp = (BLUETOOTH_LE_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_BLUETOOTH_LE_DP,
+ (UINT16)sizeof (BLUETOOTH_LE_DEVICE_PATH)
+ );
- BluetoothLeDp->Address.Type = (UINT8) Strtoi (BluetoothLeAddrTypeStr);
+ BluetoothLeDp->Address.Type = (UINT8)Strtoi (BluetoothLeAddrTypeStr);
StrHexToBytes (
- BluetoothLeAddrStr, sizeof (BluetoothLeDp->Address.Address) * 2,
- BluetoothLeDp->Address.Address, sizeof (BluetoothLeDp->Address.Address)
+ BluetoothLeAddrStr,
+ sizeof (BluetoothLeDp->Address.Address) * 2,
+ BluetoothLeDp->Address.Address,
+ sizeof (BluetoothLeDp->Address.Address)
);
- return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothLeDp;
+ return (EFI_DEVICE_PATH_PROTOCOL *)BluetoothLeDp;
}
/**
@@ -2759,17 +2777,16 @@ DevPathFromTextBluetoothLE ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextDns (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *DeviceNodeStr;
- CHAR16 *DeviceNodeStrPtr;
- UINT32 DnsServerIpCount;
- UINT16 DnsDeviceNodeLength;
- DNS_DEVICE_PATH *DnsDeviceNode;
- UINT32 DnsServerIpIndex;
- CHAR16 *DnsServerIp;
-
+ CHAR16 *DeviceNodeStr;
+ CHAR16 *DeviceNodeStrPtr;
+ UINT32 DnsServerIpCount;
+ UINT16 DnsDeviceNodeLength;
+ DNS_DEVICE_PATH *DnsDeviceNode;
+ UINT32 DnsServerIpIndex;
+ CHAR16 *DnsServerIp;
//
// Count the DNS server address number.
@@ -2784,7 +2801,7 @@ DevPathFromTextDns ( DnsServerIpCount = 0;
while (DeviceNodeStrPtr != NULL && *DeviceNodeStrPtr != L'\0') {
GetNextParamStr (&DeviceNodeStrPtr);
- DnsServerIpCount ++;
+ DnsServerIpCount++;
}
FreePool (DeviceNodeStr);
@@ -2801,12 +2818,12 @@ DevPathFromTextDns ( //
// Create the DNS DeviceNode.
//
- DnsDeviceNodeLength = (UINT16) (sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (UINT8) + DnsServerIpCount * sizeof (EFI_IP_ADDRESS));
- DnsDeviceNode = (DNS_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_DNS_DP,
- DnsDeviceNodeLength
- );
+ DnsDeviceNodeLength = (UINT16)(sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (UINT8) + DnsServerIpCount * sizeof (EFI_IP_ADDRESS));
+ DnsDeviceNode = (DNS_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_DNS_DP,
+ DnsDeviceNodeLength
+ );
if (DnsDeviceNode == NULL) {
return NULL;
}
@@ -2832,13 +2849,13 @@ DevPathFromTextDns ( for (DnsServerIpIndex = 0; DnsServerIpIndex < DnsServerIpCount; DnsServerIpIndex++) {
DnsServerIp = GetNextParamStr (&TextDeviceNode);
if (DnsDeviceNode->IsIPv6 == 0x00) {
- StrToIpv4Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v4), NULL);
+ StrToIpv4Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v4), NULL);
} else {
StrToIpv6Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v6), NULL);
}
}
- return (EFI_DEVICE_PATH_PROTOCOL *) DnsDeviceNode;
+ return (EFI_DEVICE_PATH_PROTOCOL *)DnsDeviceNode;
}
/**
@@ -2851,26 +2868,26 @@ DevPathFromTextDns ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextUri (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *UriStr;
UINTN UriLength;
URI_DEVICE_PATH *Uri;
- UriStr = GetNextParamStr (&TextDeviceNode);
+ UriStr = GetNextParamStr (&TextDeviceNode);
UriLength = StrnLenS (UriStr, MAX_UINT16 - sizeof (URI_DEVICE_PATH));
- Uri = (URI_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_URI_DP,
- (UINT16) (sizeof (URI_DEVICE_PATH) + UriLength)
- );
+ Uri = (URI_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_URI_DP,
+ (UINT16)(sizeof (URI_DEVICE_PATH) + UriLength)
+ );
while (UriLength-- != 0) {
- Uri->Uri[UriLength] = (CHAR8) UriStr[UriLength];
+ Uri->Uri[UriLength] = (CHAR8)UriStr[UriLength];
}
- return (EFI_DEVICE_PATH_PROTOCOL *) Uri;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Uri;
}
/**
@@ -2883,7 +2900,7 @@ DevPathFromTextUri ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextMediaPath (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return DevPathFromTextGenericPath (MEDIA_DEVICE_PATH, TextDeviceNode);
@@ -2899,52 +2916,52 @@ DevPathFromTextMediaPath ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextHD (
- IN CHAR16 *TextDeviceNode
- )
-{
- CHAR16 *PartitionStr;
- CHAR16 *TypeStr;
- CHAR16 *SignatureStr;
- CHAR16 *StartStr;
- CHAR16 *SizeStr;
- UINT32 Signature32;
- HARDDRIVE_DEVICE_PATH *Hd;
-
- PartitionStr = GetNextParamStr (&TextDeviceNode);
- TypeStr = GetNextParamStr (&TextDeviceNode);
- SignatureStr = GetNextParamStr (&TextDeviceNode);
- StartStr = GetNextParamStr (&TextDeviceNode);
- SizeStr = GetNextParamStr (&TextDeviceNode);
- Hd = (HARDDRIVE_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_HARDDRIVE_DP,
- (UINT16) sizeof (HARDDRIVE_DEVICE_PATH)
- );
+ IN CHAR16 *TextDeviceNode
+ )
+{
+ CHAR16 *PartitionStr;
+ CHAR16 *TypeStr;
+ CHAR16 *SignatureStr;
+ CHAR16 *StartStr;
+ CHAR16 *SizeStr;
+ UINT32 Signature32;
+ HARDDRIVE_DEVICE_PATH *Hd;
+
+ PartitionStr = GetNextParamStr (&TextDeviceNode);
+ TypeStr = GetNextParamStr (&TextDeviceNode);
+ SignatureStr = GetNextParamStr (&TextDeviceNode);
+ StartStr = GetNextParamStr (&TextDeviceNode);
+ SizeStr = GetNextParamStr (&TextDeviceNode);
+ Hd = (HARDDRIVE_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_HARDDRIVE_DP,
+ (UINT16)sizeof (HARDDRIVE_DEVICE_PATH)
+ );
- Hd->PartitionNumber = (UINT32) Strtoi (PartitionStr);
+ Hd->PartitionNumber = (UINT32)Strtoi (PartitionStr);
ZeroMem (Hd->Signature, 16);
- Hd->MBRType = (UINT8) 0;
+ Hd->MBRType = (UINT8)0;
if (StrCmp (TypeStr, L"MBR") == 0) {
Hd->SignatureType = SIGNATURE_TYPE_MBR;
Hd->MBRType = 0x01;
- Signature32 = (UINT32) Strtoi (SignatureStr);
+ Signature32 = (UINT32)Strtoi (SignatureStr);
CopyMem (Hd->Signature, &Signature32, sizeof (UINT32));
} else if (StrCmp (TypeStr, L"GPT") == 0) {
Hd->SignatureType = SIGNATURE_TYPE_GUID;
Hd->MBRType = 0x02;
- StrToGuid (SignatureStr, (EFI_GUID *) Hd->Signature);
+ StrToGuid (SignatureStr, (EFI_GUID *)Hd->Signature);
} else {
- Hd->SignatureType = (UINT8) Strtoi (TypeStr);
+ Hd->SignatureType = (UINT8)Strtoi (TypeStr);
}
Strtoi64 (StartStr, &Hd->PartitionStart);
Strtoi64 (SizeStr, &Hd->PartitionSize);
- return (EFI_DEVICE_PATH_PROTOCOL *) Hd;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Hd;
}
/**
@@ -2957,28 +2974,28 @@ DevPathFromTextHD ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextCDROM (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *EntryStr;
- CHAR16 *StartStr;
- CHAR16 *SizeStr;
- CDROM_DEVICE_PATH *CDROMDevPath;
+ CHAR16 *EntryStr;
+ CHAR16 *StartStr;
+ CHAR16 *SizeStr;
+ CDROM_DEVICE_PATH *CDROMDevPath;
- EntryStr = GetNextParamStr (&TextDeviceNode);
- StartStr = GetNextParamStr (&TextDeviceNode);
- SizeStr = GetNextParamStr (&TextDeviceNode);
- CDROMDevPath = (CDROM_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_CDROM_DP,
- (UINT16) sizeof (CDROM_DEVICE_PATH)
- );
+ EntryStr = GetNextParamStr (&TextDeviceNode);
+ StartStr = GetNextParamStr (&TextDeviceNode);
+ SizeStr = GetNextParamStr (&TextDeviceNode);
+ CDROMDevPath = (CDROM_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_CDROM_DP,
+ (UINT16)sizeof (CDROM_DEVICE_PATH)
+ );
- CDROMDevPath->BootEntry = (UINT32) Strtoi (EntryStr);
+ CDROMDevPath->BootEntry = (UINT32)Strtoi (EntryStr);
Strtoi64 (StartStr, &CDROMDevPath->PartitionStart);
Strtoi64 (SizeStr, &CDROMDevPath->PartitionSize);
- return (EFI_DEVICE_PATH_PROTOCOL *) CDROMDevPath;
+ return (EFI_DEVICE_PATH_PROTOCOL *)CDROMDevPath;
}
/**
@@ -2991,7 +3008,7 @@ DevPathFromTextCDROM ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVenMedia (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return ConvertFromTextVendor (
@@ -3011,20 +3028,20 @@ DevPathFromTextVenMedia ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextFilePath (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
FILEPATH_DEVICE_PATH *File;
- File = (FILEPATH_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_FILEPATH_DP,
- (UINT16) (sizeof (FILEPATH_DEVICE_PATH) + StrLen (TextDeviceNode) * 2)
- );
+ File = (FILEPATH_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_FILEPATH_DP,
+ (UINT16)(sizeof (FILEPATH_DEVICE_PATH) + StrLen (TextDeviceNode) * 2)
+ );
StrCpyS (File->PathName, StrLen (TextDeviceNode) + 1, TextDeviceNode);
- return (EFI_DEVICE_PATH_PROTOCOL *) File;
+ return (EFI_DEVICE_PATH_PROTOCOL *)File;
}
/**
@@ -3037,22 +3054,22 @@ DevPathFromTextFilePath ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextMedia (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *GuidStr;
MEDIA_PROTOCOL_DEVICE_PATH *Media;
GuidStr = GetNextParamStr (&TextDeviceNode);
- Media = (MEDIA_PROTOCOL_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_PROTOCOL_DP,
- (UINT16) sizeof (MEDIA_PROTOCOL_DEVICE_PATH)
- );
+ Media = (MEDIA_PROTOCOL_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_PROTOCOL_DP,
+ (UINT16)sizeof (MEDIA_PROTOCOL_DEVICE_PATH)
+ );
StrToGuid (GuidStr, &Media->Protocol);
- return (EFI_DEVICE_PATH_PROTOCOL *) Media;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Media;
}
/**
@@ -3065,22 +3082,22 @@ DevPathFromTextMedia ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextFv (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *GuidStr;
MEDIA_FW_VOL_DEVICE_PATH *Fv;
GuidStr = GetNextParamStr (&TextDeviceNode);
- Fv = (MEDIA_FW_VOL_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_PIWG_FW_VOL_DP,
- (UINT16) sizeof (MEDIA_FW_VOL_DEVICE_PATH)
- );
+ Fv = (MEDIA_FW_VOL_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_PIWG_FW_VOL_DP,
+ (UINT16)sizeof (MEDIA_FW_VOL_DEVICE_PATH)
+ );
StrToGuid (GuidStr, &Fv->FvName);
- return (EFI_DEVICE_PATH_PROTOCOL *) Fv;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Fv;
}
/**
@@ -3093,22 +3110,22 @@ DevPathFromTextFv ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextFvFile (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
CHAR16 *GuidStr;
MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFile;
GuidStr = GetNextParamStr (&TextDeviceNode);
- FvFile = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_PIWG_FW_FILE_DP,
- (UINT16) sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)
- );
+ FvFile = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_PIWG_FW_FILE_DP,
+ (UINT16)sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)
+ );
StrToGuid (GuidStr, &FvFile->FvFileName);
- return (EFI_DEVICE_PATH_PROTOCOL *) FvFile;
+ return (EFI_DEVICE_PATH_PROTOCOL *)FvFile;
}
/**
@@ -3121,25 +3138,25 @@ DevPathFromTextFvFile ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextRelativeOffsetRange (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *StartingOffsetStr;
- CHAR16 *EndingOffsetStr;
- MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset;
+ CHAR16 *StartingOffsetStr;
+ CHAR16 *EndingOffsetStr;
+ MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset;
StartingOffsetStr = GetNextParamStr (&TextDeviceNode);
EndingOffsetStr = GetNextParamStr (&TextDeviceNode);
- Offset = (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_RELATIVE_OFFSET_RANGE_DP,
- (UINT16) sizeof (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH)
- );
+ Offset = (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_RELATIVE_OFFSET_RANGE_DP,
+ (UINT16)sizeof (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH)
+ );
Strtoi64 (StartingOffsetStr, &Offset->StartingOffset);
Strtoi64 (EndingOffsetStr, &Offset->EndingOffset);
- return (EFI_DEVICE_PATH_PROTOCOL *) Offset;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Offset;
}
/**
@@ -3152,35 +3169,35 @@ DevPathFromTextRelativeOffsetRange ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextRamDisk (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *StartingAddrStr;
- CHAR16 *EndingAddrStr;
- CHAR16 *TypeGuidStr;
- CHAR16 *InstanceStr;
- MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
- UINT64 StartingAddr;
- UINT64 EndingAddr;
+ CHAR16 *StartingAddrStr;
+ CHAR16 *EndingAddrStr;
+ CHAR16 *TypeGuidStr;
+ CHAR16 *InstanceStr;
+ MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
+ UINT64 StartingAddr;
+ UINT64 EndingAddr;
StartingAddrStr = GetNextParamStr (&TextDeviceNode);
EndingAddrStr = GetNextParamStr (&TextDeviceNode);
InstanceStr = GetNextParamStr (&TextDeviceNode);
TypeGuidStr = GetNextParamStr (&TextDeviceNode);
- RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_RAM_DISK_DP,
- (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
- );
+ RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_RAM_DISK_DP,
+ (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
+ );
Strtoi64 (StartingAddrStr, &StartingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);
Strtoi64 (EndingAddrStr, &EndingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);
- RamDisk->Instance = (UINT16) Strtoi (InstanceStr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);
+ RamDisk->Instance = (UINT16)Strtoi (InstanceStr);
StrToGuid (TypeGuidStr, &RamDisk->TypeGuid);
- return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;
+ return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;
}
/**
@@ -3193,34 +3210,34 @@ DevPathFromTextRamDisk ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVirtualDisk (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *StartingAddrStr;
- CHAR16 *EndingAddrStr;
- CHAR16 *InstanceStr;
- MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
- UINT64 StartingAddr;
- UINT64 EndingAddr;
+ CHAR16 *StartingAddrStr;
+ CHAR16 *EndingAddrStr;
+ CHAR16 *InstanceStr;
+ MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
+ UINT64 StartingAddr;
+ UINT64 EndingAddr;
StartingAddrStr = GetNextParamStr (&TextDeviceNode);
EndingAddrStr = GetNextParamStr (&TextDeviceNode);
InstanceStr = GetNextParamStr (&TextDeviceNode);
- RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_RAM_DISK_DP,
- (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
- );
+ RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_RAM_DISK_DP,
+ (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
+ );
Strtoi64 (StartingAddrStr, &StartingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);
Strtoi64 (EndingAddrStr, &EndingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);
- RamDisk->Instance = (UINT16) Strtoi (InstanceStr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);
+ RamDisk->Instance = (UINT16)Strtoi (InstanceStr);
CopyGuid (&RamDisk->TypeGuid, &gEfiVirtualDiskGuid);
- return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;
+ return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;
}
/**
@@ -3233,34 +3250,34 @@ DevPathFromTextVirtualDisk ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextVirtualCd (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *StartingAddrStr;
- CHAR16 *EndingAddrStr;
- CHAR16 *InstanceStr;
- MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
- UINT64 StartingAddr;
- UINT64 EndingAddr;
+ CHAR16 *StartingAddrStr;
+ CHAR16 *EndingAddrStr;
+ CHAR16 *InstanceStr;
+ MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
+ UINT64 StartingAddr;
+ UINT64 EndingAddr;
StartingAddrStr = GetNextParamStr (&TextDeviceNode);
EndingAddrStr = GetNextParamStr (&TextDeviceNode);
InstanceStr = GetNextParamStr (&TextDeviceNode);
- RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_RAM_DISK_DP,
- (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
- );
+ RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_RAM_DISK_DP,
+ (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
+ );
Strtoi64 (StartingAddrStr, &StartingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);
Strtoi64 (EndingAddrStr, &EndingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);
- RamDisk->Instance = (UINT16) Strtoi (InstanceStr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);
+ RamDisk->Instance = (UINT16)Strtoi (InstanceStr);
CopyGuid (&RamDisk->TypeGuid, &gEfiVirtualCdGuid);
- return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;
+ return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;
}
/**
@@ -3273,34 +3290,34 @@ DevPathFromTextVirtualCd ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextPersistentVirtualDisk (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *StartingAddrStr;
- CHAR16 *EndingAddrStr;
- CHAR16 *InstanceStr;
- MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
- UINT64 StartingAddr;
- UINT64 EndingAddr;
+ CHAR16 *StartingAddrStr;
+ CHAR16 *EndingAddrStr;
+ CHAR16 *InstanceStr;
+ MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
+ UINT64 StartingAddr;
+ UINT64 EndingAddr;
StartingAddrStr = GetNextParamStr (&TextDeviceNode);
EndingAddrStr = GetNextParamStr (&TextDeviceNode);
InstanceStr = GetNextParamStr (&TextDeviceNode);
- RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_RAM_DISK_DP,
- (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
- );
+ RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_RAM_DISK_DP,
+ (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
+ );
Strtoi64 (StartingAddrStr, &StartingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);
Strtoi64 (EndingAddrStr, &EndingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);
- RamDisk->Instance = (UINT16) Strtoi (InstanceStr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);
+ RamDisk->Instance = (UINT16)Strtoi (InstanceStr);
CopyGuid (&RamDisk->TypeGuid, &gEfiPersistentVirtualDiskGuid);
- return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;
+ return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;
}
/**
@@ -3313,34 +3330,34 @@ DevPathFromTextPersistentVirtualDisk ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextPersistentVirtualCd (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- CHAR16 *StartingAddrStr;
- CHAR16 *EndingAddrStr;
- CHAR16 *InstanceStr;
- MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
- UINT64 StartingAddr;
- UINT64 EndingAddr;
+ CHAR16 *StartingAddrStr;
+ CHAR16 *EndingAddrStr;
+ CHAR16 *InstanceStr;
+ MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
+ UINT64 StartingAddr;
+ UINT64 EndingAddr;
StartingAddrStr = GetNextParamStr (&TextDeviceNode);
EndingAddrStr = GetNextParamStr (&TextDeviceNode);
InstanceStr = GetNextParamStr (&TextDeviceNode);
- RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (
- MEDIA_DEVICE_PATH,
- MEDIA_RAM_DISK_DP,
- (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
- );
+ RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (
+ MEDIA_DEVICE_PATH,
+ MEDIA_RAM_DISK_DP,
+ (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)
+ );
Strtoi64 (StartingAddrStr, &StartingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);
Strtoi64 (EndingAddrStr, &EndingAddr);
- WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);
- RamDisk->Instance = (UINT16) Strtoi (InstanceStr);
+ WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);
+ RamDisk->Instance = (UINT16)Strtoi (InstanceStr);
CopyGuid (&RamDisk->TypeGuid, &gEfiPersistentVirtualCdGuid);
- return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;
+ return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;
}
/**
@@ -3353,7 +3370,7 @@ DevPathFromTextPersistentVirtualCd ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextBbsPath (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
return DevPathFromTextGenericPath (BBS_DEVICE_PATH, TextDeviceNode);
@@ -3369,23 +3386,23 @@ DevPathFromTextBbsPath ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextBBS (
- IN CHAR16 *TextDeviceNode
- )
-{
- CHAR16 *TypeStr;
- CHAR16 *IdStr;
- CHAR16 *FlagsStr;
- CHAR8 *AsciiStr;
- BBS_BBS_DEVICE_PATH *Bbs;
-
- TypeStr = GetNextParamStr (&TextDeviceNode);
- IdStr = GetNextParamStr (&TextDeviceNode);
- FlagsStr = GetNextParamStr (&TextDeviceNode);
- Bbs = (BBS_BBS_DEVICE_PATH *) CreateDeviceNode (
- BBS_DEVICE_PATH,
- BBS_BBS_DP,
- (UINT16) (sizeof (BBS_BBS_DEVICE_PATH) + StrLen (IdStr))
- );
+ IN CHAR16 *TextDeviceNode
+ )
+{
+ CHAR16 *TypeStr;
+ CHAR16 *IdStr;
+ CHAR16 *FlagsStr;
+ CHAR8 *AsciiStr;
+ BBS_BBS_DEVICE_PATH *Bbs;
+
+ TypeStr = GetNextParamStr (&TextDeviceNode);
+ IdStr = GetNextParamStr (&TextDeviceNode);
+ FlagsStr = GetNextParamStr (&TextDeviceNode);
+ Bbs = (BBS_BBS_DEVICE_PATH *)CreateDeviceNode (
+ BBS_DEVICE_PATH,
+ BBS_BBS_DP,
+ (UINT16)(sizeof (BBS_BBS_DEVICE_PATH) + StrLen (IdStr))
+ );
if (StrCmp (TypeStr, L"Floppy") == 0) {
Bbs->DeviceType = BBS_TYPE_FLOPPY;
@@ -3400,15 +3417,15 @@ DevPathFromTextBBS ( } else if (StrCmp (TypeStr, L"Network") == 0) {
Bbs->DeviceType = BBS_TYPE_EMBEDDED_NETWORK;
} else {
- Bbs->DeviceType = (UINT16) Strtoi (TypeStr);
+ Bbs->DeviceType = (UINT16)Strtoi (TypeStr);
}
AsciiStr = Bbs->String;
StrToAscii (IdStr, &AsciiStr);
- Bbs->StatusFlag = (UINT16) Strtoi (FlagsStr);
+ Bbs->StatusFlag = (UINT16)Strtoi (FlagsStr);
- return (EFI_DEVICE_PATH_PROTOCOL *) Bbs;
+ return (EFI_DEVICE_PATH_PROTOCOL *)Bbs;
}
/**
@@ -3421,24 +3438,24 @@ DevPathFromTextBBS ( **/
EFI_DEVICE_PATH_PROTOCOL *
DevPathFromTextSata (
- IN CHAR16 *TextDeviceNode
+ IN CHAR16 *TextDeviceNode
)
{
- SATA_DEVICE_PATH *Sata;
- CHAR16 *Param1;
- CHAR16 *Param2;
- CHAR16 *Param3;
+ SATA_DEVICE_PATH *Sata;
+ CHAR16 *Param1;
+ CHAR16 *Param2;
+ CHAR16 *Param3;
Param1 = GetNextParamStr (&TextDeviceNode);
Param2 = GetNextParamStr (&TextDeviceNode);
Param3 = GetNextParamStr (&TextDeviceNode);
- Sata = (SATA_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_SATA_DP,
- (UINT16) sizeof (SATA_DEVICE_PATH)
- );
- Sata->HBAPortNumber = (UINT16) Strtoi (Param1);
+ Sata = (SATA_DEVICE_PATH *)CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_SATA_DP,
+ (UINT16)sizeof (SATA_DEVICE_PATH)
+ );
+ Sata->HBAPortNumber = (UINT16)Strtoi (Param1);
//
// According to UEFI spec, if PMPN is not provided, the default is 0xFFFF
@@ -3446,105 +3463,106 @@ DevPathFromTextSata ( if (*Param2 == L'\0' ) {
Sata->PortMultiplierPortNumber = 0xFFFF;
} else {
- Sata->PortMultiplierPortNumber = (UINT16) Strtoi (Param2);
- }
- Sata->Lun = (UINT16) Strtoi (Param3);
-
- return (EFI_DEVICE_PATH_PROTOCOL *) Sata;
-}
-
-GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevPathFromTextTable[] = {
- {L"Path", DevPathFromTextPath },
-
- {L"HardwarePath", DevPathFromTextHardwarePath },
- {L"Pci", DevPathFromTextPci },
- {L"PcCard", DevPathFromTextPcCard },
- {L"MemoryMapped", DevPathFromTextMemoryMapped },
- {L"VenHw", DevPathFromTextVenHw },
- {L"Ctrl", DevPathFromTextCtrl },
- {L"BMC", DevPathFromTextBmc },
-
- {L"AcpiPath", DevPathFromTextAcpiPath },
- {L"Acpi", DevPathFromTextAcpi },
- {L"PciRoot", DevPathFromTextPciRoot },
- {L"PcieRoot", DevPathFromTextPcieRoot },
- {L"Floppy", DevPathFromTextFloppy },
- {L"Keyboard", DevPathFromTextKeyboard },
- {L"Serial", DevPathFromTextSerial },
- {L"ParallelPort", DevPathFromTextParallelPort },
- {L"AcpiEx", DevPathFromTextAcpiEx },
- {L"AcpiExp", DevPathFromTextAcpiExp },
- {L"AcpiAdr", DevPathFromTextAcpiAdr },
-
- {L"Msg", DevPathFromTextMsg },
- {L"Ata", DevPathFromTextAta },
- {L"Scsi", DevPathFromTextScsi },
- {L"Fibre", DevPathFromTextFibre },
- {L"FibreEx", DevPathFromTextFibreEx },
- {L"I1394", DevPathFromText1394 },
- {L"USB", DevPathFromTextUsb },
- {L"I2O", DevPathFromTextI2O },
- {L"Infiniband", DevPathFromTextInfiniband },
- {L"VenMsg", DevPathFromTextVenMsg },
- {L"VenPcAnsi", DevPathFromTextVenPcAnsi },
- {L"VenVt100", DevPathFromTextVenVt100 },
- {L"VenVt100Plus", DevPathFromTextVenVt100Plus },
- {L"VenUtf8", DevPathFromTextVenUtf8 },
- {L"UartFlowCtrl", DevPathFromTextUartFlowCtrl },
- {L"SAS", DevPathFromTextSAS },
- {L"SasEx", DevPathFromTextSasEx },
- {L"NVMe", DevPathFromTextNVMe },
- {L"UFS", DevPathFromTextUfs },
- {L"SD", DevPathFromTextSd },
- {L"eMMC", DevPathFromTextEmmc },
- {L"DebugPort", DevPathFromTextDebugPort },
- {L"MAC", DevPathFromTextMAC },
- {L"IPv4", DevPathFromTextIPv4 },
- {L"IPv6", DevPathFromTextIPv6 },
- {L"Uart", DevPathFromTextUart },
- {L"UsbClass", DevPathFromTextUsbClass },
- {L"UsbAudio", DevPathFromTextUsbAudio },
- {L"UsbCDCControl", DevPathFromTextUsbCDCControl },
- {L"UsbHID", DevPathFromTextUsbHID },
- {L"UsbImage", DevPathFromTextUsbImage },
- {L"UsbPrinter", DevPathFromTextUsbPrinter },
- {L"UsbMassStorage", DevPathFromTextUsbMassStorage },
- {L"UsbHub", DevPathFromTextUsbHub },
- {L"UsbCDCData", DevPathFromTextUsbCDCData },
- {L"UsbSmartCard", DevPathFromTextUsbSmartCard },
- {L"UsbVideo", DevPathFromTextUsbVideo },
- {L"UsbDiagnostic", DevPathFromTextUsbDiagnostic },
- {L"UsbWireless", DevPathFromTextUsbWireless },
- {L"UsbDeviceFirmwareUpdate", DevPathFromTextUsbDeviceFirmwareUpdate },
- {L"UsbIrdaBridge", DevPathFromTextUsbIrdaBridge },
- {L"UsbTestAndMeasurement", DevPathFromTextUsbTestAndMeasurement },
- {L"UsbWwid", DevPathFromTextUsbWwid },
- {L"Unit", DevPathFromTextUnit },
- {L"iSCSI", DevPathFromTextiSCSI },
- {L"Vlan", DevPathFromTextVlan },
- {L"Dns", DevPathFromTextDns },
- {L"Uri", DevPathFromTextUri },
- {L"Bluetooth", DevPathFromTextBluetooth },
- {L"Wi-Fi", DevPathFromTextWiFi },
- {L"BluetoothLE", DevPathFromTextBluetoothLE },
- {L"MediaPath", DevPathFromTextMediaPath },
- {L"HD", DevPathFromTextHD },
- {L"CDROM", DevPathFromTextCDROM },
- {L"VenMedia", DevPathFromTextVenMedia },
- {L"Media", DevPathFromTextMedia },
- {L"Fv", DevPathFromTextFv },
- {L"FvFile", DevPathFromTextFvFile },
- {L"Offset", DevPathFromTextRelativeOffsetRange },
- {L"RamDisk", DevPathFromTextRamDisk },
- {L"VirtualDisk", DevPathFromTextVirtualDisk },
- {L"VirtualCD", DevPathFromTextVirtualCd },
- {L"PersistentVirtualDisk", DevPathFromTextPersistentVirtualDisk },
- {L"PersistentVirtualCD", DevPathFromTextPersistentVirtualCd },
-
- {L"BbsPath", DevPathFromTextBbsPath },
- {L"BBS", DevPathFromTextBBS },
- {L"Sata", DevPathFromTextSata },
- {NULL, NULL}
+ Sata->PortMultiplierPortNumber = (UINT16)Strtoi (Param2);
+ }
+
+ Sata->Lun = (UINT16)Strtoi (Param3);
+
+ return (EFI_DEVICE_PATH_PROTOCOL *)Sata;
+}
+
+GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevPathFromTextTable[] = {
+ { L"Path", DevPathFromTextPath },
+
+ { L"HardwarePath", DevPathFromTextHardwarePath },
+ { L"Pci", DevPathFromTextPci },
+ { L"PcCard", DevPathFromTextPcCard },
+ { L"MemoryMapped", DevPathFromTextMemoryMapped },
+ { L"VenHw", DevPathFromTextVenHw },
+ { L"Ctrl", DevPathFromTextCtrl },
+ { L"BMC", DevPathFromTextBmc },
+
+ { L"AcpiPath", DevPathFromTextAcpiPath },
+ { L"Acpi", DevPathFromTextAcpi },
+ { L"PciRoot", DevPathFromTextPciRoot },
+ { L"PcieRoot", DevPathFromTextPcieRoot },
+ { L"Floppy", DevPathFromTextFloppy },
+ { L"Keyboard", DevPathFromTextKeyboard },
+ { L"Serial", DevPathFromTextSerial },
+ { L"ParallelPort", DevPathFromTextParallelPort },
+ { L"AcpiEx", DevPathFromTextAcpiEx },
+ { L"AcpiExp", DevPathFromTextAcpiExp },
+ { L"AcpiAdr", DevPathFromTextAcpiAdr },
+
+ { L"Msg", DevPathFromTextMsg },
+ { L"Ata", DevPathFromTextAta },
+ { L"Scsi", DevPathFromTextScsi },
+ { L"Fibre", DevPathFromTextFibre },
+ { L"FibreEx", DevPathFromTextFibreEx },
+ { L"I1394", DevPathFromText1394 },
+ { L"USB", DevPathFromTextUsb },
+ { L"I2O", DevPathFromTextI2O },
+ { L"Infiniband", DevPathFromTextInfiniband },
+ { L"VenMsg", DevPathFromTextVenMsg },
+ { L"VenPcAnsi", DevPathFromTextVenPcAnsi },
+ { L"VenVt100", DevPathFromTextVenVt100 },
+ { L"VenVt100Plus", DevPathFromTextVenVt100Plus },
+ { L"VenUtf8", DevPathFromTextVenUtf8 },
+ { L"UartFlowCtrl", DevPathFromTextUartFlowCtrl },
+ { L"SAS", DevPathFromTextSAS },
+ { L"SasEx", DevPathFromTextSasEx },
+ { L"NVMe", DevPathFromTextNVMe },
+ { L"UFS", DevPathFromTextUfs },
+ { L"SD", DevPathFromTextSd },
+ { L"eMMC", DevPathFromTextEmmc },
+ { L"DebugPort", DevPathFromTextDebugPort },
+ { L"MAC", DevPathFromTextMAC },
+ { L"IPv4", DevPathFromTextIPv4 },
+ { L"IPv6", DevPathFromTextIPv6 },
+ { L"Uart", DevPathFromTextUart },
+ { L"UsbClass", DevPathFromTextUsbClass },
+ { L"UsbAudio", DevPathFromTextUsbAudio },
+ { L"UsbCDCControl", DevPathFromTextUsbCDCControl },
+ { L"UsbHID", DevPathFromTextUsbHID },
+ { L"UsbImage", DevPathFromTextUsbImage },
+ { L"UsbPrinter", DevPathFromTextUsbPrinter },
+ { L"UsbMassStorage", DevPathFromTextUsbMassStorage },
+ { L"UsbHub", DevPathFromTextUsbHub },
+ { L"UsbCDCData", DevPathFromTextUsbCDCData },
+ { L"UsbSmartCard", DevPathFromTextUsbSmartCard },
+ { L"UsbVideo", DevPathFromTextUsbVideo },
+ { L"UsbDiagnostic", DevPathFromTextUsbDiagnostic },
+ { L"UsbWireless", DevPathFromTextUsbWireless },
+ { L"UsbDeviceFirmwareUpdate", DevPathFromTextUsbDeviceFirmwareUpdate },
+ { L"UsbIrdaBridge", DevPathFromTextUsbIrdaBridge },
+ { L"UsbTestAndMeasurement", DevPathFromTextUsbTestAndMeasurement },
+ { L"UsbWwid", DevPathFromTextUsbWwid },
+ { L"Unit", DevPathFromTextUnit },
+ { L"iSCSI", DevPathFromTextiSCSI },
+ { L"Vlan", DevPathFromTextVlan },
+ { L"Dns", DevPathFromTextDns },
+ { L"Uri", DevPathFromTextUri },
+ { L"Bluetooth", DevPathFromTextBluetooth },
+ { L"Wi-Fi", DevPathFromTextWiFi },
+ { L"BluetoothLE", DevPathFromTextBluetoothLE },
+ { L"MediaPath", DevPathFromTextMediaPath },
+ { L"HD", DevPathFromTextHD },
+ { L"CDROM", DevPathFromTextCDROM },
+ { L"VenMedia", DevPathFromTextVenMedia },
+ { L"Media", DevPathFromTextMedia },
+ { L"Fv", DevPathFromTextFv },
+ { L"FvFile", DevPathFromTextFvFile },
+ { L"Offset", DevPathFromTextRelativeOffsetRange },
+ { L"RamDisk", DevPathFromTextRamDisk },
+ { L"VirtualDisk", DevPathFromTextVirtualDisk },
+ { L"VirtualCD", DevPathFromTextVirtualCd },
+ { L"PersistentVirtualDisk", DevPathFromTextPersistentVirtualDisk },
+ { L"PersistentVirtualCD", DevPathFromTextPersistentVirtualCd },
+
+ { L"BbsPath", DevPathFromTextBbsPath },
+ { L"BBS", DevPathFromTextBBS },
+ { L"Sata", DevPathFromTextSata },
+ { NULL, NULL }
};
/**
@@ -3561,14 +3579,14 @@ GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevP EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
UefiDevicePathLibConvertTextToDeviceNode (
- IN CONST CHAR16 *TextDeviceNode
+ IN CONST CHAR16 *TextDeviceNode
)
{
- DEVICE_PATH_FROM_TEXT FromText;
- CHAR16 *ParamStr;
- EFI_DEVICE_PATH_PROTOCOL *DeviceNode;
- CHAR16 *DeviceNodeStr;
- UINTN Index;
+ DEVICE_PATH_FROM_TEXT FromText;
+ CHAR16 *ParamStr;
+ EFI_DEVICE_PATH_PROTOCOL *DeviceNode;
+ CHAR16 *DeviceNodeStr;
+ UINTN Index;
if ((TextDeviceNode == NULL) || (IS_NULL (*TextDeviceNode))) {
return NULL;
@@ -3591,7 +3609,7 @@ UefiDevicePathLibConvertTextToDeviceNode ( //
// A file path
//
- FromText = DevPathFromTextFilePath;
+ FromText = DevPathFromTextFilePath;
DeviceNode = FromText (DeviceNodeStr);
} else {
DeviceNode = FromText (ParamStr);
@@ -3618,28 +3636,28 @@ UefiDevicePathLibConvertTextToDeviceNode ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
UefiDevicePathLibConvertTextToDevicePath (
- IN CONST CHAR16 *TextDevicePath
+ IN CONST CHAR16 *TextDevicePath
)
{
- EFI_DEVICE_PATH_PROTOCOL *DeviceNode;
- EFI_DEVICE_PATH_PROTOCOL *NewDevicePath;
- CHAR16 *DevicePathStr;
- CHAR16 *Str;
- CHAR16 *DeviceNodeStr;
- BOOLEAN IsInstanceEnd;
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
+ EFI_DEVICE_PATH_PROTOCOL *DeviceNode;
+ EFI_DEVICE_PATH_PROTOCOL *NewDevicePath;
+ CHAR16 *DevicePathStr;
+ CHAR16 *Str;
+ CHAR16 *DeviceNodeStr;
+ BOOLEAN IsInstanceEnd;
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;
if ((TextDevicePath == NULL) || (IS_NULL (*TextDevicePath))) {
return NULL;
}
- DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH);
+ DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)AllocatePool (END_DEVICE_PATH_LENGTH);
ASSERT (DevicePath != NULL);
SetDevicePathEndNode (DevicePath);
DevicePathStr = UefiDevicePathLibStrDuplicate (TextDevicePath);
- Str = DevicePathStr;
+ Str = DevicePathStr;
while ((DeviceNodeStr = GetNextDeviceNodeStr (&Str, &IsInstanceEnd)) != NULL) {
DeviceNode = UefiDevicePathLibConvertTextToDeviceNode (DeviceNodeStr);
@@ -3649,7 +3667,7 @@ UefiDevicePathLibConvertTextToDevicePath ( DevicePath = NewDevicePath;
if (IsInstanceEnd) {
- DeviceNode = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH);
+ DeviceNode = (EFI_DEVICE_PATH_PROTOCOL *)AllocatePool (END_DEVICE_PATH_LENGTH);
ASSERT (DeviceNode != NULL);
SetDevicePathEndNode (DeviceNode);
DeviceNode->SubType = END_INSTANCE_DEVICE_PATH_SUBTYPE;
diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c index fb65ebd8f4..dd90dfa58e 100644 --- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c @@ -26,27 +26,28 @@ SPDX-License-Identifier: BSD-2-Clause-Patent CHAR16 *
EFIAPI
UefiDevicePathLibCatPrint (
- IN OUT POOL_PRINT *Str,
- IN CHAR16 *Fmt,
+ IN OUT POOL_PRINT *Str,
+ IN CHAR16 *Fmt,
...
)
{
- UINTN Count;
- VA_LIST Args;
+ UINTN Count;
+ VA_LIST Args;
VA_START (Args, Fmt);
Count = SPrintLength (Fmt, Args);
- VA_END(Args);
+ VA_END (Args);
if ((Str->Count + (Count + 1)) * sizeof (CHAR16) > Str->Capacity) {
Str->Capacity = (Str->Count + (Count + 1) * 2) * sizeof (CHAR16);
- Str->Str = ReallocatePool (
- Str->Count * sizeof (CHAR16),
- Str->Capacity,
- Str->Str
- );
+ Str->Str = ReallocatePool (
+ Str->Count * sizeof (CHAR16),
+ Str->Capacity,
+ Str->Str
+ );
ASSERT (Str->Str != NULL);
}
+
VA_START (Args, Fmt);
UnicodeVSPrint (&Str->Str[Str->Count], Str->Capacity - Str->Count * sizeof (CHAR16), Fmt, Args);
Str->Count += Count;
@@ -76,7 +77,7 @@ DevPathToTextPci ( IN BOOLEAN AllowShortcuts
)
{
- PCI_DEVICE_PATH *Pci;
+ PCI_DEVICE_PATH *Pci;
Pci = DevPath;
UefiDevicePathLibCatPrint (Str, L"Pci(0x%x,0x%x)", Pci->Device, Pci->Function);
@@ -170,94 +171,95 @@ DevPathToTextVendor ( UINT32 FlowControlMap;
UINT16 Info;
- Vendor = (VENDOR_DEVICE_PATH *) DevPath;
+ Vendor = (VENDOR_DEVICE_PATH *)DevPath;
switch (DevicePathType (&Vendor->Header)) {
- case HARDWARE_DEVICE_PATH:
- Type = L"Hw";
- break;
-
- case MESSAGING_DEVICE_PATH:
- Type = L"Msg";
- if (AllowShortcuts) {
- if (CompareGuid (&Vendor->Guid, &gEfiPcAnsiGuid)) {
- UefiDevicePathLibCatPrint (Str, L"VenPcAnsi()");
- return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiVT100Guid)) {
- UefiDevicePathLibCatPrint (Str, L"VenVt100()");
- return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiVT100PlusGuid)) {
- UefiDevicePathLibCatPrint (Str, L"VenVt100Plus()");
- return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) {
- UefiDevicePathLibCatPrint (Str, L"VenUtf8()");
- return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid)) {
- FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *) Vendor)->FlowControlMap);
- switch (FlowControlMap & 0x00000003) {
- case 0:
- UefiDevicePathLibCatPrint (Str, L"UartFlowCtrl(%s)", L"None");
- break;
-
- case 1:
- UefiDevicePathLibCatPrint (Str, L"UartFlowCtrl(%s)", L"Hardware");
- break;
-
- case 2:
- UefiDevicePathLibCatPrint (Str, L"UartFlowCtrl(%s)", L"XonXoff");
- break;
-
- default:
- break;
- }
+ case HARDWARE_DEVICE_PATH:
+ Type = L"Hw";
+ break;
- return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiSasDevicePathGuid)) {
- UefiDevicePathLibCatPrint (
- Str,
- L"SAS(0x%lx,0x%lx,0x%x,",
- ((SAS_DEVICE_PATH *) Vendor)->SasAddress,
- ((SAS_DEVICE_PATH *) Vendor)->Lun,
- ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort
- );
- Info = (((SAS_DEVICE_PATH *) Vendor)->DeviceTopology);
- if (((Info & 0x0f) == 0) && ((Info & BIT7) == 0)) {
- UefiDevicePathLibCatPrint (Str, L"NoTopology,0,0,0,");
- } else if (((Info & 0x0f) <= 2) && ((Info & BIT7) == 0)) {
+ case MESSAGING_DEVICE_PATH:
+ Type = L"Msg";
+ if (AllowShortcuts) {
+ if (CompareGuid (&Vendor->Guid, &gEfiPcAnsiGuid)) {
+ UefiDevicePathLibCatPrint (Str, L"VenPcAnsi()");
+ return;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiVT100Guid)) {
+ UefiDevicePathLibCatPrint (Str, L"VenVt100()");
+ return;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiVT100PlusGuid)) {
+ UefiDevicePathLibCatPrint (Str, L"VenVt100Plus()");
+ return;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) {
+ UefiDevicePathLibCatPrint (Str, L"VenUtf8()");
+ return;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid)) {
+ FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *)Vendor)->FlowControlMap);
+ switch (FlowControlMap & 0x00000003) {
+ case 0:
+ UefiDevicePathLibCatPrint (Str, L"UartFlowCtrl(%s)", L"None");
+ break;
+
+ case 1:
+ UefiDevicePathLibCatPrint (Str, L"UartFlowCtrl(%s)", L"Hardware");
+ break;
+
+ case 2:
+ UefiDevicePathLibCatPrint (Str, L"UartFlowCtrl(%s)", L"XonXoff");
+ break;
+
+ default:
+ break;
+ }
+
+ return;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiSasDevicePathGuid)) {
UefiDevicePathLibCatPrint (
Str,
- L"%s,%s,%s,",
- ((Info & BIT4) != 0) ? L"SATA" : L"SAS",
- ((Info & BIT5) != 0) ? L"External" : L"Internal",
- ((Info & BIT6) != 0) ? L"Expanded" : L"Direct"
+ L"SAS(0x%lx,0x%lx,0x%x,",
+ ((SAS_DEVICE_PATH *)Vendor)->SasAddress,
+ ((SAS_DEVICE_PATH *)Vendor)->Lun,
+ ((SAS_DEVICE_PATH *)Vendor)->RelativeTargetPort
);
- if ((Info & 0x0f) == 1) {
- UefiDevicePathLibCatPrint (Str, L"0,");
+ Info = (((SAS_DEVICE_PATH *)Vendor)->DeviceTopology);
+ if (((Info & 0x0f) == 0) && ((Info & BIT7) == 0)) {
+ UefiDevicePathLibCatPrint (Str, L"NoTopology,0,0,0,");
+ } else if (((Info & 0x0f) <= 2) && ((Info & BIT7) == 0)) {
+ UefiDevicePathLibCatPrint (
+ Str,
+ L"%s,%s,%s,",
+ ((Info & BIT4) != 0) ? L"SATA" : L"SAS",
+ ((Info & BIT5) != 0) ? L"External" : L"Internal",
+ ((Info & BIT6) != 0) ? L"Expanded" : L"Direct"
+ );
+ if ((Info & 0x0f) == 1) {
+ UefiDevicePathLibCatPrint (Str, L"0,");
+ } else {
+ //
+ // Value 0x0 thru 0xFF -> Drive 1 thru Drive 256
+ //
+ UefiDevicePathLibCatPrint (Str, L"0x%x,", ((Info >> 8) & 0xff) + 1);
+ }
} else {
- //
- // Value 0x0 thru 0xFF -> Drive 1 thru Drive 256
- //
- UefiDevicePathLibCatPrint (Str, L"0x%x,", ((Info >> 8) & 0xff) + 1);
+ UefiDevicePathLibCatPrint (Str, L"0x%x,0,0,0,", Info);
}
- } else {
- UefiDevicePathLibCatPrint (Str, L"0x%x,0,0,0,", Info);
- }
- UefiDevicePathLibCatPrint (Str, L"0x%x)", ((SAS_DEVICE_PATH *) Vendor)->Reserved);
- return ;
- } else if (CompareGuid (&Vendor->Guid, &gEfiDebugPortProtocolGuid)) {
- UefiDevicePathLibCatPrint (Str, L"DebugPort()");
- return ;
+ UefiDevicePathLibCatPrint (Str, L"0x%x)", ((SAS_DEVICE_PATH *)Vendor)->Reserved);
+ return;
+ } else if (CompareGuid (&Vendor->Guid, &gEfiDebugPortProtocolGuid)) {
+ UefiDevicePathLibCatPrint (Str, L"DebugPort()");
+ return;
+ }
}
- }
- break;
- case MEDIA_DEVICE_PATH:
- Type = L"Media";
- break;
+ break;
+
+ case MEDIA_DEVICE_PATH:
+ Type = L"Media";
+ break;
- default:
- Type = L"?";
- break;
+ default:
+ Type = L"?";
+ break;
}
DataLength = DevicePathNodeLength (&Vendor->Header) - sizeof (VENDOR_DEVICE_PATH);
@@ -265,7 +267,7 @@ DevPathToTextVendor ( if (DataLength != 0) {
UefiDevicePathLibCatPrint (Str, L",");
for (Index = 0; Index < DataLength; Index++) {
- UefiDevicePathLibCatPrint (Str, L"%02x", ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]);
+ UefiDevicePathLibCatPrint (Str, L"%02x", ((VENDOR_DEVICE_PATH_WITH_DATA *)Vendor)->VendorDefinedData[Index]);
}
}
@@ -324,14 +326,14 @@ DevPathToTextBmc ( IN BOOLEAN AllowShortcuts
)
{
- BMC_DEVICE_PATH *Bmc;
+ BMC_DEVICE_PATH *Bmc;
Bmc = DevPath;
UefiDevicePathLibCatPrint (
Str,
L"BMC(0x%x,0x%lx)",
Bmc->InterfaceType,
- ReadUnaligned64 ((UINT64 *) (&Bmc->BaseAddress))
+ ReadUnaligned64 ((UINT64 *)(&Bmc->BaseAddress))
);
}
@@ -361,33 +363,33 @@ DevPathToTextAcpi ( Acpi = DevPath;
if ((Acpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {
switch (EISA_ID_TO_NUM (Acpi->HID)) {
- case 0x0a03:
- UefiDevicePathLibCatPrint (Str, L"PciRoot(0x%x)", Acpi->UID);
- break;
+ case 0x0a03:
+ UefiDevicePathLibCatPrint (Str, L"PciRoot(0x%x)", Acpi->UID);
+ break;
- case 0x0a08:
- UefiDevicePathLibCatPrint (Str, L"PcieRoot(0x%x)", Acpi->UID);
- break;
+ case 0x0a08:
+ UefiDevicePathLibCatPrint (Str, L"PcieRoot(0x%x)", Acpi->UID);
+ break;
- case 0x0604:
- UefiDevicePathLibCatPrint (Str, L"Floppy(0x%x)", Acpi->UID);
- break;
+ case 0x0604:
+ UefiDevicePathLibCatPrint (Str, L"Floppy(0x%x)", Acpi->UID);
+ break;
- case 0x0301:
- UefiDevicePathLibCatPrint (Str, L"Keyboard(0x%x)", Acpi->UID);
- break;
+ case 0x0301:
+ UefiDevicePathLibCatPrint (Str, L"Keyboard(0x%x)", Acpi->UID);
+ break;
- case 0x0501:
- UefiDevicePathLibCatPrint (Str, L"Serial(0x%x)", Acpi->UID);
- break;
+ case 0x0501:
+ UefiDevicePathLibCatPrint (Str, L"Serial(0x%x)", Acpi->UID);
+ break;
- case 0x0401:
- UefiDevicePathLibCatPrint (Str, L"ParallelPort(0x%x)", Acpi->UID);
- break;
+ case 0x0401:
+ UefiDevicePathLibCatPrint (Str, L"ParallelPort(0x%x)", Acpi->UID);
+ break;
- default:
- UefiDevicePathLibCatPrint (Str, L"Acpi(PNP%04x,0x%x)", EISA_ID_TO_NUM (Acpi->HID), Acpi->UID);
- break;
+ default:
+ UefiDevicePathLibCatPrint (Str, L"Acpi(PNP%04x,0x%x)", EISA_ID_TO_NUM (Acpi->HID), Acpi->UID);
+ break;
}
} else {
UefiDevicePathLibCatPrint (Str, L"Acpi(0x%08x,0x%x)", Acpi->HID, Acpi->UID);
@@ -423,27 +425,30 @@ DevPathToTextAcpiEx ( CHAR16 CIDText[11];
AcpiEx = DevPath;
- HIDStr = (CHAR8 *) (((UINT8 *) AcpiEx) + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));
+ HIDStr = (CHAR8 *)(((UINT8 *)AcpiEx) + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));
UIDStr = HIDStr + AsciiStrLen (HIDStr) + 1;
CIDStr = UIDStr + AsciiStrLen (UIDStr) + 1;
if (DisplayOnly) {
if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A03) ||
- (EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A03 && EISA_ID_TO_NUM (AcpiEx->HID) != 0x0A08)) {
+ ((EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A03) && (EISA_ID_TO_NUM (AcpiEx->HID) != 0x0A08)))
+ {
if (AcpiEx->UID == 0) {
UefiDevicePathLibCatPrint (Str, L"PciRoot(%a)", UIDStr);
} else {
UefiDevicePathLibCatPrint (Str, L"PciRoot(0x%x)", AcpiEx->UID);
}
+
return;
}
- if (EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A08 || EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A08) {
+ if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A08) || (EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A08)) {
if (AcpiEx->UID == 0) {
UefiDevicePathLibCatPrint (Str, L"PcieRoot(%a)", UIDStr);
} else {
UefiDevicePathLibCatPrint (Str, L"PcieRoot(0x%x)", AcpiEx->UID);
}
+
return;
}
}
@@ -480,7 +485,7 @@ DevPathToTextAcpiEx ( L"AcpiExp(%s,0,%a)",
HIDText,
UIDStr
- );
+ );
} else {
UefiDevicePathLibCatPrint (
Str,
@@ -488,7 +493,7 @@ DevPathToTextAcpiEx ( HIDText,
CIDText,
UIDStr
- );
+ );
}
} else {
if (DisplayOnly) {
@@ -548,19 +553,20 @@ DevPathToTextAcpiAdr ( IN BOOLEAN AllowShortcuts
)
{
- ACPI_ADR_DEVICE_PATH *AcpiAdr;
- UINT16 Index;
- UINT16 Length;
- UINT16 AdditionalAdrCount;
+ ACPI_ADR_DEVICE_PATH *AcpiAdr;
+ UINT16 Index;
+ UINT16 Length;
+ UINT16 AdditionalAdrCount;
AcpiAdr = DevPath;
- Length = (UINT16) DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) AcpiAdr);
- AdditionalAdrCount = (UINT16) ((Length - 8) / 4);
+ Length = (UINT16)DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *)AcpiAdr);
+ AdditionalAdrCount = (UINT16)((Length - 8) / 4);
UefiDevicePathLibCatPrint (Str, L"AcpiAdr(0x%x", AcpiAdr->ADR);
for (Index = 0; Index < AdditionalAdrCount; Index++) {
- UefiDevicePathLibCatPrint (Str, L",0x%x", *(UINT32 *) ((UINT8 *) AcpiAdr + 8 + Index * 4));
+ UefiDevicePathLibCatPrint (Str, L",0x%x", *(UINT32 *)((UINT8 *)AcpiAdr + 8 + Index * 4));
}
+
UefiDevicePathLibCatPrint (Str, L")");
}
@@ -585,7 +591,7 @@ DevPathToTextAtapi ( IN BOOLEAN AllowShortcuts
)
{
- ATAPI_DEVICE_PATH *Atapi;
+ ATAPI_DEVICE_PATH *Atapi;
Atapi = DevPath;
@@ -685,10 +691,12 @@ DevPathToTextFibreEx ( for (Index = 0; Index < sizeof (FibreEx->WWN) / sizeof (FibreEx->WWN[0]); Index++) {
UefiDevicePathLibCatPrint (Str, L"%02x", FibreEx->WWN[Index]);
}
+
UefiDevicePathLibCatPrint (Str, L",0x");
for (Index = 0; Index < sizeof (FibreEx->Lun) / sizeof (FibreEx->Lun[0]); Index++) {
UefiDevicePathLibCatPrint (Str, L"%02x", FibreEx->Lun[Index]);
}
+
UefiDevicePathLibCatPrint (Str, L")");
}
@@ -722,10 +730,12 @@ DevPathToTextSasEx ( for (Index = 0; Index < sizeof (SasEx->SasAddress) / sizeof (SasEx->SasAddress[0]); Index++) {
UefiDevicePathLibCatPrint (Str, L"%02x", SasEx->SasAddress[Index]);
}
+
UefiDevicePathLibCatPrint (Str, L",0x");
for (Index = 0; Index < sizeof (SasEx->Lun) / sizeof (SasEx->Lun[0]); Index++) {
UefiDevicePathLibCatPrint (Str, L"%02x", SasEx->Lun[Index]);
}
+
UefiDevicePathLibCatPrint (Str, L",0x%x,", SasEx->RelativeTargetPort);
if (((SasEx->DeviceTopology & 0x0f) == 0) && ((SasEx->DeviceTopology & BIT7) == 0)) {
@@ -751,8 +761,7 @@ DevPathToTextSasEx ( }
UefiDevicePathLibCatPrint (Str, L")");
- return ;
-
+ return;
}
/**
@@ -776,17 +785,23 @@ DevPathToTextNVMe ( IN BOOLEAN AllowShortcuts
)
{
- NVME_NAMESPACE_DEVICE_PATH *Nvme;
- UINT8 *Uuid;
+ NVME_NAMESPACE_DEVICE_PATH *Nvme;
+ UINT8 *Uuid;
Nvme = DevPath;
- Uuid = (UINT8 *) &Nvme->NamespaceUuid;
+ Uuid = (UINT8 *)&Nvme->NamespaceUuid;
UefiDevicePathLibCatPrint (
Str,
L"NVMe(0x%x,%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)",
Nvme->NamespaceId,
- Uuid[7], Uuid[6], Uuid[5], Uuid[4],
- Uuid[3], Uuid[2], Uuid[1], Uuid[0]
+ Uuid[7],
+ Uuid[6],
+ Uuid[5],
+ Uuid[4],
+ Uuid[3],
+ Uuid[2],
+ Uuid[1],
+ Uuid[0]
);
}
@@ -838,7 +853,7 @@ DevPathToTextSd ( IN BOOLEAN AllowShortcuts
)
{
- SD_DEVICE_PATH *Sd;
+ SD_DEVICE_PATH *Sd;
Sd = DevPath;
UefiDevicePathLibCatPrint (
@@ -869,7 +884,7 @@ DevPathToTextEmmc ( IN BOOLEAN AllowShortcuts
)
{
- EMMC_DEVICE_PATH *Emmc;
+ EMMC_DEVICE_PATH *Emmc;
Emmc = DevPath;
UefiDevicePathLibCatPrint (
@@ -900,7 +915,7 @@ DevPathToText1394 ( IN BOOLEAN AllowShortcuts
)
{
- F1394_DEVICE_PATH *F1394DevPath;
+ F1394_DEVICE_PATH *F1394DevPath;
F1394DevPath = DevPath;
//
@@ -930,7 +945,7 @@ DevPathToTextUsb ( IN BOOLEAN AllowShortcuts
)
{
- USB_DEVICE_PATH *Usb;
+ USB_DEVICE_PATH *Usb;
Usb = DevPath;
UefiDevicePathLibCatPrint (Str, L"USB(0x%x,0x%x)", Usb->ParentPortNumber, Usb->InterfaceNumber);
@@ -964,15 +979,15 @@ DevPathToTextUsbWWID ( UsbWWId = DevPath;
- SerialNumberStr = (CHAR16 *) ((UINT8 *) UsbWWId + sizeof (USB_WWID_DEVICE_PATH));
- Length = (UINT16) ((DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) UsbWWId) - sizeof (USB_WWID_DEVICE_PATH)) / sizeof (CHAR16));
- if (Length >= 1 && SerialNumberStr [Length - 1] != 0) {
+ SerialNumberStr = (CHAR16 *)((UINT8 *)UsbWWId + sizeof (USB_WWID_DEVICE_PATH));
+ Length = (UINT16)((DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *)UsbWWId) - sizeof (USB_WWID_DEVICE_PATH)) / sizeof (CHAR16));
+ if ((Length >= 1) && (SerialNumberStr[Length - 1] != 0)) {
//
// In case no NULL terminator in SerialNumber, create a new one with NULL terminator
//
NewStr = AllocateCopyPool ((Length + 1) * sizeof (CHAR16), SerialNumberStr);
ASSERT (NewStr != NULL);
- NewStr [Length] = 0;
+ NewStr[Length] = 0;
SerialNumberStr = NewStr;
}
@@ -1007,7 +1022,7 @@ DevPathToTextLogicalUnit ( IN BOOLEAN AllowShortcuts
)
{
- DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;
+ DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;
LogicalUnit = DevPath;
UefiDevicePathLibCatPrint (Str, L"Unit(0x%x)", LogicalUnit->Lun);
@@ -1034,65 +1049,64 @@ DevPathToTextUsbClass ( IN BOOLEAN AllowShortcuts
)
{
- USB_CLASS_DEVICE_PATH *UsbClass;
- BOOLEAN IsKnownSubClass;
-
+ USB_CLASS_DEVICE_PATH *UsbClass;
+ BOOLEAN IsKnownSubClass;
UsbClass = DevPath;
IsKnownSubClass = TRUE;
switch (UsbClass->DeviceClass) {
- case USB_CLASS_AUDIO:
- UefiDevicePathLibCatPrint (Str, L"UsbAudio");
- break;
+ case USB_CLASS_AUDIO:
+ UefiDevicePathLibCatPrint (Str, L"UsbAudio");
+ break;
- case USB_CLASS_CDCCONTROL:
- UefiDevicePathLibCatPrint (Str, L"UsbCDCControl");
- break;
+ case USB_CLASS_CDCCONTROL:
+ UefiDevicePathLibCatPrint (Str, L"UsbCDCControl");
+ break;
- case USB_CLASS_HID:
- UefiDevicePathLibCatPrint (Str, L"UsbHID");
- break;
+ case USB_CLASS_HID:
+ UefiDevicePathLibCatPrint (Str, L"UsbHID");
+ break;
- case USB_CLASS_IMAGE:
- UefiDevicePathLibCatPrint (Str, L"UsbImage");
- break;
+ case USB_CLASS_IMAGE:
+ UefiDevicePathLibCatPrint (Str, L"UsbImage");
+ break;
- case USB_CLASS_PRINTER:
- UefiDevicePathLibCatPrint (Str, L"UsbPrinter");
- break;
+ case USB_CLASS_PRINTER:
+ UefiDevicePathLibCatPrint (Str, L"UsbPrinter");
+ break;
- case USB_CLASS_MASS_STORAGE:
- UefiDevicePathLibCatPrint (Str, L"UsbMassStorage");
- break;
+ case USB_CLASS_MASS_STORAGE:
+ UefiDevicePathLibCatPrint (Str, L"UsbMassStorage");
+ break;
- case USB_CLASS_HUB:
- UefiDevicePathLibCatPrint (Str, L"UsbHub");
- break;
+ case USB_CLASS_HUB:
+ UefiDevicePathLibCatPrint (Str, L"UsbHub");
+ break;
- case USB_CLASS_CDCDATA:
- UefiDevicePathLibCatPrint (Str, L"UsbCDCData");
- break;
+ case USB_CLASS_CDCDATA:
+ UefiDevicePathLibCatPrint (Str, L"UsbCDCData");
+ break;
- case USB_CLASS_SMART_CARD:
- UefiDevicePathLibCatPrint (Str, L"UsbSmartCard");
- break;
+ case USB_CLASS_SMART_CARD:
+ UefiDevicePathLibCatPrint (Str, L"UsbSmartCard");
+ break;
- case USB_CLASS_VIDEO:
- UefiDevicePathLibCatPrint (Str, L"UsbVideo");
- break;
+ case USB_CLASS_VIDEO:
+ UefiDevicePathLibCatPrint (Str, L"UsbVideo");
+ break;
- case USB_CLASS_DIAGNOSTIC:
- UefiDevicePathLibCatPrint (Str, L"UsbDiagnostic");
- break;
+ case USB_CLASS_DIAGNOSTIC:
+ UefiDevicePathLibCatPrint (Str, L"UsbDiagnostic");
+ break;
- case USB_CLASS_WIRELESS:
- UefiDevicePathLibCatPrint (Str, L"UsbWireless");
- break;
+ case USB_CLASS_WIRELESS:
+ UefiDevicePathLibCatPrint (Str, L"UsbWireless");
+ break;
- default:
- IsKnownSubClass = FALSE;
- break;
+ default:
+ IsKnownSubClass = FALSE;
+ break;
}
if (IsKnownSubClass) {
@@ -1170,7 +1184,7 @@ DevPathToTextSata ( IN BOOLEAN AllowShortcuts
)
{
- SATA_DEVICE_PATH *Sata;
+ SATA_DEVICE_PATH *Sata;
Sata = DevPath;
UefiDevicePathLibCatPrint (
@@ -1203,7 +1217,7 @@ DevPathToTextI2O ( IN BOOLEAN AllowShortcuts
)
{
- I2O_DEVICE_PATH *I2ODevPath;
+ I2O_DEVICE_PATH *I2ODevPath;
I2ODevPath = DevPath;
UefiDevicePathLibCatPrint (Str, L"I2O(0x%x)", I2ODevPath->Tid);
@@ -1237,7 +1251,7 @@ DevPathToTextMacAddr ( MacDevPath = DevPath;
HwAddressSize = sizeof (EFI_MAC_ADDRESS);
- if (MacDevPath->IfType == 0x01 || MacDevPath->IfType == 0x00) {
+ if ((MacDevPath->IfType == 0x01) || (MacDevPath->IfType == 0x00)) {
HwAddressSize = 6;
}
@@ -1280,8 +1294,8 @@ CatNetworkProtocol ( **/
VOID
CatIPv4Address (
- IN OUT POOL_PRINT *Str,
- IN EFI_IPv4_ADDRESS *Address
+ IN OUT POOL_PRINT *Str,
+ IN EFI_IPv4_ADDRESS *Address
)
{
UefiDevicePathLibCatPrint (Str, L"%d.%d.%d.%d", Address->Addr[0], Address->Addr[1], Address->Addr[2], Address->Addr[3]);
@@ -1295,21 +1309,30 @@ CatIPv4Address ( **/
VOID
CatIPv6Address (
- IN OUT POOL_PRINT *Str,
- IN EFI_IPv6_ADDRESS *Address
+ IN OUT POOL_PRINT *Str,
+ IN EFI_IPv6_ADDRESS *Address
)
{
UefiDevicePathLibCatPrint (
- Str, L"%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
- Address->Addr[0], Address->Addr[1],
- Address->Addr[2], Address->Addr[3],
- Address->Addr[4], Address->Addr[5],
- Address->Addr[6], Address->Addr[7],
- Address->Addr[8], Address->Addr[9],
- Address->Addr[10], Address->Addr[11],
- Address->Addr[12], Address->Addr[13],
- Address->Addr[14], Address->Addr[15]
- );
+ Str,
+ L"%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
+ Address->Addr[0],
+ Address->Addr[1],
+ Address->Addr[2],
+ Address->Addr[3],
+ Address->Addr[4],
+ Address->Addr[5],
+ Address->Addr[6],
+ Address->Addr[7],
+ Address->Addr[8],
+ Address->Addr[9],
+ Address->Addr[10],
+ Address->Addr[11],
+ Address->Addr[12],
+ Address->Addr[13],
+ Address->Addr[14],
+ Address->Addr[15]
+ );
}
/**
@@ -1341,7 +1364,7 @@ DevPathToTextIPv4 ( if (DisplayOnly) {
UefiDevicePathLibCatPrint (Str, L")");
- return ;
+ return;
}
UefiDevicePathLibCatPrint (Str, L",");
@@ -1355,6 +1378,7 @@ DevPathToTextIPv4 ( UefiDevicePathLibCatPrint (Str, L",");
CatIPv4Address (Str, &IPDevPath->SubnetMask);
}
+
UefiDevicePathLibCatPrint (Str, L")");
}
@@ -1386,7 +1410,7 @@ DevPathToTextIPv6 ( CatIPv6Address (Str, &IPDevPath->RemoteIpAddress);
if (DisplayOnly) {
UefiDevicePathLibCatPrint (Str, L")");
- return ;
+ return;
}
UefiDevicePathLibCatPrint (Str, L",");
@@ -1410,6 +1434,7 @@ DevPathToTextIPv6 ( UefiDevicePathLibCatPrint (Str, L",0x%x,", IPDevPath->PrefixLength);
CatIPv6Address (Str, &IPDevPath->GatewayIpAddress);
}
+
UefiDevicePathLibCatPrint (Str, L")");
}
@@ -1474,33 +1499,33 @@ DevPathToTextUart ( Uart = DevPath;
switch (Uart->Parity) {
- case 0:
- Parity = 'D';
- break;
+ case 0:
+ Parity = 'D';
+ break;
- case 1:
- Parity = 'N';
- break;
+ case 1:
+ Parity = 'N';
+ break;
- case 2:
- Parity = 'E';
- break;
+ case 2:
+ Parity = 'E';
+ break;
- case 3:
- Parity = 'O';
- break;
+ case 3:
+ Parity = 'O';
+ break;
- case 4:
- Parity = 'M';
- break;
+ case 4:
+ Parity = 'M';
+ break;
- case 5:
- Parity = 'S';
- break;
+ case 5:
+ Parity = 'S';
+ break;
- default:
- Parity = 'x';
- break;
+ default:
+ Parity = 'x';
+ break;
}
if (Uart->BaudRate == 0) {
@@ -1518,25 +1543,25 @@ DevPathToTextUart ( UefiDevicePathLibCatPrint (Str, L"%c,", Parity);
switch (Uart->StopBits) {
- case 0:
- UefiDevicePathLibCatPrint (Str, L"D)");
- break;
+ case 0:
+ UefiDevicePathLibCatPrint (Str, L"D)");
+ break;
- case 1:
- UefiDevicePathLibCatPrint (Str, L"1)");
- break;
+ case 1:
+ UefiDevicePathLibCatPrint (Str, L"1)");
+ break;
- case 2:
- UefiDevicePathLibCatPrint (Str, L"1.5)");
- break;
+ case 2:
+ UefiDevicePathLibCatPrint (Str, L"1.5)");
+ break;
- case 3:
- UefiDevicePathLibCatPrint (Str, L"2)");
- break;
+ case 3:
+ UefiDevicePathLibCatPrint (Str, L"2)");
+ break;
- default:
- UefiDevicePathLibCatPrint (Str, L"x)");
- break;
+ default:
+ UefiDevicePathLibCatPrint (Str, L"x)");
+ break;
}
}
@@ -1561,9 +1586,9 @@ DevPathToTextiSCSI ( IN BOOLEAN AllowShortcuts
)
{
- ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath;
- UINT16 Options;
- UINTN Index;
+ ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath;
+ UINT16 Options;
+ UINTN Index;
ISCSIDevPath = DevPath;
UefiDevicePathLibCatPrint (
@@ -1575,6 +1600,7 @@ DevPathToTextiSCSI ( for (Index = 0; Index < sizeof (ISCSIDevPath->Lun) / sizeof (UINT8); Index++) {
UefiDevicePathLibCatPrint (Str, L"%02x", ((UINT8 *)&ISCSIDevPath->Lun)[Index]);
}
+
Options = ISCSIDevPath->LoginOption;
UefiDevicePathLibCatPrint (Str, L",%s,", (((Options >> 1) & 0x0001) != 0) ? L"CRC32C" : L"None");
UefiDevicePathLibCatPrint (Str, L"%s,", (((Options >> 3) & 0x0001) != 0) ? L"CRC32C" : L"None");
@@ -1584,7 +1610,6 @@ DevPathToTextiSCSI ( UefiDevicePathLibCatPrint (Str, L"%s,", L"CHAP_UNI");
} else {
UefiDevicePathLibCatPrint (Str, L"%s,", L"CHAP_BI");
-
}
UefiDevicePathLibCatPrint (Str, L"%s)", (ISCSIDevPath->NetworkProtocol == 0) ? L"TCP" : L"reserved");
@@ -1674,8 +1699,8 @@ DevPathToTextWiFi ( IN BOOLEAN AllowShortcuts
)
{
- WIFI_DEVICE_PATH *WiFi;
- UINT8 SSId[33];
+ WIFI_DEVICE_PATH *WiFi;
+ UINT8 SSId[33];
WiFi = DevPath;
@@ -1747,8 +1772,8 @@ DevPathToTextDns ( UINT32 DnsServerIpCount;
UINT32 DnsServerIpIndex;
- DnsDevPath = DevPath;
- DnsServerIpCount = (UINT32) (DevicePathNodeLength(DnsDevPath) - sizeof (EFI_DEVICE_PATH_PROTOCOL) - sizeof (DnsDevPath->IsIPv6)) / sizeof (EFI_IP_ADDRESS);
+ DnsDevPath = DevPath;
+ DnsServerIpCount = (UINT32)(DevicePathNodeLength (DnsDevPath) - sizeof (EFI_DEVICE_PATH_PROTOCOL) - sizeof (DnsDevPath->IsIPv6)) / sizeof (EFI_IP_ADDRESS);
UefiDevicePathLibCatPrint (Str, L"Dns(");
@@ -1788,16 +1813,16 @@ DevPathToTextUri ( IN BOOLEAN AllowShortcuts
)
{
- URI_DEVICE_PATH *Uri;
- UINTN UriLength;
- CHAR8 *UriStr;
+ URI_DEVICE_PATH *Uri;
+ UINTN UriLength;
+ CHAR8 *UriStr;
//
// Uri in the device path may not be null terminated.
//
Uri = DevPath;
UriLength = DevicePathNodeLength (Uri) - sizeof (URI_DEVICE_PATH);
- UriStr = AllocatePool (UriLength + 1);
+ UriStr = AllocatePool (UriLength + 1);
ASSERT (UriStr != NULL);
CopyMem (UriStr, Uri->Uri, UriLength);
@@ -1827,38 +1852,38 @@ DevPathToTextHardDrive ( IN BOOLEAN AllowShortcuts
)
{
- HARDDRIVE_DEVICE_PATH *Hd;
+ HARDDRIVE_DEVICE_PATH *Hd;
Hd = DevPath;
switch (Hd->SignatureType) {
- case SIGNATURE_TYPE_MBR:
- UefiDevicePathLibCatPrint (
- Str,
- L"HD(%d,%s,0x%08x,",
- Hd->PartitionNumber,
- L"MBR",
- *((UINT32 *) (&(Hd->Signature[0])))
- );
- break;
+ case SIGNATURE_TYPE_MBR:
+ UefiDevicePathLibCatPrint (
+ Str,
+ L"HD(%d,%s,0x%08x,",
+ Hd->PartitionNumber,
+ L"MBR",
+ *((UINT32 *)(&(Hd->Signature[0])))
+ );
+ break;
- case SIGNATURE_TYPE_GUID:
- UefiDevicePathLibCatPrint (
- Str,
- L"HD(%d,%s,%g,",
- Hd->PartitionNumber,
- L"GPT",
- (EFI_GUID *) &(Hd->Signature[0])
- );
- break;
+ case SIGNATURE_TYPE_GUID:
+ UefiDevicePathLibCatPrint (
+ Str,
+ L"HD(%d,%s,%g,",
+ Hd->PartitionNumber,
+ L"GPT",
+ (EFI_GUID *)&(Hd->Signature[0])
+ );
+ break;
- default:
- UefiDevicePathLibCatPrint (
- Str,
- L"HD(%d,%d,0,",
- Hd->PartitionNumber,
- Hd->SignatureType
- );
- break;
+ default:
+ UefiDevicePathLibCatPrint (
+ Str,
+ L"HD(%d,%d,0,",
+ Hd->PartitionNumber,
+ Hd->SignatureType
+ );
+ break;
}
UefiDevicePathLibCatPrint (Str, L"0x%lx,0x%lx)", Hd->PartitionStart, Hd->PartitionSize);
@@ -1885,12 +1910,12 @@ DevPathToTextCDROM ( IN BOOLEAN AllowShortcuts
)
{
- CDROM_DEVICE_PATH *Cd;
+ CDROM_DEVICE_PATH *Cd;
Cd = DevPath;
if (DisplayOnly) {
UefiDevicePathLibCatPrint (Str, L"CDROM(0x%x)", Cd->BootEntry);
- return ;
+ return;
}
UefiDevicePathLibCatPrint (Str, L"CDROM(0x%x,0x%lx,0x%lx)", Cd->BootEntry, Cd->PartitionStart, Cd->PartitionSize);
@@ -2019,13 +2044,13 @@ DevPathToTextFvFile ( **/
VOID
DevPathRelativeOffsetRange (
- IN OUT POOL_PRINT *Str,
- IN VOID *DevPath,
- IN BOOLEAN DisplayOnly,
- IN BOOLEAN AllowShortcuts
+ IN OUT POOL_PRINT *Str,
+ IN VOID *DevPath,
+ IN BOOLEAN DisplayOnly,
+ IN BOOLEAN AllowShortcuts
)
{
- MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset;
+ MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset;
Offset = DevPath;
UefiDevicePathLibCatPrint (
@@ -2051,13 +2076,13 @@ DevPathRelativeOffsetRange ( **/
VOID
DevPathToTextRamDisk (
- IN OUT POOL_PRINT *Str,
- IN VOID *DevPath,
- IN BOOLEAN DisplayOnly,
- IN BOOLEAN AllowShortcuts
+ IN OUT POOL_PRINT *Str,
+ IN VOID *DevPath,
+ IN BOOLEAN DisplayOnly,
+ IN BOOLEAN AllowShortcuts
)
{
- MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
+ MEDIA_RAM_DISK_DEVICE_PATH *RamDisk;
RamDisk = DevPath;
@@ -2126,38 +2151,38 @@ DevPathToTextBBS ( IN BOOLEAN AllowShortcuts
)
{
- BBS_BBS_DEVICE_PATH *Bbs;
- CHAR16 *Type;
+ BBS_BBS_DEVICE_PATH *Bbs;
+ CHAR16 *Type;
Bbs = DevPath;
switch (Bbs->DeviceType) {
- case BBS_TYPE_FLOPPY:
- Type = L"Floppy";
- break;
+ case BBS_TYPE_FLOPPY:
+ Type = L"Floppy";
+ break;
- case BBS_TYPE_HARDDRIVE:
- Type = L"HD";
- break;
+ case BBS_TYPE_HARDDRIVE:
+ Type = L"HD";
+ break;
- case BBS_TYPE_CDROM:
- Type = L"CDROM";
- break;
+ case BBS_TYPE_CDROM:
+ Type = L"CDROM";
+ break;
- case BBS_TYPE_PCMCIA:
- Type = L"PCMCIA";
- break;
+ case BBS_TYPE_PCMCIA:
+ Type = L"PCMCIA";
+ break;
- case BBS_TYPE_USB:
- Type = L"USB";
- break;
+ case BBS_TYPE_USB:
+ Type = L"USB";
+ break;
- case BBS_TYPE_EMBEDDED_NETWORK:
- Type = L"Network";
- break;
+ case BBS_TYPE_EMBEDDED_NETWORK:
+ Type = L"Network";
+ break;
- default:
- Type = NULL;
- break;
+ default:
+ Type = NULL;
+ break;
}
if (Type != NULL) {
@@ -2168,7 +2193,7 @@ DevPathToTextBBS ( if (DisplayOnly) {
UefiDevicePathLibCatPrint (Str, L")");
- return ;
+ return;
}
UefiDevicePathLibCatPrint (Str, L",0x%x)", Bbs->StatusFlag);
@@ -2198,13 +2223,13 @@ DevPathToTextEndInstance ( UefiDevicePathLibCatPrint (Str, L",");
}
-GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_GENERIC_TABLE mUefiDevicePathLibToTextTableGeneric[] = {
- {HARDWARE_DEVICE_PATH, L"HardwarePath" },
- {ACPI_DEVICE_PATH, L"AcpiPath" },
- {MESSAGING_DEVICE_PATH, L"Msg" },
- {MEDIA_DEVICE_PATH, L"MediaPath" },
- {BBS_DEVICE_PATH, L"BbsPath" },
- {0, NULL}
+GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_GENERIC_TABLE mUefiDevicePathLibToTextTableGeneric[] = {
+ { HARDWARE_DEVICE_PATH, L"HardwarePath" },
+ { ACPI_DEVICE_PATH, L"AcpiPath" },
+ { MESSAGING_DEVICE_PATH, L"Msg" },
+ { MEDIA_DEVICE_PATH, L"MediaPath" },
+ { BBS_DEVICE_PATH, L"BbsPath" },
+ { 0, NULL }
};
/**
@@ -2228,8 +2253,8 @@ DevPathToTextNodeGeneric ( IN BOOLEAN AllowShortcuts
)
{
- EFI_DEVICE_PATH_PROTOCOL *Node;
- UINTN Index;
+ EFI_DEVICE_PATH_PROTOCOL *Node;
+ UINTN Index;
Node = DevPath;
@@ -2254,65 +2279,65 @@ DevPathToTextNodeGeneric ( Index = sizeof (EFI_DEVICE_PATH_PROTOCOL);
if (Index < DevicePathNodeLength (Node)) {
UefiDevicePathLibCatPrint (Str, L",");
- for (; Index < DevicePathNodeLength (Node); Index++) {
- UefiDevicePathLibCatPrint (Str, L"%02x", ((UINT8 *) Node)[Index]);
+ for ( ; Index < DevicePathNodeLength (Node); Index++) {
+ UefiDevicePathLibCatPrint (Str, L"%02x", ((UINT8 *)Node)[Index]);
}
}
UefiDevicePathLibCatPrint (Str, L")");
}
-GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_TABLE mUefiDevicePathLibToTextTable[] = {
- {HARDWARE_DEVICE_PATH, HW_PCI_DP, DevPathToTextPci },
- {HARDWARE_DEVICE_PATH, HW_PCCARD_DP, DevPathToTextPccard },
- {HARDWARE_DEVICE_PATH, HW_MEMMAP_DP, DevPathToTextMemMap },
- {HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DevPathToTextVendor },
- {HARDWARE_DEVICE_PATH, HW_CONTROLLER_DP, DevPathToTextController },
- {HARDWARE_DEVICE_PATH, HW_BMC_DP, DevPathToTextBmc },
- {ACPI_DEVICE_PATH, ACPI_DP, DevPathToTextAcpi },
- {ACPI_DEVICE_PATH, ACPI_EXTENDED_DP, DevPathToTextAcpiEx },
- {ACPI_DEVICE_PATH, ACPI_ADR_DP, DevPathToTextAcpiAdr },
- {MESSAGING_DEVICE_PATH, MSG_ATAPI_DP, DevPathToTextAtapi },
- {MESSAGING_DEVICE_PATH, MSG_SCSI_DP, DevPathToTextScsi },
- {MESSAGING_DEVICE_PATH, MSG_FIBRECHANNEL_DP, DevPathToTextFibre },
- {MESSAGING_DEVICE_PATH, MSG_FIBRECHANNELEX_DP, DevPathToTextFibreEx },
- {MESSAGING_DEVICE_PATH, MSG_SASEX_DP, DevPathToTextSasEx },
- {MESSAGING_DEVICE_PATH, MSG_NVME_NAMESPACE_DP, DevPathToTextNVMe },
- {MESSAGING_DEVICE_PATH, MSG_UFS_DP, DevPathToTextUfs },
- {MESSAGING_DEVICE_PATH, MSG_SD_DP, DevPathToTextSd },
- {MESSAGING_DEVICE_PATH, MSG_EMMC_DP, DevPathToTextEmmc },
- {MESSAGING_DEVICE_PATH, MSG_1394_DP, DevPathToText1394 },
- {MESSAGING_DEVICE_PATH, MSG_USB_DP, DevPathToTextUsb },
- {MESSAGING_DEVICE_PATH, MSG_USB_WWID_DP, DevPathToTextUsbWWID },
- {MESSAGING_DEVICE_PATH, MSG_DEVICE_LOGICAL_UNIT_DP, DevPathToTextLogicalUnit },
- {MESSAGING_DEVICE_PATH, MSG_USB_CLASS_DP, DevPathToTextUsbClass },
- {MESSAGING_DEVICE_PATH, MSG_SATA_DP, DevPathToTextSata },
- {MESSAGING_DEVICE_PATH, MSG_I2O_DP, DevPathToTextI2O },
- {MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, DevPathToTextMacAddr },
- {MESSAGING_DEVICE_PATH, MSG_IPv4_DP, DevPathToTextIPv4 },
- {MESSAGING_DEVICE_PATH, MSG_IPv6_DP, DevPathToTextIPv6 },
- {MESSAGING_DEVICE_PATH, MSG_INFINIBAND_DP, DevPathToTextInfiniBand },
- {MESSAGING_DEVICE_PATH, MSG_UART_DP, DevPathToTextUart },
- {MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, DevPathToTextVendor },
- {MESSAGING_DEVICE_PATH, MSG_ISCSI_DP, DevPathToTextiSCSI },
- {MESSAGING_DEVICE_PATH, MSG_VLAN_DP, DevPathToTextVlan },
- {MESSAGING_DEVICE_PATH, MSG_DNS_DP, DevPathToTextDns },
- {MESSAGING_DEVICE_PATH, MSG_URI_DP, DevPathToTextUri },
- {MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_DP, DevPathToTextBluetooth },
- {MESSAGING_DEVICE_PATH, MSG_WIFI_DP, DevPathToTextWiFi },
- {MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_LE_DP, DevPathToTextBluetoothLE },
- {MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, DevPathToTextHardDrive },
- {MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, DevPathToTextCDROM },
- {MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, DevPathToTextVendor },
- {MEDIA_DEVICE_PATH, MEDIA_PROTOCOL_DP, DevPathToTextMediaProtocol },
- {MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, DevPathToTextFilePath },
- {MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_VOL_DP, DevPathToTextFv },
- {MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_FILE_DP, DevPathToTextFvFile },
- {MEDIA_DEVICE_PATH, MEDIA_RELATIVE_OFFSET_RANGE_DP, DevPathRelativeOffsetRange },
- {MEDIA_DEVICE_PATH, MEDIA_RAM_DISK_DP, DevPathToTextRamDisk },
- {BBS_DEVICE_PATH, BBS_BBS_DP, DevPathToTextBBS },
- {END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, DevPathToTextEndInstance },
- {0, 0, NULL}
+GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_TABLE mUefiDevicePathLibToTextTable[] = {
+ { HARDWARE_DEVICE_PATH, HW_PCI_DP, DevPathToTextPci },
+ { HARDWARE_DEVICE_PATH, HW_PCCARD_DP, DevPathToTextPccard },
+ { HARDWARE_DEVICE_PATH, HW_MEMMAP_DP, DevPathToTextMemMap },
+ { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DevPathToTextVendor },
+ { HARDWARE_DEVICE_PATH, HW_CONTROLLER_DP, DevPathToTextController },
+ { HARDWARE_DEVICE_PATH, HW_BMC_DP, DevPathToTextBmc },
+ { ACPI_DEVICE_PATH, ACPI_DP, DevPathToTextAcpi },
+ { ACPI_DEVICE_PATH, ACPI_EXTENDED_DP, DevPathToTextAcpiEx },
+ { ACPI_DEVICE_PATH, ACPI_ADR_DP, DevPathToTextAcpiAdr },
+ { MESSAGING_DEVICE_PATH, MSG_ATAPI_DP, DevPathToTextAtapi },
+ { MESSAGING_DEVICE_PATH, MSG_SCSI_DP, DevPathToTextScsi },
+ { MESSAGING_DEVICE_PATH, MSG_FIBRECHANNEL_DP, DevPathToTextFibre },
+ { MESSAGING_DEVICE_PATH, MSG_FIBRECHANNELEX_DP, DevPathToTextFibreEx },
+ { MESSAGING_DEVICE_PATH, MSG_SASEX_DP, DevPathToTextSasEx },
+ { MESSAGING_DEVICE_PATH, MSG_NVME_NAMESPACE_DP, DevPathToTextNVMe },
+ { MESSAGING_DEVICE_PATH, MSG_UFS_DP, DevPathToTextUfs },
+ { MESSAGING_DEVICE_PATH, MSG_SD_DP, DevPathToTextSd },
+ { MESSAGING_DEVICE_PATH, MSG_EMMC_DP, DevPathToTextEmmc },
+ { MESSAGING_DEVICE_PATH, MSG_1394_DP, DevPathToText1394 },
+ { MESSAGING_DEVICE_PATH, MSG_USB_DP, DevPathToTextUsb },
+ { MESSAGING_DEVICE_PATH, MSG_USB_WWID_DP, DevPathToTextUsbWWID },
+ { MESSAGING_DEVICE_PATH, MSG_DEVICE_LOGICAL_UNIT_DP, DevPathToTextLogicalUnit },
+ { MESSAGING_DEVICE_PATH, MSG_USB_CLASS_DP, DevPathToTextUsbClass },
+ { MESSAGING_DEVICE_PATH, MSG_SATA_DP, DevPathToTextSata },
+ { MESSAGING_DEVICE_PATH, MSG_I2O_DP, DevPathToTextI2O },
+ { MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, DevPathToTextMacAddr },
+ { MESSAGING_DEVICE_PATH, MSG_IPv4_DP, DevPathToTextIPv4 },
+ { MESSAGING_DEVICE_PATH, MSG_IPv6_DP, DevPathToTextIPv6 },
+ { MESSAGING_DEVICE_PATH, MSG_INFINIBAND_DP, DevPathToTextInfiniBand },
+ { MESSAGING_DEVICE_PATH, MSG_UART_DP, DevPathToTextUart },
+ { MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, DevPathToTextVendor },
+ { MESSAGING_DEVICE_PATH, MSG_ISCSI_DP, DevPathToTextiSCSI },
+ { MESSAGING_DEVICE_PATH, MSG_VLAN_DP, DevPathToTextVlan },
+ { MESSAGING_DEVICE_PATH, MSG_DNS_DP, DevPathToTextDns },
+ { MESSAGING_DEVICE_PATH, MSG_URI_DP, DevPathToTextUri },
+ { MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_DP, DevPathToTextBluetooth },
+ { MESSAGING_DEVICE_PATH, MSG_WIFI_DP, DevPathToTextWiFi },
+ { MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_LE_DP, DevPathToTextBluetoothLE },
+ { MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, DevPathToTextHardDrive },
+ { MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, DevPathToTextCDROM },
+ { MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, DevPathToTextVendor },
+ { MEDIA_DEVICE_PATH, MEDIA_PROTOCOL_DP, DevPathToTextMediaProtocol },
+ { MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, DevPathToTextFilePath },
+ { MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_VOL_DP, DevPathToTextFv },
+ { MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_FILE_DP, DevPathToTextFvFile },
+ { MEDIA_DEVICE_PATH, MEDIA_RELATIVE_OFFSET_RANGE_DP, DevPathRelativeOffsetRange },
+ { MEDIA_DEVICE_PATH, MEDIA_RAM_DISK_DP, DevPathToTextRamDisk },
+ { BBS_DEVICE_PATH, BBS_BBS_DP, DevPathToTextBBS },
+ { END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, DevPathToTextEndInstance },
+ { 0, 0, NULL }
};
/**
@@ -2338,9 +2363,9 @@ UefiDevicePathLibConvertDeviceNodeToText ( IN BOOLEAN AllowShortcuts
)
{
- POOL_PRINT Str;
- UINTN Index;
- DEVICE_PATH_TO_TEXT ToText;
+ POOL_PRINT Str;
+ UINTN Index;
+ DEVICE_PATH_TO_TEXT ToText;
if (DeviceNode == NULL) {
return NULL;
@@ -2354,9 +2379,10 @@ UefiDevicePathLibConvertDeviceNodeToText ( //
ToText = DevPathToTextNodeGeneric;
for (Index = 0; mUefiDevicePathLibToTextTable[Index].Function != NULL; Index++) {
- if (DevicePathType (DeviceNode) == mUefiDevicePathLibToTextTable[Index].Type &&
- DevicePathSubType (DeviceNode) == mUefiDevicePathLibToTextTable[Index].SubType
- ) {
+ if ((DevicePathType (DeviceNode) == mUefiDevicePathLibToTextTable[Index].Type) &&
+ (DevicePathSubType (DeviceNode) == mUefiDevicePathLibToTextTable[Index].SubType)
+ )
+ {
ToText = mUefiDevicePathLibToTextTable[Index].Function;
break;
}
@@ -2365,7 +2391,7 @@ UefiDevicePathLibConvertDeviceNodeToText ( //
// Print this node
//
- ToText (&Str, (VOID *) DeviceNode, DisplayOnly, AllowShortcuts);
+ ToText (&Str, (VOID *)DeviceNode, DisplayOnly, AllowShortcuts);
ASSERT (Str.Str != NULL);
return Str.Str;
@@ -2389,16 +2415,16 @@ UefiDevicePathLibConvertDeviceNodeToText ( CHAR16 *
EFIAPI
UefiDevicePathLibConvertDevicePathToText (
- IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
- IN BOOLEAN DisplayOnly,
- IN BOOLEAN AllowShortcuts
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
+ IN BOOLEAN DisplayOnly,
+ IN BOOLEAN AllowShortcuts
)
{
- POOL_PRINT Str;
- EFI_DEVICE_PATH_PROTOCOL *Node;
- EFI_DEVICE_PATH_PROTOCOL *AlignedNode;
- UINTN Index;
- DEVICE_PATH_TO_TEXT ToText;
+ POOL_PRINT Str;
+ EFI_DEVICE_PATH_PROTOCOL *Node;
+ EFI_DEVICE_PATH_PROTOCOL *AlignedNode;
+ UINTN Index;
+ DEVICE_PATH_TO_TEXT ToText;
if (DevicePath == NULL) {
return NULL;
@@ -2409,7 +2435,7 @@ UefiDevicePathLibConvertDevicePathToText ( //
// Process each device path node
//
- Node = (EFI_DEVICE_PATH_PROTOCOL *) DevicePath;
+ Node = (EFI_DEVICE_PATH_PROTOCOL *)DevicePath;
while (!IsDevicePathEnd (Node)) {
//
// Find the handler to dump this device path node
@@ -2417,14 +2443,15 @@ UefiDevicePathLibConvertDevicePathToText ( //
ToText = DevPathToTextNodeGeneric;
for (Index = 0; mUefiDevicePathLibToTextTable[Index].Function != NULL; Index += 1) {
-
- if (DevicePathType (Node) == mUefiDevicePathLibToTextTable[Index].Type &&
- DevicePathSubType (Node) == mUefiDevicePathLibToTextTable[Index].SubType
- ) {
+ if ((DevicePathType (Node) == mUefiDevicePathLibToTextTable[Index].Type) &&
+ (DevicePathSubType (Node) == mUefiDevicePathLibToTextTable[Index].SubType)
+ )
+ {
ToText = mUefiDevicePathLibToTextTable[Index].Function;
break;
}
}
+
//
// Put a path separator in if needed
//
diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c index b9aa462fdf..5ee3e9a31f 100644 --- a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c @@ -46,18 +46,18 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_PROTOCOL mUefiDevicePathLib BOOLEAN
EFIAPI
IsDevicePathValid (
- IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
- IN UINTN MaxSize
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
+ IN UINTN MaxSize
)
{
- UINTN Count;
- UINTN Size;
- UINTN NodeLength;
+ UINTN Count;
+ UINTN Size;
+ UINTN NodeLength;
//
- //Validate the input whether exists and its size big enough to touch the first node
+ // Validate the input whether exists and its size big enough to touch the first node
//
- if (DevicePath == NULL || (MaxSize > 0 && MaxSize < END_DEVICE_PATH_LENGTH)) {
+ if ((DevicePath == NULL) || ((MaxSize > 0) && (MaxSize < END_DEVICE_PATH_LENGTH))) {
return FALSE;
}
@@ -74,6 +74,7 @@ IsDevicePathValid ( if (NodeLength > MAX_UINTN - Size) {
return FALSE;
}
+
Size += NodeLength;
//
@@ -93,9 +94,10 @@ IsDevicePathValid ( //
// FilePath must be a NULL-terminated string.
//
- if (DevicePathType (DevicePath) == MEDIA_DEVICE_PATH &&
- DevicePathSubType (DevicePath) == MEDIA_FILEPATH_DP &&
- *(CHAR16 *)((UINT8 *)DevicePath + NodeLength - 2) != 0) {
+ if ((DevicePathType (DevicePath) == MEDIA_DEVICE_PATH) &&
+ (DevicePathSubType (DevicePath) == MEDIA_FILEPATH_DP) &&
+ (*(CHAR16 *)((UINT8 *)DevicePath + NodeLength - 2) != 0))
+ {
return FALSE;
}
}
@@ -103,10 +105,9 @@ IsDevicePathValid ( //
// Only return TRUE when the End Device Path node is valid.
//
- return (BOOLEAN) (DevicePathNodeLength (DevicePath) == END_DEVICE_PATH_LENGTH);
+ return (BOOLEAN)(DevicePathNodeLength (DevicePath) == END_DEVICE_PATH_LENGTH);
}
-
/**
Returns the Type field of a device path node.
@@ -197,7 +198,7 @@ NextDevicePathNode ( )
{
ASSERT (Node != NULL);
- return (EFI_DEVICE_PATH_PROTOCOL *)((UINT8 *)(Node) + DevicePathNodeLength(Node));
+ return (EFI_DEVICE_PATH_PROTOCOL *)((UINT8 *)(Node) + DevicePathNodeLength (Node));
}
/**
@@ -227,7 +228,7 @@ IsDevicePathEndType ( )
{
ASSERT (Node != NULL);
- return (BOOLEAN) (DevicePathType (Node) == END_DEVICE_PATH_TYPE);
+ return (BOOLEAN)(DevicePathType (Node) == END_DEVICE_PATH_TYPE);
}
/**
@@ -254,7 +255,7 @@ IsDevicePathEnd ( )
{
ASSERT (Node != NULL);
- return (BOOLEAN) (IsDevicePathEndType (Node) && DevicePathSubType(Node) == END_ENTIRE_DEVICE_PATH_SUBTYPE);
+ return (BOOLEAN)(IsDevicePathEndType (Node) && DevicePathSubType (Node) == END_ENTIRE_DEVICE_PATH_SUBTYPE);
}
/**
@@ -281,7 +282,7 @@ IsDevicePathEndInstance ( )
{
ASSERT (Node != NULL);
- return (BOOLEAN) (IsDevicePathEndType (Node) && DevicePathSubType(Node) == END_INSTANCE_DEVICE_PATH_SUBTYPE);
+ return (BOOLEAN)(IsDevicePathEndType (Node) && DevicePathSubType (Node) == END_INSTANCE_DEVICE_PATH_SUBTYPE);
}
/**
@@ -380,7 +381,7 @@ UefiDevicePathLibGetDevicePathSize ( //
// Compute the size and add back in the size of the end device path structure
//
- return ((UINTN) DevicePath - (UINTN) Start) + DevicePathNodeLength (DevicePath);
+ return ((UINTN)DevicePath - (UINTN)Start) + DevicePathNodeLength (DevicePath);
}
/**
@@ -405,7 +406,7 @@ UefiDevicePathLibDuplicateDevicePath ( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
{
- UINTN Size;
+ UINTN Size;
//
// Compute the size
@@ -478,9 +479,9 @@ UefiDevicePathLibAppendDevicePath ( // Allocate space for the combined device path. It only has one end node of
// length EFI_DEVICE_PATH_PROTOCOL.
//
- Size1 = GetDevicePathSize (FirstDevicePath);
- Size2 = GetDevicePathSize (SecondDevicePath);
- Size = Size1 + Size2 - END_DEVICE_PATH_LENGTH;
+ Size1 = GetDevicePathSize (FirstDevicePath);
+ Size2 = GetDevicePathSize (SecondDevicePath);
+ Size = Size1 + Size2 - END_DEVICE_PATH_LENGTH;
NewDevicePath = AllocatePool (Size);
@@ -489,8 +490,8 @@ UefiDevicePathLibAppendDevicePath ( //
// Over write FirstDevicePath EndNode and do the copy
//
- DevicePath2 = (EFI_DEVICE_PATH_PROTOCOL *) ((CHAR8 *) NewDevicePath +
- (Size1 - END_DEVICE_PATH_LENGTH));
+ DevicePath2 = (EFI_DEVICE_PATH_PROTOCOL *)((CHAR8 *)NewDevicePath +
+ (Size1 - END_DEVICE_PATH_LENGTH));
CopyMem (DevicePath2, SecondDevicePath, Size2);
}
@@ -540,6 +541,7 @@ UefiDevicePathLibAppendDevicePathNode ( if (DevicePathNode == NULL) {
return DuplicateDevicePath ((DevicePath != NULL) ? DevicePath : &mUefiDevicePathLibEndDevicePath);
}
+
//
// Build a Node that has a terminator on it
//
@@ -549,6 +551,7 @@ UefiDevicePathLibAppendDevicePathNode ( if (TempDevicePath == NULL) {
return NULL;
}
+
TempDevicePath = CopyMem (TempDevicePath, DevicePathNode, NodeLength);
//
// Add and end device path node to convert Node to device path
@@ -612,20 +615,19 @@ UefiDevicePathLibAppendDevicePathInstance ( return NULL;
}
- SrcSize = GetDevicePathSize (DevicePath);
- InstanceSize = GetDevicePathSize (DevicePathInstance);
+ SrcSize = GetDevicePathSize (DevicePath);
+ InstanceSize = GetDevicePathSize (DevicePathInstance);
NewDevicePath = AllocatePool (SrcSize + InstanceSize);
if (NewDevicePath != NULL) {
-
- TempDevicePath = CopyMem (NewDevicePath, DevicePath, SrcSize);;
+ TempDevicePath = CopyMem (NewDevicePath, DevicePath, SrcSize);
while (!IsDevicePathEnd (TempDevicePath)) {
TempDevicePath = NextDevicePathNode (TempDevicePath);
}
- TempDevicePath->SubType = END_INSTANCE_DEVICE_PATH_SUBTYPE;
- TempDevicePath = NextDevicePathNode (TempDevicePath);
+ TempDevicePath->SubType = END_INSTANCE_DEVICE_PATH_SUBTYPE;
+ TempDevicePath = NextDevicePathNode (TempDevicePath);
CopyMem (TempDevicePath, DevicePathInstance, InstanceSize);
}
@@ -663,8 +665,8 @@ UefiDevicePathLibAppendDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
UefiDevicePathLibGetNextDevicePathInstance (
- IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
- OUT UINTN *Size
+ IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
+ OUT UINTN *Size
)
{
EFI_DEVICE_PATH_PROTOCOL *DevPath;
@@ -673,7 +675,7 @@ UefiDevicePathLibGetNextDevicePathInstance ( ASSERT (Size != NULL);
- if (DevicePath == NULL || *DevicePath == NULL) {
+ if ((DevicePath == NULL) || (*DevicePath == NULL)) {
*Size = 0;
return NULL;
}
@@ -693,15 +695,15 @@ UefiDevicePathLibGetNextDevicePathInstance ( //
// Compute the size of the device path instance
//
- *Size = ((UINTN) DevPath - (UINTN) (*DevicePath)) + sizeof (EFI_DEVICE_PATH_PROTOCOL);
+ *Size = ((UINTN)DevPath - (UINTN)(*DevicePath)) + sizeof (EFI_DEVICE_PATH_PROTOCOL);
//
// Make a copy and return the device path instance
//
- Temp = DevPath->SubType;
- DevPath->SubType = END_ENTIRE_DEVICE_PATH_SUBTYPE;
- ReturnValue = DuplicateDevicePath (*DevicePath);
- DevPath->SubType = Temp;
+ Temp = DevPath->SubType;
+ DevPath->SubType = END_ENTIRE_DEVICE_PATH_SUBTYPE;
+ ReturnValue = DuplicateDevicePath (*DevicePath);
+ DevPath->SubType = Temp;
//
// If DevPath is the end of an entire device path, then another instance
@@ -738,12 +740,12 @@ UefiDevicePathLibGetNextDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
UefiDevicePathLibCreateDeviceNode (
- IN UINT8 NodeType,
- IN UINT8 NodeSubType,
- IN UINT16 NodeLength
+ IN UINT8 NodeType,
+ IN UINT8 NodeSubType,
+ IN UINT16 NodeLength
)
{
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;
if (NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {
//
@@ -754,9 +756,9 @@ UefiDevicePathLibCreateDeviceNode ( DevicePath = AllocateZeroPool (NodeLength);
if (DevicePath != NULL) {
- DevicePath->Type = NodeType;
- DevicePath->SubType = NodeSubType;
- SetDevicePathNodeLength (DevicePath, NodeLength);
+ DevicePath->Type = NodeType;
+ DevicePath->SubType = NodeSubType;
+ SetDevicePathNodeLength (DevicePath, NodeLength);
}
return DevicePath;
@@ -783,7 +785,7 @@ UefiDevicePathLibIsDevicePathMultiInstance ( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
{
- CONST EFI_DEVICE_PATH_PROTOCOL *Node;
+ CONST EFI_DEVICE_PATH_PROTOCOL *Node;
if (DevicePath == NULL) {
return FALSE;
@@ -805,7 +807,6 @@ UefiDevicePathLibIsDevicePathMultiInstance ( return FALSE;
}
-
/**
Allocates a device path for a file and appends it to an existing device path.
@@ -830,8 +831,8 @@ UefiDevicePathLibIsDevicePathMultiInstance ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
FileDevicePath (
- IN EFI_HANDLE Device OPTIONAL,
- IN CONST CHAR16 *FileName
+ IN EFI_HANDLE Device OPTIONAL,
+ IN CONST CHAR16 *FileName
)
{
UINTN Size;
@@ -841,10 +842,10 @@ FileDevicePath ( DevicePath = NULL;
- Size = StrSize (FileName);
+ Size = StrSize (FileName);
FileDevicePath = AllocatePool (Size + SIZE_OF_FILEPATH_DEVICE_PATH + END_DEVICE_PATH_LENGTH);
if (FileDevicePath != NULL) {
- FilePath = (FILEPATH_DEVICE_PATH *) FileDevicePath;
+ FilePath = (FILEPATH_DEVICE_PATH *)FileDevicePath;
FilePath->Header.Type = MEDIA_DEVICE_PATH;
FilePath->Header.SubType = MEDIA_FILEPATH_DP;
CopyMem (&FilePath->PathName, FileName, Size);
diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesDxeSmm.c b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesDxeSmm.c index 7f3b6076ef..ddd139567e 100644 --- a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesDxeSmm.c +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesDxeSmm.c @@ -16,7 +16,6 @@ #include "UefiDevicePathLib.h"
-
/**
Retrieves the device path protocol from a handle.
@@ -33,7 +32,7 @@ EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
DevicePathFromHandle (
- IN EFI_HANDLE Handle
+ IN EFI_HANDLE Handle
)
{
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
@@ -42,10 +41,11 @@ DevicePathFromHandle ( Status = gBS->HandleProtocol (
Handle,
&gEfiDevicePathProtocolGuid,
- (VOID *) &DevicePath
+ (VOID *)&DevicePath
);
if (EFI_ERROR (Status)) {
DevicePath = NULL;
}
+
return DevicePath;
}
diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesStandaloneMm.c b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesStandaloneMm.c index 930e778d37..096f835b90 100644 --- a/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesStandaloneMm.c +++ b/MdePkg/Library/UefiDevicePathLib/DevicePathUtilitiesStandaloneMm.c @@ -16,7 +16,6 @@ #include "UefiDevicePathLib.h"
-
/**
Retrieves the device path protocol from a handle.
@@ -33,7 +32,7 @@ EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
DevicePathFromHandle (
- IN EFI_HANDLE Handle
+ IN EFI_HANDLE Handle
)
{
return NULL;
diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c index af4b219387..a67d1cb30c 100644 --- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c +++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c @@ -13,7 +13,6 @@ **/
-
#include "UefiDevicePathLib.h"
/**
@@ -199,8 +198,8 @@ AppendDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
GetNextDevicePathInstance (
- IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
- OUT UINTN *Size
+ IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
+ OUT UINTN *Size
)
{
return UefiDevicePathLibGetNextDevicePathInstance (DevicePath, Size);
@@ -228,9 +227,9 @@ GetNextDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
CreateDeviceNode (
- IN UINT8 NodeType,
- IN UINT8 NodeSubType,
- IN UINT16 NodeLength
+ IN UINT8 NodeType,
+ IN UINT8 NodeSubType,
+ IN UINT16 NodeLength
)
{
return UefiDevicePathLibCreateDeviceNode (NodeType, NodeSubType, NodeLength);
@@ -304,9 +303,9 @@ ConvertDeviceNodeToText ( CHAR16 *
EFIAPI
ConvertDevicePathToText (
- IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
- IN BOOLEAN DisplayOnly,
- IN BOOLEAN AllowShortcuts
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
+ IN BOOLEAN DisplayOnly,
+ IN BOOLEAN AllowShortcuts
)
{
return UefiDevicePathLibConvertDevicePathToText (DevicePath, DisplayOnly, AllowShortcuts);
@@ -326,7 +325,7 @@ ConvertDevicePathToText ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
ConvertTextToDeviceNode (
- IN CONST CHAR16 *TextDeviceNode
+ IN CONST CHAR16 *TextDeviceNode
)
{
return UefiDevicePathLibConvertTextToDeviceNode (TextDeviceNode);
@@ -347,7 +346,7 @@ ConvertTextToDeviceNode ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
ConvertTextToDevicePath (
- IN CONST CHAR16 *TextDevicePath
+ IN CONST CHAR16 *TextDevicePath
)
{
return UefiDevicePathLibConvertTextToDevicePath (TextDevicePath);
diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h index 04b2375000..8f759f18fa 100644 --- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h +++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h @@ -24,28 +24,27 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include <Library/PcdLib.h>
#include <IndustryStandard/Bluetooth.h>
-#define IS_COMMA(a) ((a) == L',')
-#define IS_HYPHEN(a) ((a) == L'-')
-#define IS_DOT(a) ((a) == L'.')
-#define IS_LEFT_PARENTH(a) ((a) == L'(')
-#define IS_RIGHT_PARENTH(a) ((a) == L')')
-#define IS_SLASH(a) ((a) == L'/')
-#define IS_NULL(a) ((a) == L'\0')
-
+#define IS_COMMA(a) ((a) == L',')
+#define IS_HYPHEN(a) ((a) == L'-')
+#define IS_DOT(a) ((a) == L'.')
+#define IS_LEFT_PARENTH(a) ((a) == L'(')
+#define IS_RIGHT_PARENTH(a) ((a) == L')')
+#define IS_SLASH(a) ((a) == L'/')
+#define IS_NULL(a) ((a) == L'\0')
//
// Private Data structure
//
typedef struct {
- CHAR16 *Str;
- UINTN Count;
- UINTN Capacity;
+ CHAR16 *Str;
+ UINTN Count;
+ UINTN Capacity;
} POOL_PRINT;
typedef
EFI_DEVICE_PATH_PROTOCOL *
(*DEVICE_PATH_FROM_TEXT) (
- IN CHAR16 *Str
+ IN CHAR16 *Str
);
typedef
@@ -58,90 +57,90 @@ VOID );
typedef struct {
- UINT8 Type;
- UINT8 SubType;
- DEVICE_PATH_TO_TEXT Function;
+ UINT8 Type;
+ UINT8 SubType;
+ DEVICE_PATH_TO_TEXT Function;
} DEVICE_PATH_TO_TEXT_TABLE;
typedef struct {
- UINT8 Type;
- CHAR16 *Text;
+ UINT8 Type;
+ CHAR16 *Text;
} DEVICE_PATH_TO_TEXT_GENERIC_TABLE;
typedef struct {
- CHAR16 *DevicePathNodeText;
- DEVICE_PATH_FROM_TEXT Function;
+ CHAR16 *DevicePathNodeText;
+ DEVICE_PATH_FROM_TEXT Function;
} DEVICE_PATH_FROM_TEXT_TABLE;
typedef struct {
- BOOLEAN ClassExist;
- UINT8 Class;
- BOOLEAN SubClassExist;
- UINT8 SubClass;
+ BOOLEAN ClassExist;
+ UINT8 Class;
+ BOOLEAN SubClassExist;
+ UINT8 SubClass;
} USB_CLASS_TEXT;
-#define USB_CLASS_AUDIO 1
-#define USB_CLASS_CDCCONTROL 2
-#define USB_CLASS_HID 3
-#define USB_CLASS_IMAGE 6
-#define USB_CLASS_PRINTER 7
-#define USB_CLASS_MASS_STORAGE 8
-#define USB_CLASS_HUB 9
-#define USB_CLASS_CDCDATA 10
-#define USB_CLASS_SMART_CARD 11
-#define USB_CLASS_VIDEO 14
-#define USB_CLASS_DIAGNOSTIC 220
-#define USB_CLASS_WIRELESS 224
-
-#define USB_CLASS_RESERVE 254
-#define USB_SUBCLASS_FW_UPDATE 1
-#define USB_SUBCLASS_IRDA_BRIDGE 2
-#define USB_SUBCLASS_TEST 3
-
-#define RFC_1700_UDP_PROTOCOL 17
-#define RFC_1700_TCP_PROTOCOL 6
+#define USB_CLASS_AUDIO 1
+#define USB_CLASS_CDCCONTROL 2
+#define USB_CLASS_HID 3
+#define USB_CLASS_IMAGE 6
+#define USB_CLASS_PRINTER 7
+#define USB_CLASS_MASS_STORAGE 8
+#define USB_CLASS_HUB 9
+#define USB_CLASS_CDCDATA 10
+#define USB_CLASS_SMART_CARD 11
+#define USB_CLASS_VIDEO 14
+#define USB_CLASS_DIAGNOSTIC 220
+#define USB_CLASS_WIRELESS 224
+
+#define USB_CLASS_RESERVE 254
+#define USB_SUBCLASS_FW_UPDATE 1
+#define USB_SUBCLASS_IRDA_BRIDGE 2
+#define USB_SUBCLASS_TEST 3
+
+#define RFC_1700_UDP_PROTOCOL 17
+#define RFC_1700_TCP_PROTOCOL 6
#pragma pack(1)
typedef struct {
- EFI_DEVICE_PATH_PROTOCOL Header;
- EFI_GUID Guid;
- UINT8 VendorDefinedData[1];
+ EFI_DEVICE_PATH_PROTOCOL Header;
+ EFI_GUID Guid;
+ UINT8 VendorDefinedData[1];
} VENDOR_DEFINED_HARDWARE_DEVICE_PATH;
typedef struct {
- EFI_DEVICE_PATH_PROTOCOL Header;
- EFI_GUID Guid;
- UINT8 VendorDefinedData[1];
+ EFI_DEVICE_PATH_PROTOCOL Header;
+ EFI_GUID Guid;
+ UINT8 VendorDefinedData[1];
} VENDOR_DEFINED_MESSAGING_DEVICE_PATH;
typedef struct {
- EFI_DEVICE_PATH_PROTOCOL Header;
- EFI_GUID Guid;
- UINT8 VendorDefinedData[1];
+ EFI_DEVICE_PATH_PROTOCOL Header;
+ EFI_GUID Guid;
+ UINT8 VendorDefinedData[1];
} VENDOR_DEFINED_MEDIA_DEVICE_PATH;
typedef struct {
- EFI_DEVICE_PATH_PROTOCOL Header;
- UINT32 Hid;
- UINT32 Uid;
- UINT32 Cid;
- CHAR8 HidUidCidStr[3];
+ EFI_DEVICE_PATH_PROTOCOL Header;
+ UINT32 Hid;
+ UINT32 Uid;
+ UINT32 Cid;
+ CHAR8 HidUidCidStr[3];
} ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR;
typedef struct {
- EFI_DEVICE_PATH_PROTOCOL Header;
- UINT16 NetworkProtocol;
- UINT16 LoginOption;
- UINT64 Lun;
- UINT16 TargetPortalGroupTag;
- CHAR8 TargetName[1];
+ EFI_DEVICE_PATH_PROTOCOL Header;
+ UINT16 NetworkProtocol;
+ UINT16 LoginOption;
+ UINT64 Lun;
+ UINT16 TargetPortalGroupTag;
+ CHAR8 TargetName[1];
} ISCSI_DEVICE_PATH_WITH_NAME;
typedef struct {
- EFI_DEVICE_PATH_PROTOCOL Header;
- EFI_GUID Guid;
- UINT8 VendorDefinedData[1];
+ EFI_DEVICE_PATH_PROTOCOL Header;
+ EFI_GUID Guid;
+ UINT8 VendorDefinedData[1];
} VENDOR_DEVICE_PATH_WITH_DATA;
#pragma pack()
@@ -314,8 +313,8 @@ UefiDevicePathLibAppendDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
UefiDevicePathLibGetNextDevicePathInstance (
- IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
- OUT UINTN *Size
+ IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
+ OUT UINTN *Size
);
/**
@@ -340,9 +339,9 @@ UefiDevicePathLibGetNextDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
UefiDevicePathLibCreateDeviceNode (
- IN UINT8 NodeType,
- IN UINT8 NodeSubType,
- IN UINT16 NodeLength
+ IN UINT8 NodeType,
+ IN UINT8 NodeSubType,
+ IN UINT16 NodeLength
);
/**
@@ -366,7 +365,6 @@ UefiDevicePathLibIsDevicePathMultiInstance ( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
);
-
/**
Converts a device path to its text representation.
@@ -385,9 +383,9 @@ UefiDevicePathLibIsDevicePathMultiInstance ( CHAR16 *
EFIAPI
UefiDevicePathLibConvertDevicePathToText (
- IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
- IN BOOLEAN DisplayOnly,
- IN BOOLEAN AllowShortcuts
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
+ IN BOOLEAN DisplayOnly,
+ IN BOOLEAN AllowShortcuts
);
/**
@@ -427,7 +425,7 @@ UefiDevicePathLibConvertDeviceNodeToText ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
UefiDevicePathLibConvertTextToDeviceNode (
- IN CONST CHAR16 *TextDeviceNode
+ IN CONST CHAR16 *TextDeviceNode
);
/**
@@ -445,7 +443,7 @@ UefiDevicePathLibConvertTextToDeviceNode ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
UefiDevicePathLibConvertTextToDevicePath (
- IN CONST CHAR16 *TextDevicePath
+ IN CONST CHAR16 *TextDevicePath
);
#endif
diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c index e1e629442a..dfe211205b 100644 --- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c +++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c @@ -13,12 +13,11 @@ **/
-
#include "UefiDevicePathLib.h"
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_UTILITIES_PROTOCOL *mDevicePathLibDevicePathUtilities = NULL;
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *mDevicePathLibDevicePathToText = NULL;
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *mDevicePathLibDevicePathFromText = NULL;
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_UTILITIES_PROTOCOL *mDevicePathLibDevicePathUtilities = NULL;
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *mDevicePathLibDevicePathToText = NULL;
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *mDevicePathLibDevicePathFromText = NULL;
/**
The constructor function caches the pointer to DevicePathUtilites protocol,
@@ -37,16 +36,16 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *mDevicePathLib EFI_STATUS
EFIAPI
UefiDevicePathLibOptionalDevicePathProtocolConstructor (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE *SystemTable
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
Status = gBS->LocateProtocol (
&gEfiDevicePathUtilitiesProtocolGuid,
NULL,
- (VOID**) &mDevicePathLibDevicePathUtilities
+ (VOID **)&mDevicePathLibDevicePathUtilities
);
ASSERT_EFI_ERROR (Status);
ASSERT (mDevicePathLibDevicePathUtilities != NULL);
@@ -256,8 +255,8 @@ AppendDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
GetNextDevicePathInstance (
- IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
- OUT UINTN *Size
+ IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,
+ OUT UINTN *Size
)
{
if (mDevicePathLibDevicePathUtilities != NULL) {
@@ -289,9 +288,9 @@ GetNextDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
CreateDeviceNode (
- IN UINT8 NodeType,
- IN UINT8 NodeSubType,
- IN UINT16 NodeLength
+ IN UINT8 NodeType,
+ IN UINT8 NodeSubType,
+ IN UINT16 NodeLength
)
{
if (mDevicePathLibDevicePathUtilities != NULL) {
@@ -338,15 +337,16 @@ IsDevicePathMultiInstance ( **/
VOID *
UefiDevicePathLibLocateProtocol (
- EFI_GUID *ProtocolGuid
+ EFI_GUID *ProtocolGuid
)
{
- EFI_STATUS Status;
- VOID *Protocol;
+ EFI_STATUS Status;
+ VOID *Protocol;
+
Status = gBS->LocateProtocol (
ProtocolGuid,
NULL,
- (VOID**) &Protocol
+ (VOID **)&Protocol
);
if (EFI_ERROR (Status)) {
return NULL;
@@ -381,6 +381,7 @@ ConvertDeviceNodeToText ( if (mDevicePathLibDevicePathToText == NULL) {
mDevicePathLibDevicePathToText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathToTextProtocolGuid);
}
+
if (mDevicePathLibDevicePathToText != NULL) {
return mDevicePathLibDevicePathToText->ConvertDeviceNodeToText (DeviceNode, DisplayOnly, AllowShortcuts);
}
@@ -406,14 +407,15 @@ ConvertDeviceNodeToText ( CHAR16 *
EFIAPI
ConvertDevicePathToText (
- IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
- IN BOOLEAN DisplayOnly,
- IN BOOLEAN AllowShortcuts
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
+ IN BOOLEAN DisplayOnly,
+ IN BOOLEAN AllowShortcuts
)
{
if (mDevicePathLibDevicePathToText == NULL) {
mDevicePathLibDevicePathToText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathToTextProtocolGuid);
}
+
if (mDevicePathLibDevicePathToText != NULL) {
return mDevicePathLibDevicePathToText->ConvertDevicePathToText (DevicePath, DisplayOnly, AllowShortcuts);
}
@@ -435,12 +437,13 @@ ConvertDevicePathToText ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
ConvertTextToDeviceNode (
- IN CONST CHAR16 *TextDeviceNode
+ IN CONST CHAR16 *TextDeviceNode
)
{
if (mDevicePathLibDevicePathFromText == NULL) {
mDevicePathLibDevicePathFromText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathFromTextProtocolGuid);
}
+
if (mDevicePathLibDevicePathFromText != NULL) {
return mDevicePathLibDevicePathFromText->ConvertTextToDeviceNode (TextDeviceNode);
}
@@ -463,12 +466,13 @@ ConvertTextToDeviceNode ( EFI_DEVICE_PATH_PROTOCOL *
EFIAPI
ConvertTextToDevicePath (
- IN CONST CHAR16 *TextDevicePath
+ IN CONST CHAR16 *TextDevicePath
)
{
if (mDevicePathLibDevicePathFromText == NULL) {
mDevicePathLibDevicePathFromText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathFromTextProtocolGuid);
}
+
if (mDevicePathLibDevicePathFromText != NULL) {
return mDevicePathLibDevicePathFromText->ConvertTextToDevicePath (TextDevicePath);
}
|