MdeModulePkg XhciPei: Fix build failure "conversion from 'UINT32' to 'UINT8', possibl...

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / UhciDxe / UhciSched.h

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
index ec685d56af8d8ed3935dd8adec8c27df23167a4a..f6d4fc40a7060d7a68f5e7d84ce99409e186e2bd 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
@@ -2,8 +2,8 @@
 \r
   The definition for EHCI register operation routines.\r
 \r
-Copyright (c) 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2007 - 2010, 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
@@ -17,21 +17,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_UHCI_SCHED_H_\r
 \r
 \r
-typedef enum {\r
-  UHCI_ASYNC_INT_SIGNATURE = EFI_SIGNATURE_32 ('u', 'h', 'c', 'a'),\r
-\r
-  //\r
-  // The failure mask for USB transfer return status. If any of\r
-  // these bit is set, the transfer failed. EFI_USB_ERR_NOEXECUTE\r
-  // and EFI_USB_ERR_NAK are not considered as error condition:\r
-  // the transfer is still going on.\r
-  //\r
-  USB_ERR_FAIL_MASK = EFI_USB_ERR_STALL   | EFI_USB_ERR_BUFFER |\r
-                      EFI_USB_ERR_BABBLE  | EFI_USB_ERR_CRC    |\r
-                      EFI_USB_ERR_TIMEOUT | EFI_USB_ERR_BITSTUFF |\r
-                      EFI_USB_ERR_SYSTEM\r
+#define UHCI_ASYNC_INT_SIGNATURE  SIGNATURE_32 ('u', 'h', 'c', 'a')\r
+//\r
+// The failure mask for USB transfer return status. If any of\r
+// these bit is set, the transfer failed. EFI_USB_ERR_NOEXECUTE\r
+// and EFI_USB_ERR_NAK are not considered as error condition:\r
+// the transfer is still going on.\r
+//\r
+#define USB_ERR_FAIL_MASK  (EFI_USB_ERR_STALL   | EFI_USB_ERR_BUFFER | \\r
+                            EFI_USB_ERR_BABBLE  | EFI_USB_ERR_CRC    | \\r
+                            EFI_USB_ERR_TIMEOUT | EFI_USB_ERR_BITSTUFF | \\r
+                            EFI_USB_ERR_SYSTEM)\r
 \r
-}UHCI_ERR_FAIL_MASK;\r
 \r
 //\r
 // Structure to return the result of UHCI QH execution.\r
@@ -131,15 +128,13 @@ UhciConvertPollRate (
   Link a queue head (for asynchronous interrupt transfer) to\r
   the frame list.\r
 \r
-  @param  FrameBase              The base of the frame list.\r
+  @param  Uhc                    The UHCI device.\r
   @param  Qh                     The queue head to link into.\r
 \r
-  @return None.\r
-\r
 **/\r
 VOID\r
 UhciLinkQhToFrameList (\r
-  UINT32                  *FrameBase,\r
+  USB_HC_DEV              *Uhc,\r
   UHCI_QH_SW              *Qh\r
   );\r
 \r
@@ -149,16 +144,14 @@ UhciLinkQhToFrameList (
   the precedence node, and pointer there next to QhSw's\r
   next.\r
 \r
-  @param  FrameBase              The base address of the frame list.\r
+  @param  Uhc                    The UHCI device.\r
   @param  Qh                     The queue head to unlink.\r
 \r
-  @return None.\r
-\r
 **/\r
 VOID\r
 UhciUnlinkQhFromFrameList (\r
-  UINT32                *FrameBase,\r
-  UHCI_QH_SW            *Qh\r
+  USB_HC_DEV              *Uhc,\r
+  UHCI_QH_SW              *Qh\r
   );\r
 \r
 \r
@@ -197,7 +190,6 @@ UhciExecuteTransfer (
   @param  EndPoint               EndPoint Address.\r
   @param  DataLen                Data length.\r
   @param  Interval               Polling Interval when inserted to frame list.\r
-  @param  Mapping                Mapping value.\r
   @param  Data                   Data buffer, unmapped.\r
   @param  Callback               Callback after interrupt transfeer.\r
   @param  Context                Callback Context passed as function parameter.\r
@@ -217,7 +209,6 @@ UhciCreateAsyncReq (
   IN UINT8                            EndPoint,\r
   IN UINTN                            DataLen,\r
   IN UINTN                            Interval,\r
-  IN VOID                             *Mapping,\r
   IN UINT8                            *Data,\r
   IN EFI_ASYNC_USB_TRANSFER_CALLBACK  Callback,\r
   IN VOID                             *Context,\r
@@ -271,6 +262,7 @@ UhciFreeAllAsyncReq (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 UhciMonitorAsyncReqList (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r