Revert all the #pramga(1) related patches to r6434, we need to review all the updates...

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

diff --git a/MdePkg/Include/IndustryStandard/Usb.h b/MdePkg/Include/IndustryStandard/Usb.h
index 5ec270c7a118840d6240967019f4d91f32cd164c..ec86d8b794034439f33f6ac1382975083842b321 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Usb.h
+++ b/MdePkg/Include/IndustryStandard/Usb.h
@@ -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
@@ -352,6 +352,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