[ros-diffs] [cfinck] 28562: Completely disable the floppy driver in the branch for now as it's totally broken. This should "fix" booting problems for some users.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Sun Aug 26 00:36:50 2007
New Revision: 28562

URL: http://svn.reactos.org/svn/reactos?rev=28562&view=rev
Log:
Completely disable the floppy driver in the branch for now as it's totally broken.
This should "fix" booting problems for some users.

Modified:
    branches/ros-branch-0_3_3-new/reactos/boot/bootdata/hivesys.inf
    branches/ros-branch-0_3_3-new/reactos/boot/bootdata/txtsetup.sif
    branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/setupldr.c
    branches/ros-branch-0_3_3-new/reactos/drivers/storage/directory.rbuild

Modified: branches/ros-branch-0_3_3-new/reactos/boot/bootdata/hivesys.inf
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/boot/bootdata/hivesys.inf?rev=28562&r1=28561&r2=28562&view=diff
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/boot/bootdata/hivesys.inf (original)
+++ branches/ros-branch-0_3_3-new/reactos/boot/bootdata/hivesys.inf Sun Aug 26 00:36:50 2007
@@ -570,11 +570,11 @@
 HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000010
 
 ; Floppy driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk"
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001
+;HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000
+;HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk"
+;HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys"
+;HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001
+;HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001
 
 ; Filesystem recognizer driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ErrorControl",0x00010001,0x00000000

Modified: branches/ros-branch-0_3_3-new/reactos/boot/bootdata/txtsetup.sif
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/boot/bootdata/txtsetup.sif?rev=28562&r1=28561&r2=28562&view=diff
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/boot/bootdata/txtsetup.sif (original)
+++ branches/ros-branch-0_3_3-new/reactos/boot/bootdata/txtsetup.sif Sun Aug 26 00:36:50 2007
@@ -24,7 +24,7 @@
 class2.sys    = 3
 kdcom.dll     = 3
 disk.sys      = 3
-floppy.sys    = 3
+;floppy.sys    = 3
 ;keyboard.sys  = 3
 i8042prt.sys  = 3
 kbdclass.sys  = 3

Modified: branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/setupldr.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/setupldr.c?rev=28562&r1=28561&r2=28562&view=diff
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original)
+++ branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/setupldr.c Sun Aug 26 00:36:50 2007
@@ -482,8 +482,8 @@
     return;
 
   /* Load floppy.sys */
-  if (!LoadDriver(SourcePath, "floppy.sys"))
-    return;
+  /*if (!LoadDriver(SourcePath, "floppy.sys"))
+    return;*/
 
   /* Load vfatfs.sys (could be loaded by the setup prog!) */
   if (!LoadDriver(SourcePath, "vfatfs.sys"))

Modified: branches/ros-branch-0_3_3-new/reactos/drivers/storage/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/drivers/storage/directory.rbuild?rev=28562&r1=28561&r2=28562&view=diff
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/drivers/storage/directory.rbuild (original)
+++ branches/ros-branch-0_3_3-new/reactos/drivers/storage/directory.rbuild Sun Aug 26 00:36:50 2007
@@ -1,9 +1,11 @@
 <directory name="class">
 	<xi:include href="class/directory.rbuild" />
 </directory>
+<!-- Floppy driver is totally broken at the moment, so it has been disabled
 <directory name="floppy">
 	<xi:include href="floppy/floppy.rbuild" />
 </directory>
+-->
 <directory name="ide">
 	<xi:include href="ide/directory.rbuild" />
 </directory>