Get current sub-string from a string list, before return\r
the list header is moved to next sub-string. The sub-string is separated\r
by the specified character. For example, the separator is ',', the string\r
- list is "2,0,3", it returns "2", the remain list move to "2,3"\r
+ list is "2,0,3", it returns "2", the remain list move to "0,3"\r
\r
Arguments:\r
List - A string list separated by the specified separator\r
STATIC\r
CHAR16 *\r
TrimHexStr (\r
- IN CHAR16 *Str\r
+ IN CHAR16 *Str,\r
+ OUT BOOLEAN *IsHex\r
)\r
/*++\r
\r
Routine Description:\r
- Skip the leading white space and '0x' or '0X' of a hex string\r
+ Skip the leading white space and '0x' or '0X' of a integer string\r
\r
Arguments:\r
- Str - The hex string\r
+ Str - The integer string\r
+ IsHex - 1: Hex string, 0: Decimal string\r
\r
Returns:\r
\r
--*/\r
{\r
+ *IsHex = FALSE;\r
+\r
//\r
// skip preceeding white space\r
//\r
//\r
if (*Str && (*Str == 'x' || *Str == 'X')) {\r
Str += 1;\r
+ *IsHex = TRUE;\r
}\r
\r
return Str;\r
//\r
Rvalue = 0;\r
Length = sizeof (UINTN);\r
- HexStringToBuf ((UINT8 *) &Rvalue, &Length, TrimHexStr (Str), NULL);\r
+ HexStringToBuf ((UINT8 *) &Rvalue, &Length, Str, NULL);\r
\r
return Rvalue;\r
}\r
\r
*Data = 0;\r
Length = sizeof (UINT64);\r
- HexStringToBuf ((UINT8 *) Data, &Length, TrimHexStr (Str), NULL);\r
+ HexStringToBuf ((UINT8 *) Data, &Length, Str, NULL);\r
}\r
\r
STATIC\r
UINTN\r
-Atoi (\r
+Dtoi (\r
IN CHAR16 *str\r
)\r
/*++\r
return Rvalue;\r
}\r
\r
+STATIC\r
+VOID\r
+Dtoi64 (\r
+ IN CHAR16 *str,\r
+ OUT UINT64 *Data\r
+ )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+ Convert decimal string to uint\r
+\r
+Arguments:\r
+\r
+ Str - The string\r
+\r
+Returns:\r
+\r
+--*/\r
+{\r
+ UINT64 Rvalue;\r
+ CHAR16 Char;\r
+ UINT64 High;\r
+ UINT64 Low;\r
+\r
+ ASSERT (str != NULL);\r
+ ASSERT (Data != NULL);\r
+\r
+ //\r
+ // skip preceeding white space\r
+ //\r
+ while (*str && *str == ' ') {\r
+ str += 1;\r
+ }\r
+ //\r
+ // convert digits\r
+ //\r
+ Rvalue = 0;\r
+ Char = *(str++);\r
+ while (Char) {\r
+ if (Char >= '0' && Char <= '9') {\r
+ High = LShiftU64 (Rvalue, 3);\r
+ Low = LShiftU64 (Rvalue, 1);\r
+ Rvalue = High + Low + Char - '0';\r
+ } else {\r
+ break;\r
+ }\r
+\r
+ Char = *(str++);\r
+ }\r
+\r
+ *Data = Rvalue;\r
+}\r
+\r
+STATIC\r
+UINTN\r
+Strtoi (\r
+ IN CHAR16 *Str\r
+ )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+ Convert integer string to uint.\r
+\r
+Arguments:\r
+\r
+ Str - The integer string. If leading with "0x" or "0X", it's heximal.\r
+\r
+Returns:\r
+\r
+--*/\r
+{\r
+ BOOLEAN IsHex;\r
+\r
+ Str = TrimHexStr (Str, &IsHex);\r
+\r
+ if (IsHex) {\r
+ return Xtoi (Str);\r
+ } else {\r
+ return Dtoi (Str);\r
+ }\r
+}\r
+\r
+STATIC\r
+VOID\r
+Strtoi64 (\r
+ IN CHAR16 *Str,\r
+ IN UINT64 *Data\r
+ )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+ Convert integer string to 64 bit data.\r
+\r
+Arguments:\r
+\r
+ Str - The integer string. If leading with "0x" or "0X", it's heximal.\r
+\r
+Returns:\r
+\r
+--*/\r
+{\r
+ BOOLEAN IsHex;\r
+\r
+ Str = TrimHexStr (Str, &IsHex);\r
+\r
+ if (IsHex) {\r
+ Xtoi64 (Str, Data);\r
+ } else {\r
+ Dtoi64 (Str, Data);\r
+ }\r
+}\r
+\r
STATIC\r
EFI_STATUS \r
StrToBuf (\r
UINTN Index;\r
\r
for (Index = 0; Index < 4; Index++) {\r
- IPv4Addr->Addr[Index] = (UINT8) Atoi (SplitStr (Str, L'.'));\r
+ IPv4Addr->Addr[Index] = (UINT8) Dtoi (SplitStr (Str, L'.'));\r
}\r
}\r
\r
CHAR16 *DeviceStr;\r
PCI_DEVICE_PATH *Pci;\r
\r
- FunctionStr = GetNextParamStr (&TextDeviceNode);\r
DeviceStr = GetNextParamStr (&TextDeviceNode);\r
+ FunctionStr = GetNextParamStr (&TextDeviceNode);\r
Pci = (PCI_DEVICE_PATH *) CreateDeviceNode (\r
HARDWARE_DEVICE_PATH,\r
HW_PCI_DP,\r
sizeof (PCI_DEVICE_PATH)\r
);\r
\r
- Pci->Function = (UINT8) Xtoi (FunctionStr);\r
- Pci->Device = (UINT8) Xtoi (DeviceStr);\r
+ Pci->Function = (UINT8) Strtoi (FunctionStr);\r
+ Pci->Device = (UINT8) Strtoi (DeviceStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Pci;\r
}\r
sizeof (PCCARD_DEVICE_PATH)\r
);\r
\r
- Pccard->FunctionNumber = (UINT8) Xtoi (FunctionNumberStr);\r
+ Pccard->FunctionNumber = (UINT8) Strtoi (FunctionNumberStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Pccard;\r
}\r
IN CHAR16 *TextDeviceNode\r
)\r
{\r
+ CHAR16 *MemoryTypeStr;\r
CHAR16 *StartingAddressStr;\r
CHAR16 *EndingAddressStr;\r
MEMMAP_DEVICE_PATH *MemMap;\r
\r
+ MemoryTypeStr = GetNextParamStr (&TextDeviceNode);\r
StartingAddressStr = GetNextParamStr (&TextDeviceNode);\r
EndingAddressStr = GetNextParamStr (&TextDeviceNode);\r
MemMap = (MEMMAP_DEVICE_PATH *) CreateDeviceNode (\r
sizeof (MEMMAP_DEVICE_PATH)\r
);\r
\r
- MemMap->MemoryType = 0;\r
-\r
- Xtoi64 (StartingAddressStr, &MemMap->StartingAddress);\r
- Xtoi64 (EndingAddressStr, &MemMap->EndingAddress);\r
+ MemMap->MemoryType = (UINT32) Strtoi (MemoryTypeStr);\r
+ Strtoi64 (StartingAddressStr, &MemMap->StartingAddress);\r
+ Strtoi64 (EndingAddressStr, &MemMap->EndingAddress);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) MemMap;\r
}\r
HW_CONTROLLER_DP,\r
sizeof (CONTROLLER_DEVICE_PATH)\r
);\r
- Controller->ControllerNumber = (UINT32) Xtoi (ControllerStr);\r
+ Controller->ControllerNumber = (UINT32) Strtoi (ControllerStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Controller;\r
}\r
\r
STATIC\r
+VOID\r
+EisaIdFromText (\r
+ IN CHAR16 *Text,\r
+ OUT UINT32 *EisaId\r
+ )\r
+{\r
+ UINTN PnpId;\r
+\r
+ PnpId = Xtoi (Text + 3);\r
+ *EisaId = (((Text[0] - '@') & 0x1f) << 10) + \r
+ (((Text[1] - '@') & 0x1f) << 5) + \r
+ ((Text[2] - '@') & 0x1f) +\r
+ (UINT32) (PnpId << 16);\r
+}\r
+\r
EFI_DEVICE_PATH_PROTOCOL *\r
DevPathFromTextAcpi (\r
IN CHAR16 *TextDeviceNode\r
sizeof (ACPI_HID_DEVICE_PATH)\r
);\r
\r
- if ((HIDStr[0] == L'P') && (HIDStr[1] == L'N') && (HIDStr[2] == L'P')) {\r
- HIDStr += 3;\r
- }\r
-\r
- Acpi->HID = EISA_PNP_ID (Xtoi (HIDStr));\r
- Acpi->UID = (UINT32) Xtoi (UIDStr);\r
+ EisaIdFromText (HIDStr, &Acpi->HID);\r
+ Acpi->UID = (UINT32) Strtoi (UIDStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Acpi;\r
}\r
EFI_DEVICE_PATH_PROTOCOL *\r
ConvertFromTextAcpi (\r
IN CHAR16 *TextDeviceNode,\r
- IN UINT32 Hid\r
+ IN UINT32 PnPId\r
)\r
{\r
CHAR16 *UIDStr;\r
sizeof (ACPI_HID_DEVICE_PATH)\r
);\r
\r
- Acpi->HID = Hid;\r
- Acpi->UID = (UINT32) Xtoi (UIDStr);\r
+ Acpi->HID = EFI_PNP_ID (PnPId);\r
+ Acpi->UID = (UINT32) Strtoi (UIDStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Acpi;\r
}\r
IN CHAR16 *TextDeviceNode\r
)\r
{\r
- return ConvertFromTextAcpi (TextDeviceNode, 0x0a0341d0);\r
+ return ConvertFromTextAcpi (TextDeviceNode, 0x0a03);\r
}\r
\r
STATIC\r
IN CHAR16 *TextDeviceNode\r
)\r
{\r
- return ConvertFromTextAcpi (TextDeviceNode, 0x060441d0);\r
+ return ConvertFromTextAcpi (TextDeviceNode, 0x0604);\r
}\r
\r
STATIC\r
IN CHAR16 *TextDeviceNode\r
)\r
{\r
- return ConvertFromTextAcpi (TextDeviceNode, 0x030141d0);\r
+ return ConvertFromTextAcpi (TextDeviceNode, 0x0301);\r
}\r
\r
STATIC\r
IN CHAR16 *TextDeviceNode\r
)\r
{\r
- return ConvertFromTextAcpi (TextDeviceNode, 0x050141d0);\r
+ return ConvertFromTextAcpi (TextDeviceNode, 0x0501);\r
}\r
\r
STATIC\r
IN CHAR16 *TextDeviceNode\r
)\r
{\r
- return ConvertFromTextAcpi (TextDeviceNode, 0x040141d0);\r
+ return ConvertFromTextAcpi (TextDeviceNode, 0x0401);\r
}\r
\r
STATIC\r
IN CHAR16 *TextDeviceNode\r
)\r
{\r
- CHAR16 *HIDStr;\r
- CHAR16 *CIDStr;\r
- CHAR16 *UIDStr;\r
- CHAR16 *HIDSTRStr;\r
- CHAR16 *CIDSTRStr;\r
- CHAR16 *UIDSTRStr;\r
- CHAR8 *AsciiStr;\r
- UINT16 Length;\r
- ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR *AcpiExt;\r
+ CHAR16 *HIDStr;\r
+ CHAR16 *CIDStr;\r
+ CHAR16 *UIDStr;\r
+ CHAR16 *HIDSTRStr;\r
+ CHAR16 *CIDSTRStr;\r
+ CHAR16 *UIDSTRStr;\r
+ CHAR8 *AsciiStr;\r
+ UINT16 Length;\r
+ ACPI_EXTENDED_HID_DEVICE_PATH *AcpiEx;\r
\r
HIDStr = GetNextParamStr (&TextDeviceNode);\r
CIDStr = GetNextParamStr (&TextDeviceNode);\r
Length = (UINT16) (sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (HIDSTRStr) + 1);\r
Length = (UINT16) (Length + StrLen (UIDSTRStr) + 1);\r
Length = (UINT16) (Length + StrLen (CIDSTRStr) + 1);\r
- AcpiExt = (ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR *) CreateDeviceNode (\r
- ACPI_DEVICE_PATH,\r
- ACPI_EXTENDED_DP,\r
- Length\r
- );\r
-\r
- if ((HIDStr[0] == L'P') && (HIDStr[1] == L'N') && (HIDStr[2] == L'P')) {\r
- HIDStr += 3;\r
- AcpiExt->HID = EISA_PNP_ID (Xtoi (HIDStr));\r
- } else {\r
- AcpiExt->HID = (UINT32) Xtoi (HIDStr);\r
- }\r
+ AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *) CreateDeviceNode (\r
+ ACPI_DEVICE_PATH,\r
+ ACPI_EXTENDED_DP,\r
+ Length\r
+ );\r
\r
- AcpiExt->UID = (UINT32) Xtoi (UIDStr);\r
- AcpiExt->CID = (UINT32) Xtoi (CIDStr);\r
+ EisaIdFromText (HIDStr, &AcpiEx->HID);\r
+ EisaIdFromText (CIDStr, &AcpiEx->CID);\r
+ AcpiEx->UID = (UINT32) Strtoi (UIDStr);\r
\r
- AsciiStr = AcpiExt->HidUidCidStr;\r
+ AsciiStr = (CHAR8 *) ((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));\r
StrToAscii (HIDSTRStr, &AsciiStr);\r
StrToAscii (UIDSTRStr, &AsciiStr);\r
StrToAscii (CIDSTRStr, &AsciiStr);\r
- \r
- return (EFI_DEVICE_PATH_PROTOCOL *) AcpiExt;\r
+\r
+ return (EFI_DEVICE_PATH_PROTOCOL *) AcpiEx;\r
}\r
\r
STATIC\r
IN CHAR16 *TextDeviceNode\r
)\r
{\r
- CHAR16 *HIDStr;\r
- CHAR16 *CIDStr;\r
- CHAR16 *UIDSTRStr;\r
- CHAR8 *AsciiStr;\r
- UINT16 Length;\r
- ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR *AcpiExt;\r
+ CHAR16 *HIDStr;\r
+ CHAR16 *CIDStr;\r
+ CHAR16 *UIDSTRStr;\r
+ CHAR8 *AsciiStr;\r
+ UINT16 Length;\r
+ ACPI_EXTENDED_HID_DEVICE_PATH *AcpiEx;\r
\r
HIDStr = GetNextParamStr (&TextDeviceNode);\r
CIDStr = GetNextParamStr (&TextDeviceNode);\r
UIDSTRStr = GetNextParamStr (&TextDeviceNode);\r
Length = (UINT16) (sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (UIDSTRStr) + 3);\r
- AcpiExt = (ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR *) CreateDeviceNode (\r
- ACPI_DEVICE_PATH,\r
- ACPI_EXTENDED_DP,\r
- Length\r
- );\r
-\r
- if ((HIDStr[0] == L'P') && (HIDStr[1] == L'N') && (HIDStr[2] == L'P')) {\r
- HIDStr += 3;\r
- AcpiExt->HID = EISA_PNP_ID (Xtoi (HIDStr));\r
- } else {\r
- AcpiExt->HID = (UINT32) Xtoi (HIDStr);\r
- }\r
+ AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *) CreateDeviceNode (\r
+ ACPI_DEVICE_PATH,\r
+ ACPI_EXTENDED_DP,\r
+ Length\r
+ );\r
\r
- AcpiExt->UID = 0;\r
- AcpiExt->CID = (UINT32) Xtoi (CIDStr);\r
+ EisaIdFromText (HIDStr, &AcpiEx->HID);\r
+ EisaIdFromText (CIDStr, &AcpiEx->CID);\r
+ AcpiEx->UID = 0;\r
\r
- AsciiStr = AcpiExt->HidUidCidStr;\r
+ AsciiStr = (CHAR8 *) ((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));\r
//\r
// HID string is NULL\r
//\r
- *AsciiStr = 0;\r
+ *AsciiStr = '\0';\r
//\r
// Convert UID string\r
//\r
//\r
// CID string is NULL\r
//\r
- *AsciiStr = 0;\r
+ *AsciiStr = '\0';\r
\r
- return (EFI_DEVICE_PATH_PROTOCOL *) AcpiExt;\r
+ return (EFI_DEVICE_PATH_PROTOCOL *) AcpiEx;\r
}\r
\r
STATIC\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) Xtoi (LunStr);\r
+ Atapi->Lun = (UINT16) Strtoi (LunStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Atapi;\r
}\r
sizeof (SCSI_DEVICE_PATH)\r
);\r
\r
- Scsi->Pun = (UINT16) Xtoi (PunStr);\r
- Scsi->Lun = (UINT16) Xtoi (LunStr);\r
+ Scsi->Pun = (UINT16) Strtoi (PunStr);\r
+ Scsi->Lun = (UINT16) Strtoi (LunStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Scsi;\r
}\r
);\r
\r
Fibre->Reserved = 0;\r
- Xtoi64 (WWNStr, &Fibre->WWN);\r
- Xtoi64 (LunStr, &Fibre->Lun);\r
+ Strtoi64 (WWNStr, &Fibre->WWN);\r
+ Strtoi64 (LunStr, &Fibre->Lun);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Fibre;\r
}\r
sizeof (USB_DEVICE_PATH)\r
);\r
\r
- Usb->ParentPortNumber = (UINT8) Xtoi (PortStr);\r
- Usb->InterfaceNumber = (UINT8) Xtoi (InterfaceStr);\r
+ Usb->ParentPortNumber = (UINT8) Strtoi (PortStr);\r
+ Usb->InterfaceNumber = (UINT8) Strtoi (InterfaceStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Usb;\r
}\r
sizeof (I2O_DEVICE_PATH)\r
);\r
\r
- I2O->Tid = (UINT32) Xtoi (TIDStr);\r
+ I2O->Tid = (UINT32) Strtoi (TIDStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) I2O;\r
}\r
sizeof (INFINIBAND_DEVICE_PATH)\r
);\r
\r
- InfiniBand->ResourceFlags = (UINT32) Xtoi (FlagsStr);\r
+ InfiniBand->ResourceFlags = (UINT32) Strtoi (FlagsStr);\r
StrToGuid (GuidStr, &PortGid);\r
CopyMem (InfiniBand->PortGid, &PortGid, sizeof (EFI_GUID));\r
- Xtoi64 (SidStr, &InfiniBand->ServiceId);\r
- Xtoi64 (TidStr, &InfiniBand->TargetPortId);\r
- Xtoi64 (DidStr, &InfiniBand->DeviceId);\r
+ Strtoi64 (SidStr, &InfiniBand->ServiceId);\r
+ Strtoi64 (TidStr, &InfiniBand->TargetPortId);\r
+ Strtoi64 (DidStr, &InfiniBand->DeviceId);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) InfiniBand;\r
}\r
);\r
\r
CopyGuid (&Sas->Guid, &mEfiDevicePathMessagingSASGuid);\r
- Xtoi64 (AddressStr, &Sas->SasAddress);\r
- Xtoi64 (LunStr, &Sas->Lun);\r
- Sas->RelativeTargetPort = (UINT16) Xtoi (RTPStr);\r
- if (StrCmp (SASSATAStr, L"NoTopology") == 0)\r
- ;\r
- else {\r
+ Strtoi64 (AddressStr, &Sas->SasAddress);\r
+ Strtoi64 (LunStr, &Sas->Lun);\r
+ Sas->RelativeTargetPort = (UINT16) Strtoi (RTPStr);\r
+ if (StrCmp (SASSATAStr, L"NoTopology") != 0) {\r
if (StrCmp (DriveBayStr, L"0") == 0) {\r
Info |= 0x0001;\r
} else {\r
Info |= 0x0002;\r
- Info = (UINT16) (Info | (Xtoi (DriveBayStr) << 8));\r
+ Info = (UINT16) (Info | (Strtoi (DriveBayStr) << 8));\r
}\r
\r
if (StrCmp (SASSATAStr, L"SATA") == 0) {\r
}\r
\r
Sas->DeviceTopology = Info;\r
- Sas->Reserved = (UINT32) Xtoi (ReservedStr);\r
+ Sas->Reserved = (UINT32) Strtoi (ReservedStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Sas;\r
}\r
sizeof (MAC_ADDR_DEVICE_PATH)\r
);\r
\r
- MAC->IfType = (UINT8) Xtoi (IfTypeStr);\r
+ MAC->IfType = (UINT8) Strtoi (IfTypeStr);\r
\r
Length = sizeof (EFI_MAC_ADDRESS);\r
StrToBuf (&MAC->MacAddress.Addr[0], Length, AddressStr);\r
\r
StrToIPv4Addr (&LocalIPStr, &IPv4->LocalIpAddress);\r
\r
- IPv4->LocalPort = 0;\r
- IPv4->RemotePort = 0;\r
+ IPv4->LocalPort = 0;\r
+ IPv4->RemotePort = 0;\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) IPv4;\r
}\r
sizeof (UART_DEVICE_PATH)\r
);\r
\r
- Uart->BaudRate = (StrCmp (BaudStr, L"DEFAULT") == 0) ? 115200 : Atoi (BaudStr);\r
- Uart->DataBits = (UINT8) ((StrCmp (DataBitsStr, L"DEFAULT") == 0) ? 8 : Atoi (DataBitsStr));\r
+ Uart->BaudRate = (StrCmp (BaudStr, L"DEFAULT") == 0) ? 115200 : Dtoi (BaudStr);\r
+ Uart->DataBits = (UINT8) ((StrCmp (DataBitsStr, L"DEFAULT") == 0) ? 8 : Dtoi (DataBitsStr));\r
switch (*ParityStr) {\r
case L'D':\r
Uart->Parity = 0;\r
PIDStr = GetNextParamStr (&TextDeviceNode);\r
if (UsbClassText->ClassExist) {\r
ClassStr = GetNextParamStr (&TextDeviceNode);\r
- UsbClass->DeviceClass = (UINT8) Xtoi (ClassStr);\r
+ UsbClass->DeviceClass = (UINT8) Strtoi (ClassStr);\r
} else {\r
UsbClass->DeviceClass = UsbClassText->Class;\r
}\r
if (UsbClassText->SubClassExist) {\r
SubClassStr = GetNextParamStr (&TextDeviceNode);\r
- UsbClass->DeviceSubClass = (UINT8) Xtoi (SubClassStr);\r
+ UsbClass->DeviceSubClass = (UINT8) Strtoi (SubClassStr);\r
} else {\r
UsbClass->DeviceSubClass = UsbClassText->SubClass;\r
} \r
\r
ProtocolStr = GetNextParamStr (&TextDeviceNode);\r
\r
- UsbClass->VendorId = (UINT16) Xtoi (VIDStr);\r
- UsbClass->ProductId = (UINT16) Xtoi (PIDStr);\r
- UsbClass->DeviceProtocol = (UINT8) Xtoi (ProtocolStr);\r
+ UsbClass->VendorId = (UINT16) Strtoi (VIDStr);\r
+ UsbClass->ProductId = (UINT16) Strtoi (PIDStr);\r
+ UsbClass->DeviceProtocol = (UINT8) Strtoi (ProtocolStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) UsbClass;\r
}\r
CHAR16 *VIDStr;\r
CHAR16 *PIDStr;\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
MESSAGING_DEVICE_PATH,\r
MSG_USB_WWID_DP,\r
- sizeof (USB_WWID_DEVICE_PATH)\r
+ (UINT16) (sizeof (USB_WWID_DEVICE_PATH) + StrSize (SerialNumberStr))\r
);\r
\r
- UsbWwid->VendorId = (UINT16) Xtoi (VIDStr);\r
- UsbWwid->ProductId = (UINT16) Xtoi (PIDStr);\r
- UsbWwid->InterfaceNumber = (UINT16) Xtoi (InterfaceNumStr);\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
\r
return (EFI_DEVICE_PATH_PROTOCOL *) UsbWwid;\r
}\r
LogicalUnit = (DEVICE_LOGICAL_UNIT_DEVICE_PATH *) CreateDeviceNode (\r
MESSAGING_DEVICE_PATH,\r
MSG_DEVICE_LOGICAL_UNIT_DP,\r
- sizeof (DEVICE_LOGICAL_UNIT_DEVICE_PATH)\r
+ (UINT16) sizeof (DEVICE_LOGICAL_UNIT_DEVICE_PATH)\r
);\r
\r
- LogicalUnit->Lun = (UINT8) Xtoi (LunStr);\r
+ LogicalUnit->Lun = (UINT8) Strtoi (LunStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) LogicalUnit;\r
}\r
CHAR16 *DataDigestStr;\r
CHAR16 *AuthenticationStr;\r
CHAR16 *ProtocolStr;\r
+ CHAR8 *AsciiStr;\r
ISCSI_DEVICE_PATH_WITH_NAME *iSCSI;\r
\r
NameStr = GetNextParamStr (&TextDeviceNode);\r
(UINT16) (sizeof (ISCSI_DEVICE_PATH_WITH_NAME) + StrLen (NameStr) * 2)\r
);\r
\r
- StrCpy (iSCSI->iSCSITargetName, NameStr);\r
- iSCSI->TargetPortalGroupTag = (UINT16) Xtoi (PortalGroupStr);\r
- Xtoi64 (LunStr, &iSCSI->Lun);\r
+ AsciiStr = iSCSI->iSCSITargetName;\r
+ StrToAscii (NameStr, &AsciiStr);\r
+\r
+ iSCSI->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr);\r
+ Strtoi64 (LunStr, &iSCSI->Lun);\r
\r
Options = 0x0000;\r
if (StrCmp (HeaderDigestStr, L"CRC32C") == 0) {\r
iSCSI->LoginOption = (UINT16) Options;\r
\r
iSCSI->NetworkProtocol = (UINT16) StrCmp (ProtocolStr, L"TCP");\r
- iSCSI->Reserved = (UINT16) 0;\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) iSCSI;\r
}\r
sizeof (HARDDRIVE_DEVICE_PATH)\r
);\r
\r
- Hd->PartitionNumber = (UINT32) Atoi (PartitionStr);\r
+ Hd->PartitionNumber = (UINT32) Dtoi (PartitionStr);\r
\r
ZeroMem (Hd->Signature, 16);\r
Hd->MBRType = (UINT8) 0;\r
\r
- if (StrCmp (TypeStr, L"None") == 0) {\r
- Hd->SignatureType = (UINT8) 0;\r
- } else if (StrCmp (TypeStr, L"MBR") == 0) {\r
+ if (StrCmp (TypeStr, L"MBR") == 0) {\r
Hd->SignatureType = SIGNATURE_TYPE_MBR;\r
Hd->MBRType = 0x01;\r
\r
- Signature32 = (UINT32) Xtoi (SignatureStr);\r
+ Signature32 = (UINT32) Strtoi (SignatureStr);\r
CopyMem (Hd->Signature, &Signature32, sizeof (UINT32));\r
- } else if (StrCmp (TypeStr, L"GUID") == 0) {\r
+ } else if (StrCmp (TypeStr, L"GPT") == 0) {\r
Hd->SignatureType = SIGNATURE_TYPE_GUID;\r
Hd->MBRType = 0x02;\r
\r
StrToGuid (SignatureStr, &SignatureGuid);\r
CopyMem (Hd->Signature, &SignatureGuid, sizeof (EFI_GUID));\r
} else {\r
- Hd->SignatureType = 0xff;\r
-\r
+ Hd->SignatureType = (UINT8) Strtoi (TypeStr);\r
}\r
\r
- Xtoi64 (StartStr, &Hd->PartitionStart);\r
- Xtoi64 (SizeStr, &Hd->PartitionSize);\r
+ Strtoi64 (StartStr, &Hd->PartitionStart);\r
+ Strtoi64 (SizeStr, &Hd->PartitionSize);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Hd;\r
}\r
sizeof (CDROM_DEVICE_PATH)\r
);\r
\r
- CDROM->BootEntry = (UINT32) Xtoi (EntryStr);\r
- Xtoi64 (StartStr, &CDROM->PartitionStart);\r
- Xtoi64 (SizeStr, &CDROM->PartitionSize);\r
+ CDROM->BootEntry = (UINT32) Strtoi (EntryStr);\r
+ Strtoi64 (StartStr, &CDROM->PartitionStart);\r
+ Strtoi64 (SizeStr, &CDROM->PartitionSize);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) CDROM;\r
}\r
return (EFI_DEVICE_PATH_PROTOCOL *) Media;\r
}\r
\r
+STATIC\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextFv (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ CHAR16 *GuidStr;\r
+ MEDIA_FW_VOL_DEVICE_PATH *Fv;\r
+\r
+ GuidStr = GetNextParamStr (&TextDeviceNode);\r
+ Fv = (MEDIA_FW_VOL_DEVICE_PATH *) CreateDeviceNode (\r
+ MEDIA_DEVICE_PATH,\r
+ MEDIA_PIWG_FW_VOL_DP,\r
+ sizeof (MEDIA_FW_VOL_DEVICE_PATH)\r
+ );\r
+\r
+ StrToGuid (GuidStr, &Fv->FvName);\r
+\r
+ return (EFI_DEVICE_PATH_PROTOCOL *) Fv;\r
+}\r
+\r
+STATIC\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextFvFile (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ CHAR16 *GuidStr;\r
+ MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFile;\r
+\r
+ GuidStr = GetNextParamStr (&TextDeviceNode);\r
+ FvFile = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) CreateDeviceNode (\r
+ MEDIA_DEVICE_PATH,\r
+ MEDIA_PIWG_FW_FILE_DP,\r
+ sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)\r
+ );\r
+\r
+ StrToGuid (GuidStr, &FvFile->FvFileName);\r
+\r
+ return (EFI_DEVICE_PATH_PROTOCOL *) FvFile;\r
+}\r
+\r
STATIC\r
EFI_DEVICE_PATH_PROTOCOL *\r
DevPathFromTextBBS (\r
CHAR16 *TypeStr;\r
CHAR16 *IdStr;\r
CHAR16 *FlagsStr;\r
- UINT8 *AsciiStr;\r
+ CHAR8 *AsciiStr;\r
BBS_BBS_DEVICE_PATH *Bbs;\r
\r
TypeStr = GetNextParamStr (&TextDeviceNode);\r
} else if (StrCmp (TypeStr, L"Network") == 0) {\r
Bbs->DeviceType = BBS_TYPE_EMBEDDED_NETWORK;\r
} else {\r
- Bbs->DeviceType = BBS_TYPE_UNKNOWN;\r
+ Bbs->DeviceType = (UINT16) Strtoi (TypeStr);\r
}\r
\r
- AsciiStr = (UINT8 *) Bbs->String;\r
- StrToAscii (IdStr, (CHAR8 **) &AsciiStr);\r
+ AsciiStr = Bbs->String;\r
+ StrToAscii (IdStr, &AsciiStr);\r
\r
- Bbs->StatusFlag = (UINT16) Xtoi (FlagsStr);\r
+ Bbs->StatusFlag = (UINT16) Strtoi (FlagsStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Bbs;\r
}\r
\r
+STATIC\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+DevPathFromTextSata (\r
+ IN CHAR16 *TextDeviceNode\r
+ )\r
+{\r
+ SATA_DEVICE_PATH *Sata;\r
+ CHAR16 *Param1;\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
+\r
+ Sata = (SATA_DEVICE_PATH *) CreateDeviceNode (\r
+ MESSAGING_DEVICE_PATH,\r
+ MSG_SATA_DP,\r
+ sizeof (SATA_DEVICE_PATH)\r
+ );\r
+ Sata->HbaPortNumber = (UINT16) Xtoi (Param1);\r
+ if (Param3 != NULL) {\r
+ Sata->PortMultiplierPort = (UINT16) Xtoi (Param2);\r
+ Param2 = Param3;\r
+ } else {\r
+ Sata->PortMultiplierPort = 0;\r
+ }\r
+ Sata->LogicalUnitNumber = (UINT16) Xtoi (Param2);\r
+\r
+ return (EFI_DEVICE_PATH_PROTOCOL *) Sata;\r
+}\r
+\r
GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE DevPathFromTextTable[] = {\r
{L"Pci", DevPathFromTextPci},\r
{L"PcCard", DevPathFromTextPcCard},\r
{L"CDROM", DevPathFromTextCDROM},\r
{L"VenMEDIA", DevPathFromTextVenMEDIA},\r
{L"Media", DevPathFromTextMedia},\r
+ {L"Fv", DevPathFromTextFv},\r
+ {L"FvFile", DevPathFromTextFvFile},\r
{L"BBS", DevPathFromTextBBS},\r
+ {L"Sata", DevPathFromTextSata},\r
{NULL, NULL}\r
};\r
\r
projects / mirror_edk2.git / blobdiff