X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/d1ff9643d914a61f1d1a08bdb5a5ac7ae665aa16..7edd7d4014c0744be072e76f07ea51710a2ff8a7:/debounce.c

diff --git a/debounce.c b/debounce.c
index ec20fdb..852118f 100644
--- a/debounce.c
+++ b/debounce.c
@@ -3,10 +3,21 @@
 #include <linux/platform_device.h>
 #include <linux/gpio_event.h>
 
-int find_ms2_dev(struct device *dev, void *data)
+#define PREFIX "debounce: "
+
+static int debounce_delay = 15;
+
+static int old_delay = 0;
+static unsigned old_flags = 0;
+static struct gpio_event_matrix_info *gpio_evmi = NULL;
+
+module_param(debounce_delay, int, S_IRUSR | S_IRGRP | S_IROTH);
+MODULE_PARM_DESC(debounce_delay, "debouncing delay (ms), default: 15");
+
+static int find_ms2_dev(struct device *dev, void *data)
 {
 	if (!strncmp((char*)data, dev_name(dev), strlen((char*)data))) {
-		printk(KERN_INFO "Found it!\n");
+		printk(KERN_INFO PREFIX "Found it\n");
 		return 1;
 	}
 	return 0;
@@ -17,9 +28,8 @@ static int __init debounce_init(void)
 	struct device *event_dev = NULL;
 	struct gpio_event_platform_data *gpio_epd;
 	struct gpio_event_info *gpio_ei;
-	struct gpio_event_matrix_info *gpio_evmi;
 
-	printk(KERN_INFO "Searching for " GPIO_EVENT_DEV_NAME "...\n");
+	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);
@@ -27,27 +37,58 @@ static int __init debounce_init(void)
 		return -ENODEV;
 
 	gpio_epd = (struct gpio_event_platform_data*)event_dev->platform_data;
-	printk(KERN_INFO "And there is a %s connected...\n", gpio_epd->name);
+	printk(KERN_INFO PREFIX "And there is a %s connected...\n", gpio_epd->name);
 	if (strcmp(gpio_epd->name, "sholes-keypad"))
 		return -ENODEV;
 
 	gpio_ei = (struct gpio_event_info*)gpio_epd->info[0];
 	gpio_evmi = container_of(gpio_ei, struct gpio_event_matrix_info, info);
 
-	printk(KERN_INFO "settle_time: %u\n", gpio_evmi->settle_time.tv.nsec);
-	printk(KERN_INFO "poll_time: %u\n", gpio_evmi->poll_time.tv.nsec);
-	printk(KERN_INFO "debounce_delay: %u\n", gpio_evmi->debounce_delay.tv.nsec);
-	if (!gpio_evmi->debounce_delay.tv.nsec) {
-		printk(KERN_INFO "Activating debounce!\n");
-		gpio_evmi->debounce_delay.tv.nsec = 5 * NSEC_PER_MSEC;
-		printk(KERN_INFO "debounce_delay: %u\n", gpio_evmi->debounce_delay.tv.nsec);
+	printk(KERN_INFO PREFIX "settle_time: %u\n", gpio_evmi->settle_time.tv.nsec);
+	printk(KERN_INFO PREFIX "poll_time: %u\n", gpio_evmi->poll_time.tv.nsec);
+	printk(KERN_INFO PREFIX "debounce_delay: %u\n", gpio_evmi->debounce_delay.tv.nsec);
+	printk(KERN_INFO PREFIX "flags: 0x%x\n", gpio_evmi->flags);
+
+	old_delay = gpio_evmi->debounce_delay.tv.nsec;
+
+	if (gpio_evmi->debounce_delay.tv.nsec != debounce_delay * NSEC_PER_MSEC) {
+		printk(KERN_INFO PREFIX "Changing debounce_delay\n");
+		gpio_evmi->debounce_delay.tv.nsec = debounce_delay * NSEC_PER_MSEC;
+		printk(KERN_INFO PREFIX "debounce_delay: %u\n", gpio_evmi->debounce_delay.tv.nsec);
 	}
 
+	old_flags = gpio_evmi->flags;
+
+	if (gpio_evmi->debounce_delay.tv.nsec != 0) {
+		/* GPIOKPF_DEBOUNCE should already be set by GPIOKPF_REMOVE_PHANTOM_KEYS */
+		if (!(gpio_evmi->flags & GPIOKPF_DEBOUNCE)) {
+			printk(KERN_INFO PREFIX "Activating debounce\n");
+			gpio_evmi->flags |= GPIOKPF_DEBOUNCE;
+		}
+	} else {
+		/* Deactivating GPIOKPF_DEBOUNCE */
+		printk(KERN_INFO PREFIX "Deactivating debounce\n");
+		gpio_evmi->flags &= ~GPIOKPF_DEBOUNCE;
+	}
+	printk(KERN_INFO PREFIX "flags: 0x%x\n", gpio_evmi->flags);
+
 	return 0;
 }
 
 static void __exit debounce_exit(void)
 {
+	if (gpio_evmi) {
+		if (gpio_evmi->debounce_delay.tv.nsec != old_delay) {
+			printk(KERN_INFO PREFIX "Restoring debounce_delay\n");
+			gpio_evmi->debounce_delay.tv.nsec = old_delay;
+			printk(KERN_INFO PREFIX "debounce_delay: %u\n", gpio_evmi->debounce_delay.tv.nsec);
+		}
+		if (gpio_evmi->flags != old_flags) {
+			printk(KERN_INFO PREFIX "Restoring flags\n");
+			gpio_evmi->flags = old_flags;
+			printk(KERN_INFO PREFIX "flags: 0x%x\n", gpio_evmi->flags);
+		}
+	}
 }
 
 module_init(debounce_init);