MdePkg: add missing #defines for decoding PCIe 2.1 extended capability structures

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

diff --git a/MdePkg/Include/IndustryStandard/Usb.h b/MdePkg/Include/IndustryStandard/Usb.h
index 5ec270c7a118840d6240967019f4d91f32cd164c..c4367b58bb8861a6f7f79676961df2f317c59b75 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Usb.h
+++ b/MdePkg/Include/IndustryStandard/Usb.h
@@ -1,8 +1,8 @@
 /** @file\r
   Support for USB 2.0 standard.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2006 - 2008, 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
@@ -62,6 +62,7 @@
 //\r
 // USB standard descriptors and reqeust\r
 //\r
+#pragma pack(1)\r
 \r
 ///\r
 /// Format of Setup Data for USB Device Requests\r
@@ -96,7 +97,6 @@ typedef struct {
   UINT8           NumConfigurations;\r
 } USB_DEVICE_DESCRIPTOR;\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Standard Configuration Descriptor\r
 /// USB 2.0 spec, Section 9.6.3\r
@@ -111,7 +111,6 @@ typedef struct {
   UINT8           Attributes;\r
   UINT8           MaxPower;\r
 } USB_CONFIG_DESCRIPTOR;\r
-#pragma pack()\r
 \r
 ///\r
 /// Standard Interface Descriptor\r
@@ -129,7 +128,6 @@ typedef struct {
   UINT8           Interface;\r
 } USB_INTERFACE_DESCRIPTOR;\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Standard Endpoint Descriptor\r
 /// USB 2.0 spec, Section 9.6.6\r
@@ -142,7 +140,6 @@ typedef struct {
   UINT16          MaxPacketSize;\r
   UINT8           Interval;\r
 } USB_ENDPOINT_DESCRIPTOR;\r
-#pragma pack()\r
 \r
 ///\r
 /// UNICODE String Descriptor\r
@@ -154,6 +151,9 @@ typedef struct {
   CHAR16          String[1];\r
 } EFI_USB_STRING_DESCRIPTOR;\r
 \r
+#pragma pack()\r
+\r
+\r
 typedef enum {\r
   //\r
   // USB request type\r
@@ -334,6 +334,7 @@ typedef enum {
 #pragma pack(1)\r
 ///\r
 /// Descriptor header for Report/Physical Descriptors\r
+/// HID 1.1, section 6.2.1\r
 ///\r
 typedef struct hid_class_descriptor {\r
   UINT8   DescriptorType;\r
@@ -343,6 +344,7 @@ typedef struct hid_class_descriptor {
 ///\r
 /// The HID descriptor identifies the length and type\r
 /// of subordinate descriptors for a device.\r
+/// HID 1.1, section 6.2.1\r
 ///\r
 typedef struct hid_descriptor {\r
   UINT8                         Length;\r
@@ -352,6 +354,7 @@ typedef struct hid_descriptor {
   UINT8                         NumDescriptors;\r
   EFI_USB_HID_CLASS_DESCRIPTOR  HidClassDesc[1];\r
 } EFI_USB_HID_DESCRIPTOR;\r
+\r
 #pragma pack()\r
 \r
 #endif\r