diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-09 20:54:53 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-09 20:54:53 +0100 |
| commit | 65b57ebb3031a60dddd451097dc5c435fb051b6f (patch) | |
| tree | 5454164b2ec4bb59131b615360b31bf6c262588a /arch | |
| parent | fced09ae386d1aa7fcfdf9111c99da4be56e5b43 (diff) | |
| parent | d8a593c68bac7b9d9b26af6fa8c392671213ce93 (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/nios2/include/asm/gpio.h | 12 | ||||
| -rw-r--r-- | arch/nios2/include/asm/posix_types.h | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/nios2/include/asm/gpio.h b/arch/nios2/include/asm/gpio.h index cff1dd9a1a..4b21c8f7f2 100644 --- a/arch/nios2/include/asm/gpio.h +++ b/arch/nios2/include/asm/gpio.h @@ -26,6 +26,11 @@ static inline int gpio_request(unsigned gpio, const char *label) return 0; } +static inline int gpio_free(unsigned gpio) +{ + return 0; +} + static inline int gpio_direction_input(unsigned gpio) { writel(1, CONFIG_SYS_GPIO_BASE + (gpio << 2)); @@ -47,12 +52,19 @@ static inline void gpio_set_value(unsigned gpio, int value) { writel(value ? 3 : 2, CONFIG_SYS_GPIO_BASE + (gpio << 2)); } + +static inline int gpio_is_valid(int number) +{ + return ((unsigned)number) < CONFIG_SYS_GPIO_WIDTH; +} #else extern int gpio_request(unsigned gpio, const char *label); +extern int gpio_free(unsigned gpio); extern int gpio_direction_input(unsigned gpio); extern int gpio_direction_output(unsigned gpio, int value); extern int gpio_get_value(unsigned gpio); extern void gpio_set_value(unsigned gpio, int value); +extern int gpio_is_valid(int number); #endif /* CONFIG_SYS_GPIO_BASE */ #endif /* _ASM_NIOS2_GPIO_H_ */ diff --git a/arch/nios2/include/asm/posix_types.h b/arch/nios2/include/asm/posix_types.h index c2deea6bf7..673364099a 100644 --- a/arch/nios2/include/asm/posix_types.h +++ b/arch/nios2/include/asm/posix_types.h @@ -17,7 +17,7 @@ typedef unsigned short __kernel_ipc_pid_t; typedef unsigned short __kernel_uid_t; typedef unsigned short __kernel_gid_t; typedef unsigned long __kernel_size_t; -typedef int __kernel_ssize_t; +typedef long __kernel_ssize_t; typedef int __kernel_ptrdiff_t; typedef long __kernel_time_t; typedef long __kernel_suseconds_t; |