Improve coding style in MdeModulePkg.

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbMassStorageDxe / UsbMassCbi.h

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
index ec4c3e14dab146ffd01a213bccd3ba0a7c466415..aeffb5fc678f250b56c6c15b24c1323683293ea3 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
@@ -2,7 +2,7 @@
   Defination for the USB mass storage Control/Bulk/Interrupt (CBI) transport,\r
   according to USB Mass Storage Class Control/Bulk/Interrupt (CBI) Transport, Revision 1.1.\r
 \r
-Copyright (c) 2007 - 2008, Intel Corporation\r
+Copyright (c) 2007 - 2010, Intel Corporation\r
 All rights reserved. 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
@@ -16,28 +16,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _EFI_USBMASS_CBI_H_\r
 #define _EFI_USBMASS_CBI_H_\r
 \r
+#include "UsbMass.h"\r
+\r
 extern USB_MASS_TRANSPORT mUsbCbi0Transport;\r
 extern USB_MASS_TRANSPORT mUsbCbi1Transport;\r
 \r
-typedef enum {\r
-  USB_CBI_MAX_PACKET_NUM        = 16,\r
-  USB_CBI_RESET_CMD_LEN         = 12,\r
-\r
-  //\r
-  // USB CBI retry C/B/I transport times, set by experience\r
-  //\r
-  USB_CBI_MAX_RETRY             = 3,\r
-\r
-  //\r
-  // Time to wait for USB CBI reset to complete, set by experience\r
-  //  \r
-  USB_CBI_RESET_DEVICE_STALL    = 50 * USB_MASS_1_MILLISECOND,\r
-\r
-  //\r
-  // USB CBI transport timeout, set by experience\r
-  //\r
-  USB_CBI_RESET_DEVICE_TIMEOUT  = 1 * USB_MASS_1_SECOND\r
-} USB_CBI_DATA;\r
+#define USB_CBI_MAX_PACKET_NUM        16\r
+#define USB_CBI_RESET_CMD_LEN         12\r
+//\r
+// USB CBI retry C/B/I transport times, set by experience\r
+//\r
+#define USB_CBI_MAX_RETRY             3\r
+//\r
+// Time to wait for USB CBI reset to complete, set by experience\r
+//  \r
+#define USB_CBI_RESET_DEVICE_STALL    (50 * USB_MASS_1_MILLISECOND)\r
+//\r
+// USB CBI transport timeout, set by experience\r
+//\r
+#define USB_CBI_RESET_DEVICE_TIMEOUT  (1 * USB_MASS_1_SECOND)\r
 \r
 typedef struct {\r
   //\r