]> git.zerfleddert.de Git - ms2-fixes/blobdiff - debounce.c
more consistency
[ms2-fixes] / debounce.c
index a5138c3ec99ba1b1129e72b43d817d63d3e06d46..e6040167c3de8f2ccbbd9c1cb57405ca49aba6da 100644 (file)
@@ -2,19 +2,17 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/gpio_event.h>
+#include <mach/gpio.h>
 
 #define PREFIX "debounce: "
 
-static int debounce_delay = 15;
-
 static unsigned old_flags = 0;
-ktime_t old_debounce_delay;
-ktime_t old_settle_time;
-ktime_t old_poll_time;
+static ktime_t old_debounce_delay;
+static ktime_t old_settle_time;
+static 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 hw_debounce = 0;
+static int hw_debounce_time = 0;
 
 static int find_ms2_dev(struct device *dev, void *data)
 {
@@ -25,6 +23,29 @@ static int find_ms2_dev(struct device *dev, void *data)
        return 0;
 }
 
+/* hardware debounce: (time + 1) * 31us */
+static void hw_debounce_set(int enable, int time) {
+       int i;
+
+       if (gpio_evmi == NULL)
+               return;
+
+       for (i = 0; i < gpio_evmi->ninputs; i++) {
+               int gpio = gpio_evmi->input_gpios[i];
+
+               if ((time != -1) && (time != hw_debounce_time) && hw_debounce) {
+                       printk(KERN_INFO PREFIX "Setting hardware debounce time for GPIO %d to %d (%dus)\n", gpio, time, (time+1)*31);
+                       omap_set_gpio_debounce_time(gpio, time);
+               }
+
+               if ((enable != -1) && (enable != hw_debounce)) {
+                       printk(KERN_INFO PREFIX "%sabling hardware debounce for GPIO %d\n", (enable?"En":"Dis"), gpio);
+                       omap_set_gpio_debounce(gpio, enable);
+               }
+       }
+}
+
+
 static ssize_t show_debounce_delay(struct device *dev, struct device_attribute *attr, char *buf)
 {
        if (!gpio_evmi) 
@@ -38,7 +59,6 @@ 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;
-               debounce_delay = delay;
                printk(KERN_INFO PREFIX "debounce_delay: %u\n", gpio_evmi->debounce_delay.tv.nsec);
        }
 
@@ -131,9 +151,6 @@ static ssize_t store_flags(struct device *dev, struct device_attribute *attr, co
 
        printk(KERN_INFO PREFIX "flags: 0x%x\n", flags);
 
-       if (flags & GPIOKPF_DRIVE_INACTIVE)
-               return count;
-
        gpio_evmi->flags = flags;
 
        return count;
@@ -269,6 +286,106 @@ static ssize_t store_print_phantom_keys_flag(struct device *dev, struct device_a
        return count;
 }
 
+static ssize_t show_active_high_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_ACTIVE_HIGH) ? 1 : 0);
+}
+
+static ssize_t store_active_high_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_ACTIVE_HIGH;
+       } else {
+               gpio_evmi->flags &= ~GPIOKPF_ACTIVE_HIGH;
+       }
+
+       return count;
+}
+
+static ssize_t show_drive_inactive_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_DRIVE_INACTIVE) ? 1 : 0);
+}
+
+static ssize_t store_drive_inactive_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_DRIVE_INACTIVE;
+       } else {
+               gpio_evmi->flags &= ~GPIOKPF_DRIVE_INACTIVE;
+       }
+
+       return count;
+}
+
+static ssize_t show_hw_debounce(struct device *dev, struct device_attribute *attr, char *buf)
+{
+       return snprintf(buf, PAGE_SIZE, "%d\n", hw_debounce);
+}
+
+static ssize_t store_hw_debounce(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+       int enable;
+
+       sscanf(buf, "%d", &enable);
+
+       if (enable) {
+               hw_debounce_set(1, -1);
+               hw_debounce = 1;
+       }
+       else {
+               hw_debounce_set(-1, 0);
+               hw_debounce_set(0, -1);
+               hw_debounce = 0;
+               hw_debounce_time = 0;
+       }
+
+       return count;
+}
+
+static ssize_t show_hw_debounce_time(struct device *dev, struct device_attribute *attr, char *buf)
+{
+       return snprintf(buf, PAGE_SIZE, "%d\n", hw_debounce_time);
+}
+
+static ssize_t store_hw_debounce_time(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+       int time;
+
+       sscanf(buf, "%d", &time);
+
+       if ((time < 0) || (time > 0xff))
+               return count;
+
+       if (!hw_debounce)
+               return count;
+
+       hw_debounce_set(-1, time);
+       hw_debounce_time = time;
+
+       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);
@@ -278,6 +395,10 @@ 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(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);
 
 static void debounce_release(struct device *dev)
 {
@@ -323,6 +444,10 @@ static int __init debounce_init(void)
        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);
+       err = device_create_file(&debounce_device, &dev_attr_active_high_flag);
+       err = device_create_file(&debounce_device, &dev_attr_drive_inactive_flag);
+       err = device_create_file(&debounce_device, &dev_attr_hw_debounce);
+       err = device_create_file(&debounce_device, &dev_attr_hw_debounce_time);
 
        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);
@@ -334,8 +459,6 @@ static int __init debounce_init(void)
        old_poll_time = gpio_evmi->poll_time;
        old_flags = gpio_evmi->flags;
 
-       set_debounce_delay(debounce_delay);
-
        printk(KERN_INFO PREFIX "flags: 0x%x\n", gpio_evmi->flags);
 
        return 0;
@@ -357,6 +480,7 @@ static void __exit debounce_exit(void)
                gpio_evmi->settle_time = old_settle_time;
                gpio_evmi->poll_time = old_poll_time;
        }
+       hw_debounce_set(0, 0);
        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);
@@ -366,6 +490,10 @@ static void __exit debounce_exit(void)
        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_remove_file(&debounce_device, &dev_attr_active_high_flag);
+       device_remove_file(&debounce_device, &dev_attr_drive_inactive_flag);
+       device_remove_file(&debounce_device, &dev_attr_hw_debounce);
+       device_remove_file(&debounce_device, &dev_attr_hw_debounce_time);
        device_unregister(&debounce_device);
 }
 
Impressum, Datenschutz