X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/a4838b14f5c5bdb4ceda232aec01e695e56af575..0b9d6422126cbd641917c648172f890e2ca72c6f:/debounce.c

diff --git a/debounce.c b/debounce.c
index 852118f..029ff91 100644
--- a/debounce.c
+++ b/debounce.c
@@ -5,15 +5,12 @@
 
 #define PREFIX "debounce: "
 
-static int debounce_delay = 15;
-
-static int old_delay = 0;
 static unsigned old_flags = 0;
+ktime_t old_debounce_delay;
+ktime_t old_settle_time;
+ktime_t old_poll_time;
 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))) {
@@ -23,14 +20,276 @@ static int find_ms2_dev(struct device *dev, void *data)
 	return 0;
 }
 
+static ssize_t show_debounce_delay(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	return snprintf(buf, PAGE_SIZE, "%ld\n", (gpio_evmi->debounce_delay.tv.nsec / NSEC_PER_MSEC));
+}
+
+static void set_debounce_delay(long delay)
+{
+	if (gpio_evmi->debounce_delay.tv.nsec != delay * NSEC_PER_MSEC) {
+		printk(KERN_INFO PREFIX "Changing debounce_delay\n");
+		gpio_evmi->debounce_delay.tv.nsec = delay * NSEC_PER_MSEC;
+		printk(KERN_INFO PREFIX "debounce_delay: %u\n", gpio_evmi->debounce_delay.tv.nsec);
+	}
+
+#if 0
+	if (gpio_evmi->debounce_delay.tv.nsec != 0) {
+		if (!(gpio_evmi->flags & GPIOKPF_DEBOUNCE)) {
+			printk(KERN_INFO PREFIX "Activating debounce\n");
+			gpio_evmi->flags |= GPIOKPF_DEBOUNCE;
+		}
+	} else {
+		if (gpio_evmi->flags & GPIOKPF_DEBOUNCE) {
+			printk(KERN_INFO PREFIX "Deactivating debounce\n");
+			gpio_evmi->flags &= ~GPIOKPF_DEBOUNCE;
+		}
+	}
+#endif
+}
+
+static ssize_t store_debounce_delay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	long int delay;
+
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	sscanf(buf, "%ld", &delay);
+	set_debounce_delay(delay);
+
+	return count;
+}
+
+static ssize_t show_settle_time(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	return snprintf(buf, PAGE_SIZE, "%ld\n", (gpio_evmi->settle_time.tv.nsec / NSEC_PER_USEC));
+}
+
+static ssize_t store_settle_time(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	long int delay;
+
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	sscanf(buf, "%ld", &delay);
+	gpio_evmi->settle_time.tv.nsec = delay * NSEC_PER_USEC;
+
+	return count;
+}
+
+static ssize_t show_poll_time(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	return snprintf(buf, PAGE_SIZE, "%ld\n", (gpio_evmi->poll_time.tv.nsec / NSEC_PER_MSEC));
+}
+
+static ssize_t store_poll_time(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	long int delay;
+
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	sscanf(buf, "%ld", &delay);
+	gpio_evmi->poll_time.tv.nsec = delay * NSEC_PER_MSEC;
+
+	return count;
+}
+
+static ssize_t show_flags(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	return snprintf(buf, PAGE_SIZE, "0x%x\n", gpio_evmi->flags);
+}
+
+static ssize_t store_flags(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	unsigned flags;
+
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	sscanf(buf, "0x%x", &flags);
+
+	printk(KERN_INFO PREFIX "flags: 0x%x\n", flags);
+
+	if (flags & GPIOKPF_DRIVE_INACTIVE)
+		return count;
+
+	gpio_evmi->flags = flags;
+
+	return count;
+}
+
+static ssize_t show_debounce_flag(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_DEBOUNCE) ? 1 : 0);
+}
+
+static ssize_t store_debounce_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	unsigned flag;
+
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	sscanf(buf, "%u", &flag);
+
+	if (flag) {
+		gpio_evmi->flags |= GPIOKPF_DEBOUNCE;
+	} else {
+		gpio_evmi->flags &= ~GPIOKPF_DEBOUNCE;
+	}
+
+	return count;
+}
+
+static ssize_t show_remove_some_phantom_keys_flag(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_REMOVE_SOME_PHANTOM_KEYS) ? 1 : 0);
+}
+
+static ssize_t store_remove_some_phantom_keys_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	unsigned flag;
+
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	sscanf(buf, "%u", &flag);
+
+	if (flag) {
+		gpio_evmi->flags |= GPIOKPF_REMOVE_SOME_PHANTOM_KEYS;
+	} else {
+		gpio_evmi->flags &= ~GPIOKPF_REMOVE_SOME_PHANTOM_KEYS;
+	}
+
+	return count;
+}
+
+static ssize_t show_print_unmapped_keys_flag(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_PRINT_UNMAPPED_KEYS) ? 1 : 0);
+}
+
+static ssize_t store_print_unmapped_keys_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	unsigned flag;
+
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	sscanf(buf, "%u", &flag);
+
+	if (flag) {
+		gpio_evmi->flags |= GPIOKPF_PRINT_UNMAPPED_KEYS;
+	} else {
+		gpio_evmi->flags &= ~GPIOKPF_PRINT_UNMAPPED_KEYS;
+	}
+
+	return count;
+}
+
+static ssize_t show_print_mapped_keys_flag(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_PRINT_MAPPED_KEYS) ? 1 : 0);
+}
+
+static ssize_t store_print_mapped_keys_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	unsigned flag;
+
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	sscanf(buf, "%u", &flag);
+
+	if (flag) {
+		gpio_evmi->flags |= GPIOKPF_PRINT_MAPPED_KEYS;
+	} else {
+		gpio_evmi->flags &= ~GPIOKPF_PRINT_MAPPED_KEYS;
+	}
+
+	return count;
+}
+
+static ssize_t show_print_phantom_keys_flag(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_PRINT_PHANTOM_KEYS) ? 1 : 0);
+}
+
+static ssize_t store_print_phantom_keys_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+	unsigned flag;
+
+	if (!gpio_evmi) 
+		return -ENODEV;
+
+	sscanf(buf, "%u", &flag);
+
+	if (flag) {
+		gpio_evmi->flags |= GPIOKPF_PRINT_PHANTOM_KEYS;
+	} else {
+		gpio_evmi->flags &= ~GPIOKPF_PRINT_PHANTOM_KEYS;
+	}
+
+	return count;
+}
+
+static DEVICE_ATTR(debounce_delay, (S_IRUGO | S_IWUGO), show_debounce_delay, store_debounce_delay);
+static DEVICE_ATTR(settle_time, (S_IRUGO | S_IWUGO), show_settle_time, store_settle_time);
+static DEVICE_ATTR(poll_time, (S_IRUGO | S_IWUGO), show_poll_time, store_poll_time);
+static DEVICE_ATTR(flags, (S_IRUGO), show_flags, store_flags);
+static DEVICE_ATTR(debounce_flag, (S_IRUGO | S_IWUGO), show_debounce_flag, store_debounce_flag);
+static DEVICE_ATTR(remove_some_phantom_keys_flag, (S_IRUGO | S_IWUGO), show_remove_some_phantom_keys_flag, store_remove_some_phantom_keys_flag);
+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 void debounce_release(struct device *dev)
+{
+}
+
+static struct device debounce_device = {
+	.init_name = "debounce",
+	.release = debounce_release,
+};
+
 static int __init debounce_init(void)
 {
 	struct device *event_dev = NULL;
 	struct gpio_event_platform_data *gpio_epd;
 	struct gpio_event_info *gpio_ei;
+	int err = 0;
 
 	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)
@@ -44,32 +303,31 @@ 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);
 
+	err = device_register(&debounce_device);
+	if (err) {
+		return err;
+	}
+
+	err = device_create_file(&debounce_device, &dev_attr_debounce_delay);
+	err = device_create_file(&debounce_device, &dev_attr_settle_time);
+	err = device_create_file(&debounce_device, &dev_attr_poll_time);
+	err = device_create_file(&debounce_device, &dev_attr_flags);
+	err = device_create_file(&debounce_device, &dev_attr_debounce_flag);
+	err = device_create_file(&debounce_device, &dev_attr_remove_some_phantom_keys_flag);
+	err = device_create_file(&debounce_device, &dev_attr_print_unmapped_keys_flag);
+	err = device_create_file(&debounce_device, &dev_attr_print_mapped_keys_flag);
+	err = device_create_file(&debounce_device, &dev_attr_print_phantom_keys_flag);
+
 	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_debounce_delay = gpio_evmi->debounce_delay;
+	old_settle_time = gpio_evmi->settle_time;
+	old_poll_time = gpio_evmi->poll_time;
 	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;
@@ -78,9 +336,9 @@ static int __init debounce_init(void)
 static void __exit debounce_exit(void)
 {
 	if (gpio_evmi) {
-		if (gpio_evmi->debounce_delay.tv.nsec != old_delay) {
+		if (gpio_evmi->debounce_delay.tv.nsec != old_debounce_delay.tv.nsec) {
 			printk(KERN_INFO PREFIX "Restoring debounce_delay\n");
-			gpio_evmi->debounce_delay.tv.nsec = old_delay;
+			gpio_evmi->debounce_delay = old_debounce_delay;
 			printk(KERN_INFO PREFIX "debounce_delay: %u\n", gpio_evmi->debounce_delay.tv.nsec);
 		}
 		if (gpio_evmi->flags != old_flags) {
@@ -88,7 +346,19 @@ static void __exit debounce_exit(void)
 			gpio_evmi->flags = old_flags;
 			printk(KERN_INFO PREFIX "flags: 0x%x\n", gpio_evmi->flags);
 		}
+		gpio_evmi->settle_time = old_settle_time;
+		gpio_evmi->poll_time = old_poll_time;
 	}
+	device_remove_file(&debounce_device, &dev_attr_debounce_delay);
+	device_remove_file(&debounce_device, &dev_attr_settle_time);
+	device_remove_file(&debounce_device, &dev_attr_poll_time);
+	device_remove_file(&debounce_device, &dev_attr_flags);
+	device_remove_file(&debounce_device, &dev_attr_debounce_flag);
+	device_remove_file(&debounce_device, &dev_attr_remove_some_phantom_keys_flag);
+	device_remove_file(&debounce_device, &dev_attr_print_unmapped_keys_flag);
+	device_remove_file(&debounce_device, &dev_attr_print_mapped_keys_flag);
+	device_remove_file(&debounce_device, &dev_attr_print_phantom_keys_flag);
+	device_unregister(&debounce_device);
 }
 
 module_init(debounce_init);