https://git.reactos.org/?p=reactos.git;a=commitdiff;h=18b4cc147944cb5feddc5c87d36a16fb3ac11e4a
commit 18b4cc147944cb5feddc5c87d36a16fb3ac11e4a Author: Dmitry Borisov <[email protected]> AuthorDate: Wed May 12 00:11:48 2021 +0600 Commit: Dmitry Borisov <[email protected]> CommitDate: Sun Jun 20 19:24:32 2021 +0600 [ISAPNP] Start the driver early in the boot Because our child devices can have boot-start drivers --- boot/bootdata/hivesys.inf | 3 +++ boot/bootdata/txtsetup.sif | 2 +- drivers/bus/isapnp/CMakeLists.txt | 1 + drivers/bus/isapnp/isapnp_reg.inf | 8 ++++++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 651698173e2..f35501c8a0c 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -20,6 +20,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A08","ClassGU HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0604","Service",0x00000000,"pci" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0604","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0601","Service",0x00000000,"isapnp" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0601","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" + HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 1fdf60c17f9..8929c94a698 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -100,7 +100,7 @@ c_1252.nls = 1,,,,,,,2,,,,1,2 cdfs.sys = 1,,,,,,x,4,,,,1,4 cdrom.sys = 1,,,,,,x,4,,,,1,4 classpnp.sys = 1,,,,,,,4,,,,1,4 -isapnp.sys = 1,,,,,,,4,,,,1,4 +isapnp.sys = 1,,,,,,x,4,,,,1,4 kdcom.dll = 1,,,,,,,2,,,,1,2 kdvbox.dll = 1,,,,,,,2,,,,1,2 disk.sys = 1,,,,,,x,4,,,,1,4 diff --git a/drivers/bus/isapnp/CMakeLists.txt b/drivers/bus/isapnp/CMakeLists.txt index c4be1b57da3..e0e1f3e2ee1 100644 --- a/drivers/bus/isapnp/CMakeLists.txt +++ b/drivers/bus/isapnp/CMakeLists.txt @@ -19,3 +19,4 @@ set_module_type(isapnp kernelmodedriver) add_importlibs(isapnp ntoskrnl hal) add_pch(isapnp isapnp.h SOURCE) add_cd_file(TARGET isapnp DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(isapnp_reg.inf) diff --git a/drivers/bus/isapnp/isapnp_reg.inf b/drivers/bus/isapnp/isapnp_reg.inf new file mode 100644 index 00000000000..ff067df5676 --- /dev/null +++ b/drivers/bus/isapnp/isapnp_reg.inf @@ -0,0 +1,8 @@ +; ISA PnP Bus Driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\isapnp","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\isapnp","Group",0x00000000,"Boot Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\isapnp","ImagePath",0x00020000,"system32\drivers\isapnp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\isapnp","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\isapnp","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\isapnp","Tag",0x00010001,0x00000003
