Input: trackpoint - enable devices connected to external port

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

2 files changed, 16 insertions, 8 deletions

diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index b4898d8a68e..6d9ec9ab1b9 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -68,15 +68,19 @@ struct trackpoint_attr_data {
         size_t field_offset;
         unsigned char command;
         unsigned char mask;
+        unsigned char inverted;
 };
 
 static ssize_t trackpoint_show_int_attr(struct psmouse *psmouse, void *data, char *buf)
 {
         struct trackpoint_data *tp = psmouse->private;
         struct trackpoint_attr_data *attr = data;
-        unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset);
+        unsigned char value = *(unsigned char *)((char *)tp + attr->field_offset);
+
+        if (attr->inverted)
+                value = !value;
 
-        return sprintf(buf, "%u\n", *field);
+        return sprintf(buf, "%u\n", value);
 }
 
 static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data,
@@ -120,6 +124,9 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data,
         if (*rest || value > 1)
                 return -EINVAL;
 
+        if (attr->inverted)
+                value = !value;
+
         if (*field != value) {
                 *field = value;
                 trackpoint_toggle_bit(&psmouse->ps2dev, attr->command, attr->mask);
@@ -129,11 +136,12 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data,
 }
 
 
-#define TRACKPOINT_BIT_ATTR(_name, _command, _mask)                             \
+#define TRACKPOINT_BIT_ATTR(_name, _command, _mask, _inv)                               \
         static struct trackpoint_attr_data trackpoint_attr_##_name = {          \
                 .field_offset   = offsetof(struct trackpoint_data, _name),      \
                 .command        = _command,                                     \
                 .mask           = _mask,                                        \
+                .inverted       = _inv,                                         \
         };                                                                      \
         PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO,                           \
                             &trackpoint_attr_##_name,                           \
@@ -150,9 +158,9 @@ TRACKPOINT_INT_ATTR(upthresh, TP_UP_THRESH);
 TRACKPOINT_INT_ATTR(ztime, TP_Z_TIME);
 TRACKPOINT_INT_ATTR(jenks, TP_JENKS_CURV);
 
-TRACKPOINT_BIT_ATTR(press_to_select, TP_TOGGLE_PTSON, TP_MASK_PTSON);
-TRACKPOINT_BIT_ATTR(skipback, TP_TOGGLE_SKIPBACK, TP_MASK_SKIPBACK);
-TRACKPOINT_BIT_ATTR(ext_dev, TP_TOGGLE_EXT_DEV, TP_MASK_EXT_DEV);
+TRACKPOINT_BIT_ATTR(press_to_select, TP_TOGGLE_PTSON, TP_MASK_PTSON, 0);
+TRACKPOINT_BIT_ATTR(skipback, TP_TOGGLE_SKIPBACK, TP_MASK_SKIPBACK, 0);
+TRACKPOINT_BIT_ATTR(ext_dev, TP_TOGGLE_EXT_DEV, TP_MASK_EXT_DEV, 1);
 
 static struct attribute *trackpoint_attrs[] = {
         &psmouse_attr_sensitivity.dattr.attr,
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
index 9857d8b6ad6..050298b1a09 100644
--- a/drivers/input/mouse/trackpoint.h
+++ b/drivers/input/mouse/trackpoint.h
@@ -78,7 +78,7 @@
 
 #define TP_TOGGLE_MB            0x23    /* Disable/Enable Middle Button */
 #define TP_MASK_MB                      0x01
-#define TP_TOGGLE_EXT_DEV       0x23    /* Toggle external device */
+#define TP_TOGGLE_EXT_DEV       0x23    /* Disable external device */
 #define TP_MASK_EXT_DEV                 0x02
 #define TP_TOGGLE_DRIFT         0x23    /* Drift Correction */
 #define TP_MASK_DRIFT                   0x80
@@ -125,7 +125,7 @@
 #define TP_DEF_MB               0x00
 #define TP_DEF_PTSON            0x00
 #define TP_DEF_SKIPBACK         0x00
-#define TP_DEF_EXT_DEV          0x01
+#define TP_DEF_EXT_DEV          0x00    /* 0 means enabled */
 
 #define MAKE_PS2_CMD(params, results, cmd) ((params<<12) | (results<<8) | (cmd))