hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel: change debounce logic in the gpio-buttons driver 

* thanks to Nuno Gonçalves


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19115 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2010-01-13 10:18:24 +00:00
parent 7c1b3086d4
commit 2f07f54570
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
View File

@ -1,7 +1,8 @@
/* /*
* Driver for buttons on GPIO lines not capable of generating interrupts * Driver for buttons on GPIO lines not capable of generating interrupts
* *
* Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> * Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
* Copyright (C) 2010 Nuno Goncalves <nunojpg@gmail.com>
* *
* This file was based on: /drivers/input/misc/cobalt_btns.c * This file was based on: /drivers/input/misc/cobalt_btns.c
* Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> * Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
@ -29,12 +30,18 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#define DRV_NAME "gpio-buttons" #define DRV_NAME "gpio-buttons"
#define DRV_VERSION "0.1.1" #define DRV_VERSION "0.1.2"
#define PFX DRV_NAME ": " #define PFX DRV_NAME ": "
struct gpio_button_data {
int last_state;
int count;
};
struct gpio_buttons_dev { struct gpio_buttons_dev {
struct input_polled_dev *poll_dev; struct input_polled_dev *poll_dev;
struct gpio_buttons_platform_data *pdata; struct gpio_buttons_platform_data *pdata;
struct gpio_button_data *data;
}; };
static void gpio_buttons_poll(struct input_polled_dev *dev) static void gpio_buttons_poll(struct input_polled_dev *dev)
@ -49,22 +56,18 @@ static void gpio_buttons_poll(struct input_polled_dev *dev)
unsigned int type = button->type ?: EV_KEY; unsigned int type = button->type ?: EV_KEY;
int state; int state;
state = gpio_get_value(button->gpio) ? 1 : 0; if (bdev->data[i].count < button->threshold) {
state ^= button->active_low; bdev->data[i].count++;
continue;
if (state) {
button->count++;
} else {
if (button->count >= button->threshold) {
input_event(input, type, button->code, 1);
input_sync(input);
}
button->count = 0;
} }
if (button->count == button->threshold) { state = gpio_get_value(button->gpio) ? 1 : 0;
input_event(input, type, button->code, 0); if (state != bdev->data[i].last_state) {
input_event(input, type, button->code,
!!(state ^ button->active_low));
input_sync(input); input_sync(input);
bdev->data[i].count = 0;
bdev->data[i].last_state = state;
} }
} }
} }
@ -77,16 +80,19 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
struct input_dev *input; struct input_dev *input;
int error, i; int error, i;
if (!pdata) if (!pdata)
return -ENXIO; return -ENXIO;
bdev = kzalloc(sizeof(*bdev), GFP_KERNEL); bdev = kzalloc(sizeof(struct gpio_buttons_dev) +
sizeof(struct gpio_button_data) * pdata->nbuttons,
GFP_KERNEL);
if (!bdev) { if (!bdev) {
printk(KERN_ERR DRV_NAME "no memory for device\n"); printk(KERN_ERR DRV_NAME "no memory for device\n");
return -ENOMEM; return -ENOMEM;
} }
bdev->data = (struct gpio_button_data *) &bdev[1];
poll_dev = input_allocate_polled_device(); poll_dev = input_allocate_polled_device();
if (!poll_dev) { if (!poll_dev) {
printk(KERN_ERR DRV_NAME "no memory for polled device\n"); printk(KERN_ERR DRV_NAME "no memory for polled device\n");
@ -131,7 +137,7 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
} }
input_set_capability(input, type, button->code); input_set_capability(input, type, button->code);
button->count = 0; bdev->data[i].last_state = gpio_get_value(button->gpio) ? 1 : 0;
} }
bdev->poll_dev = poll_dev; bdev->poll_dev = poll_dev;

4
target/linux/generic-2.6/files/include/linux/gpio_buttons.h
View File

@ -1,7 +1,7 @@
/* /*
* Definitions for the GPIO buttons interface driver * Definitions for the GPIO buttons interface driver
* *
* Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org> * Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
* *
* This file was based on: /include/linux/gpio_keys.h * This file was based on: /include/linux/gpio_keys.h
* The original gpio_keys.h seems not to have a license. * The original gpio_keys.h seems not to have a license.
@ -21,7 +21,6 @@ struct gpio_button {
char *desc; /* button description */ char *desc; /* button description */
int type; /* input event type (EV_KEY, EV_SW) */ int type; /* input event type (EV_KEY, EV_SW) */
int code; /* input event code (KEY_*, SW_*) */ int code; /* input event code (KEY_*, SW_*) */
int count;
int threshold; /* count threshold */ int threshold; /* count threshold */
}; };
@ -32,4 +31,3 @@ struct gpio_buttons_platform_data {
}; };
#endif /* _GPIO_BUTTONS_H_ */ #endif /* _GPIO_BUTTONS_H_ */