From 684eccd71ea5017949cb9c7b80f0572b035ac2a6 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 16 Feb 2012 23:08:05 +0000 Subject: [PATCH] [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 svn path=/trunk/; revision=55652 --- reactos/boot/bootdata/hivesys_i386.inf | 4 ++-- reactos/hal/halx86/legacy/halpnpdd.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/boot/bootdata/hivesys_i386.inf b/reactos/boot/bootdata/hivesys_i386.inf index 22cd33525ab..7f7e6556b0e 100644 --- a/reactos/boot/bootdata/hivesys_i386.inf +++ b/reactos/boot/bootdata/hivesys_i386.inf @@ -34,8 +34,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubCl 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}" diff --git a/reactos/hal/halx86/legacy/halpnpdd.c b/reactos/hal/halx86/legacy/halpnpdd.c index d3a935f60b6..5de3bc19b30 100644 --- a/reactos/hal/halx86/legacy/halpnpdd.c +++ b/reactos/hal/halx86/legacy/halpnpdd.c @@ -384,8 +384,8 @@ HalpQueryResources(IN PDEVICE_OBJECT DeviceObject, 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;