gpio-button-hotplug: use gpio_button_get_value() to fetch state.

[openwrt/svn-archive/archive.git] / package / kernel / gpio-button-hotplug / src / gpio-button-hotplug.c

diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
index 9d91b57b56fd761c82dbc069ae804c170ed94138..9cbee21e0a5e70f62ee6b29f6099ead63cd7a5ca 100644 (file)
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -49,6 +49,7 @@ struct bh_priv {
 
 struct bh_event {
        const char              *name;
+       unsigned int            type;
        char                    *action;
        unsigned long           seen;
 
@@ -91,9 +92,7 @@ static struct bh_map button_map[] = {
        BH_MAP(BTN_9,           "BTN_9"),
        BH_MAP(KEY_RESTART,     "reset"),
        BH_MAP(KEY_RFKILL,      "rfkill"),
-#ifdef KEY_WPS_BUTTON
        BH_MAP(KEY_WPS_BUTTON,  "wps"),
-#endif /* KEY_WPS_BUTTON */
 };
 
 /* -------------------------------------------------------------------------*/
@@ -140,7 +139,20 @@ static int button_hotplug_fill_event(struct bh_event *event)
        if (ret)
                return ret;
 
-       ret = bh_event_add_var(event, 0, "SUBSYSTEM=%s", "button");
+       char *s;
+       switch (event->type) {
+               case EV_KEY:
+                       s = "button";
+                       break;
+               case EV_SW:
+                       s = "switch";
+                       break;
+               default:
+                       s = "button";
+                       break;
+       }
+
+       ret = bh_event_add_var(event, 0, "SUBSYSTEM=%s", s);
        if (ret)
                return ret;
 
@@ -190,8 +202,8 @@ static void button_hotplug_work(struct work_struct *work)
        kfree(event);
 }
 
-static int button_hotplug_create_event(const char *name, unsigned long seen,
-               int pressed)
+static int button_hotplug_create_event(const char *name, unsigned int type,
+               unsigned long seen, int pressed)
 {
        struct bh_event *event;
 
@@ -203,6 +215,7 @@ static int button_hotplug_create_event(const char *name, unsigned long seen,
                return -ENOMEM;
 
        event->name = name;
+       event->type = type;
        event->seen = seen;
        event->action = pressed ? "pressed" : "released";
 
@@ -225,6 +238,7 @@ static int button_get_index(unsigned int code)
 
        return -1;
 }
+
 static void button_hotplug_event(struct gpio_keys_button_data *data,
                           unsigned int type, unsigned int code, int value)
 {
@@ -234,14 +248,14 @@ static void button_hotplug_event(struct gpio_keys_button_data *data,
 
        BH_DBG("event type=%u, code=%u, value=%d\n", type, code, value);
 
-       if (type != EV_KEY)
+       if ((type != EV_KEY) && (type != EV_SW))
                return;
 
        btn = button_get_index(code);
        if (btn < 0)
                return;
 
-       button_hotplug_create_event(button_map[btn].name,
+       button_hotplug_create_event(button_map[btn].name, type,
                        (seen - priv->seen) / HZ, value);
        priv->seen = seen;
 }
@@ -260,24 +274,36 @@ struct gpio_keys_polled_dev {
        struct gpio_keys_button_data data[0];
 };
 
+static inline int gpio_button_get_value(struct gpio_keys_button *button,
+                         struct gpio_keys_button_data *bdata)
+{
+       if (bdata->can_sleep)
+               return !!gpio_get_value_cansleep(button->gpio);
+       else
+               return !!gpio_get_value(button->gpio);
+}
+
 static void gpio_keys_polled_check_state(struct gpio_keys_button *button,
                                         struct gpio_keys_button_data *bdata)
 {
        int state;
 
-       if (bdata->can_sleep)
-               state = !!gpio_get_value_cansleep(button->gpio);
-       else
-               state = !!gpio_get_value(button->gpio);
+       state = gpio_button_get_value(button, bdata);
 
        state = !!(state ^ button->active_low);
        if (state != bdata->last_state) {
                unsigned int type = button->type ?: EV_KEY;
 
+               if (bdata->count < bdata->threshold) {
+                       bdata->count++;
+                       return;
+               }
+
                button_hotplug_event(bdata, type, button->code, state);
-               bdata->count = 0;
                bdata->last_state = state;
        }
+
+       bdata->count = 0;
 }
 
 static void gpio_keys_polled_queue_work(struct gpio_keys_polled_dev *bdev)
@@ -299,11 +325,7 @@ static void gpio_keys_polled_poll(struct work_struct *work)
 
        for (i = 0; i < bdev->pdata->nbuttons; i++) {
                struct gpio_keys_button_data *bdata = &bdev->data[i];
-
-               if (bdata->count < bdata->threshold)
-                       bdata->count++;
-               else
-                       gpio_keys_polled_check_state(&pdata->buttons[i], bdata);
+               gpio_keys_polled_check_state(&pdata->buttons[i], bdata);
        }
        gpio_keys_polled_queue_work(bdev);
 }