logo       

[patch 10/19] chardev: pc8736x_gpio - adapt scx200_gpio to use vtable: msg#00019

Subject: [patch 10/19] chardev: pc8736x_gpio - adapt scx200_gpio to use vtable
GPIO SUPPORT FOR SCx200 & PC8736x

This patch-set reworks the 2.4 vintage scx200_gpio driver for modern
2.6, and refactors GPIO support to reuse it in a new driver for the
GPIO on PC-8736x chips.

10/19. patch.vtable-calls:

Now actually call the gpio operations thru the vtable.

Signed-off-by:  Jim Cromie <jim.cromie@xxxxxxxxx>

diffstat patch.vtable-calls:
scx200_gpio.c |   24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)


diff -ruNp -X dontdiff -X exclude-diffs k16r-9/drivers/char/scx200_gpio.c 
k16r-10/drivers/char/scx200_gpio.c
--- k16r-9/drivers/char/scx200_gpio.c   2006-05-28 12:21:21.000000000 -0600
+++ k16r-10/drivers/char/scx200_gpio.c  2006-05-28 12:21:35.000000000 -0600
@@ -53,6 +53,7 @@ static ssize_t scx200_gpio_write(struct size_t len, loff_t * ppos)
{
        unsigned m = iminor(file->f_dentry->d_inode);
+       struct nsc_gpio_ops *amp = file->private_data;
        size_t i;
        int err = 0;

@@ -62,41 +63,41 @@ static ssize_t scx200_gpio_write(struct return -EFAULT;
                switch (c) {
                case '0':
-                       scx200_gpio_set(m, 0);
+                       amp->gpio_set(m, 0);
                        break;
                case '1':
-                       scx200_gpio_set(m, 1);
+                       amp->gpio_set(m, 1);
                        break;
                case 'O':
                        printk(KERN_INFO NAME ": GPIO%d output enabled\n", m);
-                       scx200_gpio_configure(m, ~1, 1);
+                       amp->gpio_config(m, ~1, 1);
                        break;
                case 'o':
                        printk(KERN_INFO NAME ": GPIO%d output disabled\n", m);
-                       scx200_gpio_configure(m, ~1, 0);
+                       amp->gpio_config(m, ~1, 0);
                        break;
                case 'T':
                        printk(KERN_INFO NAME ": GPIO%d output is push pull\n",
                               m);
-                       scx200_gpio_configure(m, ~2, 2);
+                       amp->gpio_config(m, ~2, 2);
                        break;
                case 't':
                        printk(KERN_INFO NAME ": GPIO%d output is open drain\n",
                               m);
-                       scx200_gpio_configure(m, ~2, 0);
+                       amp->gpio_config(m, ~2, 0);
                        break;
                case 'P':
                        printk(KERN_INFO NAME ": GPIO%d pull up enabled\n", m);
-                       scx200_gpio_configure(m, ~4, 4);
+                       amp->gpio_config(m, ~4, 4);
                        break;
                case 'p':
                        printk(KERN_INFO NAME ": GPIO%d pull up disabled\n", m);
-                       scx200_gpio_configure(m, ~4, 0);
+                       amp->gpio_config(m, ~4, 0);
                        break;

                case 'v':
                        /* View Current pin settings */
-                       scx200_gpio_dump(m);
+                       amp->gpio_dump(m);
                        break;
                case '\n':
                        /* end of settings string, do nothing */
@@ -119,8 +120,9 @@ static ssize_t scx200_gpio_read(struct f
{
        unsigned m = iminor(file->f_dentry->d_inode);
        int value;
+       struct nsc_gpio_ops *amp = file->private_data;

-       value = scx200_gpio_get(m);
+       value = amp->gpio_get(m);
        if (put_user(value ? '1' : '0', buf))
                return -EFAULT;

@@ -130,6 +132,8 @@ static ssize_t scx200_gpio_read(struct f
static int scx200_gpio_open(struct inode *inode, struct file *file)
{
        unsigned m = iminor(inode);
+       file->private_data = &scx200_access;
+
        if (m > 63)
                return -EINVAL;
        return nonseekable_open(inode, file);


<Prev in Thread] Current Thread [Next in Thread>