File synaptics-retry-serial-open.diff of Package xorg-x11-driver-input

Overview Repositories Revisions Requests Users Attributes Meta

File synaptics-retry-serial-open.diff of Package xorg-x11-driver-input (Revision 18277591975651782cd8f5cfb2703e75)

Currently displaying revision 18277591975651782cd8f5cfb2703e75 , Show latest

Fixes bnc 573644,569340,573642 - Synaptics driver does not survive S3/S4

--- xf86-input-synaptics-1.2.2/src/synaptics.c.orig	2010-03-26 08:04:38.000000000 +0100
+++ xf86-input-synaptics-1.2.2/src/synaptics.c	2010-03-26 08:14:22.000000000 +0100
@@ -198,7 +198,8 @@ SetDeviceAndProtocol(LocalDevicePtr loca
     }
     if (device && strstr(device, "/dev/input/event")) {
 #ifdef BUILD_EVENTCOMM
-	proto = SYN_PROTO_EVENT;
+	if (event_proto_operations.AutoDevProbe(local))
+	    proto = SYN_PROTO_EVENT;
 #endif
     } else {
 	str_par = xf86FindOptionValue(local->options, "Protocol");
@@ -745,15 +746,22 @@ DeviceControl(DeviceIntPtr dev, int mode
 }
 
 static Bool
-DeviceOn(DeviceIntPtr dev)
+_DeviceOn(LocalDevicePtr local)
 {
-    LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
     SynapticsPrivate *priv = (SynapticsPrivate *) (local->private);
+    static int tries = 1;
+    int n;
 
     DBG(3, ErrorF("Synaptics DeviceOn called\n"));
 
-    SetDeviceAndProtocol(local);
-    local->fd = xf86OpenSerial(local->options);
+    for (n = tries-1; n >= 0; n--) {
+	SetDeviceAndProtocol(local);
+	local->fd = xf86OpenSerial(local->options);
+	if (local->fd != -1)
+	    break;
+	if (n)
+	    xf86Msg(X_WARNING, "%s: cannot open input device - retrying %d more times\n", local->name, n);
+    }
     if (local->fd == -1) {
 	xf86Msg(X_WARNING, "%s: cannot open input device\n", local->name);
 	return !Success;
@@ -781,16 +789,30 @@ DeviceOn(DeviceIntPtr dev)
         return !Success;
     }
 
+    /* This has succeeded once, so chances are the hardware *really* is present
+     * - this is not a hotplug device after all.
+     * Without trying really hard on some machines with some kernels the device
+     * won't be found after S3/S4 again. */
+    tries = 5;
+
     xf86AddEnabledDevice(local);
-    dev->public.on = TRUE;
 
     return Success;
 }
 
 static Bool
-DeviceOff(DeviceIntPtr dev)
+DeviceOn(DeviceIntPtr dev)
+{
+    Bool ret = _DeviceOn((LocalDevicePtr)dev->public.devicePrivate);
+
+    if (ret)
+	dev->public.on = TRUE;
+    return ret;
+}
+
+static Bool
+_DeviceOff(LocalDevicePtr local)
 {
-    LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
     SynapticsPrivate *priv = (SynapticsPrivate *) (local->private);
 
     DBG(3, ErrorF("Synaptics DeviceOff called\n"));
@@ -807,6 +829,13 @@ DeviceOff(DeviceIntPtr dev)
 	xf86CloseSerial(local->fd);
 	local->fd = -1;
     }
+    return Success;
+}
+
+static Bool
+DeviceOff(DeviceIntPtr dev)
+{
+    _DeviceOff((LocalDevicePtr)dev->public.devicePrivate);
     dev->public.on = FALSE;
     return Success;
 }
@@ -1143,14 +1172,27 @@ ReadInput(LocalDevicePtr local)
     struct SynapticsHwState hw;
     int delay = 0;
     Bool newDelay = FALSE;
+    int processed = 0;
 
     while (SynapticsGetHwState(local, priv, &hw)) {
+	processed++;
 	hw.millis = GetTimeInMillis();
 	priv->hwState = hw;
 	delay = HandleState(local, &hw);
 	newDelay = TRUE;
     }
 
+    if (!processed) {
+	/* strange callback, check the device and reconnect if needed */
+	if (1 /*dev && access(dev, 0)*/) {
+	    xf86Msg(X_WARNING, "%s: reconnecting device...\n", local->name);
+	    _DeviceOff(local);
+	    usleep(100*1000);
+	    _DeviceOn(local);
+	    xf86Msg(X_WARNING, "%s: reconnection done\n", local->name);
+	}
+    }
+
     if (newDelay)
 	priv->timer = TimerSet(priv->timer, 0, delay, timerFunc, local);
 }

Places

File synaptics-retry-serial-open.diff of Package xorg-x11-driver-input (Revision 18277591975651782cd8f5cfb2703e75)

Places