Update .inf files

svn path=/trunk/; revision=18091

diff --git a/reactos/media/inf/mouse.inf b/reactos/media/inf/mouse.inf
index 30d8a41..ae642fd 100644 (file)
--- a/reactos/media/inf/mouse.inf
+++ b/reactos/media/inf/mouse.inf
@@ -25,12 +25,17 @@ HKR, , NoInstallClass, 0, 1
 \r
 [Manufacturer]\r
 %StdMfg% = StdMfg\r
+%IbmMfg% = IbmMfg\r
 %LogMfg% = LogMfg\r
 %MSMfg%  = MSMfg\r
 \r
 [StdMfg]\r
 %SERIAL_MOUSE.DeviceDesc% = Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOUSE\r
 %PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE\r
+%HID_MOUSE.DeviceDesc% = HID_Inst,HID_DEVICE_SYSTEM_MOUSE\r
+\r
+[IbmMfg]\r
+*IBM3780.DeviceDesc = PS2_Inst,*IBM3780\r
 \r
 [LogMfg]\r
 %*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08\r
@@ -97,31 +102,44 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","SampleRate",0x0001
 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001\r
 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","MouseResolution",0x00010001,0x00000003\r
 \r
+;---------------------------- HID MOUSE DRIVER --------------------------\r
+\r
+[HID_Inst.NT]\r
+CopyFiles = HID_CopyFiles, Mouclass_CopyFiles\r
+\r
+[HID_CopyFiles]\r
+mouhid.sys\r
+\r
+[HID_Inst.NT.Services]\r
+AddService = mouhid, 0x00000002, mouhid_Service_Inst\r
+AddService = mouclass, , mouclass_Service_Inst\r
+\r
+[mouhid_Service_Inst]\r
+ServiceType   = 1\r
+StartType     = 3\r
+ErrorControl  = 0\r
+ServiceBinary = %12%\mouhid.sys\r
+LoadOrderGroup = Pointer Port\r
+\r
 ;-------------------------------- STRINGS -------------------------------\r
 \r
 [Strings]\r
 ReactOS = "ReactOS Team"\r
 MouseClassName = "Mice and other pointing devices"\r
+\r
 StdMfg = "(Standard mice)"\r
+SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse"\r
+PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse"\r
+HID_MOUSE.DeviceDesc = "HID Mouse"\r
+\r
+IbmMfg = "IBM"\r
+*IBM3780.DeviceDesc = "IBM PS/2 Trackpoint"\r
+\r
 LogMfg = "Logitech"\r
-MSMfg  = "Microsoft"\r
+*PNP0F08.DeviceDesc = "Logitech Serial Mouse"\r
+*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse"\r
 \r
+MSMfg = "Microsoft"\r
 *PNP0F01.DeviceDesc = "Microsoft Serial Mouse"\r
 *PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse"\r
-*PNP0F08.DeviceDesc = "Logitech Serial Mouse"\r
-*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse"\r
 *PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice"\r
-SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse"\r
-PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse"\r
-\r
-[String.040c]\r
-MouseClassName = "Souris et autres dispositifs de pointage"\r
-StdMfg = "(Souris standard)"\r
-\r
-*PNP0F01.DeviceDesc = "Souris Microsoft sur port série"\r
-*PNP0F03.DeviceDesc = "Souris Microsoft sur port PS/2"\r
-*PNP0F08.DeviceDesc = "Souris Logitech sur port série"\r
-*PNP0F12.DeviceDesc = "Souris Logitech sur port PS/2"\r
-*PNP0F13.DeviceDesc = "Souris compatible PS/2"\r
-SERIAL_MOUSE.DeviceDesc = "Souris standard sur port série"\r
-PS2_MOUSE.DeviceDesc = "Souris standard sur port PS/2"
\ No newline at end of file

diff --git a/reactos/media/inf/ports.inf b/reactos/media/inf/ports.inf
index cfb1d04..8ae0685 100644 (file)
--- a/reactos/media/inf/ports.inf
+++ b/reactos/media/inf/ports.inf
@@ -61,14 +61,7 @@ LoadOrderGroup = PNP Filter
 [Strings]\r
 ReactOS = "ReactOS Team"\r
 PortsClassName = "Serial and parallel ports"\r
-StdMfg = "(Standard ports)"\r
 \r
+StdMfg = "(Standard ports)"\r
 *PNP0500.DeviceDesc = "Serial communication port"\r
 *PNP0501.DeviceDesc = "Serial communication port"\r
-\r
-[String.040c]\r
-PortsClassName = "Ports (Série et parallèle)"\r
-StdMfg = "(Ports standard)"\r
-\r
-*PNP0500.DeviceDesc = "Port de communication série"\r
-*PNP0501.DeviceDesc = "Port de communication série"
\ No newline at end of file

diff --git a/reactos/media/inf/usbport.inf b/reactos/media/inf/usbport.inf
index 06604d3..9faa57b 100644 (file)
--- a/reactos/media/inf/usbport.inf
+++ b/reactos/media/inf/usbport.inf
@@ -39,7 +39,7 @@ HKR, , NoInstallClass, 0, 1
 ;------------------------------ UHCI DRIVER -----------------------------\r
 \r
 [UHCI_Inst.NT]\r
-CopyFiles = UHCI_CopyFiles\r
+CopyFiles = UHCI_CopyFiles.NT\r
 \r
 [UHCI_CopyFiles.NT]\r
 usbport.sys\r
@@ -58,7 +58,7 @@ LoadOrderGroup = Base
 ;------------------------------ OHCI DRIVER -----------------------------\r
 \r
 [OHCI_Inst.NT]\r
-CopyFiles = OHCI_CopyFiles\r
+CopyFiles = OHCI_CopyFiles.NT\r
 \r
 [OHCI_CopyFiles.NT]\r
 usbport.sys\r
@@ -77,7 +77,7 @@ LoadOrderGroup = Base
 ;------------------------------ EHCI DRIVER -----------------------------\r
 \r
 [EHCI_Inst.NT]\r
-CopyFiles = EHCI_CopyFiles\r
+CopyFiles = EHCI_CopyFiles.NT\r
 \r
 [EHCI_CopyFiles.NT]\r
 usbport.sys\r
@@ -96,7 +96,7 @@ LoadOrderGroup = Base
 ;---------------------------- ROOT HUB DRIVER ---------------------------\r
 \r
 [RootHub_Inst.NT]\r
-CopyFiles = RootHub_CopyFiles\r
+CopyFiles = RootHub_CopyFiles.NT\r
 \r
 [RootHub_CopyFiles.NT]\r
 usbport.sys\r