49148020bc
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>
125 lines
3.5 KiB
C
125 lines
3.5 KiB
C
#ifndef _M68K_IRQ_H_
|
|
#define _M68K_IRQ_H_
|
|
|
|
#include <linux/linkage.h>
|
|
#include <linux/hardirq.h>
|
|
#include <linux/spinlock_types.h>
|
|
|
|
/*
|
|
* This should be the same as the max(NUM_X_SOURCES) for all the
|
|
* different m68k hosts compiled into the kernel.
|
|
* Currently the Atari has 72 and the Amiga 24, but if both are
|
|
* supported in the kernel it is better to make room for 72.
|
|
*/
|
|
#if defined(CONFIG_VME) || defined(CONFIG_SUN3) || defined(CONFIG_SUN3X)
|
|
#define NR_IRQS 200
|
|
#elif defined(CONFIG_ATARI) || defined(CONFIG_MAC)
|
|
#define NR_IRQS 72
|
|
#elif defined(CONFIG_Q40)
|
|
#define NR_IRQS 43
|
|
#elif defined(CONFIG_AMIGA)
|
|
#define NR_IRQS 32
|
|
#elif defined(CONFIG_APOLLO)
|
|
#define NR_IRQS 24
|
|
#elif defined(CONFIG_HP300)
|
|
#define NR_IRQS 8
|
|
#else
|
|
#define NR_IRQS 0
|
|
#endif
|
|
|
|
/*
|
|
* The hardirq mask has to be large enough to have
|
|
* space for potentially all IRQ sources in the system
|
|
* nesting on a single CPU:
|
|
*/
|
|
#if (1 << HARDIRQ_BITS) < NR_IRQS
|
|
# error HARDIRQ_BITS is too low!
|
|
#endif
|
|
|
|
/*
|
|
* Interrupt source definitions
|
|
* General interrupt sources are the level 1-7.
|
|
* Adding an interrupt service routine for one of these sources
|
|
* results in the addition of that routine to a chain of routines.
|
|
* Each one is called in succession. Each individual interrupt
|
|
* service routine should determine if the device associated with
|
|
* that routine requires service.
|
|
*/
|
|
|
|
#define IRQ_SPURIOUS 0
|
|
|
|
#define IRQ_AUTO_1 1 /* level 1 interrupt */
|
|
#define IRQ_AUTO_2 2 /* level 2 interrupt */
|
|
#define IRQ_AUTO_3 3 /* level 3 interrupt */
|
|
#define IRQ_AUTO_4 4 /* level 4 interrupt */
|
|
#define IRQ_AUTO_5 5 /* level 5 interrupt */
|
|
#define IRQ_AUTO_6 6 /* level 6 interrupt */
|
|
#define IRQ_AUTO_7 7 /* level 7 interrupt (non-maskable) */
|
|
|
|
#define IRQ_USER 8
|
|
|
|
extern unsigned int irq_canonicalize(unsigned int irq);
|
|
|
|
struct pt_regs;
|
|
|
|
/*
|
|
* various flags for request_irq() - the Amiga now uses the standard
|
|
* mechanism like all other architectures - IRQF_DISABLED and
|
|
* IRQF_SHARED are your friends.
|
|
*/
|
|
#ifndef MACH_AMIGA_ONLY
|
|
#define IRQ_FLG_LOCK (0x0001) /* handler is not replaceable */
|
|
#define IRQ_FLG_REPLACE (0x0002) /* replace existing handler */
|
|
#define IRQ_FLG_FAST (0x0004)
|
|
#define IRQ_FLG_SLOW (0x0008)
|
|
#define IRQ_FLG_STD (0x8000) /* internally used */
|
|
#endif
|
|
|
|
/*
|
|
* This structure is used to chain together the ISRs for a particular
|
|
* interrupt source (if it supports chaining).
|
|
*/
|
|
typedef struct irq_node {
|
|
int (*handler)(int, void *);
|
|
void *dev_id;
|
|
struct irq_node *next;
|
|
unsigned long flags;
|
|
const char *devname;
|
|
} irq_node_t;
|
|
|
|
/*
|
|
* This structure has only 4 elements for speed reasons
|
|
*/
|
|
struct irq_handler {
|
|
int (*handler)(int, void *);
|
|
unsigned long flags;
|
|
void *dev_id;
|
|
const char *devname;
|
|
};
|
|
|
|
struct irq_controller {
|
|
const char *name;
|
|
spinlock_t lock;
|
|
int (*startup)(unsigned int irq);
|
|
void (*shutdown)(unsigned int irq);
|
|
void (*enable)(unsigned int irq);
|
|
void (*disable)(unsigned int irq);
|
|
};
|
|
|
|
extern int m68k_irq_startup(unsigned int);
|
|
extern void m68k_irq_shutdown(unsigned int);
|
|
|
|
/*
|
|
* This function returns a new irq_node_t
|
|
*/
|
|
extern irq_node_t *new_irq_node(void);
|
|
|
|
extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *));
|
|
extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
|
|
void (*handler)(unsigned int, struct pt_regs *));
|
|
extern void m68k_setup_irq_controller(struct irq_controller *, unsigned int, unsigned int);
|
|
|
|
asmlinkage void m68k_handle_int(unsigned int);
|
|
asmlinkage void __m68k_handle_int(unsigned int, struct pt_regs *);
|
|
|
|
#endif /* _M68K_IRQ_H_ */
|