Improve coding style in MdeModulePkg.

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

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
index e7d3ad2621b9aff26e9e4ff60694c661a8dd6f92..2acb3b21fbc43320997ee88243ab9147a9ba41f9 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 - 2008, Intel Corporation. <BR>\r
+Copyright (c) 2006 - 2010, Intel Corporation. <BR>\r
 All rights reserved. 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
@@ -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
@@ -123,9 +132,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