Add DevicePathUtilities DevicePathToText DevciePathFromText USB2HostController protocols

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1037 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 51 insertions, 18 deletions

diff --git a/MdePkg/Include/Guid/PcAnsi.h b/MdePkg/Include/Guid/PcAnsi.h
index c9b74ab03e..afbfc73bab 100644
--- a/MdePkg/Include/Guid/PcAnsi.h
+++ b/MdePkg/Include/Guid/PcAnsi.h
@@ -40,6 +40,16 @@
     0xad15a0d6, 0x8bec, 0x4acf, {0xa0, 0x73, 0xd0, 0x1d, 0xe7, 0x7e, 0x2d, 0x88 } \

   }

 

+#define EFI_UART_DEVICE_PATH_GUID \

+  { \

+    0x37499a9d, 0x542f, 0x4c89, {0xa0, 0x26, 0x35, 0xda, 0x14, 0x20, 0x94, 0xe4 } \

+  }

+  

+#define EFI_SAS_DEVICE_PATH_GUID \

+  { \

+    0xb4dd87d4, 0x8b00, 0xd911, {0xaf, 0xdc, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d } \

+  }

+

 extern EFI_GUID gEfiPcAnsiGuid;

 extern EFI_GUID gEfiVT100Guid;

 extern EFI_GUID gEfiVT100PlusGuid;

diff --git a/MdePkg/Include/IndustryStandard/Usb.h b/MdePkg/Include/IndustryStandard/Usb.h
index dca7351ff1..d3328a5461 100644
--- a/MdePkg/Include/IndustryStandard/Usb.h
+++ b/MdePkg/Include/IndustryStandard/Usb.h
@@ -255,6 +255,8 @@ typedef struct {
 #define USB_PORT_STAT_RESET         0x0010

 #define USB_PORT_STAT_POWER         0x0100

 #define USB_PORT_STAT_LOW_SPEED     0x0200

+#define USB_PORT_STAT_HIGH_SPEED    0x0400

+#define USB_PORT_STAT_OWNER         0x0800

 

 #define USB_PORT_STAT_C_CONNECTION  0x0001

 #define USB_PORT_STAT_C_ENABLE      0x0002

@@ -270,6 +272,7 @@ typedef enum {
   EfiUsbPortSuspend           = 2,

   EfiUsbPortReset             = 4,

   EfiUsbPortPower             = 8,

+  EfiUsbPortOwner             = 13,

   EfiUsbPortConnectChange     = 16,

   EfiUsbPortEnableChange      = 17,

   EfiUsbPortSuspendChange     = 18,

diff --git a/MdePkg/Include/Protocol/DevicePathFromText.h b/MdePkg/Include/Protocol/DevicePathFromText.h
index a3a6c431ca..0d1ce3208a 100644
--- a/MdePkg/Include/Protocol/DevicePathFromText.h
+++ b/MdePkg/Include/Protocol/DevicePathFromText.h
@@ -64,8 +64,8 @@ EFI_DEVICE_PATH_PROTOCOL*
 ;  

   

 typedef struct {

-  EFI_DEVICE_PATH_FROM_TEXT_NODE  ConvertDeviceNodeFromText;

-  EFI_DEVICE_PATH_FROM_TEXT_PATH  ConvertDevicePathFromText;

+  EFI_DEVICE_PATH_FROM_TEXT_NODE  ConvertTextToDeviceNode;

+  EFI_DEVICE_PATH_FROM_TEXT_PATH  ConvertTextToDevicePath;

 } EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL;

 

 extern EFI_GUID gEfiDevicePathFromTextProtocolGuid;

diff --git a/MdePkg/Include/Protocol/Usb2HostController.h b/MdePkg/Include/Protocol/Usb2HostController.h
index 5326d5b623..2a9d02da07 100644
--- a/MdePkg/Include/Protocol/Usb2HostController.h
+++ b/MdePkg/Include/Protocol/Usb2HostController.h
@@ -269,6 +269,7 @@ EFI_STATUS
   IN OUT UINT8                                               *DataToggle,

   IN     UINTN                                               PollingInterval  OPTIONAL,

   IN     UINTN                                               DataLength       OPTIONAL,

+  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR                  *Translator      OPTIONAL,

   IN     EFI_ASYNC_USB_TRANSFER_CALLBACK                     CallBackFunction OPTIONAL,

   IN     VOID                                                *Context         OPTIONAL

   )

@@ -305,16 +306,17 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_USB2_HC_PROTOCOL_SYNC_INTERRUPT_TRANSFER) (

-  IN     EFI_USB2_HC_PROTOCOL   *This,

-  IN     UINT8                  DeviceAddress,

-  IN     UINT8                  EndPointAddress,

-  IN     UINT8                  DeviceSpeed,

-  IN     UINTN                  MaximumPacketLength,

-  IN OUT VOID                   *Data,

-  IN OUT UINTN                  *DataLength,

-  IN OUT UINT8                  *DataToggle,

-  IN     UINTN                  TimeOut,

-  OUT    UINT32                 *TransferResult

+  IN     EFI_USB2_HC_PROTOCOL                        *This,

+  IN     UINT8                                       DeviceAddress,

+  IN     UINT8                                       EndPointAddress,

+  IN     UINT8                                       DeviceSpeed,

+  IN     UINTN                                       MaximumPacketLength,

+  IN OUT VOID                                        *Data,

+  IN OUT UINTN                                       *DataLength,

+  IN OUT UINT8                                       *DataToggle,

+  IN     UINTN                                       TimeOut,

+  IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR          *Translator,

+  OUT    UINT32                                      *TransferResult

   )

 ;

 

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