Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-01 15:38:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed page fault due to timer. Problem with timeout still needs to be fixed.

Browse source 
svn path=/trunk/; revision=213
This commit is contained in:
Rex Jolliff 1999-02-06 00:33:33 +00:00
parent dbad901d31
commit 6bee27aa2a
1 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
reactos/drivers/dd/ide/ide.c
View file

@ -1598,10 +1598,15 @@ IDEBeginControllerReset(PIDE_CONTROLLER_EXTENSION ControllerExtension)
{ {
int Retries; int Retries;
// Assert drive reset line DPRINT("Controller Reset initiated on %04x\n",
ControllerExtension->ControlPortBase);
/* Assert drive reset line */
DPRINT("Asserting reset line\n");
IDEWriteDriveControl(ControllerExtension->ControlPortBase, IDE_DC_SRST); IDEWriteDriveControl(ControllerExtension->ControlPortBase, IDE_DC_SRST);
// FIXME: wait for BSY assertion /* Wait for BSY assertion */
DPRINT("Waiting for BSY assertion\n");
for (Retries = 0; Retries < IDE_MAX_RESET_RETRIES; Retries++) for (Retries = 0; Retries < IDE_MAX_RESET_RETRIES; Retries++)
{ {
BYTE Status = IDEReadStatus(ControllerExtension->CommandPortBase); BYTE Status = IDEReadStatus(ControllerExtension->CommandPortBase);
@ -1611,13 +1616,18 @@ IDEBeginControllerReset(PIDE_CONTROLLER_EXTENSION ControllerExtension)
} }
KeStallExecutionProcessor(10); KeStallExecutionProcessor(10);
} }
if (Retries == IDE_MAX_RESET_RETRIES)
{
DPRINT("Timeout on BSY assertion\n");
}
// Negate drive reset line /* Negate drive reset line */
DPRINT("Negating reset line\n");
IDEWriteDriveControl(ControllerExtension->ControlPortBase, 0); IDEWriteDriveControl(ControllerExtension->ControlPortBase, 0);
// FIXME: handle case of no device 0 // FIXME: handle case of no device 0
// FIXME: set timer to check for end of reset /* Set timer to check for end of reset */
ControllerExtension->TimerState = IDETimerResetWaitForBusyNegate; ControllerExtension->TimerState = IDETimerResetWaitForBusyNegate;
ControllerExtension->TimerCount = IDE_RESET_BUSY_TIMEOUT; ControllerExtension->TimerCount = IDE_RESET_BUSY_TIMEOUT;
} }
@ -1946,17 +1956,17 @@ IDEIoTimer(PDEVICE_OBJECT DeviceObject,
PIDE_CONTROLLER_EXTENSION ControllerExtension; PIDE_CONTROLLER_EXTENSION ControllerExtension;
// Setup Extension pointer // Setup Extension pointer
CHECKPOINT;
ControllerExtension = (PIDE_CONTROLLER_EXTENSION) Context; ControllerExtension = (PIDE_CONTROLLER_EXTENSION) Context;
DPRINT("Timer activated for %04lx\n", ControllerExtension->CommandPortBase);
// Handle state change if necessary // Handle state change if necessary
switch (ControllerExtension->TimerState) switch (ControllerExtension->TimerState)
{ {
case IDETimerResetWaitForBusyNegate: case IDETimerResetWaitForBusyNegate:
CHECKPOINT;
if (!(IDEReadStatus(ControllerExtension->CommandPortBase) & if (!(IDEReadStatus(ControllerExtension->CommandPortBase) &
IDE_SR_BUSY)) IDE_SR_BUSY))
{ {
DPRINT("Busy line has negated, waiting for DRDY assert\n");
ControllerExtension->TimerState = IDETimerResetWaitForDrdyAssert; ControllerExtension->TimerState = IDETimerResetWaitForDrdyAssert;
ControllerExtension->TimerCount = IDE_RESET_DRDY_TIMEOUT; ControllerExtension->TimerCount = IDE_RESET_DRDY_TIMEOUT;
return; return;
@ -1964,16 +1974,16 @@ CHECKPOINT;
break; break;
case IDETimerResetWaitForDrdyAssert: case IDETimerResetWaitForDrdyAssert:
CHECKPOINT;
if (IDEReadStatus(ControllerExtension->CommandPortBase) & if (IDEReadStatus(ControllerExtension->CommandPortBase) &
IDE_SR_DRQ) IDE_SR_DRQ)
{ {
DPRINT("DRDY has asserted, reset complete\n");
ControllerExtension->TimerState = IDETimerIdle; ControllerExtension->TimerState = IDETimerIdle;
ControllerExtension->TimerCount = 0; ControllerExtension->TimerCount = 0;
// FIXME: get diagnostic code from drive 0 // FIXME: get diagnostic code from drive 0
// Start current packet command again /* Start current packet command again */
if (!KeSynchronizeExecution(ControllerExtension->Interrupt, if (!KeSynchronizeExecution(ControllerExtension->Interrupt,
IDEStartController, IDEStartController,
ControllerExtension->DeviceForOperation)) ControllerExtension->DeviceForOperation))
@ -1991,27 +2001,28 @@ CHECKPOINT;
// If we're counting down, then count. // If we're counting down, then count.
if (ControllerExtension->TimerCount > 0) if (ControllerExtension->TimerCount > 0)
{ {
CHECKPOINT;
ControllerExtension->TimerCount--; ControllerExtension->TimerCount--;
// Else we'll check the state and process if necessary // Else we'll check the state and process if necessary
} }
else else
{ {
CHECKPOINT;
switch (ControllerExtension->TimerState) switch (ControllerExtension->TimerState)
{ {
case IDETimerIdle: case IDETimerIdle:
break; break;
case IDETimerCmdWait: case IDETimerCmdWait:
// Command timed out, reset drive and try again or fail /* Command timed out, reset drive and try again or fail */
CHECKPOINT; DPRINT("Timeout waiting for command completion\n");
if (++ControllerExtension->Retries > IDE_MAX_CMD_RETRIES) if (++ControllerExtension->Retries > IDE_MAX_CMD_RETRIES)
{ {
DPRINT("Max retries has been reached, IRP finished with error\n");
ControllerExtension->CurrentIrp->IoStatus.Status = STATUS_IO_TIMEOUT; ControllerExtension->CurrentIrp->IoStatus.Status = STATUS_IO_TIMEOUT;
ControllerExtension->CurrentIrp->IoStatus.Information = 0; ControllerExtension->CurrentIrp->IoStatus.Information = 0;
IDEFinishOperation(ControllerExtension); IDEFinishOperation(ControllerExtension);
ControllerExtension->TimerState = IDETimerIdle;
ControllerExtension->TimerCount = 0;
} }
else else
{ {
@ -2021,10 +2032,16 @@ CHECKPOINT;
case IDETimerResetWaitForBusyNegate: case IDETimerResetWaitForBusyNegate:
case IDETimerResetWaitForDrdyAssert: case IDETimerResetWaitForDrdyAssert:
CHECKPOINT; DPRINT("Timeout waiting for drive reset, giving up on IRP\n");
ControllerExtension->CurrentIrp->IoStatus.Status = STATUS_IO_TIMEOUT; if (ControllerExtension->CurrentIrp != NULL)
ControllerExtension->CurrentIrp->IoStatus.Information = 0; {
IDEFinishOperation(ControllerExtension); ControllerExtension->CurrentIrp->IoStatus.Status =
STATUS_IO_TIMEOUT;
ControllerExtension->CurrentIrp->IoStatus.Information = 0;
IDEFinishOperation(ControllerExtension);
}
ControllerExtension->TimerState = IDETimerIdle;
ControllerExtension->TimerCount = 0;
break; break;
} }
} }