THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
\r
- Module Name: UefiDevicePathLib.c\r
-\r
**/\r
\r
+\r
+#include <Uefi.h>\r
+\r
+#include <Protocol/DevicePath.h>\r
+\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/BaseLib.h>\r
+\r
+//\r
+// Template for an end-of-device path node.\r
+//\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_PROTOCOL mUefiDevicePathLibEndDevicePath = {\r
+ END_DEVICE_PATH_TYPE,\r
+ END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
+ {\r
+ END_DEVICE_PATH_LENGTH,\r
+ 0\r
+ }\r
+};\r
+\r
/**\r
Returns the size of a device path in bytes.\r
\r
DevicePath including the end of device path node. If DevicePath is NULL, then 0 is returned.\r
\r
@param DevicePath A pointer to a device path data structure.\r
-\r
- @return The size of a device path in bytes.\r
+ \r
+ @retval 0 If DevicePath is NULL.\r
+ @retval Others The size of a device path in bytes.\r
\r
**/\r
UINTN\r
// Search for the end of the device path structure\r
//\r
Start = DevicePath;\r
- while (!EfiIsDevicePathEnd (DevicePath)) {\r
- DevicePath = EfiNextDevicePathNode (DevicePath);\r
+ while (!IsDevicePathEnd (DevicePath)) {\r
+ DevicePath = NextDevicePathNode (DevicePath);\r
}\r
\r
//\r
// Compute the size and add back in the size of the end device path structure\r
//\r
- return ((UINTN) DevicePath - (UINTN) Start) + sizeof (EFI_DEVICE_PATH_PROTOCOL);\r
+ return ((UINTN) DevicePath - (UINTN) Start) + DevicePathNodeLength (DevicePath);\r
}\r
\r
/**\r
DevicePath is NULL, then NULL is returned. If the memory is successfully allocated, then the\r
contents of DevicePath are copied to the newly allocated buffer, and a pointer to that buffer\r
is returned. Otherwise, NULL is returned. \r
+ The memory for the new device path is allocated from EFI boot services memory. \r
+ It is the responsibility of the caller to free the memory allocated. \r
\r
@param DevicePath A pointer to a device path data structure.\r
\r
- @return A pointer to the duplicated device path.\r
-\r
+ @retval NULL If DevicePath is NULL.\r
+ @retval Others A pointer to the duplicated device path.\r
+ \r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
EFIAPI\r
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
)\r
{\r
- EFI_DEVICE_PATH_PROTOCOL *NewDevicePath;\r
UINTN Size;\r
\r
//\r
//\r
// Allocate space for duplicate device path\r
//\r
- NewDevicePath = AllocateCopyPool (Size, DevicePath);\r
\r
- return NewDevicePath;\r
+ return AllocateCopyPool (Size, DevicePath);\r
}\r
\r
/**\r
SecondDevicePath is retained. The newly created device path is returned. \r
If FirstDevicePath is NULL, then it is ignored, and a duplicate of SecondDevicePath is returned. \r
If SecondDevicePath is NULL, then it is ignored, and a duplicate of FirstDevicePath is returned. \r
- If both FirstDevicePath and SecondDevicePath are NULL, then NULL is returned. \r
+ If both FirstDevicePath and SecondDevicePath are NULL, then a copy of an end-of-device-path is\r
+ returned. \r
If there is not enough memory for the newly allocated buffer, then NULL is returned.\r
The memory for the new device path is allocated from EFI boot services memory. It is the\r
responsibility of the caller to free the memory allocated.\r
\r
@param FirstDevicePath A pointer to a device path data structure.\r
@param SecondDevicePath A pointer to a device path data structure.\r
-\r
- @return A pointer to the new device path.\r
+ \r
+ @retval NULL If there is not enough memory for the newly allocated buffer.\r
+ @retval Others A pointer to the new device path if success.\r
+ Or a copy an end-of-device-path if both FirstDevicePath and SecondDevicePath are NULL.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
// If there's only 1 path, just duplicate it.\r
//\r
if (FirstDevicePath == NULL) {\r
- return DuplicateDevicePath (SecondDevicePath);\r
+ return DuplicateDevicePath ((SecondDevicePath != NULL) ? SecondDevicePath : &mUefiDevicePathLibEndDevicePath);\r
}\r
\r
if (SecondDevicePath == NULL) {\r
//\r
Size1 = GetDevicePathSize (FirstDevicePath);\r
Size2 = GetDevicePathSize (SecondDevicePath);\r
- Size = Size1 + Size2 - sizeof (EFI_DEVICE_PATH_PROTOCOL);\r
+ Size = Size1 + Size2 - END_DEVICE_PATH_LENGTH;\r
\r
NewDevicePath = AllocatePool (Size);\r
\r
// Over write FirstDevicePath EndNode and do the copy\r
//\r
DevicePath2 = (EFI_DEVICE_PATH_PROTOCOL *) ((CHAR8 *) NewDevicePath +\r
- (Size1 - sizeof (EFI_DEVICE_PATH_PROTOCOL)));\r
+ (Size1 - END_DEVICE_PATH_LENGTH));\r
CopyMem (DevicePath2, SecondDevicePath, Size2);\r
}\r
\r
This function creates a new device path by appending a copy of the device node specified by\r
DevicePathNode to a copy of the device path specified by DevicePath in an allocated buffer.\r
The end-of-device-path device node is moved after the end of the appended device node.\r
- If DevicePath is NULL, then NULL is returned.\r
- If DevicePathNode is NULL, then NULL is returned.\r
+ If DevicePathNode is NULL then a copy of DevicePath is returned.\r
+ If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device path device\r
+ node is returned.\r
+ If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path device node\r
+ is returned.\r
If there is not enough memory to allocate space for the new device path, then NULL is returned. \r
The memory is allocated from EFI boot services memory. It is the responsibility of the caller to\r
free the memory allocated.\r
@param DevicePath A pointer to a device path data structure.\r
@param DevicePathNode A pointer to a single device path node.\r
\r
- @return A pointer to the new device path.\r
+ @retval NULL If there is not enough memory for the new device path.\r
+ @retval Others A pointer to the new device path if success.\r
+ A copy of DevicePathNode followed by an end-of-device-path node \r
+ if both FirstDevicePath and SecondDevicePath are NULL.\r
+ A copy of an end-of-device-path node if both FirstDevicePath and SecondDevicePath are NULL.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
EFI_DEVICE_PATH_PROTOCOL *NewDevicePath;\r
UINTN NodeLength;\r
\r
- if (DevicePath == NULL || DevicePathNode == NULL) {\r
- return NULL;\r
+ if (DevicePathNode == NULL) {\r
+ return DuplicateDevicePath ((DevicePath != NULL) ? DevicePath : &mUefiDevicePathLibEndDevicePath);\r
}\r
//\r
// Build a Node that has a terminator on it\r
//\r
NodeLength = DevicePathNodeLength (DevicePathNode);\r
\r
- TempDevicePath = AllocatePool (NodeLength + sizeof (EFI_DEVICE_PATH_PROTOCOL));\r
+ TempDevicePath = AllocatePool (NodeLength + END_DEVICE_PATH_LENGTH);\r
if (TempDevicePath == NULL) {\r
return NULL;\r
}\r
}\r
\r
/**\r
- Creates a copy of the current device path instance and returns a pointer to the next device path\r
- instance.\r
+ Creates a device node.\r
\r
This function creates a new device node in a newly allocated buffer of size NodeLength and\r
initializes the device path node header with NodeType and NodeSubType. The new device path node\r
return NULL;\r
}\r
\r
- DevicePath = AllocatePool (NodeLength);\r
+ DevicePath = AllocateZeroPool (NodeLength);\r
if (DevicePath != NULL) {\r
DevicePath->Type = NodeType;\r
DevicePath->SubType = NodeSubType;\r
+ SetDevicePathNodeLength (DevicePath, NodeLength);\r
}\r
\r
return DevicePath;\r
}\r
\r
Node = DevicePath;\r
- while (!EfiIsDevicePathEnd (Node)) {\r
- if (EfiIsDevicePathEndInstance (Node)) {\r
+ while (!IsDevicePathEnd (Node)) {\r
+ if (IsDevicePathEndInstance (Node)) {\r
return TRUE;\r
}\r
\r
- Node = EfiNextDevicePathNode (Node);\r
+ Node = NextDevicePathNode (Node);\r
}\r
\r
return FALSE;\r
handle Device. The allocated device path is returned. If Device is NULL or Device is a handle\r
that does not support the device path protocol, then a device path containing a single device\r
path node for the file specified by FileName is allocated and returned.\r
+ The memory for the new device path is allocated from EFI boot services memory. It is the responsibility\r
+ of the caller to free the memory allocated.\r
+ \r
If FileName is NULL, then ASSERT().\r
+ If FileName is not aligned on a 16-bit boundary, then ASSERT().\r
\r
@param Device A pointer to a device handle. This parameter is optional and\r
may be NULL.\r
IN CONST CHAR16 *FileName\r
)\r
{\r
- UINTN Size;\r
+ UINT16 Size;\r
FILEPATH_DEVICE_PATH *FilePath;\r
EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
EFI_DEVICE_PATH_PROTOCOL *FileDevicePath;\r
\r
DevicePath = NULL;\r
\r
- Size = StrSize (FileName);\r
- FileDevicePath = AllocatePool (Size + SIZE_OF_FILEPATH_DEVICE_PATH + EFI_END_DEVICE_PATH_LENGTH);\r
+ Size = (UINT16) StrSize (FileName);\r
+ \r
+ FileDevicePath = AllocatePool (Size + SIZE_OF_FILEPATH_DEVICE_PATH + END_DEVICE_PATH_LENGTH);\r
if (FileDevicePath != NULL) {\r
FilePath = (FILEPATH_DEVICE_PATH *) FileDevicePath;\r
FilePath->Header.Type = MEDIA_DEVICE_PATH;\r
projects / mirror_edk2.git / blobdiff