Ticket #3678: touchpad_reset_r29384.diff

ps2_synaptics.c

@@ -630 +630 @@
 status_t
 synaptics_close(void *_cookie)
 {
+    status_t status;
     synaptics_cookie *cookie = _cookie;
 
     ps2_dev_command_timeout(cookie->dev, PS2_CMD_DISABLE, NULL, 0, NULL, 0,
@@ -641 +642 @@
     atomic_and(&cookie->dev->flags, ~PS2_FLAG_OPEN);
     atomic_and(&cookie->dev->flags, ~PS2_FLAG_ENABLED);
 
+    // Reset the touchpad so it generate standard ps2 packets instead of
+    // extended ones. If not, BeOS is confused with such packets when rebooting
+    // without a complete shutdown.
+    status = ps2_reset_mouse(cookie->dev);
+    if (status != B_OK) {
+        INFO("ps2: reset failed\n");
+        return B_ERROR;
+    }
+        
     if (gTouchpadInfo.capPassThrough)
         ps2_service_notify_device_removed(gPassthroughDevice);
 

ps2_dev.c

@@ -66 +66 @@
 };
 
 
-static status_t
+status_t
 ps2_reset_mouse(ps2_dev *dev)
 {
     uint8 data[2];

ps2_dev.h

@@ -74 +74 @@
 status_t    ps2_dev_command_timeout(ps2_dev *dev, uint8 cmd, const uint8 *out,
                 int out_count, uint8 *in, int in_count, bigtime_t timeout);
 
+status_t    ps2_reset_mouse(ps2_dev *dev);
+
 void        ps2_dev_publish(ps2_dev *dev);
 void        ps2_dev_unpublish(ps2_dev *dev);