[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1340859117-19654-2-git-send-email-djkurtz@chromium.org>
Date: Thu, 28 Jun 2012 12:51:57 +0800
From: Daniel Kurtz <djkurtz@...omium.org>
To: Alessandro Rubini <rubini@...vis.unipv.it>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Henrik Rydberg <rydberg@...omail.se>
Cc: Olof Johansson <olof@...om.net>,
Benson Leung <bleung@...omium.org>,
linux-input@...r.kernel.org, linux-kernel@...r.kernel.org,
Daniel Kurtz <djkurtz@...omium.org>
Subject: [PATCH 2/2] Input: synaptics - add sysfs access to firmware ID & board ID
Allow userspace to query firmware ID and board ID, which are read and
cached during device initialization.
Signed-off-by: Daniel Kurtz <djkurtz@...omium.org>
---
drivers/input/mouse/synaptics.c | 41 +++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 81685c1..985d550 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -1258,6 +1258,17 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
}
}
+/*****************************************************************************
+ * sysfs interface
+ ****************************************************************************/
+/* Sysfs entry for board ID */
+static ssize_t synaptics_show_board_id(struct psmouse *psmouse, void *data,
+ char *buf)
+{
+ struct synaptics_data *priv = psmouse->private;
+ return scnprintf(buf, PAGE_SIZE, "%lu\n", priv->board_id);
+}
+
static ssize_t synaptics_show_disable_gesture(struct psmouse *psmouse,
void *data, char *buf)
{
@@ -1296,9 +1307,30 @@ static ssize_t synaptics_set_disable_gesture(struct psmouse *psmouse,
return len;
}
+/* Sysfs entry for firmware ID */
+static ssize_t synaptics_show_firmware_id(struct psmouse *psmouse, void *data,
+ char *buf)
+{
+ struct synaptics_data *priv = psmouse->private;
+ return scnprintf(buf, PAGE_SIZE, "%lu\n", priv->firmware_id);
+}
+
+PSMOUSE_DEFINE_RO_ATTR(board_id, S_IRUGO, NULL, synaptics_show_board_id);
PSMOUSE_DEFINE_ATTR(disable_gesture, S_IWUSR | S_IRUGO, NULL,
synaptics_show_disable_gesture,
synaptics_set_disable_gesture);
+PSMOUSE_DEFINE_RO_ATTR(firmware_id, S_IRUGO, NULL, synaptics_show_firmware_id);
+
+static struct attribute *synaptics_attrs[] = {
+ &psmouse_attr_board_id.dattr.attr,
+ &psmouse_attr_firmware_id.dattr.attr,
+ NULL
+};
+
+static struct attribute_group synaptics_attr_group = {
+ .attrs = synaptics_attrs,
+};
+
static void synaptics_disconnect(struct psmouse *psmouse)
{
@@ -1308,6 +1340,9 @@ static void synaptics_disconnect(struct psmouse *psmouse)
device_remove_file(&psmouse->ps2dev.serio->dev,
&psmouse_attr_disable_gesture.dattr);
+ sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj,
+ &synaptics_attr_group);
+
synaptics_reset(psmouse);
kfree(priv);
psmouse->private = NULL;
@@ -1528,6 +1563,12 @@ static int __synaptics_init(struct psmouse *psmouse, bool absolute_mode)
}
}
+ err = sysfs_create_group(&psmouse->ps2dev.serio->dev.kobj,
+ &synaptics_attr_group);
+ if (err)
+ psmouse_warn(psmouse,
+ "Failed to create sysfs attributes (%d)", err);
+
return 0;
init_fail:
--
1.7.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists