ArmPkg: Move IS_DEVICE_PATH_NODE for sharing

Move IS_DEVICE_PATH_NODE into header to share it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jun Nie <jun.nie@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPkg/Include/Library/BdsLib.h b/ArmPkg/Include/Library/BdsLib.h
index c58f47eb2a2861199cd438c339c140e995cc85e9..4528c2e8739b2abb586643b09665af76dab7a733 100644 (file)
--- a/ArmPkg/Include/Library/BdsLib.h
+++ b/ArmPkg/Include/Library/BdsLib.h
@@ -15,6 +15,9 @@
 #ifndef __BDS_ENTRY_H__\r
 #define __BDS_ENTRY_H__\r
 \r
 #ifndef __BDS_ENTRY_H__\r
 #define __BDS_ENTRY_H__\r
 \r

+#define IS_DEVICE_PATH_NODE(node,type,subtype)    \\r
+        (((node)->Type == (type)) && ((node)->SubType == (subtype)))\r
+\r

 /**\r
   This is defined by the UEFI specs, don't change it\r
 **/\r
 /**\r
   This is defined by the UEFI specs, don't change it\r
 **/\r

diff --git a/ArmPkg/Library/BdsLib/BdsFilePath.c b/ArmPkg/Library/BdsLib/BdsFilePath.c
index f9d8c4c205bfba280ea4197bb6bf2f3bafce1ae9..41557bb91816e7df488298e72e44994090b2af6b 100644 (file)
--- a/ArmPkg/Library/BdsLib/BdsFilePath.c
+++ b/ArmPkg/Library/BdsLib/BdsFilePath.c
@@ -24,9 +24,6 @@
 #include <Protocol/Dhcp4.h>\r
 #include <Protocol/Mtftp4.h>\r
 \r
 #include <Protocol/Dhcp4.h>\r
 #include <Protocol/Mtftp4.h>\r
 \r

-\r
-#define IS_DEVICE_PATH_NODE(node,type,subtype) (((node)->Type == (type)) && ((node)->SubType == (subtype)))\r
-\r

 /* Type and defines to set up the DHCP4 options */\r
 \r
 typedef struct {\r
 /* Type and defines to set up the DHCP4 options */\r
 \r
 typedef struct {\r