Author: cgutman
Date: Fri May 27 22:35:05 2011
New Revision: 51969
URL: http://svn.reactos.org/svn/reactos?rev=51969&view=rev
Log:
[USETUP]
- Load other driver sections from txtsetup.sif
- Enable a debug print
[TXTSETUP]
- Add PnP entries for storage devices
[PCIIDE/PCIIDEX]
- Add to bootcd
- Both usetup's PnP manager and the user-mode PnP manager now recognize PCI IDE
channels
Modified:
trunk/reactos/base/setup/usetup/interface/devinst.c
trunk/reactos/boot/bootdata/txtsetup.sif
trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild
trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild
Modified: trunk/reactos/base/setup/usetup/interface/devinst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface/devinst.c?rev=51969&r1=51968&r2=51969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] Fri May 27
22:35:05 2011
@@ -65,6 +65,8 @@
/* Find associated driver name */
/* FIXME: check in other sections too! */
if (!SetupFindFirstLineW(hInf, L"BootBusExtenders.Load", Driver, &Context)
+ && !SetupFindFirstLineW(hInf, L"BusExtenders.Load", Driver, &Context)
+ && !SetupFindFirstLineW(hInf, L"SCSI.Load", Driver, &Context)
&& !SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver, &Context))
return FALSE;
if (!INF_GetDataField(&Context, 1, &ImagePath))
@@ -81,7 +83,7 @@
RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength);
wcscat(FullImagePath, ImagePath);
- DPRINT("Using driver '%S' for device '%S'\n", ImagePath, DeviceId);
+ DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId);
/* Create service key */
RtlInitUnicodeString(&StringU, Driver);
Modified: trunk/reactos/boot/bootdata/txtsetup.sif
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif?rev=51969&r1=51968&r2=51969&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri May 27 22:35:05
2011
@@ -41,6 +41,8 @@
ramdisk.sys=,,,,,,x,,,,,,4
ext2fs.sys=,,,,,,x,,,,,,4
classpnp.sys=,,,,,,,,,,,,4
+pciide.sys=,,,,,,,,,,,,4
+pciidex.sys=,,,,,,,,,,,,4
pcix.sys=,,,,,,,,,,,,4
pcmcia.sys=,,,,,,,,,,,,4
swenum.sys=,,,,,,,,,,,,4
@@ -52,11 +54,24 @@
*PNP0C08 = acpi
;PCI\CC_0601 = isapnp
PCI\CC_0604 = pci
+PCI\VEN_104B&CC_0100 = buslogic
+PCI\CC_0101 = pciide
+PCI\CC_0104 = uniata
+PCI\CC_0105 = uniata
+PCI\CC_0106 = uniata
+*PNP0600 = uniata
[BootBusExtenders.Load]
acpi = acpi.sys
pci = pci.sys
isapnp = isapnp.sys
+
+[BusExtenders.Load]
+pciide = pciide.sys
+
+[SCSI.Load]
+uniata = uniata.sys
+buslogic = buslogic.sys
[Cabinets]
Cabinet=reactos.cab
Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild?rev=51969&r1=51968&r2=51969&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild [iso-8859-1]
(original)
+++ trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild [iso-8859-1] Fri May
27 22:35:05 2011
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="pciide" type="kernelmodedriver" installbase="system32/drivers"
installname="pciide.sys">
+ <bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<library>pciidex</library>
<library>ntoskrnl</library>
<file>pciide.c</file>
Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild?rev=51969&r1=51968&r2=51969&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild [iso-8859-1]
(original)
+++ trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild [iso-8859-1] Fri
May 27 22:35:05 2011
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="pciidex" type="kernelmodedriver" installbase="system32/drivers"
installname="pciidex.sys">
+ <bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<importlibrary definition="pciidex.spec" />
<library>ntoskrnl</library>
<file>fdo.c</file>
