Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 01:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FLOPPY]

Browse source 
- Prevent a deadlock on very old controllers by sending the configure and version commands before resetting the controller

svn path=/trunk/; revision=54267
This commit is contained in:
Cameron Gutman 2011-10-29 14:19:30 +00:00
parent 9267b63627
commit f89a5c926a
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/drivers/storage/floppy/floppy.c
View file

@ -666,15 +666,22 @@ InitController(PCONTROLLER_INFO ControllerInfo)
UCHAR HeadLoadTime;
UCHAR HeadUnloadTime;
UCHAR StepRateTime;
UCHAR ControllerVersion;
PAGED_CODE();
ASSERT(ControllerInfo);
TRACE_(FLOPPY, "InitController called with Controller 0x%p\n", ControllerInfo);
/* Get controller in a known state */
HwConfigure(ControllerInfo, FALSE, TRUE, TRUE, 0, 0);
/* Get the controller version */
ControllerVersion = HwGetVersion(ControllerInfo);
KeClearEvent(&ControllerInfo->SynchEvent);
/* Reset the controller to avoid interrupt garbage on certain controllers */
/* Reset the controller */
if(HwReset(ControllerInfo) != STATUS_SUCCESS)
{
WARN_(FLOPPY, "InitController: unable to reset controller\n");
@ -701,10 +708,10 @@ InitController(PCONTROLLER_INFO ControllerInfo)
INFO_(FLOPPY, "InitController: done sensing interrupts\n");
/* Next, see if we have the right version to do implied seek */
if(HwGetVersion(ControllerInfo) == VERSION_ENHANCED)
if(ControllerVersion == VERSION_ENHANCED)
{
/* If so, set that up -- all defaults below except first TRUE for EIS */
if(HwConfigure(ControllerInfo, TRUE, TRUE, FALSE, 0, 0) != STATUS_SUCCESS)
if(HwConfigure(ControllerInfo, TRUE, TRUE, TRUE, 0, 0) != STATUS_SUCCESS)
{
WARN_(FLOPPY, "InitController: unable to set up implied seek\n");
ControllerInfo->ImpliedSeeks = FALSE;