/** @file\r
DevicePathFromText protocol as defined in the UEFI 2.0 specification.\r
\r
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
UINTN Index;\r
\r
for (Index = 0; Index < 4; Index++) {\r
- IPv4Addr->Addr[Index] = (UINT8) StrDecimalToUintn (SplitStr (Str, L'.'));\r
+ IPv4Addr->Addr[Index] = (UINT8) Strtoi (SplitStr (Str, L'.'));\r
}\r
}\r
\r
*AsciiStr = Dest + 1;\r
}\r
\r
+/**\r
+ Converts a generic text device path node to device path structure.\r
+\r
+ @param Type The type of the device path node.\r
+ @param TextDeviceNode The input text device path node.\r
+\r
+ @return A pointer to device path structure.\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextGenericPath (\r
+ IN UINT8 Type,\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ EFI_DEVICE_PATH_PROTOCOL *Node;\r
+ CHAR16 *SubtypeStr;\r
+ CHAR16 *DataStr;\r
+ UINTN DataLength;\r
+\r
+ SubtypeStr = GetNextParamStr (&TextDeviceNode);\r
+ DataStr = GetNextParamStr (&TextDeviceNode);\r
+\r
+ if (DataStr == NULL) {\r
+ DataLength = 0;\r
+ } else {\r
+ DataLength = StrLen (DataStr) / 2;\r
+ }\r
+ Node = CreateDeviceNode (\r
+ Type,\r
+ (UINT8) Strtoi (SubtypeStr),\r
+ (UINT16) (sizeof (EFI_DEVICE_PATH_PROTOCOL) + DataLength)\r
+ );\r
+\r
+ if (DataLength != 0) {\r
+ StrToBuf ((UINT8 *) (Node + 1), DataLength, DataStr);\r
+ }\r
+ return Node;\r
+}\r
+\r
+/**\r
+ Converts a generic text device path node to device path structure.\r
+\r
+ @param TextDeviceNode The input Text device path node.\r
+\r
+ @return A pointer to device path structure.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextPath (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ CHAR16 *TypeStr;\r
+\r
+ TypeStr = GetNextParamStr (&TextDeviceNode);\r
+\r
+ return DevPathFromTextGenericPath ((UINT8) Strtoi (TypeStr), TextDeviceNode);\r
+}\r
+\r
+/**\r
+ Converts a generic hardware text device path node to Hardware device path structure.\r
+\r
+ @param TextDeviceNode The input Text device path node.\r
+\r
+ @return A pointer to Hardware device path structure.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextHardwarePath (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ return DevPathFromTextGenericPath (HARDWARE_DEVICE_PATH, TextDeviceNode);\r
+}\r
+\r
/**\r
Converts a text device path node to Hardware PCI device path structure.\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Controller;\r
}\r
\r
+/**\r
+ Converts a generic ACPI text device path node to ACPI device path structure.\r
+\r
+ @param TextDeviceNode The input Text device path node.\r
+\r
+ @return A pointer to ACPI device path structure.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextAcpiPath (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ return DevPathFromTextGenericPath (ACPI_DEVICE_PATH, TextDeviceNode);\r
+}\r
+\r
/**\r
Converts a string to EisaId.\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) AcpiAdr;\r
}\r
\r
+/**\r
+ Converts a generic messaging text device path node to messaging device path structure.\r
+\r
+ @param TextDeviceNode The input Text device path node.\r
+\r
+ @return A pointer to messaging device path structure.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextMsg (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ return DevPathFromTextGenericPath (MESSAGING_DEVICE_PATH, TextDeviceNode);\r
+}\r
+\r
/**\r
Converts a text device path node to Parallel Port device path structure.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
DevPathFromTextAta (\r
- IN CHAR16 *TextDeviceNode\r
- )\r
+IN CHAR16 *TextDeviceNode\r
+)\r
{\r
CHAR16 *PrimarySecondaryStr;\r
CHAR16 *SlaveMasterStr;\r
ATAPI_DEVICE_PATH *Atapi;\r
\r
Atapi = (ATAPI_DEVICE_PATH *) CreateDeviceNode (\r
- MESSAGING_DEVICE_PATH,\r
- MSG_ATAPI_DP,\r
- (UINT16) sizeof (ATAPI_DEVICE_PATH)\r
- );\r
-\r
- PrimarySecondaryStr = GetNextParamStr (&TextDeviceNode);\r
- SlaveMasterStr = GetNextParamStr (&TextDeviceNode);\r
- LunStr = GetNextParamStr (&TextDeviceNode);\r
+ MESSAGING_DEVICE_PATH,\r
+ MSG_ATAPI_DP,\r
+ (UINT16) sizeof (ATAPI_DEVICE_PATH)\r
+ );\r
+\r
+ PrimarySecondaryStr = GetNextParamStr (&TextDeviceNode);\r
+ SlaveMasterStr = GetNextParamStr (&TextDeviceNode);\r
+ LunStr = GetNextParamStr (&TextDeviceNode);\r
+\r
+ if (StrCmp (PrimarySecondaryStr, L"Primary") == 0) {\r
+ Atapi->PrimarySecondary = 0;\r
+ } else if (StrCmp (PrimarySecondaryStr, L"Secondary") == 0) {\r
+ Atapi->PrimarySecondary = 1;\r
+ } else {\r
+ Atapi->PrimarySecondary = (UINT8) Strtoi (PrimarySecondaryStr);\r
+ }\r
+ if (StrCmp (SlaveMasterStr, L"Master") == 0) {\r
+ Atapi->SlaveMaster = 0;\r
+ } else if (StrCmp (SlaveMasterStr, L"Slave") == 0) {\r
+ Atapi->SlaveMaster = 1;\r
+ } else {\r
+ Atapi->SlaveMaster = (UINT8) Strtoi (SlaveMasterStr);\r
+ }\r
\r
- Atapi->PrimarySecondary = (UINT8) ((StrCmp (PrimarySecondaryStr, L"Primary") == 0) ? 0 : 1);\r
- Atapi->SlaveMaster = (UINT8) ((StrCmp (SlaveMasterStr, L"Master") == 0) ? 0 : 1);\r
- Atapi->Lun = (UINT16) Strtoi (LunStr);\r
+ Atapi->Lun = (UINT16) Strtoi (LunStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Atapi;\r
}\r
return (EFI_DEVICE_PATH_PROTOCOL *) SasEx;\r
}\r
\r
+/**\r
+ Converts a text device path node to NVM Express Namespace device path structure.\r
+\r
+ @param TextDeviceNode The input Text device path node.\r
+\r
+ @return A pointer to the newly-created NVM Express Namespace device path structure.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextNVMe (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ CHAR16 *NamespaceIdStr;\r
+ CHAR16 *NamespaceUuidStr;\r
+ NVME_NAMESPACE_DEVICE_PATH *Nvme;\r
+ UINT8 *Uuid;\r
+ UINTN Index;\r
+\r
+ NamespaceIdStr = GetNextParamStr (&TextDeviceNode);\r
+ NamespaceUuidStr = GetNextParamStr (&TextDeviceNode);\r
+ Nvme = (NVME_NAMESPACE_DEVICE_PATH *) CreateDeviceNode (\r
+ MESSAGING_DEVICE_PATH,\r
+ MSG_NVME_NAMESPACE_DP,\r
+ (UINT16) sizeof (NVME_NAMESPACE_DEVICE_PATH)\r
+ );\r
+\r
+ Nvme->NamespaceId = (UINT32) Strtoi (NamespaceIdStr);\r
+ Uuid = (UINT8 *) &Nvme->NamespaceUuid;\r
+\r
+ Index = sizeof (Nvme->NamespaceUuid) / sizeof (UINT8);\r
+ while (Index-- != 0) {\r
+ Uuid[Index] = (UINT8) StrHexToUintn (SplitStr (&NamespaceUuidStr, L'-'));\r
+ }\r
+\r
+ return (EFI_DEVICE_PATH_PROTOCOL *) Nvme;\r
+}\r
+\r
+/**\r
+ Converts a text device path node to UFS device path structure.\r
+\r
+ @param TextDeviceNode The input Text device path node.\r
+\r
+ @return A pointer to the newly-created UFS device path structure.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextUfs (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ CHAR16 *PunStr;\r
+ CHAR16 *LunStr;\r
+ UFS_DEVICE_PATH *Ufs;\r
+\r
+ PunStr = GetNextParamStr (&TextDeviceNode);\r
+ LunStr = GetNextParamStr (&TextDeviceNode);\r
+ Ufs = (UFS_DEVICE_PATH *) CreateDeviceNode (\r
+ MESSAGING_DEVICE_PATH,\r
+ MSG_UFS_DP,\r
+ (UINT16) sizeof (UFS_DEVICE_PATH)\r
+ );\r
+\r
+ Ufs->Pun = (UINT8) Strtoi (PunStr);\r
+ Ufs->Lun = (UINT8) Strtoi (LunStr);\r
+\r
+ return (EFI_DEVICE_PATH_PROTOCOL *) Ufs;\r
+}\r
+\r
/**\r
Converts a text device path node to Debug Port device path structure.\r
\r
(UINT16) sizeof (UART_DEVICE_PATH)\r
);\r
\r
- Uart->BaudRate = (StrCmp (BaudStr, L"DEFAULT") == 0) ? 115200 : StrDecimalToUintn (BaudStr);\r
- Uart->DataBits = (UINT8) ((StrCmp (DataBitsStr, L"DEFAULT") == 0) ? 8 : StrDecimalToUintn (DataBitsStr));\r
+ if (StrCmp (BaudStr, L"DEFAULT") == 0) {\r
+ Uart->BaudRate = 115200;\r
+ } else {\r
+ Strtoi64 (BaudStr, &Uart->BaudRate);\r
+ }\r
+ Uart->DataBits = (UINT8) ((StrCmp (DataBitsStr, L"DEFAULT") == 0) ? 8 : Strtoi (DataBitsStr));\r
switch (*ParityStr) {\r
case L'D':\r
Uart->Parity = 0;\r
break;\r
\r
default:\r
- Uart->Parity = 0xff;\r
+ Uart->Parity = (UINT8) Strtoi (ParityStr);\r
+ break;\r
}\r
\r
if (StrCmp (StopBitsStr, L"D") == 0) {\r
} else if (StrCmp (StopBitsStr, L"2") == 0) {\r
Uart->StopBits = (UINT8) 3;\r
} else {\r
- Uart->StopBits = 0xff;\r
+ Uart->StopBits = (UINT8) Strtoi (StopBitsStr);\r
}\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Uart;\r
CHAR16 *InterfaceNumStr;\r
CHAR16 *SerialNumberStr;\r
USB_WWID_DEVICE_PATH *UsbWwid;\r
-\r
- VIDStr = GetNextParamStr (&TextDeviceNode);\r
- PIDStr = GetNextParamStr (&TextDeviceNode);\r
- InterfaceNumStr = GetNextParamStr (&TextDeviceNode);\r
- SerialNumberStr = GetNextParamStr (&TextDeviceNode);\r
- UsbWwid = (USB_WWID_DEVICE_PATH *) CreateDeviceNode (\r
+ UINTN SerialNumberStrLen;\r
+\r
+ VIDStr = GetNextParamStr (&TextDeviceNode);\r
+ PIDStr = GetNextParamStr (&TextDeviceNode);\r
+ InterfaceNumStr = GetNextParamStr (&TextDeviceNode);\r
+ SerialNumberStr = GetNextParamStr (&TextDeviceNode);\r
+ SerialNumberStrLen = StrLen (SerialNumberStr);\r
+ if (SerialNumberStrLen >= 2 &&\r
+ SerialNumberStr[0] == L'\"' &&\r
+ SerialNumberStr[SerialNumberStrLen - 1] == L'\"'\r
+ ) {\r
+ SerialNumberStr[SerialNumberStrLen - 1] = L'\0';\r
+ SerialNumberStr++;\r
+ SerialNumberStrLen -= 2;\r
+ }\r
+ UsbWwid = (USB_WWID_DEVICE_PATH *) CreateDeviceNode (\r
MESSAGING_DEVICE_PATH,\r
MSG_USB_WWID_DP,\r
- (UINT16) (sizeof (USB_WWID_DEVICE_PATH) + StrSize (SerialNumberStr))\r
+ (UINT16) (sizeof (USB_WWID_DEVICE_PATH) + SerialNumberStrLen * sizeof (CHAR16))\r
);\r
-\r
- UsbWwid->VendorId = (UINT16) Strtoi (VIDStr);\r
- UsbWwid->ProductId = (UINT16) Strtoi (PIDStr);\r
- UsbWwid->InterfaceNumber = (UINT16) Strtoi (InterfaceNumStr);\r
- StrCpy ((CHAR16 *) ((UINT8 *) UsbWwid + sizeof (USB_WWID_DEVICE_PATH)), SerialNumberStr);\r
+ UsbWwid->VendorId = (UINT16) Strtoi (VIDStr);\r
+ UsbWwid->ProductId = (UINT16) Strtoi (PIDStr);\r
+ UsbWwid->InterfaceNumber = (UINT16) Strtoi (InterfaceNumStr);\r
+ StrnCpy ((CHAR16 *) ((UINT8 *) UsbWwid + sizeof (USB_WWID_DEVICE_PATH)), SerialNumberStr, SerialNumberStrLen);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) UsbWwid;\r
}\r
return (EFI_DEVICE_PATH_PROTOCOL *) Vlan;\r
}\r
\r
+/**\r
+ Converts a text device path node to Bluetooth device path structure.\r
+\r
+ @param TextDeviceNode The input Text device path node.\r
+\r
+ @return A pointer to the newly-created Bluetooth device path structure.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextBluetooth (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ CHAR16 *BluetoothStr;\r
+ CHAR16 *Walker;\r
+ CHAR16 *TempNumBuffer;\r
+ UINTN TempBufferSize;\r
+ INT32 Index;\r
+ BLUETOOTH_DEVICE_PATH *BluetoothDp;\r
+\r
+ BluetoothStr = GetNextParamStr (&TextDeviceNode);\r
+ BluetoothDp = (BLUETOOTH_DEVICE_PATH *) CreateDeviceNode (\r
+ MESSAGING_DEVICE_PATH,\r
+ MSG_BLUETOOTH_DP,\r
+ (UINT16) sizeof (BLUETOOTH_DEVICE_PATH)\r
+ );\r
+\r
+ Index = sizeof (BLUETOOTH_ADDRESS) - 1;\r
+ while (!IS_NULL(BluetoothStr) && Index >= 0) {\r
+ Walker = SplitStr (&BluetoothStr, L':');\r
+ TempBufferSize = StrSize (Walker) + StrLen (L"0x") * sizeof (CHAR16);\r
+ TempNumBuffer = AllocateZeroPool (TempBufferSize);\r
+ if (TempNumBuffer == NULL) {\r
+ break;\r
+ }\r
+ StrnCpy (TempNumBuffer, L"0x", TempBufferSize / sizeof (CHAR16));\r
+ StrnCat (TempNumBuffer + StrLen (L"0x"), Walker, TempBufferSize / sizeof (CHAR16) - StrLen (L"0x") );\r
+ BluetoothDp->BD_ADDR.Address[Index] = (UINT8)Strtoi (TempNumBuffer);\r
+ FreePool (TempNumBuffer);\r
+ Index--;\r
+ }\r
+ \r
+ return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothDp;\r
+}\r
+\r
+/**\r
+ Converts a media text device path node to media device path structure.\r
+\r
+ @param TextDeviceNode The input Text device path node.\r
+\r
+ @return A pointer to media device path structure.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextMediaPath (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ return DevPathFromTextGenericPath (MEDIA_DEVICE_PATH, TextDeviceNode);\r
+}\r
+\r
/**\r
Converts a text device path node to HD device path structure.\r
\r
(UINT16) sizeof (HARDDRIVE_DEVICE_PATH)\r
);\r
\r
- Hd->PartitionNumber = (UINT32) StrDecimalToUintn (PartitionStr);\r
+ Hd->PartitionNumber = (UINT32) Strtoi (PartitionStr);\r
\r
ZeroMem (Hd->Signature, 16);\r
Hd->MBRType = (UINT8) 0;\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
-DevPathFromTextVenMEDIA (\r
+DevPathFromTextVenMedia (\r
IN CHAR16 *TextDeviceNode\r
)\r
{\r
return (EFI_DEVICE_PATH_PROTOCOL *) Offset;\r
}\r
\r
+\r
+/**\r
+ Converts a BBS text device path node to BBS device path structure.\r
+\r
+ @param TextDeviceNode The input Text device path node.\r
+\r
+ @return A pointer to BBS device path structure.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextBbsPath (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ return DevPathFromTextGenericPath (BBS_DEVICE_PATH, TextDeviceNode);\r
+}\r
+\r
/**\r
Converts a text device path node to BIOS Boot Specification device path structure.\r
\r
CHAR16 *Param2;\r
CHAR16 *Param3;\r
\r
- //\r
- // The PMPN is optional.\r
- //\r
Param1 = GetNextParamStr (&TextDeviceNode);\r
Param2 = GetNextParamStr (&TextDeviceNode);\r
- Param3 = NULL;\r
- if (!IS_NULL (TextDeviceNode)) {\r
- Param3 = GetNextParamStr (&TextDeviceNode);\r
- }\r
+ Param3 = GetNextParamStr (&TextDeviceNode);\r
\r
Sata = (SATA_DEVICE_PATH *) CreateDeviceNode (\r
MESSAGING_DEVICE_PATH,\r
MSG_SATA_DP,\r
(UINT16) sizeof (SATA_DEVICE_PATH)\r
);\r
- Sata->HBAPortNumber = (UINT16) StrHexToUintn (Param1);\r
- if (Param3 != NULL) {\r
- Sata->PortMultiplierPortNumber = (UINT16) StrHexToUintn (Param2);\r
- Param2 = Param3;\r
- } else {\r
- Sata->PortMultiplierPortNumber = SATA_HBA_DIRECT_CONNECT_FLAG;\r
- }\r
- Sata->Lun = (UINT16) StrHexToUintn (Param2);\r
+ Sata->HBAPortNumber = (UINT16) Strtoi (Param1);\r
+ Sata->PortMultiplierPortNumber = (UINT16) Strtoi (Param2);\r
+ Sata->Lun = (UINT16) Strtoi (Param3);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Sata;\r
}\r
\r
GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevPathFromTextTable[] = {\r
+ {L"Path", DevPathFromTextPath },\r
+\r
+ {L"HardwarePath", DevPathFromTextHardwarePath },\r
{L"Pci", DevPathFromTextPci },\r
{L"PcCard", DevPathFromTextPcCard },\r
{L"MemoryMapped", DevPathFromTextMemoryMapped },\r
{L"VenHw", DevPathFromTextVenHw },\r
{L"Ctrl", DevPathFromTextCtrl },\r
+\r
+ {L"AcpiPath", DevPathFromTextAcpiPath },\r
{L"Acpi", DevPathFromTextAcpi },\r
{L"PciRoot", DevPathFromTextPciRoot },\r
{L"PcieRoot", DevPathFromTextPcieRoot },\r
{L"AcpiEx", DevPathFromTextAcpiEx },\r
{L"AcpiExp", DevPathFromTextAcpiExp },\r
{L"AcpiAdr", DevPathFromTextAcpiAdr },\r
+\r
+ {L"Msg", DevPathFromTextMsg },\r
{L"Ata", DevPathFromTextAta },\r
{L"Scsi", DevPathFromTextScsi },\r
{L"Fibre", DevPathFromTextFibre },\r
{L"UartFlowCtrl", DevPathFromTextUartFlowCtrl },\r
{L"SAS", DevPathFromTextSAS },\r
{L"SasEx", DevPathFromTextSasEx },\r
+ {L"NVMe", DevPathFromTextNVMe },\r
+ {L"UFS", DevPathFromTextUfs },\r
{L"DebugPort", DevPathFromTextDebugPort },\r
{L"MAC", DevPathFromTextMAC },\r
{L"IPv4", DevPathFromTextIPv4 },\r
{L"Unit", DevPathFromTextUnit },\r
{L"iSCSI", DevPathFromTextiSCSI },\r
{L"Vlan", DevPathFromTextVlan },\r
+ {L"Bluetooth", DevPathFromTextBluetooth },\r
+ {L"MediaPath", DevPathFromTextMediaPath },\r
{L"HD", DevPathFromTextHD },\r
{L"CDROM", DevPathFromTextCDROM },\r
- {L"VenMEDIA", DevPathFromTextVenMEDIA },\r
+ {L"VenMedia", DevPathFromTextVenMedia },\r
{L"Media", DevPathFromTextMedia },\r
{L"Fv", DevPathFromTextFv },\r
{L"FvFile", DevPathFromTextFvFile },\r
{L"Offset", DevPathFromTextRelativeOffsetRange },\r
+\r
+ {L"BbsPath", DevPathFromTextBbsPath },\r
{L"BBS", DevPathFromTextBBS },\r
{L"Sata", DevPathFromTextSata },\r
{NULL, NULL}\r
projects / mirror_edk2.git / blobdiff