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
- This function returns the size, in bytes, \r
- of the device path data structure specified by DevicePath.\r
- If DevicePath is NULL, then 0 is returned.\r
+ Returns the size of a device path in bytes.\r
+\r
+ This function returns the size, in bytes, of the device path data structure specified by\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
+ @param DevicePath A pointer to a device path data structure.\r
\r
@return The size of a device path in bytes.\r
\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
- This function allocates space for a new copy of the device path\r
- specified by DevicePath.\r
+ Creates a new device path by appending a second device path to a first device path.\r
\r
- @param DevicePath A pointer to a device path data structure.\r
+ This function allocates space for a new copy of the device path specified by DevicePath. If\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
+ \r
+ @param DevicePath A pointer to a device path data structure.\r
\r
- @return The duplicated device path.\r
+ @return A pointer to the duplicated device path.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
EFIAPI\r
DuplicateDevicePath (\r
- IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\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
- This function appends the device path SecondDevicePath\r
- to every device path instance in FirstDevicePath. \r
-\r
- @param FirstDevicePath A pointer to a device path data structure.\r
- \r
- @param SecondDevicePath A pointer to a device path data structure.\r
+ Creates a new device path by appending a second device path to a first device path.\r
+\r
+ This function creates a new device path by appending a copy of SecondDevicePath to a copy of\r
+ FirstDevicePath in a newly allocated buffer. Only the end-of-device-path device node from\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 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 is returned.\r
- NULL is returned if space for the new device path could not be allocated from pool.\r
- It is up to the caller to free the memory used by FirstDevicePath and SecondDevicePath\r
- if they are no longer needed.\r
+ @return A pointer to the new device path.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
EFIAPI\r
AppendDevicePath (\r
- IN CONST EFI_DEVICE_PATH_PROTOCOL *FirstDevicePath,\r
- IN CONST EFI_DEVICE_PATH_PROTOCOL *SecondDevicePath\r
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *FirstDevicePath, OPTIONAL\r
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *SecondDevicePath OPTIONAL\r
)\r
{\r
UINTN Size;\r
EFI_DEVICE_PATH_PROTOCOL *DevicePath2;\r
\r
//\r
- // If there's only 1 path, just duplicate it\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
//\r
// Allocate space for the combined device path. It only has one end node of\r
- // length EFI_DEVICE_PATH_PROTOCOL\r
+ // length EFI_DEVICE_PATH_PROTOCOL.\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
if (NewDevicePath != NULL) {\r
NewDevicePath = CopyMem (NewDevicePath, FirstDevicePath, Size1);\r
//\r
- // Over write Src1 EndNode and do the copy\r
+ // Over write FirstDevicePath EndNode and do the copy\r
//\r
- DevicePath2 = (EFI_DEVICE_PATH_PROTOCOL *) ((CHAR8 *) NewDevicePath + (Size1 - sizeof (EFI_DEVICE_PATH_PROTOCOL)));\r
+ DevicePath2 = (EFI_DEVICE_PATH_PROTOCOL *) ((CHAR8 *) NewDevicePath +\r
+ (Size1 - END_DEVICE_PATH_LENGTH));\r
CopyMem (DevicePath2, SecondDevicePath, Size2);\r
}\r
\r
}\r
\r
/**\r
- This function appends the device path node SecondDevicePath\r
- to every device path instance in FirstDevicePath.\r
-\r
- @param FirstDevicePath A pointer to a device path data structure.\r
- \r
- @param SecondDevicePath A pointer to a single device path node.\r
+ Creates a new path by appending the device node to the device path.\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 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
+\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
- If there is not enough temporary pool memory available to complete this function,\r
- then NULL is returned.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
EFIAPI\r
AppendDevicePathNode (\r
- IN CONST EFI_DEVICE_PATH_PROTOCOL *FirstDevicePath,\r
- IN CONST EFI_DEVICE_PATH_PROTOCOL *SecondDevicePath\r
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath, OPTIONAL\r
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePathNode OPTIONAL\r
)\r
{\r
+ EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;\r
EFI_DEVICE_PATH_PROTOCOL *NextNode;\r
EFI_DEVICE_PATH_PROTOCOL *NewDevicePath;\r
UINTN NodeLength;\r
- UINTN Size1;\r
\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 (SecondDevicePath);\r
- Size1 = GetDevicePathSize (FirstDevicePath);\r
- \r
- NewDevicePath = AllocatePool (NodeLength + Size1);\r
- if (NewDevicePath != NULL) {\r
- //\r
- // Copy the first device path to the new device path\r
- //\r
- NewDevicePath = CopyMem (NewDevicePath, FirstDevicePath, Size1);\r
-\r
- //\r
- // Copy the device path node to the new device path\r
- //\r
- NextNode = (EFI_DEVICE_PATH_PROTOCOL *) ((CHAR8 *) NewDevicePath + (Size1 - sizeof (EFI_DEVICE_PATH_PROTOCOL)));\r
- NextNode = CopyMem (NextNode, SecondDevicePath, NodeLength);\r
+ NodeLength = DevicePathNodeLength (DevicePathNode);\r
\r
- //\r
- // Terminate the whole device path\r
- //\r
- NextNode = NextDevicePathNode (NextNode);\r
- SetDevicePathEndNode (NextNode);\r
+ TempDevicePath = AllocatePool (NodeLength + END_DEVICE_PATH_LENGTH);\r
+ if (TempDevicePath == NULL) {\r
+ return NULL;\r
}\r
+ TempDevicePath = CopyMem (TempDevicePath, DevicePathNode, NodeLength);\r
+ //\r
+ // Add and end device path node to convert Node to device path\r
+ //\r
+ NextNode = NextDevicePathNode (TempDevicePath);\r
+ SetDevicePathEndNode (NextNode);\r
+ //\r
+ // Append device paths\r
+ //\r
+ NewDevicePath = AppendDevicePath (DevicePath, TempDevicePath);\r
+\r
+ FreePool (TempDevicePath);\r
+\r
return NewDevicePath;\r
}\r
\r
/**\r
- This function appends the device path instance Instance to the device path Source.\r
- If Source is NULL, then a new device path with one instance is created. \r
-\r
- @param Source A pointer to a device path data structure.\r
- @param Instance A pointer to a device path instance.\r
+ Creates a new device path by appending the specified device path instance to the specified device\r
+ path.\r
+ \r
+ This function creates a new device path by appending a copy of the device path instance specified\r
+ by DevicePathInstance to a copy of the device path secified by DevicePath in a allocated buffer.\r
+ The end-of-device-path device node is moved after the end of the appended device path instance\r
+ and a new end-of-device-path-instance node is inserted between. \r
+ If DevicePath is NULL, then a copy if DevicePathInstance is returned.\r
+ If DevicePathInstance is NULL, then NULL 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
+ \r
+ @param DevicePath A pointer to a device path data structure.\r
+ @param DevicePathInstance A pointer to a device path instance.\r
\r
@return A pointer to the new device path.\r
- If there is not enough temporary pool memory available to complete this function,\r
- then NULL is returned.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
EFIAPI\r
AppendDevicePathInstance (\r
- IN CONST EFI_DEVICE_PATH_PROTOCOL *Source,\r
- IN CONST EFI_DEVICE_PATH_PROTOCOL *Instance\r
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath, OPTIONAL\r
+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePathInstance OPTIONAL\r
)\r
{\r
EFI_DEVICE_PATH_PROTOCOL *NewDevicePath;\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+ EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;\r
UINTN SrcSize;\r
UINTN InstanceSize;\r
\r
- if (Source == NULL) {\r
- return DuplicateDevicePath (Instance);\r
+ if (DevicePath == NULL) {\r
+ return DuplicateDevicePath (DevicePathInstance);\r
}\r
\r
- SrcSize = GetDevicePathSize (Source);\r
- InstanceSize = GetDevicePathSize (Instance);\r
+ if (DevicePathInstance == NULL) {\r
+ return NULL;\r
+ }\r
+\r
+ SrcSize = GetDevicePathSize (DevicePath);\r
+ InstanceSize = GetDevicePathSize (DevicePathInstance);\r
\r
NewDevicePath = AllocatePool (SrcSize + InstanceSize);\r
if (NewDevicePath != NULL) {\r
\r
- DevicePath = CopyMem (NewDevicePath, Source, SrcSize);;\r
+ TempDevicePath = CopyMem (NewDevicePath, DevicePath, SrcSize);;\r
\r
- while (!IsDevicePathEnd (DevicePath)) {\r
- DevicePath = NextDevicePathNode (DevicePath);\r
+ while (!IsDevicePathEnd (TempDevicePath)) {\r
+ TempDevicePath = NextDevicePathNode (TempDevicePath);\r
}\r
\r
- DevicePath->SubType = END_INSTANCE_DEVICE_PATH_SUBTYPE;\r
-\r
- DevicePath = NextDevicePathNode (DevicePath);\r
- CopyMem (DevicePath, Instance, InstanceSize);\r
+ TempDevicePath->SubType = END_INSTANCE_DEVICE_PATH_SUBTYPE;\r
+ TempDevicePath = NextDevicePathNode (TempDevicePath);\r
+ CopyMem (TempDevicePath, DevicePathInstance, InstanceSize);\r
}\r
\r
return NewDevicePath;\r
}\r
\r
/**\r
- Function retrieves the next device path instance from a device path data structure.\r
-\r
- @param DevicePath A pointer to a device path data structure.\r
- \r
- @param Size A pointer to the size of a device path instance in bytes.\r
+ Creates a copy of the current device path instance and returns a pointer to the next device path\r
+ instance.\r
+\r
+ This function creates a copy of the current device path instance. It also updates DevicePath to\r
+ point to the next device path instance in the device path (or NULL if no more) and updates Size\r
+ to hold the size of the device path instance copy.\r
+ If DevicePath is NULL, then NULL 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
+ If Size is NULL, then ASSERT().\r
+ \r
+ @param DevicePath On input, this holds the pointer to the current device path\r
+ instance. On output, this holds the pointer to the next device\r
+ path instance or NULL if there are no more device path\r
+ instances in the device path pointer to a device path data\r
+ structure.\r
+ @param Size On output, this holds the size of the device path instance, in\r
+ bytes or zero, if DevicePath is NULL.\r
\r
- @return This function returns a pointer to the current device path instance.\r
- In addition, it returns the size in bytes of the current device path instance in Size,\r
- and a pointer to the next device path instance in DevicePath.\r
- If there are no more device path instances in DevicePath, then DevicePath will be set to NULL.\r
+ @return A pointer to the current device path instance.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
EFIAPI\r
GetNextDevicePathInstance (\r
- IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,\r
- OUT UINTN *Size\r
+ IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath,\r
+ OUT UINTN *Size\r
)\r
{\r
EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
EFI_DEVICE_PATH_PROTOCOL *ReturnValue;\r
UINT8 Temp;\r
\r
- ASSERT (DevicePath != NULL);\r
ASSERT (Size != NULL);\r
- if (*DevicePath == NULL) {\r
+\r
+ if (DevicePath == NULL || *DevicePath == NULL) {\r
*Size = 0;\r
return NULL;\r
}\r
}\r
\r
/**\r
- Return TRUE is this is a multi instance device path.\r
+ Creates a copy of the current device path instance and returns a pointer to the next device path\r
+ instance.\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
+ is returned.\r
+ If NodeLength is smaller than a device path header, then NULL 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
\r
- @param DevicePath A pointer to a device path data structure.\r
+ @param NodeType The device node type for the new device node.\r
+ @param NodeSubType The device node sub-type for the new device node.\r
+ @param NodeLength The length of the new device node.\r
\r
- @retval TRUE If DevicePath is multi-instance.\r
- @retval FALSE If DevicePath is not multi-instance or DevicePath is NULL.\r
+ @return A pointer to the new create device path.\r
+\r
+**/\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+EFIAPI\r
+CreateDeviceNode (\r
+ IN UINT8 NodeType,\r
+ IN UINT8 NodeSubType,\r
+ IN UINT16 NodeLength\r
+ )\r
+{\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+\r
+ if (NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {\r
+ //\r
+ // NodeLength is less than the size of the header.\r
+ //\r
+ return NULL;\r
+ }\r
+ \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
+/**\r
+ Determines if a device path is single or multi-instance.\r
+\r
+ This function returns TRUE if the device path specified by DevicePath is multi-instance.\r
+ Otherwise, FALSE is returned. If DevicePath is NULL, then FALSE is returned.\r
+\r
+ @param DevicePath A pointer to a device path data structure.\r
+\r
+ @retval TRUE DevicePath is multi-instance.\r
+ @retval FALSE DevicePath is not multi-instance or DevicePath is NULL.\r
\r
**/\r
BOOLEAN\r
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
)\r
{\r
- CONST EFI_DEVICE_PATH_PROTOCOL *Node;\r
+ CONST EFI_DEVICE_PATH_PROTOCOL *Node;\r
\r
if (DevicePath == NULL) {\r
return FALSE;\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
}\r
\r
+\r
/**\r
- This function retrieves the device path protocol from a handle.\r
+ Retrieves the device path protocol from a handle.\r
\r
- @param Handle The handle from which to retrieve the device path protocol.\r
+ This function returns the device path protocol from the handle specified by Handle. If Handle is\r
+ NULL or Handle does not contain a device path protocol, then NULL is returned.\r
+ \r
+ @param Handle The handle from which to retrieve the device path protocol.\r
\r
- @return This function returns the device path protocol from the handle specified by Handle.\r
- If Handle is NULL or Handle does not contain a device path protocol, then NULL is returned.\r
+ @return The device path protocol from the handle specified by Handle.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
EFIAPI\r
DevicePathFromHandle (\r
- IN EFI_HANDLE Handle\r
+ IN EFI_HANDLE Handle\r
)\r
{\r
EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
}\r
\r
/**\r
- This function allocates a device path for a file and appends it to an existing device path.\r
+ Allocates a device path for a file and appends it to an existing device path.\r
\r
- @param Device A pointer to a device handle. This parameter is optional and may be NULL.\r
- @param FileName A pointer to a Null-terminated Unicode string.\r
+ If Device is a valid device handle that contains a device path protocol, then a device path for\r
+ the file specified by FileName is allocated and appended to the device path associated with the\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
+ If FileName is NULL, then ASSERT().\r
\r
- @return If Device is a valid device handle that contains a device path protocol,\r
- then a device path for the file specified by FileName is allocated\r
- and appended to the device path associated with the handle Device. The allocated device path is returned.\r
- If Device is NULL or Device is a handle that does not support the device path protocol,\r
- then a device path containing a single device path node for the file specified by FileName\r
- is allocated and returned.\r
+ @param Device A pointer to a device handle. This parameter is optional and\r
+ may be NULL.\r
+ @param FileName A pointer to a Null-terminated Unicode string.\r
+\r
+ @return A pointer to the new created file device path.\r
\r
**/\r
EFI_DEVICE_PATH_PROTOCOL *\r
EFIAPI\r
FileDevicePath (\r
- IN EFI_HANDLE Device, OPTIONAL\r
- IN CONST CHAR16 *FileName\r
+ IN EFI_HANDLE Device, OPTIONAL\r
+ IN CONST CHAR16 *FileName\r
)\r
{\r
- UINTN FileNameSize;\r
- UINTN FilePathNodeSize;\r
- FILEPATH_DEVICE_PATH *FilePathNode;\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
+ DevicePath = NULL;\r
+\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
+ FilePath->Header.SubType = MEDIA_FILEPATH_DP;\r
+ CopyMem (&FilePath->PathName, FileName, Size);\r
+ SetDevicePathNodeLength (&FilePath->Header, Size + SIZE_OF_FILEPATH_DEVICE_PATH);\r
+ SetDevicePathEndNode (NextDevicePathNode (&FilePath->Header));\r
\r
- FileNameSize = StrSize (FileName);\r
- FilePathNodeSize = FileNameSize + SIZE_OF_FILEPATH_DEVICE_PATH;\r
- FilePathNode = AllocatePool (FilePathNodeSize);\r
- if (FilePathNode != NULL) {\r
- //\r
- // Build a file path node\r
- //\r
- FilePathNode->Header.Type = MEDIA_DEVICE_PATH;\r
- FilePathNode->Header.SubType = MEDIA_FILEPATH_DP;\r
- SetDevicePathNodeLength (&FilePathNode->Header, FilePathNodeSize);\r
- CopyMem (FilePathNode->PathName, FileName, FileNameSize);\r
- \r
- //\r
- // Append file path node to device's device path\r
- //\r
if (Device != NULL) {\r
DevicePath = DevicePathFromHandle (Device);\r
}\r
- DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) FilePathNode);\r
- FreePool (FilePathNode);\r
+\r
+ DevicePath = AppendDevicePath (DevicePath, FileDevicePath);\r
+ FreePool (FileDevicePath);\r
}\r
+\r
return DevicePath;\r
}\r
\r