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>
52 lines
1.7 KiB
C
52 lines
1.7 KiB
C
/***********************************
|
|
* $Id: quicc_simple.h,v 1.1 2002/03/02 15:01:10 gerg Exp $
|
|
***********************************
|
|
*
|
|
***************************************
|
|
* Simple drivers common header
|
|
***************************************
|
|
*/
|
|
|
|
#ifndef __SIMPLE_H
|
|
#define __SIMPLE_H
|
|
|
|
/* #include "quicc.h" */
|
|
|
|
#define GLB_SCC_0 0
|
|
#define GLB_SCC_1 1
|
|
#define GLB_SCC_2 2
|
|
#define GLB_SCC_3 3
|
|
|
|
typedef void (int_routine)(unsigned short interrupt_event);
|
|
typedef int_routine *int_routine_ptr;
|
|
typedef void *(alloc_routine)(int length);
|
|
typedef void (free_routine)(int scc_num, int channel_num, void *buf);
|
|
typedef void (store_rx_buffer_routine)(int scc_num, int channel_num, void *buff, int length);
|
|
typedef int (handle_tx_error_routine)(int scc_num, int channel_num, QUICC_BD *tbd);
|
|
typedef void (handle_rx_error_routine)(int scc_num, int channel_num, QUICC_BD *rbd);
|
|
typedef void (handle_lost_error_routine)(int scc_num, int channel_num);
|
|
|
|
/* user defined functions for global errors */
|
|
typedef void (handle_glob_overrun_routine)(int scc_number);
|
|
typedef void (handle_glob_underrun_routine)(int scc_number);
|
|
typedef void (glob_intr_q_overflow_routine)(int scc_number);
|
|
|
|
/*
|
|
* General initialization and command routines
|
|
*/
|
|
void quicc_issue_cmd (unsigned short cmd, int scc_num);
|
|
void quicc_init(void);
|
|
void quicc_scc_init(int scc_number, int number_of_rx_buf, int number_of_tx_buf);
|
|
void quicc_smc_init(int smc_number, int number_of_rx_buf, int number_of_tx_buf);
|
|
void quicc_scc_start(int scc_num);
|
|
void quicc_scc_loopback(int scc_num);
|
|
|
|
/* Interrupt enable/disable routines for critical pieces of code*/
|
|
unsigned short IntrDis(void);
|
|
void IntrEna(unsigned short old_sr);
|
|
|
|
/* For debugging */
|
|
void print_rbd(int scc_num);
|
|
void print_tbd(int scc_num);
|
|
|
|
#endif
|