diff options
| author | Jeff Fan <jeff.fan@intel.com> | 2014-06-04 01:47:24 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-06-04 01:47:24 +0000 |
| commit | e9bf5b1dd192c5f14bb9b6f10f39329f79c30f54 (patch) | |
| tree | efb1dc2dd3afb4c553fdc44e52ad7fd0c8687ff5 | |
| parent | b4a6629fd91efdd235691f7d00b720f1073b9ff9 (diff) | |
| download | edk2-platforms-e9bf5b1dd192c5f14bb9b6f10f39329f79c30f54.tar.xz | |
Rename TimeoutInSeconds to Timeout to avoid confusion.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Mike Maslenkin <mihailm@parallels.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15556 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h | 14 | ||||
| -rw-r--r-- | IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyCtrl.c | 19 |
2 files changed, 16 insertions, 17 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h index 8adc386e97..30a2d7bf0c 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h @@ -1,7 +1,7 @@ /** @file
Include file for ISA Floppy Driver
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
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
@@ -917,18 +917,18 @@ DataOutByte ( /**
Detect the specified floppy logic drive is busy or not within a period of time.
- @param FdcDev Indicate it is drive A or drive B
- @param TimeoutInSeconds the time period for waiting
+ @param FdcDev Indicate it is drive A or drive B
+ @param Timeout The time period for waiting
@retval EFI_SUCCESS: The drive and command are not busy
@retval EFI_TIMEOUT: The drive or command is still busy after a period time that
- set by TimeoutInSeconds
+ set by Timeout
**/
EFI_STATUS
FddWaitForBSYClear (
IN FDC_BLK_IO_DEV *FdcDev,
- IN UINTN TimeoutInSeconds
+ IN UINTN Timeout
);
/**
@@ -936,7 +936,7 @@ FddWaitForBSYClear ( @param FdcDev Pointer to instance of FDC_BLK_IO_DEV
@param Dio BOOLEAN: Indicate the FDC is waiting to write or read
- @param TimeoutInSeconds UINTN: The time period for waiting
+ @param Timeout The time period for waiting
@retval EFI_SUCCESS: FDC is ready to write or read
@retval EFI_NOT_READY: FDC is not ready within the specified time period
@@ -946,7 +946,7 @@ EFI_STATUS FddDRQReady (
IN FDC_BLK_IO_DEV *FdcDev,
IN BOOLEAN Dio,
- IN UINTN TimeoutInSeconds
+ IN UINTN Timeout
);
/**
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyCtrl.c b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyCtrl.c index d8f181c2e2..16ad6b02e3 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyCtrl.c +++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyCtrl.c @@ -1,7 +1,7 @@ /** @file
Internal floppy disk controller programming functions for the floppy driver.
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
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
@@ -1083,17 +1083,17 @@ DataOutByte ( Detect the specified floppy logic drive is busy or not within a period of time.
@param FdcDev Indicate it is drive A or drive B
- @param TimeoutInSeconds the time period for waiting
+ @param Timeout The time period for waiting
@retval EFI_SUCCESS: The drive and command are not busy
@retval EFI_TIMEOUT: The drive or command is still busy after a period time that
- set by TimeoutInSeconds
+ set by Timeout
**/
EFI_STATUS
FddWaitForBSYClear (
IN FDC_BLK_IO_DEV *FdcDev,
- IN UINTN TimeoutInSeconds
+ IN UINTN Timeout
)
{
UINTN Delay;
@@ -1112,7 +1112,7 @@ FddWaitForBSYClear ( //
Mask = (UINT8) ((FdcDev->Disk == FdcDisk0 ? MSR_DAB : MSR_DBB) | MSR_CB);
- Delay = ((TimeoutInSeconds * STALL_1_MSECOND) / 50) + 1;
+ Delay = ((Timeout * STALL_1_MSECOND) / 50) + 1;
do {
StatusRegister = FdcReadPort (FdcDev, FDC_REGISTER_MSR);
if ((StatusRegister & Mask) == 0x00) {
@@ -1134,12 +1134,11 @@ FddWaitForBSYClear ( }
/**
-
- Routine Description: Determine whether FDC is ready to write or read.
+ Determine whether FDC is ready to write or read.
@param FdcDev Pointer to instance of FDC_BLK_IO_DEV
@param Dio BOOLEAN: Indicate the FDC is waiting to write or read
- @param TimeoutInSeconds UINTN: The time period for waiting
+ @param Timeout The time period for waiting
@retval EFI_SUCCESS: FDC is ready to write or read
@retval EFI_NOT_READY: FDC is not ready within the specified time period
@@ -1149,7 +1148,7 @@ EFI_STATUS FddDRQReady (
IN FDC_BLK_IO_DEV *FdcDev,
IN BOOLEAN Dio,
- IN UINTN TimeoutInSeconds
+ IN UINTN Timeout
)
{
UINTN Delay;
@@ -1169,7 +1168,7 @@ FddDRQReady ( //
// in order to compare bit6
//
- Delay = ((TimeoutInSeconds * STALL_1_MSECOND) / 50) + 1;
+ Delay = ((Timeout * STALL_1_MSECOND) / 50) + 1;
do {
StatusRegister = FdcReadPort (FdcDev, FDC_REGISTER_MSR);
if ((StatusRegister & MSR_RQM) == MSR_RQM && (StatusRegister & MSR_DIO) == DataInOut) {
|