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

svn path=/trunk/; revision=19226

diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index 19d26a4..da426ee 100644 (file)
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -568,10 +568,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard P
 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","ImagePath",0x00020000,"system32\d
 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","ImagePath",0x00020000,"system32
 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"

diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index 2900f8a..e5d0c1f 100755 (executable)
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -301,15 +301,17 @@ media\inf\hdc.inf                       6
 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

diff --git a/reactos/media/inf/inf.xml b/reactos/media/inf/inf.xml
index 00b82f1..a30c79f 100644 (file)
--- a/reactos/media/inf/inf.xml
+++ b/reactos/media/inf/inf.xml
@@ -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

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

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