From 562d28495df348923812281161e64bc9514e15e6 Mon Sep 17 00:00:00 2001
From: ljin6 <ljin6@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 18 Jul 2006 04:13:40 +0000
Subject: Add DevicePathUtilities DevicePathToText DevciePathFromText
 USB2HostController protocols

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1037 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdePkg/Include/Uefi/UefiSpec.h | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'MdePkg/Include/Uefi')

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 9993cd44e7..3410ad2821 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -1839,11 +1839,7 @@ typedef struct {
 #define HW_CONTROLLER_DP          0x05
 typedef struct {
   EFI_DEVICE_PATH_PROTOCOL        Header;
-#if EDK_RELEASE_VERSION >= 0x00020000
   UINT32                          ControllerNumber;
-#else
-  UINT32                          Controller;
-#endif
 } CONTROLLER_DEVICE_PATH;
 
 //
@@ -1945,6 +1941,7 @@ typedef struct {
     UINT8                         DeviceProtocol;
 } USB_CLASS_DEVICE_PATH;
 
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
 #define MSG_USB_WWID_DP           0x10
 typedef struct {
     EFI_DEVICE_PATH_PROTOCOL      Header;
@@ -1957,8 +1954,9 @@ typedef struct {
 #define MSG_DEVICE_LOGICAL_UNIT_DP  0x11
 typedef struct {
     EFI_DEVICE_PATH_PROTOCOL      Header;
-    UINT8                         LUN;
+    UINT8                         Lun;
 } DEVICE_LOGICAL_UNIT_DEVICE_PATH;
+#endif
 
 #define MSG_I2O_DP                0x06
 typedef struct {
@@ -2030,8 +2028,27 @@ typedef struct {
 #define DEVICE_PATH_MESSAGING_VT_100      EFI_VT_100_GUID
 #define DEVICE_PATH_MESSAGING_VT_100_PLUS EFI_VT_100_PLUS_GUID
 #define DEVICE_PATH_MESSAGING_VT_UTF8     EFI_VT_UTF8_GUID
-#define DEVICE_PATH_MESSAGING_SAS         EFI_SAS_DEVICE_PATH_GUID
 
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
+
+#define DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL   EFI_UART_DEVICE_PATH_GUID
+#define DEVICE_PATH_MESSAGING_SAS                 EFI_SAS_DEVICE_PATH_GUID
+
+typedef struct {
+  EFI_DEVICE_PATH_PROTOCOL        Header;
+  EFI_GUID                        Guid;
+  UINT32                          FlowControlMap;
+} UART_FLOW_CONTROL_DEVICE_PATH;
+
+typedef struct {
+  EFI_DEVICE_PATH_PROTOCOL        Header;
+  EFI_GUID                        Guid;
+  UINT32                          Reserved;
+  UINT64                          SasAddress;
+  UINT64                          Lun;
+  UINT16                          DeviceTopology;
+  UINT16                          RelativeTargetPort;
+} SAS_DEVICE_PATH;
 
 #define MSG_ISCSI_DP              0x13
 typedef struct {
@@ -2053,6 +2070,7 @@ typedef struct {
 #define ISCSI_LOGIN_OPTION_CHAP_BI                      0x0000
 #define ISCSI_LOGIN_OPTION_CHAP_UNI                     0x2000
 
+#endif
 
 //
 // Media Device Path
-- 
cgit v1.2.3