[ros-diffs] [tkreuzer] 66762: [I8042PRT] - Revert hack from r63126 to make some notebook controllers work, and which also broke the mouse wheel on other systems, and replace it with an #ifdef. See CORE-6901, C...

Author: tkreuzer
Date: Tue Mar 17 19:58:14 2015
New Revision: 66762

URL: http://svn.reactos.org/svn/reactos?rev=66762&view=rev
Log:
[I8042PRT]
- Revert hack from r63126 to make some notebook controllers work, and which also broke the
mouse wheel on other systems, and replace it with an #ifdef.
See CORE-6901, CORE-4048, CORE-8572 

Modified:
    trunk/reactos/drivers/input/i8042prt/pnp.c

Modified: trunk/reactos/drivers/input/i8042prt/pnp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp…
==============================================================================
--- trunk/reactos/drivers/input/i8042prt/pnp.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/i8042prt/pnp.c	[iso-8859-1] Tue Mar 17 19:58:14 2015
@@ -476,13 +476,15 @@
         {
             WARN_(I8042PRT, "i8042ConnectMouseInterrupt failed: %lx\n",
Status);
         }
-        
+
         /* Start the mouse */
         Irql = KeAcquireInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt);
         /* HACK: the mouse has already been reset in i8042DetectMouse. This second
            reset prevents some touchpads/mice from working (Dell D531, D600).
-           See CORE-6901
-        i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE); */
+           See CORE-6901 */
+#ifndef __I8042PRT_HACK_FOR_NOTEBOOK__
+        i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE);
+#endif
         KeReleaseInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt, Irql);
     }
 
@@ -654,13 +656,13 @@
 
     DriverExtension =
(PI8042_DRIVER_EXTENSION)IoGetDriverObjectExtension(DeviceObject->DriverObject,
DeviceObject->DriverObject);
     DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-    
+
     KeAcquireSpinLock(&DriverExtension->DeviceListLock, &OldIrql);
     RemoveEntryList(&DeviceExtension->ListEntry);
     KeReleaseSpinLock(&DriverExtension->DeviceListLock, OldIrql);
-    
+
     IoDetachDevice(DeviceExtension->LowerDevice);
-    
+
     IoDeleteDevice(DeviceObject);
 }