File xf86-input-synaptics-add-led-support.diff of Package xf86-input-synaptics

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-input-synaptics-add-led-support.diff of Package xf86-input-synaptics (Revision 901d927b14963423697dc5472b7737aa)

Currently displaying revision 901d927b14963423697dc5472b7737aa , Show latest

From f8d9dd1c9710f99d3c402517782ae7ba5ef208eb Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 10 May 2010 18:15:48 +0200
Subject: [PATCH 3/7] Add the embedded LED support

This patch adds the control of the embedded LED on the top-left corner
of new Synaptics devices.  For LED control, it requires the patch to
Linux synaptics input driver,
	https://patchwork.kernel.org/patch/92434/

When a sysfs file /sys/class/leds/psmouse::synaptics exists, the driver
assumes it supports the embeded LED control.

The LED can be controlled via new properties, "Synaptics LED" and
"Synaptics LED Status".

Index: xf86-input-synaptics-1.5.99.903/include/synaptics-properties.h
===================================================================
--- xf86-input-synaptics-1.5.99.903.orig/include/synaptics-properties.h
+++ xf86-input-synaptics-1.5.99.903/include/synaptics-properties.h
@@ -164,4 +164,10 @@
 /* 32 Bit Integer, 2 values, horizontal hysteresis, vertical hysteresis */
 #define SYNAPTICS_PROP_NOISE_CANCELLATION "Synaptics Noise Cancellation"
 
+/* 8 bit (BOOL, read-only), has_led */
+#define SYNAPTICS_PROP_LED "Synaptics LED"
+
+/* 8 bit (BOOL), led_status (on/off) */
+#define SYNAPTICS_PROP_LED_STATUS "Synaptics LED Status"
+
 #endif                          /* _SYNAPTICS_PROPERTIES_H_ */
Index: xf86-input-synaptics-1.5.99.903/man/synaptics.man
===================================================================
--- xf86-input-synaptics-1.5.99.903.orig/man/synaptics.man
+++ xf86-input-synaptics-1.5.99.903/man/synaptics.man
@@ -977,6 +977,15 @@ right button, two-finger detection, thre
 .BI "Synaptics Pad Resolution"
 32 bit unsigned, 2 values (read-only), vertical, horizontal in units/millimeter.
 
+.TP 7
+.BI "Synaptics LED"
+8 bit (BOOL, read-only), indicating whether the device has an embedded
+LED support or not.
+
+.TP 7
+.BI "Synaptics LED Status"
+8 bit (BOOL), the light status of the embedded LED.
+
 .SH "NOTES"
 Configuration through
 .I InputClass
Index: xf86-input-synaptics-1.5.99.903/src/eventcomm.c
===================================================================
--- xf86-input-synaptics-1.5.99.903.orig/src/eventcomm.c
+++ xf86-input-synaptics-1.5.99.903/src/eventcomm.c
@@ -60,6 +60,8 @@
 #define LONG(x)  ((x) / LONG_BITS)
 #define TEST_BIT(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
 
+#define SYNAPTICS_LED_SYS_FILE    "/sys/class/leds/psmouse::synaptics/brightness"
+
 /**
  * Protocol-specific data.
  */
@@ -377,6 +379,32 @@ event_get_abs(InputInfoPtr pInfo, int fd
     return 0;
 }
 
+static void
+event_query_led(InputInfoPtr pInfo)
+{
+    SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
+
+    priv->synpara.has_led = !access(SYNAPTICS_LED_SYS_FILE, W_OK);
+}
+
+static void EventUpdateLED(InputInfoPtr pInfo)
+{
+    SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
+
+    if (priv->synpara.has_led) {
+        char *val = priv->synpara.led_status ? "255" : "0";
+        int fd = open(SYNAPTICS_LED_SYS_FILE, O_WRONLY);
+        int err;
+
+        if (fd < 0)
+            return;
+        err = write(fd, val, strlen(val));
+        close(fd);
+        if (err < 0)
+            xf86IDrvMsg(pInfo, X_WARNING, "can't write LED value %s\n", val);
+    }
+}
+
 /* Query device for axis ranges */
 static void
 event_query_axis_ranges(InputInfoPtr pInfo)
@@ -933,6 +961,7 @@ EventReadDevDimensions(InputInfoPtr pInf
 #endif
         event_query_axis_ranges(pInfo);
     }
+    event_query_led(pInfo);
     event_query_model(pInfo->fd, &priv->model, &priv->id_vendor,
                       &priv->id_product);
 
@@ -1023,5 +1052,6 @@ struct SynapticsProtocolOperations event
     EventQueryHardware,
     EventReadHwState,
     EventAutoDevProbe,
-    EventReadDevDimensions
+    EventReadDevDimensions,
+    EventUpdateLED,
 };
Index: xf86-input-synaptics-1.5.99.903/src/properties.c
===================================================================
--- xf86-input-synaptics-1.5.99.903.orig/src/properties.c
+++ xf86-input-synaptics-1.5.99.903/src/properties.c
@@ -96,6 +96,8 @@ Atom prop_softbutton_areas      = 0;
 Atom prop_noise_cancellation = 0;
 Atom prop_product_id = 0;
 Atom prop_device_node = 0;
+Atom prop_led = 0;
+Atom prop_led_status = 0;
 
 static Atom
 InitTypedAtom(DeviceIntPtr dev, char *name, Atom type, int format, int nvalues,
@@ -327,6 +329,9 @@ InitDeviceProperties(InputInfoPtr pInfo)
                                        SYNAPTICS_PROP_NOISE_CANCELLATION, 32, 2,
                                        values);
 
+    prop_led = InitAtom(pInfo->dev, SYNAPTICS_PROP_LED, 8, 1, &para->has_led);
+    prop_led_status = InitAtom(pInfo->dev, SYNAPTICS_PROP_LED_STATUS, 8, 1, &para->led_status);
+
     /* only init product_id property if we actually know them */
     if (priv->id_vendor || priv->id_product) {
         values[0] = priv->id_vendor;
@@ -744,6 +749,16 @@ SetProperty(DeviceIntPtr dev, Atom prope
         para->area_right_edge = area[1];
         para->area_top_edge = area[2];
         para->area_bottom_edge = area[3];
+    } else if (property == prop_led_status)
+    {
+        if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER)
+            return BadMatch;
+
+        if (para->has_led) {
+            para->led_status = *(BOOL*)prop->data;
+            if (priv->proto_ops && priv->proto_ops->UpdateLED)
+                priv->proto_ops->UpdateLED(pInfo);
+        }
     }
     else if (property == prop_softbutton_areas) {
         int *areas;
Index: xf86-input-synaptics-1.5.99.903/src/synapticsstr.h
===================================================================
--- xf86-input-synaptics-1.5.99.903.orig/src/synapticsstr.h
+++ xf86-input-synaptics-1.5.99.903/src/synapticsstr.h
@@ -184,6 +184,8 @@ typedef struct _SynapticsParameters
     int area_left_edge, area_right_edge, area_top_edge, area_bottom_edge;       /* area coordinates absolute */
     int softbutton_areas[2][4]; /* soft button area coordinates, 0 => right, 1 => middle button */
     int hyst_x, hyst_y;         /* x and y width of hysteresis box */
+    Bool has_led;                           /* has an embedded LED */
+    Bool led_status;                        /* Current status of LED (1=on) */
 } SynapticsParameters;
 
 struct _SynapticsPrivateRec {
Index: xf86-input-synaptics-1.5.99.903/src/synproto.h
===================================================================
--- xf86-input-synaptics-1.5.99.903.orig/src/synproto.h
+++ xf86-input-synaptics-1.5.99.903/src/synproto.h
@@ -102,6 +102,7 @@ struct SynapticsProtocolOperations {
                          struct SynapticsHwState * hwRet);
     Bool (*AutoDevProbe) (InputInfoPtr pInfo, const char *device);
     void (*ReadDevDimensions) (InputInfoPtr pInfo);
+    void (*UpdateLED)(InputInfoPtr pInfo);
 };
 
 #ifdef BUILD_PS2COMM
Index: xf86-input-synaptics-1.5.99.903/tools/synclient.c
===================================================================
--- xf86-input-synaptics-1.5.99.903.orig/tools/synclient.c
+++ xf86-input-synaptics-1.5.99.903/tools/synclient.c
@@ -154,6 +154,7 @@ static struct Parameter params[] = {
     {"MiddleButtonAreaRight", PT_INT, INT_MIN, INT_MAX, SYNAPTICS_PROP_SOFTBUTTON_AREAS,	32,	5},
     {"MiddleButtonAreaTop",   PT_INT, INT_MIN, INT_MAX, SYNAPTICS_PROP_SOFTBUTTON_AREAS,	32,	6},
     {"MiddleButtonAreaBottom", PT_INT, INT_MIN, INT_MAX, SYNAPTICS_PROP_SOFTBUTTON_AREAS,	32,	7},
+    {"LEDStatus",             PT_BOOL,   0, 1,     SYNAPTICS_PROP_LED_STATUS,  8,      0},
     { NULL, 0, 0, 0, 0 }
 };

Places

File xf86-input-synaptics-add-led-support.diff of Package xf86-input-synaptics (Revision 901d927b14963423697dc5472b7737aa)

Places