[ros-diffs] [cgutman] 55652: [HAL] - Don't send a bogus bus number (-1) to the PCI driver because then it tries to scan that bus and obviously doesn't find anything - Legacy HAL can now enumerate boot critical...

Author: cgutman
Date: Thu Feb 16 23:08:05 2012
New Revision: 55652

URL: http://svn.reactos.org/svn/reactos?rev=55652&view=rev
Log:
[HAL]
- Don't send a bogus bus number (-1) to the PCI driver because then it tries to scan
that bus and obviously doesn't find anything
- Legacy HAL can now enumerate boot critical PCI devices (like the USB controller) and
build the device stack for USB boot
[HIVESYS]
- Missed this spot where usbhub is installed for an external hub causing a crash

Modified:
    trunk/reactos/boot/bootdata/hivesys_i386.inf
    trunk/reactos/hal/halx86/legacy/halpnpdd.c

Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu Feb 16 23:08:05 2012
@@ -34,8 +34,8 @@

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","Service",0x00000000,"usbccgp"

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
 
-HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub"
-HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
+;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub"
+;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"
 

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","Service",0x00000000,"usbhub"

HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}"

Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd…
==============================================================================
--- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Thu Feb 16 23:08:05 2012
@@ -384,8 +384,8 @@
         ResourceList->Count = 1;
 
         /* Setup the list fields */
-        ResourceList->List[0].BusNumber = -1;
-        ResourceList->List[0].InterfaceType = PNPBus;
+        ResourceList->List[0].BusNumber = 0;
+        ResourceList->List[0].InterfaceType = PCIBus;
         ResourceList->List[0].PartialResourceList.Version = 1;
         ResourceList->List[0].PartialResourceList.Revision = 1;
         ResourceList->List[0].PartialResourceList.Count = 0;