X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/f42863015cde28c9102ffe5406419b73939aec7f..e2cecc6a4e8bfe035f78fd910b83199a72e1e38e:/debounce.c diff --git a/debounce.c b/debounce.c index 9110598..9b8af30 100644 --- a/debounce.c +++ b/debounce.c @@ -5,6 +5,8 @@ #include #include #include +#include +#include #define PREFIX "debounce: " @@ -12,10 +14,33 @@ static unsigned old_flags = 0; static ktime_t old_debounce_delay; static ktime_t old_settle_time; static ktime_t old_poll_time; +static int (*old_sw_fixup)(int index); static struct gpio_event_matrix_info *gpio_evmi = NULL; static int hw_debounce = 0; static int hw_debounce_time = 0; +struct gpio_event { + struct gpio_event_input_devs *input_devs; + const struct gpio_event_platform_data *info; + struct early_suspend early_suspend; + void *state[0]; +}; + +struct gpio_kp { + struct gpio_event_input_devs *input_devs; + struct gpio_event_matrix_info *keypad_info; + struct hrtimer timer; + struct wake_lock wake_lock; + int current_output; + unsigned int use_irq:1; + unsigned int key_state_changed:1; + unsigned int last_key_state_changed:1; + unsigned int some_keys_pressed:2; + unsigned long keys_pressed[0]; +}; + +static struct gpio_kp *gpio_kp_state = NULL; + static int find_ms2_dev(struct device *dev, void *data) { if (!strncmp((char*)data, dev_name(dev), strlen((char*)data))) { @@ -463,12 +488,30 @@ static DEVICE_ATTR(remove_some_phantom_keys_flag, (S_IRUGO | S_IWUGO), show_remo static DEVICE_ATTR(print_unmapped_keys_flag, (S_IRUGO | S_IWUGO), show_print_unmapped_keys_flag, store_print_unmapped_keys_flag); static DEVICE_ATTR(print_mapped_keys_flag, (S_IRUGO | S_IWUGO), show_print_mapped_keys_flag, store_print_mapped_keys_flag); static DEVICE_ATTR(print_phantom_keys_flag, (S_IRUGO | S_IWUGO), show_print_phantom_keys_flag, store_print_phantom_keys_flag); -static DEVICE_ATTR(active_high_flag, (S_IRUGO), show_active_high_flag, store_active_high_flag); +static DEVICE_ATTR(active_high_flag, (S_IRUGO | S_IWUGO), show_active_high_flag, store_active_high_flag); static DEVICE_ATTR(level_triggered_irq_flag, (S_IRUGO | S_IWUGO), show_level_triggered_irq_flag, store_level_triggered_irq_flag); static DEVICE_ATTR(drive_inactive_flag, (S_IRUGO | S_IWUGO), show_drive_inactive_flag, store_drive_inactive_flag); static DEVICE_ATTR(hw_debounce, (S_IRUGO | S_IWUGO), show_hw_debounce, store_hw_debounce); static DEVICE_ATTR(hw_debounce_time, (S_IRUGO | S_IWUGO), show_hw_debounce_time, store_hw_debounce_time); +#if 0 +static int debounce_fixup(int index) +{ + int ret; + + printk(KERN_INFO PREFIX "key_state_changed: %d, last_key_state_changed: %d, some_keys_pressed: %d\n", + gpio_kp_state->key_state_changed, + gpio_kp_state->last_key_state_changed, + gpio_kp_state->some_keys_pressed); + + ret = old_sw_fixup(index); + if (!ret) + printk(KERN_INFO PREFIX "Index 0x%x ignored!\n", index); + + return ret; +} +#endif + static void debounce_release(struct device *dev) { } @@ -481,16 +524,23 @@ static struct device debounce_device = { static int __init debounce_init(void) { struct device *event_dev = NULL; + struct platform_device *pdev = NULL; struct gpio_event_platform_data *gpio_epd; struct gpio_event_info *gpio_ei; + struct gpio_event *gpio_e; int err = 0; + int i; printk(KERN_INFO PREFIX "Searching for " GPIO_EVENT_DEV_NAME "...\n"); event_dev = device_find_child(&platform_bus, GPIO_EVENT_DEV_NAME, find_ms2_dev); if (event_dev == NULL) return -ENODEV; - + + pdev = container_of(event_dev, struct platform_device, dev); + if (pdev == NULL) + return -ENODEV; + gpio_epd = (struct gpio_event_platform_data*)event_dev->platform_data; printk(KERN_INFO PREFIX "And there is a %s connected...\n", gpio_epd->name); if (strcmp(gpio_epd->name, "sholes-keypad")) @@ -499,6 +549,29 @@ static int __init debounce_init(void) gpio_ei = (struct gpio_event_info*)gpio_epd->info[0]; gpio_evmi = container_of(gpio_ei, struct gpio_event_matrix_info, info); + gpio_e = platform_get_drvdata(pdev); + printk(KERN_INFO PREFIX "Number of states: %d\n", gpio_e->info->info_count); + + /* Search for correct gpio_event state */ + for (i = 0; i < gpio_e->info->info_count; i++) { + if (gpio_e->info->info[i]->func == gpio_ei->func) { + printk(KERN_INFO PREFIX "Keypad state: %d\n", i); + gpio_kp_state = gpio_e->state[i]; + } + } + + if (!gpio_kp_state) { + printk(KERN_ERR PREFIX "Can't determine correct keypad state!\n"); + return -ENODEV; + } + + printk(KERN_INFO PREFIX "kp_use_irq: %d\n", gpio_kp_state->use_irq); +#if 0 + gpio_kp_state->use_irq=0; + hrtimer_start(&(gpio_kp_state->timer), gpio_evmi->poll_time, HRTIMER_MODE_REL); + printk(KERN_INFO PREFIX "kp_use_irq: %d\n", gpio_kp_state->use_irq); +#endif + err = device_register(&debounce_device); if (err) { return err; @@ -528,8 +601,12 @@ static int __init debounce_init(void) old_settle_time = gpio_evmi->settle_time; old_poll_time = gpio_evmi->poll_time; old_flags = gpio_evmi->flags; + old_sw_fixup = gpio_evmi->sw_fixup; - printk(KERN_INFO PREFIX "flags: 0x%x\n", gpio_evmi->flags); +#if 0 + printk(KERN_INFO PREFIX "Registering fixup handler\n"); + gpio_evmi->sw_fixup = debounce_fixup; +#endif return 0; } @@ -550,6 +627,11 @@ static void __exit debounce_exit(void) } gpio_evmi->settle_time = old_settle_time; gpio_evmi->poll_time = old_poll_time; + + if (gpio_evmi->sw_fixup != old_sw_fixup) { + printk(KERN_INFO PREFIX "Restoring fixup handler\n"); + gpio_evmi->sw_fixup = old_sw_fixup; + } } hw_debounce_set(0, 0); device_remove_file(&debounce_device, &dev_attr_debounce_delay);