[ros-diffs] [cwittich] 18692: fixed some bugs in machine.inf

fixed some bugs in machine.inf
added keyboard.inf
added LPT Port to ports.inf
Modified: trunk/reactos/bootdata/packages/reactos.dff
Modified: trunk/reactos/media/inf/inf.xml
Added: trunk/reactos/media/inf/keyboard.inf
Modified: trunk/reactos/media/inf/machine.inf
Modified: trunk/reactos/media/inf/ports.inf
  _____  

Modified: trunk/reactos/bootdata/packages/reactos.dff
--- trunk/reactos/bootdata/packages/reactos.dff	2005-10-22 22:58:24 UTC
(rev 18691)
+++ trunk/reactos/bootdata/packages/reactos.dff	2005-10-23 01:06:59 UTC
(rev 18692)
@@ -298,6 +298,7 @@

 media\inf\layout.inf                    6
 media\inf\machine.inf                   6
 media\inf\mouse.inf                     6
+media\inf\keyboard.inf                     6
 media\inf\NET_NIC.inf                   6
 media\inf\netamd.inf                    6
 media\inf\netisa.inf                    6
  _____  

Modified: trunk/reactos/media/inf/inf.xml
--- trunk/reactos/media/inf/inf.xml	2005-10-22 22:58:24 UTC (rev
18691)
+++ trunk/reactos/media/inf/inf.xml	2005-10-23 01:06:59 UTC (rev
18692)
@@ -6,6 +6,7 @@

 <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>
  _____  

Added: trunk/reactos/media/inf/keyboard.inf
--- trunk/reactos/media/inf/keyboard.inf	2005-10-22 22:58:24 UTC
(rev 18691)
+++ trunk/reactos/media/inf/keyboard.inf	2005-10-23 01:06:59 UTC
(rev 18692)
@@ -0,0 +1,67 @@

+; KEYBOARD.INF
+
+; Installation file for keyboard devices
+
+[Version]
+Signature  = "$Windows NT$"
+;Signature  = "$ReactOS$"
+LayoutFile = layout.inf
+Class      = Keyboard
+ClassGUID  = {4D36E96B-E325-11CE-BFC1-08002BE10318}
+Provider   = %ReactOS%
+DriverVer  = 10/08/2005,1.01.0.0
+
+[ClassInstall32.NT]
+AddReg = KeyboardClass.NT.AddReg
+
+[KeyboardClass.NT.AddReg]
+HKR, , ,               0, %KeyboardClassName%
+HKR, , Icon,           0, "-2"
+;HKR, , Installer32,    0, "syssetup.dll,KeyboardClassInstaller"
+HKR, , NoInstallClass, 0, 1
+
+[Manufacturer]
+%StdMfg% = StdMfg
+
+[StdMfg]
+%*PNP0303.DeviceDesc%    = PS2_Inst,*PNP0303
+
+;------------------------------ PS/2 DRIVER
-----------------------------
+
+[PS2_Inst.NT]
+CopyFiles = PS2_CopyFiles.NT, kbdclass_CopyFiles.NT
+AddReg = PS2_AddReg
+
+[PS2_CopyFiles.NT]
+i8042prt.sys
+
+[PS2_Inst.NT.Services]
+AddService = i8042prt, 0x00000002, i8042prt_Service_Inst
+AddService = kbdclass, , kbdclass_Service_Inst
+
+[i8042prt_Service_Inst]
+ServiceType   = 1
+StartType     = 1
+ErrorControl  = 1
+ServiceBinary = %12%\i8042prt.sys
+LoadOrderGroup = Keyboard Port
+
+;---------------------------- KBDCLASS DRIVER
---------------------------
+
+[kbdclass_CopyFiles.NT]
+mouclass.sys
+
+[kbdclass_Service_Inst]
+ServiceType   = 1
+StartType     = 3
+ErrorControl  = 1
+ServiceBinary = %12%\kbdclass.sys
+LoadOrderGroup = Keyboard Class
+
+;-------------------------------- STRINGS
-------------------------------
+
+[Strings]
+ReactOS = "ReactOS Team"
+KeyboardClassName = "Keyboards"
+StdMfg = "(Standard keyboards)"
+*PNP0303.DeviceDesc = "IBM PC/AT keyboard"
\ No newline at end of file
  _____  

Modified: trunk/reactos/media/inf/machine.inf
--- trunk/reactos/media/inf/machine.inf	2005-10-22 22:58:24 UTC (rev
18691)
+++ trunk/reactos/media/inf/machine.inf	2005-10-23 01:06:59 UTC (rev
18692)
@@ -35,14 +35,15 @@

 %PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7192
 
 [GenericMfg]
-%*PNP0001.DeviceDesc% = NO_DRV_Inst, *PNP0001
-%*PNP0100.DeviceDesc% = NO_DRV_Inst, *PNP0100
-%*PNP0200.DeviceDesc% = NO_DRV_Inst, *PNP0200
-%*PNP0800.DeviceDesc% = NO_DRV_Inst, *PNP0800
-%*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03
-%*PNP0A05.DeviceDesc% = NO_DRV_Inst, *PNP0A05
-%*PNP0B00.DeviceDesc% = NO_DRV_Inst, *PNP0B00
-%*PNP0C02.DeviceDesc% = NO_DRV_Inst, *PNP0C02
+%*PNP0001.DeviceDesc% = NO_DRV,   *PNP0001
+%*PNP0100.DeviceDesc% = NO_DRV,   *PNP0100
+%*PNP0200.DeviceDesc% = NO_DRV,   *PNP0200
+%*PNP0800.DeviceDesc% = NO_DRV,   *PNP0800
+%*PNP0A03.DeviceDesc% = PCI_Inst, *PNP0A03
+%*PNP0A05.DeviceDesc% = NO_DRV,   *PNP0A05
+%*PNP0B00.DeviceDesc% = NO_DRV,   *PNP0B00
+%*PNP0C02.DeviceDesc% = NO_DRV,   *PNP0C02
+%*PNP0C0F.DeviceDesc% = NO_DRV,   *PNP0C0F
 %ACPI\FixedButton.DeviceDesc% = NO_DRV, ACPI\FixedButton
 %PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604
 
@@ -104,6 +105,7 @@
 *PNP0200.DeviceDesc = "DMA controller"
 *PNP0800.DeviceDesc = "System speaker"
 *PNP0C02.DeviceDesc = "Motherboard resources"
+*PNP0C0F.DeviceDesc = "PCI interrupt link device"
 ACPI\FixedButton.DeviceDesc ="ACPI Fixed Feature Button"
 PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge"
 
  _____  

Modified: trunk/reactos/media/inf/ports.inf
--- trunk/reactos/media/inf/ports.inf	2005-10-22 22:58:24 UTC (rev
18691)
+++ trunk/reactos/media/inf/ports.inf	2005-10-23 01:06:59 UTC (rev
18692)
@@ -28,7 +28,16 @@

 [StdMfg]
 %*PNP0500.DeviceDesc% = ComPort_Inst,*PNP0500,*PNP0501
 %*PNP0501.DeviceDesc% = ComPort_Inst,*PNP0501
+%*PNP0400.DeviceDesc% = LptPort_Inst, *PNP0400,*PNP0401
+%*PNP0401.DeviceDesc% = LptPort_Inst, *PNP0401
 
+;---------------------------- LPT PORT DRIVER
---------------------------
+
+[LptPort_Inst.NT]
+CopyFiles = LptPort_CopyFiles.NT
+
+[LptPort_CopyFiles.NT]
+
 ;---------------------------- COM PORT DRIVER
---------------------------
 
 [ComPort_Inst.NT]
@@ -71,3 +80,5 @@
 StdMfg = "(Standard ports)"
 *PNP0500.DeviceDesc = "Serial communication port"
 *PNP0501.DeviceDesc = "Serial communication port"
+*PNP0400.DeviceDesc = "Standard LPT printer port"
+*PNP0401.DeviceDesc = "ECP printer port"
\ No newline at end of file