Support new format of IPv4 device path node, FibreEx and PcieRoot device path node...

[mirror_edk2.git] / MdeModulePkg / Universal / DevicePathDxe / DevicePath.h

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
index c62e9a1eb0f056b0926162cb9d518b2bda5fcfc3..8beb68c7ab905c1fda09d806b8becfe02afdc525 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
@@ -1,7 +1,7 @@
 /** @file\r
   Definition for Device Path Utilities driver\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -31,9 +31,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-\r
-#define MAX_CHAR                   480\r
-\r
 #define IS_COMMA(a)                ((a) == L',')\r
 #define IS_HYPHEN(a)               ((a) == L'-')\r
 #define IS_DOT(a)                  ((a) == L'.')\r
@@ -43,11 +40,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define IS_NULL(a)                 ((a) == L'\0')\r
 \r
 \r
-#define SET_DEVICE_PATH_INSTANCE_END_NODE(a) {           \\r
-    (a)->Type       = END_DEVICE_PATH_TYPE;              \\r
-    (a)->SubType    = END_INSTANCE_DEVICE_PATH_SUBTYPE;  \\r
-    (a)->Length[0]  = sizeof (EFI_DEVICE_PATH_PROTOCOL); \\r
-    (a)->Length[1]  = 0;                                 \\r
+#define SET_DEVICE_PATH_INSTANCE_END_NODE(a) {                   \\r
+    (a)->Type       = END_DEVICE_PATH_TYPE;                      \\r
+    (a)->SubType    = END_INSTANCE_DEVICE_PATH_SUBTYPE;          \\r
+    (a)->Length[0]  = (UINT8) sizeof (EFI_DEVICE_PATH_PROTOCOL); \\r
+    (a)->Length[1]  = 0;                                         \\r
   }\r
 \r
 //\r
@@ -55,8 +52,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 typedef struct {\r
   CHAR16  *Str;\r
-  UINTN   Len;\r
-  UINTN   MaxLen;\r
+  UINTN   Length;\r
+  UINTN   Capacity;\r
 } POOL_PRINT;\r
 \r
 typedef\r