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>
130 lines
3 KiB
C
130 lines
3 KiB
C
/*
|
|
* linux/include/asm-m68k/ide.h
|
|
*
|
|
* Copyright (C) 1994-1996 Linus Torvalds & authors
|
|
*/
|
|
|
|
/* Copyright(c) 1996 Kars de Jong */
|
|
/* Based on the ide driver from 1.2.13pl8 */
|
|
|
|
/*
|
|
* Credits (alphabetical):
|
|
*
|
|
* - Bjoern Brauel
|
|
* - Kars de Jong
|
|
* - Torsten Ebeling
|
|
* - Dwight Engen
|
|
* - Thorsten Floeck
|
|
* - Roman Hodek
|
|
* - Guenther Kelleter
|
|
* - Chris Lawrence
|
|
* - Michael Rausch
|
|
* - Christian Sauer
|
|
* - Michael Schmitz
|
|
* - Jes Soerensen
|
|
* - Michael Thurm
|
|
* - Geert Uytterhoeven
|
|
*/
|
|
|
|
#ifndef _M68K_IDE_H
|
|
#define _M68K_IDE_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
|
|
#include <asm/setup.h>
|
|
#include <asm/io.h>
|
|
#include <asm/irq.h>
|
|
|
|
#ifdef CONFIG_ATARI
|
|
#include <linux/interrupt.h>
|
|
#include <asm/atari_stdma.h>
|
|
#endif
|
|
|
|
#ifdef CONFIG_MAC
|
|
#include <asm/macints.h>
|
|
#endif
|
|
|
|
/*
|
|
* Get rid of defs from io.h - ide has its private and conflicting versions
|
|
* Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we
|
|
* always use the `raw' MMIO versions
|
|
*/
|
|
#undef inb
|
|
#undef inw
|
|
#undef insw
|
|
#undef inl
|
|
#undef insl
|
|
#undef outb
|
|
#undef outw
|
|
#undef outsw
|
|
#undef outl
|
|
#undef outsl
|
|
#undef readb
|
|
#undef readw
|
|
#undef readl
|
|
#undef writeb
|
|
#undef writew
|
|
#undef writel
|
|
|
|
#define inb in_8
|
|
#define inw in_be16
|
|
#define insw(port, addr, n) raw_insw((u16 *)port, addr, n)
|
|
#define inl in_be32
|
|
#define insl(port, addr, n) raw_insl((u32 *)port, addr, n)
|
|
#define outb(val, port) out_8(port, val)
|
|
#define outw(val, port) out_be16(port, val)
|
|
#define outsw(port, addr, n) raw_outsw((u16 *)port, addr, n)
|
|
#define outl(val, port) out_be32(port, val)
|
|
#define outsl(port, addr, n) raw_outsl((u32 *)port, addr, n)
|
|
#define readb in_8
|
|
#define readw in_be16
|
|
#define __ide_mm_insw(port, addr, n) raw_insw((u16 *)port, addr, n)
|
|
#define readl in_be32
|
|
#define __ide_mm_insl(port, addr, n) raw_insl((u32 *)port, addr, n)
|
|
#define writeb(val, port) out_8(port, val)
|
|
#define writew(val, port) out_be16(port, val)
|
|
#define __ide_mm_outsw(port, addr, n) raw_outsw((u16 *)port, addr, n)
|
|
#define writel(val, port) out_be32(port, val)
|
|
#define __ide_mm_outsl(port, addr, n) raw_outsl((u32 *)port, addr, n)
|
|
#if defined(CONFIG_ATARI) || defined(CONFIG_Q40)
|
|
#define insw_swapw(port, addr, n) raw_insw_swapw((u16 *)port, addr, n)
|
|
#define outsw_swapw(port, addr, n) raw_outsw_swapw((u16 *)port, addr, n)
|
|
#endif
|
|
|
|
#ifdef CONFIG_BLK_DEV_FALCON_IDE
|
|
#define IDE_ARCH_LOCK
|
|
|
|
extern int falconide_intr_lock;
|
|
|
|
static __inline__ void ide_release_lock (void)
|
|
{
|
|
if (MACH_IS_ATARI) {
|
|
if (falconide_intr_lock == 0) {
|
|
printk("ide_release_lock: bug\n");
|
|
return;
|
|
}
|
|
falconide_intr_lock = 0;
|
|
stdma_release();
|
|
}
|
|
}
|
|
|
|
static __inline__ void
|
|
ide_get_lock(irq_handler_t handler, void *data)
|
|
{
|
|
if (MACH_IS_ATARI) {
|
|
if (falconide_intr_lock == 0) {
|
|
if (in_interrupt() > 0)
|
|
panic( "Falcon IDE hasn't ST-DMA lock in interrupt" );
|
|
stdma_lock(handler, data);
|
|
falconide_intr_lock = 1;
|
|
}
|
|
}
|
|
}
|
|
#endif /* CONFIG_BLK_DEV_FALCON_IDE */
|
|
|
|
#define IDE_ARCH_ACK_INTR
|
|
#define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _M68K_IDE_H */
|