1, Move device path utility macros from protocol's header file to DevicePathLib library classes

2, Remove Unpack type

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6455 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 20 insertions, 48 deletions

diff --git a/MdePkg/Include/Library/DevicePathLib.h b/MdePkg/Include/Library/DevicePathLib.h
index 244e351..8df0253 100644
--- a/MdePkg/Include/Library/DevicePathLib.h
+++ b/MdePkg/Include/Library/DevicePathLib.h
@@ -15,6 +15,24 @@
 #ifndef __DEVICE_PATH_LIB_H__

 #define __DEVICE_PATH_LIB_H__

 

+#include <Library/BaseLib.h>

+

+#define END_DEVICE_PATH_LENGTH               (sizeof (EFI_DEVICE_PATH_PROTOCOL))

+#define DevicePathNodeLength(Node)           ReadUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0])

+#define NextDevicePathNode(Node)             ((EFI_DEVICE_PATH_PROTOCOL *)((UINT8 *)(Node) + DevicePathNodeLength(Node)))

+#define DevicePathType(Node)                 (((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Type) 

+#define DevicePathSubType(Node)              (((EFI_DEVICE_PATH_PROTOCOL *)(Node))->SubType)

+#define IsDevicePathEndType(Node)            (DevicePathType (Node) == END_DEVICE_PATH_TYPE)

+#define IsDevicePathEnd(Node)                (IsDevicePathEndType (Node) && DevicePathSubType(Node) == END_ENTIRE_DEVICE_PATH_SUBTYPE)

+#define IsDevicePathEndInstance(Node)        (IsDevicePathEndType (Node) && DevicePathSubType(Node) == END_INSTANCE_DEVICE_PATH_SUBTYPE)

+

+#define SetDevicePathNodeLength(Node,NodeLength)  WriteUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0], (UINT16)(NodeLength))

+#define SetDevicePathEndNode(Node)  {                                   \

+          DevicePathType (Node)    = END_DEVICE_PATH_TYPE;              \

+          DevicePathSubType (Node) = END_ENTIRE_DEVICE_PATH_SUBTYPE;    \

+          SetDevicePathNodeLength ((Node), END_DEVICE_PATH_LENGTH);       \

+          }

+

 /**

   Returns the size of a device path in bytes.

 

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index f5df67a..2304205 100644
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -526,55 +526,9 @@ typedef union {
 

 #pragma pack()

                                              

-#define EFI_DP_TYPE_MASK                     0x7F

-#define EFI_DP_TYPE_UNPACKED                 0x80

 #define END_DEVICE_PATH_TYPE                 0x7f

-                                             

-#define EFI_END_ENTIRE_DEVICE_PATH           0xff

-#define EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE   0xff

-#define EFI_END_INSTANCE_DEVICE_PATH         0x01

-#define END_ENTIRE_DEVICE_PATH_SUBTYPE       EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE

-#define END_INSTANCE_DEVICE_PATH_SUBTYPE     EFI_END_INSTANCE_DEVICE_PATH

-                                             

-#define EFI_END_DEVICE_PATH_LENGTH           (sizeof (EFI_DEVICE_PATH_PROTOCOL))

-#define END_DEVICE_PATH_LENGTH               EFI_END_DEVICE_PATH_LENGTH

-                                             

-#define DP_IS_END_TYPE(a)                    

-#define DP_IS_END_SUBTYPE(a)                 (((a)->SubType == END_ENTIRE_DEVICE_PATH_SUBTYPE)

-#define DevicePathSubType(a)                 ((a)->SubType)

-#define IsDevicePathUnpacked(a)              ((a)->Type & EFI_DP_TYPE_UNPACKED)

-                                             

-#define EfiDevicePathNodeLength(a)           (((a)->Length[0]) | ((a)->Length[1] << 8))

-#define DevicePathNodeLength(a)              (EfiDevicePathNodeLength(a))

-#define EfiNextDevicePathNode(a)             ((EFI_DEVICE_PATH_PROTOCOL *) (((UINT8 *) (a)) + EfiDevicePathNodeLength (a)))

-#define NextDevicePathNode(a)                (EfiNextDevicePathNode(a)) 

-                                             

-#define EfiDevicePathType(a)                 (((a)->Type) & EFI_DP_TYPE_MASK)

-#define DevicePathType(a)                    (EfiDevicePathType(a))

-#define EfiIsDevicePathEndType(a)            (EfiDevicePathType (a) == END_DEVICE_PATH_TYPE)

-#define IsDevicePathEndType(a)               (EfiIsDevicePathEndType(a)) 

-                                             

-                                             

-#define EfiIsDevicePathEndSubType(a)         ((a)->SubType == EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE)

-#define IsDevicePathEndSubType(a)            (EfiIsDevicePathEndSubType(a))

-#define EfiIsDevicePathEndInstanceSubType(a) ((a)->SubType == EFI_END_INSTANCE_DEVICE_PATH)

-                                             

-#define EfiIsDevicePathEnd(a)                (EfiIsDevicePathEndType (a) && EfiIsDevicePathEndSubType (a))

-#define IsDevicePathEnd(a)                   (EfiIsDevicePathEnd(a))

-#define EfiIsDevicePathEndInstance(a)        (EfiIsDevicePathEndType (a) && EfiIsDevicePathEndInstanceSubType (a))

-

-

-#define SetDevicePathNodeLength(a,l) {                           \

-          (a)->Length[0] = (UINT8) (l);                          \

-          (a)->Length[1] = (UINT8) ((l) >> 8);                   \

-          }

-

-#define SetDevicePathEndNode(a)  {                               \

-          (a)->Type = END_DEVICE_PATH_TYPE;                      \

-          (a)->SubType = END_ENTIRE_DEVICE_PATH_SUBTYPE;         \

-          (a)->Length[0] = sizeof(EFI_DEVICE_PATH_PROTOCOL);     \

-          (a)->Length[1] = 0;                                    \

-          }

+#define END_ENTIRE_DEVICE_PATH_SUBTYPE       0xFF

+#define END_INSTANCE_DEVICE_PATH_SUBTYPE     0x01

 

 extern EFI_GUID gEfiDevicePathProtocolGuid;