- Small fixies for bus drivers.

- Added (commented out) registry entry for loading PCI driver
- Commented out the Ne2000 root bus registry entry, because it crashes ReactOS without reversed Skywing's object.c patch.

svn path=/trunk/; revision=6197

reactos/bootdata/hivesys.inf

@@ -38,6 +38,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x0000000
 
 ; Service groups
 HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \
+ "Boot Bus Extender", \
  "SCSI Port", \
  "SCSI Miniport", \
  "Primary Disk", \
@@ -89,6 +90,21 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","kernel32",0x0
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","PagingFiles",0x00010000, \
  "C:\reactos\pagefile.sys"
 
+; --------------------------- BUS drivers ---------------------------
+
+; PCI driver
+;HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000000
+;HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus Extender"
+;HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ImagePath",0x00020000,"system32\drivers\pci.sys"
+;HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Start",0x00010001,0x00000003
+;HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002
+;HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Type",0x00010001,0x00000001
+;HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","Service",0x00000000,"Pci"
+;HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","Class",0x00000000,"Computer"
+;HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ClassGUID",0x00000000,"{4D36E966-E325-11CE-BFC1-08002BE10318}"
+
+; ----------------------- End of BUS drivers ------------------------
+
 ; Afd driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI"
@@ -205,7 +221,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002
 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","ErrorControl",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Group",0x00000000,"NDIS"
 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","ImagePath",0x00020000,"system32\drivers\ndis.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001
 
 ; NIC drivers are like any other drivers - but no card-specific info here.  bind/route/export
@@ -229,9 +245,9 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000\Enum","NextInstance",0x00010001,0
 ; one day this will happen automatically; until then we need this since ndis5 drivers
 ; rely on the fact that their resources are handed to them by ndis, so we have to find
 ; the driver that goes with the detected cards.  this is how.
-HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","Service",0x00000000,"Ne2000"
+;HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","Service",0x00000000,"Ne2000"
-HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","Class",0x00000000,"Net"
+;HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","Class",0x00000000,"Net"
-HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","ClassGUID",0x00000000,"{4D36E972-E325-11CE-BFC1-08002BE10318}"
+;HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","ClassGUID",0x00000000,"{4D36E972-E325-11CE-BFC1-08002BE10318}"
 
 ; Each adapter in the system gets its own SCM entry where its parameters and protocol info are stored.
 ; NOTE - service type is 0x4 (SERVICE_ADAPTER) and start is 0x3 (manual start).  These drivers are named
@@ -380,6 +396,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Group",0x00000000,"Pointer Port"
 HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","ImagePath",0x00020000,"system32\drivers\psaux.sys"
 HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Psaux\Parameters","DisableExtensionDetection",0x00010001,0x00000000
 
 ; Serial mouse driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","ErrorControl",0x00010001,0x00000000
@@ -445,7 +462,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Type",0x00010001,0x00000002
 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video"
 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004
 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi"
 
@@ -453,10 +470,18 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0
 HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Group",0x00000000,"Video"
 HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","ImagePath",0x00020000,"system32\drivers\vmx_svga.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Start",0x00010001,0x00000004
+HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Type",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","InstalledDisplayDrivers",0x00010000,"vmx_fb"
 
+; nVidia SVGA driver
+HKLM,"SYSTEM\CurrentControlSet\Services\nVidia","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\nVidia","Group",0x00000000,"Video"
+HKLM,"SYSTEM\CurrentControlSet\Services\nVidia","ImagePath",0x00020000,"system32\drivers\nv4_mini.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\nVidia","Start",0x00010001,0x00000004
+HKLM,"SYSTEM\CurrentControlSet\Services\nVidia","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\nVidia\Device0","InstalledDisplayDrivers",0x00010000,"nv4_disp"
+
 ; Kernel-mode regression test driver
 HKLM,"SYSTEM\CurrentControlSet\Services\kmregtests","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\kmregtests","Group",0x00000000,"Extended Base"

reactos/ntoskrnl/include/internal/io.h

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: io.h,v 1.35 2003/09/29 20:43:06 navaraf Exp $
+/* $Id: io.h,v 1.36 2003/09/30 15:46:59 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -259,8 +259,8 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
 NTSTATUS
 IopFreeDeviceNode(PDEVICE_NODE DeviceNode);
 NTSTATUS
-IopInterrogateBusExtender(PDEVICE_NODE DeviceNode,
+IopInvalidateDeviceRelations(PDEVICE_NODE DeviceNode,
-                          PDEVICE_OBJECT Pdo);
+                             DEVICE_RELATION_TYPE Type);
 VOID
 IopLoadBootStartDrivers(VOID);
 NTSTATUS

reactos/ntoskrnl/io/device.c

@@ -1,4 +1,4 @@
-/* $Id: device.c,v 1.61 2003/09/29 20:43:06 navaraf Exp $
+/* $Id: device.c,v 1.62 2003/09/30 15:46:59 navaraf Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -433,8 +433,9 @@ IopInitializeDevice(PDEVICE_NODE DeviceNode,
            */
           if (!BootDriver)
             {
-              Status = IopInterrogateBusExtender(
+              Status = IopInvalidateDeviceRelations(
-                DeviceNode, Fdo);
+                DeviceNode, BusRelations);
+/*              IopInterrogateBusExtender(DeviceNode, Fdo); */
               if (!NT_SUCCESS(Status))
                 {
                   ObDereferenceObject(Fdo);

reactos/ntoskrnl/io/pnpmgr.c

@@ -1,4 +1,4 @@
-/* $Id: pnpmgr.c,v 1.17 2003/09/29 20:43:07 navaraf Exp $
+/* $Id: pnpmgr.c,v 1.18 2003/09/30 15:46:59 navaraf Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -52,6 +52,17 @@ IoAdjustPagingPathCount(
 {
 }
 
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+IoInvalidateDeviceRelations(
+  IN PDEVICE_OBJECT DeviceObject,
+  IN DEVICE_RELATION_TYPE Type)
+{
+}
+
 NTSTATUS
 IopQueryBusInformation(
   PDEVICE_OBJECT DeviceObject,
@@ -156,17 +167,6 @@ IoGetDeviceProperty(
   return STATUS_NOT_IMPLEMENTED;
 }
 
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-IoInvalidateDeviceRelations(
-  IN PDEVICE_OBJECT DeviceObject,
-  IN DEVICE_RELATION_TYPE Type)
-{
-}
-
 /*
  * @unimplemented
  */
@@ -1062,9 +1062,9 @@ IopActionInitChildServices(
 
 
 NTSTATUS
-IopInterrogateBusExtender(
+IopInvalidateDeviceRelations(
-  PDEVICE_NODE DeviceNode,
+  IN PDEVICE_NODE DeviceNode,
-  PDEVICE_OBJECT Pdo)
+  IN DEVICE_RELATION_TYPE Type)
 {
   DEVICETREE_TRAVERSE_CONTEXT Context;
   PDEVICE_RELATIONS DeviceRelations;
@@ -1078,10 +1078,10 @@ IopInterrogateBusExtender(
 
   DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n");
 
-  Stack.Parameters.QueryDeviceRelations.Type = BusRelations;
+  Stack.Parameters.QueryDeviceRelations.Type = Type/*BusRelations*/;
 
   Status = IopInitiatePnpIrp(
-    Pdo,
+    DeviceNode->Pdo,
     &IoStatusBlock,
     IRP_MN_QUERY_DEVICE_RELATIONS,
     &Stack);
@@ -1178,7 +1178,7 @@ IopInterrogateBusExtender(
 
 VOID IopLoadBootStartDrivers(VOID)
 {
-  IopInterrogateBusExtender(IopRootDeviceNode, IopRootDeviceNode->Pdo);
+  IopInvalidateDeviceRelations(IopRootDeviceNode, BusRelations);
 }
 
 VOID PnpInit(VOID)