lkml.org 
[lkml]   [2006]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch -mm 09/20] chardev: GPIO for SCx200 & PC-8736x: dispatch via vtable
9/20. patch.vtable-calls

Now actually call the gpio operations thru the vtable.

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

---

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

diff -ruNp -X dontdiff -X exclude-diffs ax-8/drivers/char/scx200_gpio.c ax-9/drivers/char/scx200_gpio.c
--- ax-8/drivers/char/scx200_gpio.c 2006-06-17 01:20:34.000000000 -0600
+++ ax-9/drivers/char/scx200_gpio.c 2006-06-17 01:23:47.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,39 +63,39 @@ 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 */
@@ -117,8 +118,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;

@@ -128,6 +130,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);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-06-17 20:32    [W:0.033 / U:25.356 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site