leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] em28xx: reduce the polling interval for GPI connected buttons

Browse Source 
For GPI-connected buttons without (hardware) debouncing, the polling interval
needs to be reduced to detect button presses properly.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Frank Schaefer 2013-12-14 06:40:11 -03:00 committed by Mauro Carvalho Chehab
parent a03636cb21
commit 0ff950a73d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/usb/em28xx/em28xx-input.c
View File

@ -31,7 +31,8 @@
#include "em28xx.h" #include "em28xx.h"
#define EM28XX_SNAPSHOT_KEY KEY_CAMERA #define EM28XX_SNAPSHOT_KEY KEY_CAMERA
#define EM28XX_BUTTONS_QUERY_INTERVAL 500 #define EM28XX_BUTTONS_DEBOUNCED_QUERY_INTERVAL 500 /* [ms] */
#define EM28XX_BUTTONS_VOLATILE_QUERY_INTERVAL 100 /* [ms] */
static unsigned int ir_debug; static unsigned int ir_debug;
module_param(ir_debug, int, 0644); module_param(ir_debug, int, 0644);
@ -546,7 +547,7 @@ static void em28xx_query_buttons(struct work_struct *work)
} }
/* Schedule next poll */ /* Schedule next poll */
schedule_delayed_work(&dev->buttons_query_work, schedule_delayed_work(&dev->buttons_query_work,
msecs_to_jiffies(EM28XX_BUTTONS_QUERY_INTERVAL)); msecs_to_jiffies(dev->button_polling_interval));
} }
static int em28xx_register_snapshot_button(struct em28xx *dev) static int em28xx_register_snapshot_button(struct em28xx *dev)
@ -594,6 +595,7 @@ static void em28xx_init_buttons(struct em28xx *dev)
u8 i = 0, j = 0; u8 i = 0, j = 0;
bool addr_new = 0; bool addr_new = 0;
dev->button_polling_interval = EM28XX_BUTTONS_DEBOUNCED_QUERY_INTERVAL;
while (dev->board.buttons[i].role >= 0 && while (dev->board.buttons[i].role >= 0 &&
dev->board.buttons[i].role < EM28XX_NUM_BUTTON_ROLES) { dev->board.buttons[i].role < EM28XX_NUM_BUTTON_ROLES) {
struct em28xx_button *button = &dev->board.buttons[i]; struct em28xx_button *button = &dev->board.buttons[i];
@ -609,18 +611,18 @@ static void em28xx_init_buttons(struct em28xx *dev)
if (addr_new && dev->num_button_polling_addresses if (addr_new && dev->num_button_polling_addresses
>= EM28XX_NUM_BUTTON_ADDRESSES_MAX) { >= EM28XX_NUM_BUTTON_ADDRESSES_MAX) {
WARN_ONCE(1, "BUG: maximum number of button polling addresses exceeded."); WARN_ONCE(1, "BUG: maximum number of button polling addresses exceeded.");
addr_new = 0; goto next_button;
} }
/* Button role specific checks and actions */ /* Button role specific checks and actions */
if (button->role == EM28XX_BUTTON_SNAPSHOT) { if (button->role == EM28XX_BUTTON_SNAPSHOT) {
/* Register input device */ /* Register input device */
if (em28xx_register_snapshot_button(dev) < 0) if (em28xx_register_snapshot_button(dev) < 0)
addr_new = 0; goto next_button;
} else if (button->role == EM28XX_BUTTON_ILLUMINATION) { } else if (button->role == EM28XX_BUTTON_ILLUMINATION) {
/* Check sanity */ /* Check sanity */
if (!em28xx_find_led(dev, EM28XX_LED_ILLUMINATION)) { if (!em28xx_find_led(dev, EM28XX_LED_ILLUMINATION)) {
em28xx_errdev("BUG: illumination button defined, but no illumination LED.\n"); em28xx_errdev("BUG: illumination button defined, but no illumination LED.\n");
addr_new = 0; goto next_button;
} }
} }
/* Add read address to list of polling addresses */ /* Add read address to list of polling addresses */
@ -629,6 +631,11 @@ static void em28xx_init_buttons(struct em28xx *dev)
dev->button_polling_addresses[index] = button->reg_r; dev->button_polling_addresses[index] = button->reg_r;
dev->num_button_polling_addresses++; dev->num_button_polling_addresses++;
} }
/* Reduce polling interval if necessary */
if (!button->reg_clearing)
dev->button_polling_interval =
EM28XX_BUTTONS_VOLATILE_QUERY_INTERVAL;
next_button:
/* Next button */ /* Next button */
i++; i++;
} }
@ -640,7 +647,7 @@ static void em28xx_init_buttons(struct em28xx *dev)
INIT_DELAYED_WORK(&dev->buttons_query_work, INIT_DELAYED_WORK(&dev->buttons_query_work,
em28xx_query_buttons); em28xx_query_buttons);
schedule_delayed_work(&dev->buttons_query_work, schedule_delayed_work(&dev->buttons_query_work,
msecs_to_jiffies(EM28XX_BUTTONS_QUERY_INTERVAL)); msecs_to_jiffies(dev->button_polling_interval));
} }
} }

1
drivers/media/usb/em28xx/em28xx.h
View File

@ -681,6 +681,7 @@ struct em28xx {
u8 button_polling_addresses[EM28XX_NUM_BUTTON_ADDRESSES_MAX]; u8 button_polling_addresses[EM28XX_NUM_BUTTON_ADDRESSES_MAX];
u8 button_polling_last_values[EM28XX_NUM_BUTTON_ADDRESSES_MAX]; u8 button_polling_last_values[EM28XX_NUM_BUTTON_ADDRESSES_MAX];
u8 num_button_polling_addresses; u8 num_button_polling_addresses;
u16 button_polling_interval; /* [ms] */
/* Snapshot button input device */ /* Snapshot button input device */
char snapshot_button_path[30]; /* path of the input dev */ char snapshot_button_path[30]; /* path of the input dev */
struct input_dev *sbutton_input_dev; struct input_dev *sbutton_input_dev;