diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-sh/.gitignore | 3 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh3/rtc.h | 25 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh4/rtc.h | 25 | ||||
-rw-r--r-- | include/asm-sh/elf.h | 1 | ||||
-rw-r--r-- | include/asm-sh/hs7751rvoip/io.h | 39 | ||||
-rw-r--r-- | include/asm-sh/rts7751r2d/io.h | 37 | ||||
-rw-r--r-- | include/asm-sh/rts7751r2d/rts7751r2d.h | 3 | ||||
-rw-r--r-- | include/asm-sh/sfp-machine.h | 2 | ||||
-rw-r--r-- | include/asm-sh/spinlock.h | 9 | ||||
-rw-r--r-- | include/asm-sh/string.h | 15 |
10 files changed, 25 insertions, 134 deletions
diff --git a/include/asm-sh/.gitignore b/include/asm-sh/.gitignore new file mode 100644 index 000000000000..9218ef82b698 --- /dev/null +++ b/include/asm-sh/.gitignore | |||
@@ -0,0 +1,3 @@ | |||
1 | cpu | ||
2 | mach | ||
3 | machtypes.h | ||
diff --git a/include/asm-sh/cpu-sh3/rtc.h b/include/asm-sh/cpu-sh3/rtc.h deleted file mode 100644 index 2d926671115a..000000000000 --- a/include/asm-sh/cpu-sh3/rtc.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #ifndef __ASM_CPU_SH3_RTC_H | ||
2 | #define __ASM_CPU_SH3_RTC_H | ||
3 | |||
4 | /* SH-3 RTC */ | ||
5 | #define R64CNT 0xfffffec0 | ||
6 | #define RSECCNT 0xfffffec2 | ||
7 | #define RMINCNT 0xfffffec4 | ||
8 | #define RHRCNT 0xfffffec6 | ||
9 | #define RWKCNT 0xfffffec8 | ||
10 | #define RDAYCNT 0xfffffeca | ||
11 | #define RMONCNT 0xfffffecc | ||
12 | #define RYRCNT 0xfffffece | ||
13 | #define RSECAR 0xfffffed0 | ||
14 | #define RMINAR 0xfffffed2 | ||
15 | #define RHRAR 0xfffffed4 | ||
16 | #define RWKAR 0xfffffed6 | ||
17 | #define RDAYAR 0xfffffed8 | ||
18 | #define RMONAR 0xfffffeda | ||
19 | #define RCR1 0xfffffedc | ||
20 | #define RCR2 0xfffffede | ||
21 | |||
22 | #define RTC_BIT_INVERTED 0 /* No bug on SH7708, SH7709A */ | ||
23 | |||
24 | #endif /* __ASM_CPU_SH3_RTC_H */ | ||
25 | |||
diff --git a/include/asm-sh/cpu-sh4/rtc.h b/include/asm-sh/cpu-sh4/rtc.h deleted file mode 100644 index e091e32a67b7..000000000000 --- a/include/asm-sh/cpu-sh4/rtc.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #ifndef __ASM_CPU_SH4_RTC_H | ||
2 | #define __ASM_CPU_SH4_RTC_H | ||
3 | |||
4 | /* SH-4 RTC */ | ||
5 | #define R64CNT 0xffc80000 | ||
6 | #define RSECCNT 0xffc80004 | ||
7 | #define RMINCNT 0xffc80008 | ||
8 | #define RHRCNT 0xffc8000c | ||
9 | #define RWKCNT 0xffc80010 | ||
10 | #define RDAYCNT 0xffc80014 | ||
11 | #define RMONCNT 0xffc80018 | ||
12 | #define RYRCNT 0xffc8001c /* 16bit */ | ||
13 | #define RSECAR 0xffc80020 | ||
14 | #define RMINAR 0xffc80024 | ||
15 | #define RHRAR 0xffc80028 | ||
16 | #define RWKAR 0xffc8002c | ||
17 | #define RDAYAR 0xffc80030 | ||
18 | #define RMONAR 0xffc80034 | ||
19 | #define RCR1 0xffc80038 | ||
20 | #define RCR2 0xffc8003c | ||
21 | |||
22 | #define RTC_BIT_INVERTED 0x40 /* bug on SH7750, SH7750S */ | ||
23 | |||
24 | #endif /* __ASM_CPU_SH4_RTC_H */ | ||
25 | |||
diff --git a/include/asm-sh/elf.h b/include/asm-sh/elf.h index 3a07ab40ac4d..fc050fd7645e 100644 --- a/include/asm-sh/elf.h +++ b/include/asm-sh/elf.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __ASM_SH_ELF_H | 1 | #ifndef __ASM_SH_ELF_H |
2 | #define __ASM_SH_ELF_H | 2 | #define __ASM_SH_ELF_H |
3 | 3 | ||
4 | #include <asm/processor.h> | ||
5 | #include <asm/auxvec.h> | 4 | #include <asm/auxvec.h> |
6 | #include <asm/ptrace.h> | 5 | #include <asm/ptrace.h> |
7 | #include <asm/user.h> | 6 | #include <asm/user.h> |
diff --git a/include/asm-sh/hs7751rvoip/io.h b/include/asm-sh/hs7751rvoip/io.h deleted file mode 100644 index 513c8514001b..000000000000 --- a/include/asm-sh/hs7751rvoip/io.h +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-sh/hs7751rvoip/hs7751rvoip.h | ||
3 | * | ||
4 | * Modified version of io_se.h for the hs7751rvoip-specific functions. | ||
5 | * | ||
6 | * May be copied or modified under the terms of the GNU General Public | ||
7 | * License. See linux/COPYING for more information. | ||
8 | * | ||
9 | * IO functions for an Renesas Technology sales HS7751RVOIP | ||
10 | */ | ||
11 | |||
12 | #ifndef _ASM_SH_IO_HS7751RVOIP_H | ||
13 | #define _ASM_SH_IO_HS7751RVOIP_H | ||
14 | |||
15 | #include <asm/io_generic.h> | ||
16 | |||
17 | extern unsigned char hs7751rvoip_inb(unsigned long port); | ||
18 | extern unsigned short hs7751rvoip_inw(unsigned long port); | ||
19 | extern unsigned int hs7751rvoip_inl(unsigned long port); | ||
20 | |||
21 | extern void hs7751rvoip_outb(unsigned char value, unsigned long port); | ||
22 | extern void hs7751rvoip_outw(unsigned short value, unsigned long port); | ||
23 | extern void hs7751rvoip_outl(unsigned int value, unsigned long port); | ||
24 | |||
25 | extern unsigned char hs7751rvoip_inb_p(unsigned long port); | ||
26 | extern void hs7751rvoip_outb_p(unsigned char value, unsigned long port); | ||
27 | |||
28 | extern void hs7751rvoip_insb(unsigned long port, void *addr, unsigned long count); | ||
29 | extern void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count); | ||
30 | extern void hs7751rvoip_insl(unsigned long port, void *addr, unsigned long count); | ||
31 | extern void hs7751rvoip_outsb(unsigned long port, const void *addr, unsigned long count); | ||
32 | extern void hs7751rvoip_outsw(unsigned long port, const void *addr, unsigned long count); | ||
33 | extern void hs7751rvoip_outsl(unsigned long port, const void *addr, unsigned long count); | ||
34 | |||
35 | extern void *hs7751rvoip_ioremap(unsigned long offset, unsigned long size); | ||
36 | |||
37 | extern unsigned long hs7751rvoip_isa_port2addr(unsigned long offset); | ||
38 | |||
39 | #endif /* _ASM_SH_IO_HS7751RVOIP_H */ | ||
diff --git a/include/asm-sh/rts7751r2d/io.h b/include/asm-sh/rts7751r2d/io.h deleted file mode 100644 index 241094020567..000000000000 --- a/include/asm-sh/rts7751r2d/io.h +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-sh/io_rts7751r2d.h | ||
3 | * | ||
4 | * Modified version of io_se.h for the rts7751r2d-specific functions. | ||
5 | * | ||
6 | * May be copied or modified under the terms of the GNU General Public | ||
7 | * License. See linux/COPYING for more information. | ||
8 | * | ||
9 | * IO functions for an Renesas Technology sales RTS7751R2D | ||
10 | */ | ||
11 | |||
12 | #ifndef _ASM_SH_IO_RTS7751R2D_H | ||
13 | #define _ASM_SH_IO_RTS7751R2D_H | ||
14 | |||
15 | extern unsigned char rts7751r2d_inb(unsigned long port); | ||
16 | extern unsigned short rts7751r2d_inw(unsigned long port); | ||
17 | extern unsigned int rts7751r2d_inl(unsigned long port); | ||
18 | |||
19 | extern void rts7751r2d_outb(unsigned char value, unsigned long port); | ||
20 | extern void rts7751r2d_outw(unsigned short value, unsigned long port); | ||
21 | extern void rts7751r2d_outl(unsigned int value, unsigned long port); | ||
22 | |||
23 | extern unsigned char rts7751r2d_inb_p(unsigned long port); | ||
24 | extern void rts7751r2d_outb_p(unsigned char value, unsigned long port); | ||
25 | |||
26 | extern void rts7751r2d_insb(unsigned long port, void *addr, unsigned long count); | ||
27 | extern void rts7751r2d_insw(unsigned long port, void *addr, unsigned long count); | ||
28 | extern void rts7751r2d_insl(unsigned long port, void *addr, unsigned long count); | ||
29 | extern void rts7751r2d_outsb(unsigned long port, const void *addr, unsigned long count); | ||
30 | extern void rts7751r2d_outsw(unsigned long port, const void *addr, unsigned long count); | ||
31 | extern void rts7751r2d_outsl(unsigned long port, const void *addr, unsigned long count); | ||
32 | |||
33 | extern void *rts7751r2d_ioremap(unsigned long offset, unsigned long size); | ||
34 | |||
35 | extern unsigned long rts7751r2d_isa_port2addr(unsigned long offset); | ||
36 | |||
37 | #endif /* _ASM_SH_IO_RTS7751R2D_H */ | ||
diff --git a/include/asm-sh/rts7751r2d/rts7751r2d.h b/include/asm-sh/rts7751r2d/rts7751r2d.h index b112ae221fd1..796b8fcb81a8 100644 --- a/include/asm-sh/rts7751r2d/rts7751r2d.h +++ b/include/asm-sh/rts7751r2d/rts7751r2d.h | |||
@@ -68,4 +68,7 @@ | |||
68 | #define IRQ_PCISLOT2 10 /* PCI Slot #2 IRQ */ | 68 | #define IRQ_PCISLOT2 10 /* PCI Slot #2 IRQ */ |
69 | #define IRQ_EXTENTION 11 /* EXTn IRQ */ | 69 | #define IRQ_EXTENTION 11 /* EXTn IRQ */ |
70 | 70 | ||
71 | #define __IO_PREFIX rts7751r2d | ||
72 | #include <asm/io_generic.h> | ||
73 | |||
71 | #endif /* __ASM_SH_RENESAS_RTS7751R2D */ | 74 | #endif /* __ASM_SH_RENESAS_RTS7751R2D */ |
diff --git a/include/asm-sh/sfp-machine.h b/include/asm-sh/sfp-machine.h index 8a6399a8cfe0..d3c548443f2a 100644 --- a/include/asm-sh/sfp-machine.h +++ b/include/asm-sh/sfp-machine.h | |||
@@ -25,8 +25,6 @@ | |||
25 | #ifndef _SFP_MACHINE_H | 25 | #ifndef _SFP_MACHINE_H |
26 | #define _SFP_MACHINE_H | 26 | #define _SFP_MACHINE_H |
27 | 27 | ||
28 | #include <linux/config.h> | ||
29 | |||
30 | #define _FP_W_TYPE_SIZE 32 | 28 | #define _FP_W_TYPE_SIZE 32 |
31 | #define _FP_W_TYPE unsigned long | 29 | #define _FP_W_TYPE unsigned long |
32 | #define _FP_WS_TYPE signed long | 30 | #define _FP_WS_TYPE signed long |
diff --git a/include/asm-sh/spinlock.h b/include/asm-sh/spinlock.h index 54458fd24981..2586eef07d57 100644 --- a/include/asm-sh/spinlock.h +++ b/include/asm-sh/spinlock.h | |||
@@ -88,7 +88,14 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw) | |||
88 | __raw_spin_unlock(&rw->lock); | 88 | __raw_spin_unlock(&rw->lock); |
89 | } | 89 | } |
90 | 90 | ||
91 | #define __raw_read_trylock(lock) generic__raw_read_trylock(lock) | 91 | static inline int __raw_read_trylock(raw_rwlock_t *lock) |
92 | { | ||
93 | atomic_t *count = (atomic_t*)lock; | ||
94 | if (atomic_dec_return(count) >= 0) | ||
95 | return 1; | ||
96 | atomic_inc(count); | ||
97 | return 0; | ||
98 | } | ||
92 | 99 | ||
93 | static inline int __raw_write_trylock(raw_rwlock_t *rw) | 100 | static inline int __raw_write_trylock(raw_rwlock_t *rw) |
94 | { | 101 | { |
diff --git a/include/asm-sh/string.h b/include/asm-sh/string.h index 3e0cff04caec..95bc7db006b0 100644 --- a/include/asm-sh/string.h +++ b/include/asm-sh/string.h | |||
@@ -1,13 +1,15 @@ | |||
1 | #ifndef __ASM_SH_STRING_H | 1 | #ifndef __ASM_SH_STRING_H |
2 | #define __ASM_SH_STRING_H | 2 | #define __ASM_SH_STRING_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | ||
5 | |||
4 | /* | 6 | /* |
5 | * Copyright (C) 1999 Niibe Yutaka | 7 | * Copyright (C) 1999 Niibe Yutaka |
6 | * But consider these trivial functions to be public domain. | 8 | * But consider these trivial functions to be public domain. |
7 | */ | 9 | */ |
8 | 10 | ||
9 | #define __HAVE_ARCH_STRCPY | 11 | #define __HAVE_ARCH_STRCPY |
10 | static __inline__ char *strcpy(char *__dest, const char *__src) | 12 | static inline char *strcpy(char *__dest, const char *__src) |
11 | { | 13 | { |
12 | register char *__xdest = __dest; | 14 | register char *__xdest = __dest; |
13 | unsigned long __dummy; | 15 | unsigned long __dummy; |
@@ -26,7 +28,7 @@ static __inline__ char *strcpy(char *__dest, const char *__src) | |||
26 | } | 28 | } |
27 | 29 | ||
28 | #define __HAVE_ARCH_STRNCPY | 30 | #define __HAVE_ARCH_STRNCPY |
29 | static __inline__ char *strncpy(char *__dest, const char *__src, size_t __n) | 31 | static inline char *strncpy(char *__dest, const char *__src, size_t __n) |
30 | { | 32 | { |
31 | register char *__xdest = __dest; | 33 | register char *__xdest = __dest; |
32 | unsigned long __dummy; | 34 | unsigned long __dummy; |
@@ -52,7 +54,7 @@ static __inline__ char *strncpy(char *__dest, const char *__src, size_t __n) | |||
52 | } | 54 | } |
53 | 55 | ||
54 | #define __HAVE_ARCH_STRCMP | 56 | #define __HAVE_ARCH_STRCMP |
55 | static __inline__ int strcmp(const char *__cs, const char *__ct) | 57 | static inline int strcmp(const char *__cs, const char *__ct) |
56 | { | 58 | { |
57 | register int __res; | 59 | register int __res; |
58 | unsigned long __dummy; | 60 | unsigned long __dummy; |
@@ -78,7 +80,7 @@ static __inline__ int strcmp(const char *__cs, const char *__ct) | |||
78 | } | 80 | } |
79 | 81 | ||
80 | #define __HAVE_ARCH_STRNCMP | 82 | #define __HAVE_ARCH_STRNCMP |
81 | static __inline__ int strncmp(const char *__cs, const char *__ct, size_t __n) | 83 | static inline int strncmp(const char *__cs, const char *__ct, size_t __n) |
82 | { | 84 | { |
83 | register int __res; | 85 | register int __res; |
84 | unsigned long __dummy; | 86 | unsigned long __dummy; |
@@ -124,4 +126,9 @@ extern void *memchr(const void *__s, int __c, size_t __n); | |||
124 | #define __HAVE_ARCH_STRLEN | 126 | #define __HAVE_ARCH_STRLEN |
125 | extern size_t strlen(const char *); | 127 | extern size_t strlen(const char *); |
126 | 128 | ||
129 | /* arch/sh/lib/strcasecmp.c */ | ||
130 | extern int strcasecmp(const char *, const char *); | ||
131 | |||
132 | #endif /* __KERNEL__ */ | ||
133 | |||
127 | #endif /* __ASM_SH_STRING_H */ | 134 | #endif /* __ASM_SH_STRING_H */ |