Refine soma code to make code run safely.

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

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
index e7d3ad2621b9aff26e9e4ff60694c661a8dd6f92..8c0db787563df2f1050eb9468f61a9bdb2a9c3c5 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
@@ -1,8 +1,8 @@
 /** @file\r
   Definition for Device Path Utilities driver\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2010, 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
 http://opensource.org/licenses/bsd-license.php\r
@@ -43,11 +43,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
@@ -65,10 +65,19 @@ EFI_DEVICE_PATH_PROTOCOL  *
   IN  CHAR16 *DeviceNodeStr\r
   );\r
 \r
+typedef\r
+VOID\r
+(*DEVICE_PATH_TO_TEXT_FUNC) (\r
+  IN OUT POOL_PRINT  *Str,\r
+  IN VOID            *DevPath,\r
+  IN BOOLEAN         DisplayOnly,\r
+  IN BOOLEAN         AllowShortcuts\r
+  );\r
+\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   SubType;\r
-  VOID    (*Function) (POOL_PRINT *, VOID *, BOOLEAN, BOOLEAN);\r
+  UINT8                     Type;\r
+  UINT8                     SubType;\r
+  DEVICE_PATH_TO_TEXT_FUNC  Function;\r
 } DEVICE_PATH_TO_TEXT_TABLE;\r
 \r
 typedef struct {\r
@@ -101,6 +110,9 @@ typedef struct {
 #define USB_SUBCLASS_IRDA_BRIDGE   2\r
 #define USB_SUBCLASS_TEST          3\r
 \r
+#define RFC_1700_UDP_PROTOCOL      17\r
+#define RFC_1700_TCP_PROTOCOL      6\r
+\r
 #pragma pack(1)\r
 \r
 typedef struct {\r
@@ -123,9 +135,9 @@ typedef struct {
 \r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL  Header;\r
-  UINT32                    HID;\r
-  UINT32                    UID;\r
-  UINT32                    CID;\r
+  UINT32                    Hid;\r
+  UINT32                    Uid;\r
+  UINT32                    Cid;\r
   CHAR8                     HidUidCidStr[3];\r
 } ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR;\r
 \r