Abstract the gpio operations into the nsc_gpio_ops vtable. This vtable will (later) be shared via filp->private_data, since it has everything to handle the commands sent by the file-ops handlers. Signed-off-by: Jim Cromie <jim.cromie@xxxxxxxxx> diffstat patch.access-vtable drivers/char/scx200_gpio.c | 13 +++++++++++++ include/linux/nsc_gpio.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) --- diff -ruNp -X dontdiff -X exclude-diffs ab-7/drivers/char/scx200_gpio.c ab-8/drivers/char/scx200_gpio.c --- ab-7/drivers/char/scx200_gpio.c 2006-06-02 13:36:43.000000000 -0600 +++ ab-8/drivers/char/scx200_gpio.c 2006-06-02 13:37:14.000000000 -0600 @@ -20,6 +20,7 @@ #include <linux/cdev.h> #include <linux/scx200_gpio.h> +#include <linux/nsc_gpio.h> #define NAME "scx200_gpio" #define DEVNAME NAME @@ -36,6 +37,18 @@ MODULE_PARM_DESC(major, "Major device nu extern void scx200_gpio_dump(unsigned index); +struct nsc_gpio_ops scx200_access = { + .owner = THIS_MODULE, + .gpio_config = scx200_gpio_configure, + .gpio_dump = scx200_gpio_dump, + .gpio_get = scx200_gpio_get, + .gpio_set = scx200_gpio_set, + .gpio_set_high = scx200_gpio_set_high, + .gpio_set_low = scx200_gpio_set_low, + .gpio_change = scx200_gpio_change, + .gpio_current = scx200_gpio_current +}; + static ssize_t scx200_gpio_write(struct file *file, const char __user * data, size_t len, loff_t * ppos) { diff -ruNp -X dontdiff -X exclude-diffs ab-7/include/linux/nsc_gpio.h ab-8/include/linux/nsc_gpio.h --- ab-7/include/linux/nsc_gpio.h 1969-12-31 17:00:00.000000000 -0700 +++ ab-8/include/linux/nsc_gpio.h 2006-06-02 13:37:14.000000000 -0600 @@ -0,0 +1,33 @@ +/** + nsc_gpio.c + + National Semiconductor GPIO common access methods. + + struct nsc_gpio_ops abstracts the low-level access + operations for the GPIO units on 2 NSC chip families; the GEODE + integrated CPU, and the PC-8736[03456] integrated PC-peripheral + chips. + + The GPIO units on these chips have the same pin architecture, but + the access methods differ. Thus, scx200_gpio and pc8736x_gpio + implement their own versions of these routines; and use the common + file-operations routines implemented in nsc_gpio module. + + Copyright (c) 2006 Jim Cromie <jim.cromie@xxxxxxxxx> + + NB: this work was tested on the Geode SC-1100 and PC-87366 chips. + NSC sold the GEODE line to AMD, and the PC-8736x line to Winbond. +*/ + +struct nsc_gpio_ops { + struct module* owner; + u32 (*gpio_config) (unsigned iminor, u32 mask, u32 bits); + void (*gpio_dump) (unsigned iminor); + int (*gpio_get) (unsigned iminor); + void (*gpio_set) (unsigned iminor, int state); + void (*gpio_set_high)(unsigned iminor); + void (*gpio_set_low) (unsigned iminor); + void (*gpio_change) (unsigned iminor); + int (*gpio_current) (unsigned iminor); +}; + -- Kernelnewbies: Help each other learn about the Linux kernel. Archive: http://mail.nl.linux.org/kernelnewbies/ FAQ: http://kernelnewbies.org/faq/