git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
scx200_gpio.h
diff --git
a/include/linux/scx200_gpio.h
b/include/linux/scx200_gpio.h
index
2c6d739
..
1a82d30
100644
(file)
--- a/
include/linux/scx200_gpio.h
+++ b/
include/linux/scx200_gpio.h
@@
-1,11
+1,10
@@
#include <linux/spinlock.h>
#include <linux/spinlock.h>
-u32 scx200_gpio_configure(int index, u32 set, u32 clear);
-void scx200_gpio_dump(unsigned index);
+u32 scx200_gpio_configure(unsigned index, u32 set, u32 clear);
extern unsigned scx200_gpio_base;
extern unsigned scx200_gpio_base;
-extern spinlock_t scx200_gpio_lock;
extern long scx200_gpio_shadow[2];
extern long scx200_gpio_shadow[2];
+extern struct nsc_gpio_ops scx200_gpio_ops;
#define scx200_gpio_present() (scx200_gpio_base!=0)
#define scx200_gpio_present() (scx200_gpio_base!=0)
@@
-19,7
+18,7
@@
extern long scx200_gpio_shadow[2];
/* returns the value of the GPIO pin */
/* returns the value of the GPIO pin */
-static inline int scx200_gpio_get(
int
index) {
+static inline int scx200_gpio_get(
unsigned
index) {
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR + 0x04;
__SCx200_GPIO_INDEX;
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR + 0x04;
__SCx200_GPIO_INDEX;
@@
-31,7
+30,7
@@
static inline int scx200_gpio_get(int index) {
driven if the GPIO is configured as an output, it might not be the
state of the GPIO right now if the GPIO is configured as an input) */
driven if the GPIO is configured as an output, it might not be the
state of the GPIO right now if the GPIO is configured as an input) */
-static inline int scx200_gpio_current(
int
index) {
+static inline int scx200_gpio_current(
unsigned
index) {
__SCx200_GPIO_BANK;
__SCx200_GPIO_INDEX;
__SCx200_GPIO_BANK;
__SCx200_GPIO_INDEX;
@@
-40,7
+39,7
@@
static inline int scx200_gpio_current(int index) {
/* drive the GPIO signal high */
/* drive the GPIO signal high */
-static inline void scx200_gpio_set_high(
int
index) {
+static inline void scx200_gpio_set_high(
unsigned
index) {
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW;
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW;
@@
-51,7
+50,7
@@
static inline void scx200_gpio_set_high(int index) {
/* drive the GPIO signal low */
/* drive the GPIO signal low */
-static inline void scx200_gpio_set_low(
int
index) {
+static inline void scx200_gpio_set_low(
unsigned
index) {
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW;
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW;
@@
-62,7
+61,7
@@
static inline void scx200_gpio_set_low(int index) {
/* drive the GPIO signal to state */
/* drive the GPIO signal to state */
-static inline void scx200_gpio_set(
int
index, int state) {
+static inline void scx200_gpio_set(
unsigned
index, int state) {
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW;
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW;
@@
-75,7
+74,7
@@
static inline void scx200_gpio_set(int index, int state) {
}
/* toggle the GPIO signal */
}
/* toggle the GPIO signal */
-static inline void scx200_gpio_change(
int
index) {
+static inline void scx200_gpio_change(
unsigned
index) {
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW;
__SCx200_GPIO_BANK;
__SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW;
@@
-89,10
+88,3
@@
static inline void scx200_gpio_change(int index) {
#undef __SCx200_GPIO_SHADOW
#undef __SCx200_GPIO_INDEX
#undef __SCx200_GPIO_OUT
#undef __SCx200_GPIO_SHADOW
#undef __SCx200_GPIO_INDEX
#undef __SCx200_GPIO_OUT
-
-/*
- Local variables:
- compile-command: "make -C ../.. bzImage modules"
- c-basic-offset: 8
- End:
-*/