Since the next patch will add StrToGuid in BaseLib, renaming the
internal function StrToGuid to DevicePathLibStrToGuid to avoid
link failure.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
/** @file\r
DevicePathFromText protocol as defined in the UEFI 2.0 specification.\r
\r
/** @file\r
DevicePathFromText protocol as defined in the UEFI 2.0 specification.\r
\r
-Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2017, 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
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
+DevicePathLibStrToGuid (\r
IN CHAR16 *Str,\r
OUT EFI_GUID *Guid\r
)\r
IN CHAR16 *Str,\r
OUT EFI_GUID *Guid\r
)\r
(UINT16) (sizeof (VENDOR_DEVICE_PATH) + Length)\r
);\r
\r
(UINT16) (sizeof (VENDOR_DEVICE_PATH) + Length)\r
);\r
\r
- StrToGuid (GuidStr, &Vendor->Guid);\r
+ DevicePathLibStrToGuid (GuidStr, &Vendor->Guid);\r
StrToBuf (((UINT8 *) Vendor) + sizeof (VENDOR_DEVICE_PATH), Length, DataStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
StrToBuf (((UINT8 *) Vendor) + sizeof (VENDOR_DEVICE_PATH), Length, DataStr);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
);\r
\r
InfiniBand->ResourceFlags = (UINT32) Strtoi (FlagsStr);\r
);\r
\r
InfiniBand->ResourceFlags = (UINT32) Strtoi (FlagsStr);\r
- StrToGuid (GuidStr, &PortGid);\r
+ DevicePathLibStrToGuid (GuidStr, &PortGid);\r
CopyMem (InfiniBand->PortGid, &PortGid, sizeof (EFI_GUID));\r
Strtoi64 (SidStr, &InfiniBand->ServiceId);\r
Strtoi64 (TidStr, &InfiniBand->TargetPortId);\r
CopyMem (InfiniBand->PortGid, &PortGid, sizeof (EFI_GUID));\r
Strtoi64 (SidStr, &InfiniBand->ServiceId);\r
Strtoi64 (TidStr, &InfiniBand->TargetPortId);\r
Hd->SignatureType = SIGNATURE_TYPE_GUID;\r
Hd->MBRType = 0x02;\r
\r
Hd->SignatureType = SIGNATURE_TYPE_GUID;\r
Hd->MBRType = 0x02;\r
\r
- StrToGuid (SignatureStr, &SignatureGuid);\r
+ DevicePathLibStrToGuid (SignatureStr, &SignatureGuid);\r
CopyMem (Hd->Signature, &SignatureGuid, sizeof (EFI_GUID));\r
} else {\r
Hd->SignatureType = (UINT8) Strtoi (TypeStr);\r
CopyMem (Hd->Signature, &SignatureGuid, sizeof (EFI_GUID));\r
} else {\r
Hd->SignatureType = (UINT8) Strtoi (TypeStr);\r
(UINT16) sizeof (MEDIA_PROTOCOL_DEVICE_PATH)\r
);\r
\r
(UINT16) sizeof (MEDIA_PROTOCOL_DEVICE_PATH)\r
);\r
\r
- StrToGuid (GuidStr, &Media->Protocol);\r
+ DevicePathLibStrToGuid (GuidStr, &Media->Protocol);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Media;\r
}\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Media;\r
}\r
(UINT16) sizeof (MEDIA_FW_VOL_DEVICE_PATH)\r
);\r
\r
(UINT16) sizeof (MEDIA_FW_VOL_DEVICE_PATH)\r
);\r
\r
- StrToGuid (GuidStr, &Fv->FvName);\r
+ DevicePathLibStrToGuid (GuidStr, &Fv->FvName);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Fv;\r
}\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) Fv;\r
}\r
(UINT16) sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)\r
);\r
\r
(UINT16) sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)\r
);\r
\r
- StrToGuid (GuidStr, &FvFile->FvFileName);\r
+ DevicePathLibStrToGuid (GuidStr, &FvFile->FvFileName);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) FvFile;\r
}\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) FvFile;\r
}\r
Strtoi64 (EndingAddrStr, &EndingAddr);\r
WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);\r
RamDisk->Instance = (UINT16) Strtoi (InstanceStr);\r
Strtoi64 (EndingAddrStr, &EndingAddr);\r
WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);\r
RamDisk->Instance = (UINT16) Strtoi (InstanceStr);\r
- StrToGuid (TypeGuidStr, &RamDisk->TypeGuid);\r
+ DevicePathLibStrToGuid (TypeGuidStr, &RamDisk->TypeGuid);\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;\r
}\r
\r
return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;\r
}\r