Update to support to produce Component Name and & Component Name 2 protocol based...

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbBusDxe / usbbus.h

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
index 2ecc2c8e50a8b3e4ec61347f9d5b69378c666fc3..5fd8e763e393ed775e9042afed43117a87061eec 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/usbbus.h
@@ -24,20 +24,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _EFI_USB_BUS_H_\r
 #define _EFI_USB_BUS_H_\r
 \r
-//\r
-// The package level header files this module uses\r
-//\r
+\r
 #include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
+\r
 #include <Protocol/Usb2HostController.h>\r
 #include <Protocol/UsbHostController.h>\r
 #include <Protocol/UsbIo.h>\r
 #include <Protocol/DevicePath.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
+\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
@@ -83,14 +77,14 @@ enum {
   USB_BUS_TPL               = TPL_NOTIFY,\r
 \r
   USB_INTERFACE_SIGNATURE   = EFI_SIGNATURE_32 ('U', 'S', 'B', 'I'),\r
-  USB_BUS_SIGNATURE         = EFI_SIGNATURE_32 ('U', 'S', 'B', 'B'),\r
+  USB_BUS_SIGNATURE         = EFI_SIGNATURE_32 ('U', 'S', 'B', 'B')\r
 };\r
 \r
 #define USB_BIT(a)                  ((UINTN)(1 << (a)))\r
 #define USB_BIT_IS_SET(Data, Bit)   ((BOOLEAN)(((Data) & (Bit)) == (Bit)))\r
 \r
 #define EFI_USB_BUS_PROTOCOL_GUID \\r
-          {0x2B2F68CC, 0x0CD2, 0x44cf, 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75}\r
+          {0x2B2F68CC, 0x0CD2, 0x44cf, {0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75}}\r
 \r
 #define USB_INTERFACE_FROM_USBIO(a) \\r
           CR(a, USB_INTERFACE, UsbIo, USB_INTERFACE_SIGNATURE)\r
@@ -110,7 +104,7 @@ typedef struct _EFI_USB_BUS_PROTOCOL {
 // Stands for the real USB device. Each device may\r
 // has several seperately working interfaces.\r
 //\r
-typedef struct _USB_DEVICE {\r
+struct _USB_DEVICE {\r
   USB_BUS                   *Bus;\r
 \r
   //\r
@@ -140,12 +134,12 @@ typedef struct _USB_DEVICE {
   UINT8                     ParentAddr;\r
   USB_INTERFACE             *ParentIf;\r
   UINT8                     ParentPort;       // Start at 0\r
-} USB_DEVICE;\r
+};\r
 \r
 //\r
 // Stands for different functions of USB device\r
 //\r
-typedef struct _USB_INTERFACE {\r
+struct _USB_INTERFACE {\r
   UINTN                     Signature;\r
   USB_DEVICE                *Device;\r
   USB_INTERFACE_DESC        *IfDesc;\r
@@ -179,12 +173,12 @@ typedef struct _USB_INTERFACE {
   // connected to EHCI.\r
   //\r
   UINT8                     MaxSpeed;\r
-} USB_INTERFACE;\r
+};\r
 \r
 //\r
 // Stands for the current USB Bus\r
 //\r
-typedef struct _USB_BUS {\r
+struct _USB_BUS {\r
   UINTN                     Signature;\r
   EFI_USB_BUS_PROTOCOL      BusId;\r
 \r
@@ -201,7 +195,7 @@ typedef struct _USB_BUS {
   // for root hub. Device with address i is at Devices[i].\r
   //\r
   USB_DEVICE                *Devices[USB_MAX_DEVICES];\r
-} USB_BUS;\r
+};\r
 \r
 extern EFI_USB_IO_PROTOCOL           mUsbIoProtocol;\r
 extern EFI_DRIVER_BINDING_PROTOCOL   mUsbBusDriverBinding;\r