| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 11 Nov 2010 06:03:35 -0800
From: "Lighthart, EricX" <ericx.lighthart@...el.com>
To: "dmitry.torokhov@...il.com" <dmitry.torokhov@...il.com>,
"pb@...dhelds.org" <pb@...dhelds.org>,
"ext-mika.1.westerberg@...ia.com" <ext-mika.1.westerberg@...ia.com>
CC: "linux-input@...r.kernel.org" <linux-input@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH] input: Add sysfs interface to on/off state of GPIO keys and
switches
User space cannot learn the current state of a GPIO key or switch.
Input system reports only changes, not state.
Add two sysfs attributes, one each for keys and switches, that
report lists of keys or switches currently "on."
Signed-off-by: Eric Lighthart <ericx.lighthart@...el.com>
---
This is as much an RFC as a patch submission. Is the user space
interface proposed here an OK thing? I'd be equally happy to find
a better or already-existing solution.
drivers/input/keyboard/gpio_keys.c | 68 ++++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 6069abe..7715837 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -1,6 +1,12 @@
/*
* Driver for keys on GPIO lines capable of generating interrupts.
*
+ * Copyright (c) 2010 Intel Corporation. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
* Copyright 2005 Phil Blundell
*
* This program is free software; you can redistribute it and/or modify
@@ -44,6 +50,10 @@ struct gpio_keys_drvdata {
struct gpio_button_data data[0];
};
+#define OP_LIST 0
+#define OP_LIST_DISABLE 1
+#define OP_LIST_ON 2
+
/*
* SYSFS interface for enabling/disabling keys and switches:
*
@@ -54,10 +64,15 @@ struct gpio_keys_drvdata {
* disabled
* disabled_keys [rw] - bitmap of keys currently disabled
* disabled_switches [rw] - bitmap of switches currently disabled
+ * on_keys [ro] - bitmap of keys currently "on"
+ * on_switches [ro] - bitmap of switches currently "on"
+ *
+ * Userland can find switches and keys currently "on" (and deduce those that
+ * are therefore "off") via the on_* attrributes.
*
- * Userland can change these values and hence disable event generation
- * for each key (or switch). Disabling a key means its interrupt line
- * is disabled.
+ * Userland can change the dislabled_* values and hence disable event
+ * generation for each key (or switch). Disabling a key means its interrupt
+ * line is disabled.
*
* For example, if we have following switches set up as gpio-keys:
* SW_DOCK = 5
@@ -152,8 +167,8 @@ static void gpio_keys_enable_button(struct gpio_button_data *bdata)
* errno on failure.
*/
static ssize_t gpio_keys_attr_show_helper(struct gpio_keys_drvdata *ddata,
- char *buf, unsigned int type,
- bool only_disabled)
+ char *buf, unsigned int type,
+ int op)
{
int n_events = get_n_events_by_type(type);
unsigned long *bits;
@@ -170,10 +185,25 @@ static ssize_t gpio_keys_attr_show_helper(struct gpio_keys_drvdata *ddata,
if (bdata->button->type != type)
continue;
- if (only_disabled && !bdata->disabled)
- continue;
-
- __set_bit(bdata->button->code, bits);
+ switch (op) {
+ case OP_LIST:
+ /* Just list all the buttons/switches */
+ __set_bit(bdata->button->code, bits);
+ break;
+
+ case OP_LIST_DISABLE:
+ /* List the disabled buttons/switches */
+ if (bdata->disabled)
+ __set_bit(bdata->button->code, bits);
+ break;
+
+ case OP_LIST_ON:
+ /* List the buttons/switches that are "on" */
+ if ((gpio_get_value(bdata->button->gpio) ? 1 : 0) ^
+ bdata->button->active_low)
+ __set_bit(bdata->button->code, bits);
+ break;
+ }
}
ret = bitmap_scnlistprintf(buf, PAGE_SIZE - 2, bits, n_events);
@@ -246,7 +276,7 @@ out:
return error;
}
-#define ATTR_SHOW_FN(name, type, only_disabled) \
+#define ATTR_SHOW_FN(name, type, op) \
static ssize_t gpio_keys_show_##name(struct device *dev, \
struct device_attribute *attr, \
char *buf) \
@@ -255,22 +285,28 @@ static ssize_t gpio_keys_show_##name(struct device *dev, \
struct gpio_keys_drvdata *ddata = platform_get_drvdata(pdev); \
\
return gpio_keys_attr_show_helper(ddata, buf, \
- type, only_disabled); \
+ type, op); \
}
-ATTR_SHOW_FN(keys, EV_KEY, false);
-ATTR_SHOW_FN(switches, EV_SW, false);
-ATTR_SHOW_FN(disabled_keys, EV_KEY, true);
-ATTR_SHOW_FN(disabled_switches, EV_SW, true);
+ATTR_SHOW_FN(keys, EV_KEY, OP_LIST);
+ATTR_SHOW_FN(switches, EV_SW, OP_LIST);
+ATTR_SHOW_FN(disabled_keys, EV_KEY, OP_LIST_DISABLE);
+ATTR_SHOW_FN(disabled_switches, EV_SW, OP_LIST_DISABLE);
+ATTR_SHOW_FN(on_keys, EV_KEY, OP_LIST_ON);
+ATTR_SHOW_FN(on_switches, EV_SW, OP_LIST_ON);
/*
* ATTRIBUTES:
*
* /sys/devices/platform/gpio-keys/keys [ro]
* /sys/devices/platform/gpio-keys/switches [ro]
+ * /sys/devices/platform/gpio-keys/on_keys [ro]
+ * /sys/devices/platform/gpio-keys/on_switches [ro]
*/
static DEVICE_ATTR(keys, S_IRUGO, gpio_keys_show_keys, NULL);
static DEVICE_ATTR(switches, S_IRUGO, gpio_keys_show_switches, NULL);
+static DEVICE_ATTR(on_keys, S_IRUGO, gpio_keys_show_on_keys, NULL);
+static DEVICE_ATTR(on_switches, S_IRUGO, gpio_keys_show_on_switches, NULL);
#define ATTR_STORE_FN(name, type) \
static ssize_t gpio_keys_store_##name(struct device *dev, \
@@ -310,6 +346,8 @@ static struct attribute *gpio_keys_attrs[] = {
&dev_attr_switches.attr,
&dev_attr_disabled_keys.attr,
&dev_attr_disabled_switches.attr,
+ &dev_attr_on_keys.attr,
+ &dev_attr_on_switches.attr,
NULL,
};
--
1.7.2.1
--
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