Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-15 13:45:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed ide.sys to run under bochs, disabled support for more than one controller to do it. Let me know of this breaks on real hardware.

Browse source 
svn path=/trunk/; revision=817
This commit is contained in:
Phillip Susi 1999-12-04 07:38:16 +00:00
parent 43014d0391
commit d4c340c696
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,13 +103,13 @@ typedef struct _IDE_CONTROLLER_PARAMETERS
#define IDE_MAX_DRIVES 2 #define IDE_MAX_DRIVES 2
#define IDE_MAX_CONTROLLERS 4 #define IDE_MAX_CONTROLLERS 1
IDE_CONTROLLER_PARAMETERS Controllers[IDE_MAX_CONTROLLERS] = IDE_CONTROLLER_PARAMETERS Controllers[IDE_MAX_CONTROLLERS] =
{ {
{0x01f0, 8, 0x03f6, 1, 14, 14, 15, LevelSensitive, 0xffff}, {0x01f0, 8, 0x03f6, 1, 14, 14, 15, LevelSensitive, 0xffff}
{0x0170, 8, 0x0376, 1, 15, 15, 15, LevelSensitive, 0xffff}, /*{0x0170, 8, 0x0376, 1, 15, 15, 15, LevelSensitive, 0xffff},
{0x01E8, 8, 0x03ee, 1, 11, 11, 15, LevelSensitive, 0xffff}, {0x01E8, 8, 0x03ee, 1, 11, 11, 15, LevelSensitive, 0xffff},
{0x0168, 8, 0x036e, 1, 10, 10, 15, LevelSensitive, 0xffff} {0x0168, 8, 0x036e, 1, 10, 10, 15, LevelSensitive, 0xffff}*/
}; };
static BOOLEAN IDEInitialized = FALSE; static BOOLEAN IDEInitialized = FALSE;
@ -261,7 +261,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject,
{ {
IDEInitialized = TRUE; IDEInitialized = TRUE;
} }
DPRINT( "Returning from DriverEntry\n" );
return WeGotSomeDisks ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE; return WeGotSomeDisks ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE;
} }
@ -408,7 +408,7 @@ IDEResetController(IN WORD CommandPort,
IDEWriteDriveControl(ControlPort, 0); IDEWriteDriveControl(ControlPort, 0);
// Wait for BUSY assertion // Wait for BUSY assertion
for (Retries = 0; Retries < IDE_MAX_BUSY_RETRIES; Retries++) /*for (Retries = 0; Retries < IDE_MAX_BUSY_RETRIES; Retries++)
{ {
if (IDEReadStatus(CommandPort) & IDE_SR_BUSY) if (IDEReadStatus(CommandPort) & IDE_SR_BUSY)
{ {
@ -420,7 +420,7 @@ IDEResetController(IN WORD CommandPort,
if (Retries >= IDE_MAX_BUSY_RETRIES) if (Retries >= IDE_MAX_BUSY_RETRIES)
{ {
return FALSE; return FALSE;
} }*/
// Wait for BUSY negation // Wait for BUSY negation
for (Retries = 0; Retries < IDE_RESET_BUSY_TIMEOUT * 1000; Retries++) for (Retries = 0; Retries < IDE_RESET_BUSY_TIMEOUT * 1000; Retries++)
@ -436,16 +436,10 @@ IDEResetController(IN WORD CommandPort,
{ {
return FALSE; return FALSE;
} }
CHECKPOINT; CHECKPOINT;
// return TRUE if controller came back to life. and // return TRUE if controller came back to life. and
// the registers are initialized correctly // the registers are initialized correctly
return IDEReadError(CommandPort) == 1 && return IDEReadError(CommandPort) == 1;
IDEReadSectorCount(CommandPort) == 1 &&
IDEReadSectorNum(CommandPort) == 1 &&
IDEReadCylinderLow(CommandPort) == 0 &&
IDEReadCylinderHigh(CommandPort) == 0 &&
(IDEReadDriveHead(CommandPort) & 0x1F) == 0;
} }
// IDECreateDevices // IDECreateDevices