[ros-diffs] [cgutman] 54266: [FLOPPY] - Improve the floppy controller initialization code to fix several cases where the controller could deadlock or otherwise malfunction on us

[cgutman at svn.reactos.org]

Author: cgutman
Date: Sat Oct 29 13:22:18 2011
New Revision: 54266

URL: http://svn.reactos.org/svn/reactos?rev=54266&view=rev
Log:
[FLOPPY]
- Improve the floppy controller initialization code to fix several cases where the controller could deadlock or otherwise malfunction on us

Modified:
    trunk/reactos/drivers/storage/floppy/floppy.c

Modified: trunk/reactos/drivers/storage/floppy/floppy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/floppy.c?rev=54266&r1=54265&r2=54266&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Sat Oct 29 13:22:18 2011
@@ -674,38 +674,10 @@
 
     KeClearEvent(&ControllerInfo->SynchEvent);
 
-    INFO_(FLOPPY, "InitController: resetting the controller\n");
-
-    /* Reset the controller */
-    if(HwReset(ControllerInfo) != STATUS_SUCCESS)
-    {
-        WARN_(FLOPPY, "InitController: unable to reset controller\n");
-        return STATUS_IO_DEVICE_ERROR;
-    }
-
-    /* All controllers should support this so
-     * if we get something strange back then we
-     * know that this isn't a floppy controller
-     */
-    if (HwGetVersion(ControllerInfo) <= 0)
-    {
-        WARN_(FLOPPY, "InitController: unable to contact controller\n");
-        return STATUS_NO_SUCH_DEVICE;
-    }
-
     /* Reset the controller to avoid interrupt garbage on certain controllers */
     if(HwReset(ControllerInfo) != STATUS_SUCCESS)
     {
-        WARN_(FLOPPY, "InitController: unable to reset controller #2\n");
-        return STATUS_IO_DEVICE_ERROR;
-    }
-
-    INFO_(FLOPPY, "InitController: setting data rate\n");
-
-    /* Set data rate */
-    if(HwSetDataRate(ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS)
-    {
-        WARN_(FLOPPY, "InitController: unable to set data rate\n");
+        WARN_(FLOPPY, "InitController: unable to reset controller\n");
         return STATUS_IO_DEVICE_ERROR;
     }
 
@@ -776,6 +748,15 @@
     HeadLoadTime = SPECIFY_HLT_500K;
     HeadUnloadTime = SPECIFY_HUT_500K;
     StepRateTime = SPECIFY_SRT_500K;
+    
+    INFO_(FLOPPY, "InitController: setting data rate\n");
+    
+    /* Set data rate */
+    if(HwSetDataRate(ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS)
+    {
+        WARN_(FLOPPY, "InitController: unable to set data rate\n");
+        return STATUS_IO_DEVICE_ERROR;
+    }
 
     INFO_(FLOPPY, "InitController: issuing specify command to controller\n");
 
@@ -850,7 +831,7 @@
     }
 
     /* Now that we have a controller, set it up with the system */
-    for(i = 0; i < gNumberOfControllers; i++)
+    for(i = 0; i < gNumberOfControllers && gControllerInfo[i].NumberOfDrives > 0; i++)
     {
         /* 0: Report resource usage to the kernel, to make sure they aren't assigned to anyone else */
         /* FIXME: Implement me. */
@@ -994,7 +975,7 @@
 
     INFO_(FLOPPY, "AddControllers: --------------------------------------------> finished adding controllers\n");
 
-    return TRUE;
+    return (IoGetConfigurationInformation()->FloppyCount != 0);
 }