From 00fb63ba190818ecbc3dddfe3fa29452e3c41af2 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sun, 23 Oct 2005 01:06:59 +0000 Subject: [PATCH] fixed some bugs in machine.inf added keyboard.inf added LPT Port to ports.inf svn path=/trunk/; revision=18692 --- reactos/bootdata/packages/reactos.dff | 1 + reactos/media/inf/inf.xml | 1 + reactos/media/inf/keyboard.inf | 67 +++++++++++++++++++++++++++ reactos/media/inf/machine.inf | 18 +++---- reactos/media/inf/ports.inf | 11 +++++ 5 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 reactos/media/inf/keyboard.inf diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff index b75f8d20daf..ef00a6ba867 100755 --- a/reactos/bootdata/packages/reactos.dff +++ b/reactos/bootdata/packages/reactos.dff @@ -298,6 +298,7 @@ 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\NET_NIC.inf 6 media\inf\netamd.inf 6 media\inf\netisa.inf 6 diff --git a/reactos/media/inf/inf.xml b/reactos/media/inf/inf.xml index 8da98e85bb8..00b82f101c3 100644 --- a/reactos/media/inf/inf.xml +++ b/reactos/media/inf/inf.xml @@ -6,6 +6,7 @@ layout.inf machine.inf mouse.inf +keyboard.inf NET_NIC.inf netamd.inf netisa.inf diff --git a/reactos/media/inf/keyboard.inf b/reactos/media/inf/keyboard.inf new file mode 100644 index 00000000000..01a89fecb64 --- /dev/null +++ b/reactos/media/inf/keyboard.inf @@ -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 diff --git a/reactos/media/inf/machine.inf b/reactos/media/inf/machine.inf index 57146259f65..d77aabe6b33 100644 --- a/reactos/media/inf/machine.inf +++ b/reactos/media/inf/machine.inf @@ -35,14 +35,15 @@ HKR, , Icon, 0, "-27" %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 @@ GenericMfg = "(Generic system devices)" *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" diff --git a/reactos/media/inf/ports.inf b/reactos/media/inf/ports.inf index 434921cb255..c91f286473b 100644 --- a/reactos/media/inf/ports.inf +++ b/reactos/media/inf/ports.inf @@ -28,6 +28,15 @@ HKR, , Icon, 0, "-23" [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 --------------------------- @@ -71,3 +80,5 @@ PortsClassName = "Serial and parallel ports" 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