Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:12:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP]

Browse source 
- 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

svn path=/trunk/; revision=51969
This commit is contained in:
Cameron Gutman 2011-05-27 22:35:05 +00:00
parent c963e3d148
commit 4b24374764
4 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/setup/usetup/interface/devinst.c
View file

@ -65,6 +65,8 @@ InstallDriver(
/* Find associated driver name */ /* Find associated driver name */
/* FIXME: check in other sections too! */ /* FIXME: check in other sections too! */
if (!SetupFindFirstLineW(hInf, L"BootBusExtenders.Load", Driver, &Context) 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)) && !SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver, &Context))
return FALSE; return FALSE;
if (!INF_GetDataField(&Context, 1, &ImagePath)) if (!INF_GetDataField(&Context, 1, &ImagePath))
@ -81,7 +83,7 @@ InstallDriver(
RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength); RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength);
wcscat(FullImagePath, ImagePath); 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 */ /* Create service key */
RtlInitUnicodeString(&StringU, Driver); RtlInitUnicodeString(&StringU, Driver);

15
reactos/boot/bootdata/txtsetup.sif
View file

@ -41,6 +41,8 @@ fastfat.sys=,,,,,,x,,,,,,4
ramdisk.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4
ext2fs.sys=,,,,,,x,,,,,,4 ext2fs.sys=,,,,,,x,,,,,,4
classpnp.sys=,,,,,,,,,,,,4 classpnp.sys=,,,,,,,,,,,,4
pciide.sys=,,,,,,,,,,,,4
pciidex.sys=,,,,,,,,,,,,4
pcix.sys=,,,,,,,,,,,,4 pcix.sys=,,,,,,,,,,,,4
pcmcia.sys=,,,,,,,,,,,,4 pcmcia.sys=,,,,,,,,,,,,4
swenum.sys=,,,,,,,,,,,,4 swenum.sys=,,,,,,,,,,,,4
@ -52,12 +54,25 @@ ntdll.dll=,,,,,,,,,,,,2
*PNP0C08 = acpi *PNP0C08 = acpi
;PCI\CC_0601 = isapnp ;PCI\CC_0601 = isapnp
PCI\CC_0604 = pci 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] [BootBusExtenders.Load]
acpi = acpi.sys acpi = acpi.sys
pci = pci.sys pci = pci.sys
isapnp = isapnp.sys isapnp = isapnp.sys
[BusExtenders.Load]
pciide = pciide.sys
[SCSI.Load]
uniata = uniata.sys
buslogic = buslogic.sys
[Cabinets] [Cabinets]
Cabinet=reactos.cab Cabinet=reactos.cab

1
reactos/drivers/storage/ide/pciide/pciide.rbuild
View file

@ -1,6 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="pciide" type="kernelmodedriver" installbase="system32/drivers" installname="pciide.sys"> <module name="pciide" type="kernelmodedriver" installbase="system32/drivers" installname="pciide.sys">
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<library>pciidex</library> <library>pciidex</library>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<file>pciide.c</file> <file>pciide.c</file>

1
reactos/drivers/storage/ide/pciidex/pciidex.rbuild
View file

@ -1,6 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="pciidex" type="kernelmodedriver" installbase="system32/drivers" installname="pciidex.sys"> <module name="pciidex" type="kernelmodedriver" installbase="system32/drivers" installname="pciidex.sys">
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<importlibrary definition="pciidex.spec" /> <importlibrary definition="pciidex.spec" />
<library>ntoskrnl</library> <library>ntoskrnl</library>
<file>fdo.c</file> <file>fdo.c</file>