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>
44 lines
1.1 KiB
C
44 lines
1.1 KiB
C
/*
|
|
* ADB through the IOP
|
|
* Written by Joshua M. Thompson
|
|
*/
|
|
|
|
/* IOP number and channel number for ADB */
|
|
|
|
#define ADB_IOP IOP_NUM_ISM
|
|
#define ADB_CHAN 2
|
|
|
|
/* From the A/UX headers...maybe important, maybe not */
|
|
|
|
#define ADB_IOP_LISTEN 0x01
|
|
#define ADB_IOP_TALK 0x02
|
|
#define ADB_IOP_EXISTS 0x04
|
|
#define ADB_IOP_FLUSH 0x08
|
|
#define ADB_IOP_RESET 0x10
|
|
#define ADB_IOP_INT 0x20
|
|
#define ADB_IOP_POLL 0x40
|
|
#define ADB_IOP_UNINT 0x80
|
|
|
|
#define AIF_RESET 0x00
|
|
#define AIF_FLUSH 0x01
|
|
#define AIF_LISTEN 0x08
|
|
#define AIF_TALK 0x0C
|
|
|
|
/* Flag bits in struct adb_iopmsg */
|
|
|
|
#define ADB_IOP_EXPLICIT 0x80 /* nonzero if explicit command */
|
|
#define ADB_IOP_AUTOPOLL 0x40 /* auto/SRQ polling enabled */
|
|
#define ADB_IOP_SRQ 0x04 /* SRQ detected */
|
|
#define ADB_IOP_TIMEOUT 0x02 /* nonzero if timeout */
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
struct adb_iopmsg {
|
|
__u8 flags; /* ADB flags */
|
|
__u8 count; /* no. of data bytes */
|
|
__u8 cmd; /* ADB command */
|
|
__u8 data[8]; /* ADB data */
|
|
__u8 spare[21]; /* spare */
|
|
};
|
|
|
|
#endif /* __ASSEMBLY__ */
|