Add .inf file for Realtek netcards (8029 compatibles)
Remove NE2000 compatible card in Root bus, as QEMU enumerates it as PCI
Add .inf file for Xbox display card

Modified: trunk/reactos/bootdata/hivesys.inf
Modified: trunk/reactos/bootdata/packages/reactos.dff
Modified: trunk/reactos/media/inf/inf.xml

Added: trunk/reactos/media/inf/netrtpnt.inf
Added: trunk/reactos/media/inf/xboxdisp.inf

--- trunk/reactos/bootdata/hivesys.inf	2005-11-14 16:36:26 UTC (rev 19225)
+++ trunk/reactos/bootdata/hivesys.inf	2005-11-14 17:33:38 UTC (rev 19226)
@@ -568,10 +568,6 @@

 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001

-;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x00000000,"i8042prt"
-;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x00000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}"
-;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x00000000,"i8042prt"
-;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}"

 
 ; Keyboard class driver
 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000
@@ -627,10 +623,6 @@

 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001
 

-; NE2000 network card
-HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP80D6\0000","HardwareID",0x00010000,"*PNP80D6"
-HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP80D6\0000","DeviceDesc",0x00000000,"Network card"
-

 ; PCI driver
 HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","HardwareID",0x00010000,"*PNP0A03"
 HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","DeviceDesc",0x00000000,"PCI bus"
@@ -731,15 +723,6 @@

 HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Type",0x00010001,0x00000002
 

-; Xbox Nvidia driver
-HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Group",0x00000000,"Video"
-HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ImagePath",0x00020000,"system32\drivers\xboxvmp.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp\Device0","InstalledDisplayDrivers",0x00010000,"framebuf"
-HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10DE&DEV_02A0&SUBSYS_00000000&REV_A1\0000","Service",0x00000000,"XboxVmp"
-

 ; VBE SVGA driver
 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save SVGA"

--- trunk/reactos/bootdata/packages/reactos.dff	2005-11-14 16:36:26 UTC (rev 19225)
+++ trunk/reactos/bootdata/packages/reactos.dff	2005-11-14 17:33:38 UTC (rev 19226)
@@ -301,15 +301,17 @@

 media\inf\layout.inf                    6
 media\inf\machine.inf                   6
 media\inf\mouse.inf                     6

-media\inf\keyboard.inf                     6

+media\inf\keyboard.inf                  6

 media\inf\NET_NIC.inf                   6
 media\inf\netamd.inf                    6
 media\inf\netisa.inf                    6

+media\inf\netrtpnt.inf                  6

 media\inf\ports.inf                     6
 media\inf\scsi.inf                      6
 media\inf\syssetup.inf                  6
 media\inf\usbport.inf                   6
 media\inf\usbstor.inf                   6

+media\inf\xboxdisp.inf                  6

 modules\os2\server\os2srv.dll           1        optional
 modules\os2\lib\doscalls\doscalls.dll   1        optional
 modules\posix\server\psxsrv.dll         1        optional

--- trunk/reactos/media/inf/inf.xml	2005-11-14 16:36:26 UTC (rev 19225)
+++ trunk/reactos/media/inf/inf.xml	2005-11-14 17:33:38 UTC (rev 19226)
@@ -3,16 +3,18 @@

 <installfile base="inf">cdrom.inf</installfile>
 <installfile base="inf">display.inf</installfile>
 <installfile base="inf">hdc.inf</installfile>

+<installfile base="inf">keyboard.inf</installfile>

 <installfile base="inf">layout.inf</installfile>
 <installfile base="inf">machine.inf</installfile>
 <installfile base="inf">mouse.inf</installfile>

-<installfile base="inf">keyboard.inf</installfile>

 <installfile base="inf">NET_NIC.inf</installfile>
 <installfile base="inf">netamd.inf</installfile>
 <installfile base="inf">netisa.inf</installfile>

+<installfile base="inf">netrtpnt.inf</installfile>

 <installfile base="inf">ports.inf</installfile>
 <installfile base="inf">scsi.inf</installfile>
 <installfile base="inf">syssetup.inf</installfile>
 <installfile base="inf">usbport.inf</installfile>
 <installfile base="inf">usbstor.inf</installfile>

+<installfile base="inf">xboxdisp.inf</installfile>

 <group>
\ No newline at end of file

--- trunk/reactos/media/inf/netrtpnt.inf	2005-11-14 16:36:26 UTC (rev 19225)
+++ trunk/reactos/media/inf/netrtpnt.inf	2005-11-14 17:33:38 UTC (rev 19226)
@@ -0,0 +1,55 @@

+; NETRTPNT.INF
+
+; Installation file for 8029 compatible netcards
+
+[Version]
+Signature  = "$Windows NT$"
+;Signature  = "$ReactOS$"
+LayoutFile = layout.inf
+Class      = Net
+ClassGUID  = {4D36E972-E325-11CE-BFC1-08002BE10318}
+Provider   = %ReactOS%
+DriverVer  = 11/14/2005,1.00
+
+[DestinationDirs]
+DefaultDestDir = 12
+
+[Manufacturer]
+%RealtekMfg% = RealtekMfg
+
+[RealtekMfg]
+%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst,PCI\VEN_10EC&DEV_8029
+
+;---------------------------- NE2000 DRIVER -----------------------------
+
+[NE2000_Inst.NT]
+AddReg = NE2000_AddReg.NT
+CopyFiles = NE2000_CopyFiles.NT
+
+[NE2000_AddReg.NT]
+HKR,,Characteristics,0x00010001,0x00000000
+HKR,,BusType,0x00000000,"5"
+HKR,,Port,0x00000000,"c100"
+HKR,,Irq,0x00000000,"B"
+HKR,,NetworkAddress,0x00000000,"001122334455"
+
+[NE2000_CopyFiles.NT]
+ne2000.sys
+
+[NE2000_Inst.NT.Services]
+AddService = ne2000, 0x00000002, ne2000_Service_Inst
+
+[ne2000_Service_Inst]
+ServiceType   = 3
+StartType     = 3
+ErrorControl  = 1
+ServiceBinary = %12%\ne2000.sys
+LoadOrderGroup = NDIS
+
+;-------------------------------- STRINGS -------------------------------
+
+[Strings]
+ReactOS = "ReactOS Team"
+
+RealtekMfg = "Realtek Semiconductor Co., Ltd."
+PCI\VEN_10EC&DEV_8029.DeviceDesc = "RTL-8029(AS)"

--- trunk/reactos/media/inf/xboxdisp.inf	2005-11-14 16:36:26 UTC (rev 19225)
+++ trunk/reactos/media/inf/xboxdisp.inf	2005-11-14 17:33:38 UTC (rev 19226)
@@ -0,0 +1,53 @@

+; xboxdisp.inf
+
+; Installation file for the Xbox display card
+
+[Version]
+Signature  = "$Windows NT$"
+;Signature  = "$ReactOS$"
+LayoutFile = layout.inf
+Class      = Display
+ClassGUID  = {4D36E968-E325-11CE-BFC1-08002BE10318}
+Provider   = %ReactOS%
+DriverVer  = 11/11/2005,1.00
+
+[DestinationDirs]
+DefaultDestDir = 12
+
+[Manufacturer]
+%nVidiaMfg% = nVidiaMfg
+
+[nVidiaMfg]
+%PCI\VEN_10DE&DEV_02A0.DeviceDesc% = XboxVmp_Inst,PCI\VEN_10DE&DEV_02A0
+
+;---------------------------- XboxVmp DRIVER ----------------------------
+
+[XboxVmp_Inst.NT]
+CopyFiles = XboxVmp_CopyFiles.NT
+
+[XboxVmp_CopyFiles.NT]
+xboxvmp.sys
+
+[XboxVmp_Inst.NT.Services]
+AddService = xboxvmp, 0x00000002, xboxvmp_Service_Inst
+
+[xboxvmp_Service_Inst]
+ServiceType   = 1
+StartType     = 1
+ErrorControl  = 0
+ServiceBinary = %12%\xboxvmp.sys
+LoadOrderGroup = Video
+
+[xboxvmp.SoftwareSettings]
+AddReg = xboxvmp_SoftwareDeviceSettings
+
+[xboxvmp_SoftwareDeviceSettings]
+HKR,,InstalledDisplayDrivers,0x00010000,framebuf
+
+;-------------------------------- STRINGS -------------------------------
+
+[Strings]
+ReactOS = "ReactOS Team"
+
+nVidiaMfg = "nVidia Corporation"
+PCI\VEN_10DE&DEV_02A0.DeviceDesc = "NV2A Xbox Graphics Processing Unit"