[ros-diffs] [hpoussin] 29996: Fix typo: "SourceDiskFiles" -> "SourceDisksFiles" Add more drivers to load in txtsetup.sif

Author: hpoussin
Date: Wed Oct 31 11:56:24 2007
New Revision: 29996

URL: http://svn.reactos.org/svn/reactos?rev=29996&view=rev
Log:
Fix typo: "SourceDiskFiles" -> "SourceDisksFiles"
Add more drivers to load in txtsetup.sif

Modified:
    trunk/reactos/boot/bootdata/txtsetup.sif
    trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c

Modified: trunk/reactos/boot/bootdata/txtsetup.sif
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif?...
==============================================================================
--- trunk/reactos/boot/bootdata/txtsetup.sif (original)
+++ trunk/reactos/boot/bootdata/txtsetup.sif Wed Oct 31 11:56:24 2007
@@ -11,7 +11,9 @@
 6 = media\fonts
 7 = bin

-[SourceDiskFiles]
+[SourceDisksFiles]
+atapi.sys=,,,,,,x
+buslogic.sys=,,,,,,x
 ;acpi.sys=,,,,,,x
 ;isapnp.sys=,,,,,,x
 ;pci.sys=,,,,,,x

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/reacto...
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Wed Oct 31 11:56:24 2007
@@ -283,9 +283,6 @@
       printf("Failed to get load options\n");
       return;
     }
-#if 0
-  printf("LoadOptions: '%s'\n", LoadOptions);
-#endif

/* Set kernel command line */
   MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline));
@@ -311,13 +308,6 @@
   Base = FrLdrCreateModule ("HARDWARE");
   RegExportBinaryHive (L"\Registry\Machine\HARDWARE", (PVOID)Base, &Size);
   FrLdrCloseModule (Base, Size);
-
-#if 0
-  printf("Base: %x\n", Base);
-  printf("Size: %u\n", Size);
-  printf("*** System stopped ***\n");
-for(;;);
-#endif

/* Insert boot disk 2 */
   if (MachDiskBootingFromFloppy())
@@ -410,21 +400,13 @@
       return;
     }

-  /* Load atapi.sys (depends on hardware detection) */
-  if (!LoadDriver(SourcePath, "atapi.sys"))
-    return;
-
-  /* Load buslogic.sys (depends on hardware detection) */
-  if (!LoadDriver(SourcePath, "buslogic.sys"))
-    return;
-
   /* Load vfatfs.sys (could be loaded by the setup prog!) */
   if (!LoadDriver(SourcePath, "vfatfs.sys"))
     return;

/* Load additional files specified in txtsetup.inf */
     if (InfFindFirstLine(InfHandle,
-                         "SourceDiskFiles",
+                         "SourceDisksFiles",
                          NULL,
                          &InfContext))
     {