Move those definitions defined in UEFI Spec from IndustryStandard/Usb.h to Protocol...

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Usb.h

diff --git a/MdePkg/Include/IndustryStandard/Usb.h b/MdePkg/Include/IndustryStandard/Usb.h
index 333bb67e2ee36a696d83ba7ccf004a3d51d4e43c..0c251142a9fdfff15eb27e4dcea8836db313e25a 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Usb.h
+++ b/MdePkg/Include/IndustryStandard/Usb.h
@@ -58,68 +58,6 @@
 #define USB_DEV_SYNCH_FRAME                 0x0C\r
 #define USB_DEV_SYNCH_FRAME_REQ_TYPE        0x82\r
 \r
-//\r
-// Definitions defined in UEFI spec\r
-//\r
-\r
-//\r
-// USB Transfer Results\r
-//\r
-#define EFI_USB_NOERROR             0x00\r
-#define EFI_USB_ERR_NOTEXECUTE      0x01\r
-#define EFI_USB_ERR_STALL           0x02\r
-#define EFI_USB_ERR_BUFFER          0x04\r
-#define EFI_USB_ERR_BABBLE          0x08\r
-#define EFI_USB_ERR_NAK             0x10\r
-#define EFI_USB_ERR_CRC             0x20\r
-#define EFI_USB_ERR_TIMEOUT         0x40\r
-#define EFI_USB_ERR_BITSTUFF        0x80\r
-#define EFI_USB_ERR_SYSTEM          0x100\r
-\r
-//\r
-// Constant value for Port Status & Port Change Status\r
-//\r
-#define USB_PORT_STAT_CONNECTION    0x0001\r
-#define USB_PORT_STAT_ENABLE        0x0002\r
-#define USB_PORT_STAT_SUSPEND       0x0004\r
-#define USB_PORT_STAT_OVERCURRENT   0x0008\r
-#define USB_PORT_STAT_RESET         0x0010\r
-#define USB_PORT_STAT_POWER         0x0100\r
-#define USB_PORT_STAT_LOW_SPEED     0x0200\r
-#define USB_PORT_STAT_HIGH_SPEED    0x0400\r
-#define USB_PORT_STAT_OWNER         0x0800\r
-\r
-#define USB_PORT_STAT_C_CONNECTION  0x0001\r
-#define USB_PORT_STAT_C_ENABLE      0x0002\r
-#define USB_PORT_STAT_C_SUSPEND     0x0004\r
-#define USB_PORT_STAT_C_OVERCURRENT 0x0008\r
-#define USB_PORT_STAT_C_RESET       0x0010\r
-\r
-//\r
-// USB data transfer direction\r
-//\r
-typedef enum {\r
-  EfiUsbDataIn,\r
-  EfiUsbDataOut,\r
-  EfiUsbNoData\r
-} EFI_USB_DATA_DIRECTION;\r
-\r
-//\r
-// Usb port features\r
-//\r
-typedef enum {\r
-  EfiUsbPortEnable            = 1,\r
-  EfiUsbPortSuspend           = 2,\r
-  EfiUsbPortReset             = 4,\r
-  EfiUsbPortPower             = 8,\r
-  EfiUsbPortOwner             = 13,\r
-  EfiUsbPortConnectChange     = 16,\r
-  EfiUsbPortEnableChange      = 17,\r
-  EfiUsbPortSuspendChange     = 18,\r
-  EfiUsbPortOverCurrentChange = 19,\r
-  EfiUsbPortResetChange       = 20\r
-} EFI_USB_PORT_FEATURE;\r
-\r
 \r
 //\r
 // USB standard descriptors and reqeust\r
@@ -131,7 +69,7 @@ typedef struct {
   UINT16          Value;\r
   UINT16          Index;\r
   UINT16          Length;\r
-} EFI_USB_DEVICE_REQUEST;\r
+} USB_DEVICE_REQUEST;\r
 \r
 typedef struct {\r
   UINT8           Length;\r
@@ -148,7 +86,7 @@ typedef struct {
   UINT8           StrProduct;\r
   UINT8           StrSerialNumber;\r
   UINT8           NumConfigurations;\r
-} EFI_USB_DEVICE_DESCRIPTOR;\r
+} USB_DEVICE_DESCRIPTOR;\r
 \r
 typedef struct {\r
   UINT8           Length;\r
@@ -159,7 +97,7 @@ typedef struct {
   UINT8           Configuration;\r
   UINT8           Attributes;\r
   UINT8           MaxPower;\r
-} EFI_USB_CONFIG_DESCRIPTOR;\r
+} USB_CONFIG_DESCRIPTOR;\r
 \r
 typedef struct {\r
   UINT8           Length;\r
@@ -171,7 +109,7 @@ typedef struct {
   UINT8           InterfaceSubClass;\r
   UINT8           InterfaceProtocol;\r
   UINT8           Interface;\r
-} EFI_USB_INTERFACE_DESCRIPTOR;\r
+} USB_INTERFACE_DESCRIPTOR;\r
 \r
 typedef struct {\r
   UINT8           Length;\r
@@ -180,7 +118,7 @@ typedef struct {
   UINT8           Attributes;\r
   UINT16          MaxPacketSize;\r
   UINT8           Interval;\r
-} EFI_USB_ENDPOINT_DESCRIPTOR;\r
+} USB_ENDPOINT_DESCRIPTOR;\r
 \r
 typedef struct {\r
   UINT8           Length;\r
@@ -190,16 +128,7 @@ typedef struct {
 \r
 #pragma pack()\r
 \r
-typedef struct {\r
-  UINT16          PortStatus;\r
-  UINT16          PortChangeStatus;\r
-} EFI_USB_PORT_STATUS;\r
-\r
 \r
-//\r
-// Following are definitions not specified by UEFI spec.\r
-// Add new definitions below this line\r
-//\r
 enum {\r
   //\r
   // USB request type\r