From b8b5ff5acd0d292bcd804e589d28677af5098573 Mon Sep 17 00:00:00 2001 From: Elvin Li Date: Wed, 25 Dec 2013 07:52:55 +0000 Subject: Update XhcWaitOpRegBit to take Timout argument as microsecond. Signed-off-by: Elvin Li Reviewed-by: Feng Tian git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15020 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c | 12 ++++++------ MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'MdeModulePkg/Bus/Pci') diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c index a66d7cd95b..a513dd9581 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c @@ -2,7 +2,7 @@ The XHCI register operation routines. -Copyright (c) 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -499,7 +499,7 @@ XhcClearOpRegBit ( @param Offset The offset of the operation register. @param Bit The bit of the register to wait for. @param WaitToSet Wait the bit to set or clear. - @param Timeout The time to wait before abort (in millisecond, ms). + @param Timeout The time to wait before abort (in microsecond, us). @retval EFI_SUCCESS The bit successfully changed by host controller. @retval EFI_TIMEOUT The time out occurred. @@ -517,7 +517,7 @@ XhcWaitOpRegBit ( UINT32 Index; UINTN Loop; - Loop = (Timeout * XHC_1_MILLISECOND / XHC_POLL_DELAY) + 1; + Loop = (Timeout / XHC_POLL_DELAY) + 1; for (Index = 0; Index < Loop; Index++) { if (XHC_REG_BIT_IS_SET (Xhc, Offset, Bit) == WaitToSet) { @@ -656,7 +656,7 @@ XhcIsSysError ( Reset the XHCI host controller. @param Xhc The XHCI Instance. - @param Timeout Time to wait before abort (in millisecond, ms). + @param Timeout Time to wait before abort (in microsecond, us). @retval EFI_SUCCESS The XHCI host controller is reset. @return Others Failed to reset the XHCI before Timeout. @@ -698,7 +698,7 @@ XhcResetHC ( Halt the XHCI host controller. @param Xhc The XHCI Instance. - @param Timeout Time to wait before abort (in millisecond, ms). + @param Timeout Time to wait before abort (in microsecond, us). @return EFI_SUCCESS The XHCI host controller is halt. @return EFI_TIMEOUT Failed to halt the XHCI before Timeout. @@ -722,7 +722,7 @@ XhcHaltHC ( Set the XHCI host controller to run. @param Xhc The XHCI Instance. - @param Timeout Time to wait before abort (in millisecond, ms). + @param Timeout Time to wait before abort (in microsecond, us). @return EFI_SUCCESS The XHCI host controller is running. @return EFI_TIMEOUT Failed to set the XHCI to run before Timeout. diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h index bf2fe00143..b748c8d397 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h @@ -399,7 +399,7 @@ XhcClearOpRegBit ( @param Offset The offset of the operational register. @param Bit The bit of the register to wait for. @param WaitToSet Wait the bit to set or clear. - @param Timeout The time to wait before abort (in millisecond, ms). + @param Timeout The time to wait before abort (in microsecond, us). @retval EFI_SUCCESS The bit successfully changed by host controller. @retval EFI_TIMEOUT The time out occurred. @@ -521,7 +521,7 @@ XhcIsSysError ( Reset the XHCI host controller. @param Xhc The XHCI Instance. - @param Timeout Time to wait before abort (in millisecond, ms). + @param Timeout Time to wait before abort (in microsecond, us). @retval EFI_SUCCESS The XHCI host controller is reset. @return Others Failed to reset the XHCI before Timeout. @@ -537,7 +537,7 @@ XhcResetHC ( Halt the XHCI host controller. @param Xhc The XHCI Instance. - @param Timeout Time to wait before abort (in millisecond, ms). + @param Timeout Time to wait before abort (in microsecond, us). @return EFI_SUCCESS The XHCI host controller is halt. @return EFI_TIMEOUT Failed to halt the XHCI before Timeout. @@ -553,7 +553,7 @@ XhcHaltHC ( Set the XHCI host controller to run. @param Xhc The XHCI Instance. - @param Timeout Time to wait before abort (in millisecond, ms). + @param Timeout Time to wait before abort (in microsecond, us). @return EFI_SUCCESS The XHCI host controller is running. @return EFI_TIMEOUT Failed to set the XHCI to run before Timeout. -- cgit v1.2.3