diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2009-01-16 06:58:10 -0500 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2009-01-16 06:58:10 -0500 |
commit | 49148020bcb6910ce71417bd990a5ce7017f9bd3 (patch) | |
tree | e410cc433a69075a0254ee4000cb10d71df3a641 /arch/m68k/include/asm/atariints.h | |
parent | ae04d1401577bb63151480a053057de58b8e10bb (diff) |
m68k,m68knommu: merge header files
Merge header files for m68k and m68knommu to the single location:
arch/m68k/include/asm
The majority of this patch was the result of the
script that is included in the changelog below.
The script was originally written by Arnd Bergman and
exten by me to cover a few more files.
When the header files differed the script uses the following:
The original m68k file is named <file>_mm.h [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]
The files uses the following include guard:
This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.
Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.
The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.
The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.
The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm
INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"
EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"
NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"
FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"
mergefile() {
BASE=${1%.h}
git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h
cat << EOF > ${TARGET}/$1
EOF
git add ${TARGET}/$1
}
set -e
mkdir -p ${TARGET}
git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k
git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
git rm ${SOURCE}/$F
done
for F in $NOMUUFILES; do
git mv ${SOURCE}/$F ${TARGET}/$F
done
for F in $FILES ; do
mergefile $F
done
rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm/atariints.h')
-rw-r--r-- | arch/m68k/include/asm/atariints.h | 204 |
1 files changed, 204 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/atariints.h b/arch/m68k/include/asm/atariints.h new file mode 100644 index 000000000000..5748e99f4e26 --- /dev/null +++ b/arch/m68k/include/asm/atariints.h | |||
@@ -0,0 +1,204 @@ | |||
1 | /* | ||
2 | ** atariints.h -- Atari Linux interrupt handling structs and prototypes | ||
3 | ** | ||
4 | ** Copyright 1994 by Björn Brauel | ||
5 | ** | ||
6 | ** 5/2/94 Roman Hodek: | ||
7 | ** TT interrupt definitions added. | ||
8 | ** | ||
9 | ** 12/02/96: (Roman) | ||
10 | ** Adapted to new int handling scheme (see ataints.c); revised numbering | ||
11 | ** | ||
12 | ** This file is subject to the terms and conditions of the GNU General Public | ||
13 | ** License. See the file COPYING in the main directory of this archive | ||
14 | ** for more details. | ||
15 | ** | ||
16 | */ | ||
17 | |||
18 | #ifndef _LINUX_ATARIINTS_H_ | ||
19 | #define _LINUX_ATARIINTS_H_ | ||
20 | |||
21 | #include <asm/irq.h> | ||
22 | #include <asm/atarihw.h> | ||
23 | |||
24 | /* | ||
25 | ** Atari Interrupt sources. | ||
26 | ** | ||
27 | */ | ||
28 | |||
29 | #define STMFP_SOURCE_BASE 8 | ||
30 | #define TTMFP_SOURCE_BASE 24 | ||
31 | #define SCC_SOURCE_BASE 40 | ||
32 | #define VME_SOURCE_BASE 56 | ||
33 | #define VME_MAX_SOURCES 16 | ||
34 | |||
35 | #define NUM_ATARI_SOURCES (VME_SOURCE_BASE+VME_MAX_SOURCES-STMFP_SOURCE_BASE) | ||
36 | |||
37 | /* convert vector number to int source number */ | ||
38 | #define IRQ_VECTOR_TO_SOURCE(v) ((v) - ((v) < 0x20 ? 0x18 : (0x40-8))) | ||
39 | |||
40 | /* convert irq_handler index to vector number */ | ||
41 | #define IRQ_SOURCE_TO_VECTOR(i) ((i) + ((i) < 8 ? 0x18 : (0x40-8))) | ||
42 | |||
43 | /* interrupt service types */ | ||
44 | #define IRQ_TYPE_SLOW 0 | ||
45 | #define IRQ_TYPE_FAST 1 | ||
46 | #define IRQ_TYPE_PRIO 2 | ||
47 | |||
48 | /* ST-MFP interrupts */ | ||
49 | #define IRQ_MFP_BUSY (8) | ||
50 | #define IRQ_MFP_DCD (9) | ||
51 | #define IRQ_MFP_CTS (10) | ||
52 | #define IRQ_MFP_GPU (11) | ||
53 | #define IRQ_MFP_TIMD (12) | ||
54 | #define IRQ_MFP_TIMC (13) | ||
55 | #define IRQ_MFP_ACIA (14) | ||
56 | #define IRQ_MFP_FDC (15) | ||
57 | #define IRQ_MFP_ACSI IRQ_MFP_FDC | ||
58 | #define IRQ_MFP_FSCSI IRQ_MFP_FDC | ||
59 | #define IRQ_MFP_IDE IRQ_MFP_FDC | ||
60 | #define IRQ_MFP_TIMB (16) | ||
61 | #define IRQ_MFP_SERERR (17) | ||
62 | #define IRQ_MFP_SEREMPT (18) | ||
63 | #define IRQ_MFP_RECERR (19) | ||
64 | #define IRQ_MFP_RECFULL (20) | ||
65 | #define IRQ_MFP_TIMA (21) | ||
66 | #define IRQ_MFP_RI (22) | ||
67 | #define IRQ_MFP_MMD (23) | ||
68 | |||
69 | /* TT-MFP interrupts */ | ||
70 | #define IRQ_TT_MFP_IO0 (24) | ||
71 | #define IRQ_TT_MFP_IO1 (25) | ||
72 | #define IRQ_TT_MFP_SCC (26) | ||
73 | #define IRQ_TT_MFP_RI (27) | ||
74 | #define IRQ_TT_MFP_TIMD (28) | ||
75 | #define IRQ_TT_MFP_TIMC (29) | ||
76 | #define IRQ_TT_MFP_DRVRDY (30) | ||
77 | #define IRQ_TT_MFP_SCSIDMA (31) | ||
78 | #define IRQ_TT_MFP_TIMB (32) | ||
79 | #define IRQ_TT_MFP_SERERR (33) | ||
80 | #define IRQ_TT_MFP_SEREMPT (34) | ||
81 | #define IRQ_TT_MFP_RECERR (35) | ||
82 | #define IRQ_TT_MFP_RECFULL (36) | ||
83 | #define IRQ_TT_MFP_TIMA (37) | ||
84 | #define IRQ_TT_MFP_RTC (38) | ||
85 | #define IRQ_TT_MFP_SCSI (39) | ||
86 | |||
87 | /* SCC interrupts */ | ||
88 | #define IRQ_SCCB_TX (40) | ||
89 | #define IRQ_SCCB_STAT (42) | ||
90 | #define IRQ_SCCB_RX (44) | ||
91 | #define IRQ_SCCB_SPCOND (46) | ||
92 | #define IRQ_SCCA_TX (48) | ||
93 | #define IRQ_SCCA_STAT (50) | ||
94 | #define IRQ_SCCA_RX (52) | ||
95 | #define IRQ_SCCA_SPCOND (54) | ||
96 | |||
97 | |||
98 | #define INT_CLK 24576 /* CLK while int_clk =2.456MHz and divide = 100 */ | ||
99 | #define INT_TICKS 246 /* to make sched_time = 99.902... HZ */ | ||
100 | |||
101 | |||
102 | #define MFP_ENABLE 0 | ||
103 | #define MFP_PENDING 1 | ||
104 | #define MFP_SERVICE 2 | ||
105 | #define MFP_MASK 3 | ||
106 | |||
107 | /* Utility functions for setting/clearing bits in the interrupt registers of | ||
108 | * the MFP. 'type' should be constant, if 'irq' is constant, too, code size is | ||
109 | * reduced. set_mfp_bit() is nonsense for PENDING and SERVICE registers. */ | ||
110 | |||
111 | static inline int get_mfp_bit( unsigned irq, int type ) | ||
112 | |||
113 | { unsigned char mask, *reg; | ||
114 | |||
115 | mask = 1 << (irq & 7); | ||
116 | reg = (unsigned char *)&mfp.int_en_a + type*4 + | ||
117 | ((irq & 8) >> 2) + (((irq-8) & 16) << 3); | ||
118 | return( *reg & mask ); | ||
119 | } | ||
120 | |||
121 | static inline void set_mfp_bit( unsigned irq, int type ) | ||
122 | |||
123 | { unsigned char mask, *reg; | ||
124 | |||
125 | mask = 1 << (irq & 7); | ||
126 | reg = (unsigned char *)&mfp.int_en_a + type*4 + | ||
127 | ((irq & 8) >> 2) + (((irq-8) & 16) << 3); | ||
128 | __asm__ __volatile__ ( "orb %0,%1" | ||
129 | : : "di" (mask), "m" (*reg) : "memory" ); | ||
130 | } | ||
131 | |||
132 | static inline void clear_mfp_bit( unsigned irq, int type ) | ||
133 | |||
134 | { unsigned char mask, *reg; | ||
135 | |||
136 | mask = ~(1 << (irq & 7)); | ||
137 | reg = (unsigned char *)&mfp.int_en_a + type*4 + | ||
138 | ((irq & 8) >> 2) + (((irq-8) & 16) << 3); | ||
139 | if (type == MFP_PENDING || type == MFP_SERVICE) | ||
140 | __asm__ __volatile__ ( "moveb %0,%1" | ||
141 | : : "di" (mask), "m" (*reg) : "memory" ); | ||
142 | else | ||
143 | __asm__ __volatile__ ( "andb %0,%1" | ||
144 | : : "di" (mask), "m" (*reg) : "memory" ); | ||
145 | } | ||
146 | |||
147 | /* | ||
148 | * {en,dis}able_irq have the usual semantics of temporary blocking the | ||
149 | * interrupt, but not loosing requests that happen between disabling and | ||
150 | * enabling. This is done with the MFP mask registers. | ||
151 | */ | ||
152 | |||
153 | static inline void atari_enable_irq( unsigned irq ) | ||
154 | |||
155 | { | ||
156 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
157 | set_mfp_bit( irq, MFP_MASK ); | ||
158 | } | ||
159 | |||
160 | static inline void atari_disable_irq( unsigned irq ) | ||
161 | |||
162 | { | ||
163 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
164 | clear_mfp_bit( irq, MFP_MASK ); | ||
165 | } | ||
166 | |||
167 | /* | ||
168 | * In opposite to {en,dis}able_irq, requests between turn{off,on}_irq are not | ||
169 | * "stored" | ||
170 | */ | ||
171 | |||
172 | static inline void atari_turnon_irq( unsigned irq ) | ||
173 | |||
174 | { | ||
175 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
176 | set_mfp_bit( irq, MFP_ENABLE ); | ||
177 | } | ||
178 | |||
179 | static inline void atari_turnoff_irq( unsigned irq ) | ||
180 | |||
181 | { | ||
182 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
183 | clear_mfp_bit( irq, MFP_ENABLE ); | ||
184 | clear_mfp_bit( irq, MFP_PENDING ); | ||
185 | } | ||
186 | |||
187 | static inline void atari_clear_pending_irq( unsigned irq ) | ||
188 | |||
189 | { | ||
190 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
191 | clear_mfp_bit( irq, MFP_PENDING ); | ||
192 | } | ||
193 | |||
194 | static inline int atari_irq_pending( unsigned irq ) | ||
195 | |||
196 | { | ||
197 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return( 0 ); | ||
198 | return( get_mfp_bit( irq, MFP_PENDING ) ); | ||
199 | } | ||
200 | |||
201 | unsigned long atari_register_vme_int( void ); | ||
202 | void atari_unregister_vme_int( unsigned long ); | ||
203 | |||
204 | #endif /* linux/atariints.h */ | ||