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>
93 lines
2.8 KiB
C
93 lines
2.8 KiB
C
#ifndef _M68K_TERMIOS_H
|
|
#define _M68K_TERMIOS_H
|
|
|
|
#include <asm/termbits.h>
|
|
#include <asm/ioctls.h>
|
|
|
|
struct winsize {
|
|
unsigned short ws_row;
|
|
unsigned short ws_col;
|
|
unsigned short ws_xpixel;
|
|
unsigned short ws_ypixel;
|
|
};
|
|
|
|
#define NCC 8
|
|
struct termio {
|
|
unsigned short c_iflag; /* input mode flags */
|
|
unsigned short c_oflag; /* output mode flags */
|
|
unsigned short c_cflag; /* control mode flags */
|
|
unsigned short c_lflag; /* local mode flags */
|
|
unsigned char c_line; /* line discipline */
|
|
unsigned char c_cc[NCC]; /* control characters */
|
|
};
|
|
|
|
#ifdef __KERNEL__
|
|
/* intr=^C quit=^| erase=del kill=^U
|
|
eof=^D vtime=\0 vmin=\1 sxtc=\0
|
|
start=^Q stop=^S susp=^Z eol=\0
|
|
reprint=^R discard=^U werase=^W lnext=^V
|
|
eol2=\0
|
|
*/
|
|
#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
|
|
#endif
|
|
|
|
/* modem lines */
|
|
#define TIOCM_LE 0x001
|
|
#define TIOCM_DTR 0x002
|
|
#define TIOCM_RTS 0x004
|
|
#define TIOCM_ST 0x008
|
|
#define TIOCM_SR 0x010
|
|
#define TIOCM_CTS 0x020
|
|
#define TIOCM_CAR 0x040
|
|
#define TIOCM_RNG 0x080
|
|
#define TIOCM_DSR 0x100
|
|
#define TIOCM_CD TIOCM_CAR
|
|
#define TIOCM_RI TIOCM_RNG
|
|
#define TIOCM_OUT1 0x2000
|
|
#define TIOCM_OUT2 0x4000
|
|
#define TIOCM_LOOP 0x8000
|
|
|
|
/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/*
|
|
* Translate a "termio" structure into a "termios". Ugh.
|
|
*/
|
|
#define user_termio_to_kernel_termios(termios, termio) \
|
|
({ \
|
|
unsigned short tmp; \
|
|
get_user(tmp, &(termio)->c_iflag); \
|
|
(termios)->c_iflag = (0xffff0000 & ((termios)->c_iflag)) | tmp; \
|
|
get_user(tmp, &(termio)->c_oflag); \
|
|
(termios)->c_oflag = (0xffff0000 & ((termios)->c_oflag)) | tmp; \
|
|
get_user(tmp, &(termio)->c_cflag); \
|
|
(termios)->c_cflag = (0xffff0000 & ((termios)->c_cflag)) | tmp; \
|
|
get_user(tmp, &(termio)->c_lflag); \
|
|
(termios)->c_lflag = (0xffff0000 & ((termios)->c_lflag)) | tmp; \
|
|
get_user((termios)->c_line, &(termio)->c_line); \
|
|
copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
|
|
})
|
|
|
|
/*
|
|
* Translate a "termios" structure into a "termio". Ugh.
|
|
*/
|
|
#define kernel_termios_to_user_termio(termio, termios) \
|
|
({ \
|
|
put_user((termios)->c_iflag, &(termio)->c_iflag); \
|
|
put_user((termios)->c_oflag, &(termio)->c_oflag); \
|
|
put_user((termios)->c_cflag, &(termio)->c_cflag); \
|
|
put_user((termios)->c_lflag, &(termio)->c_lflag); \
|
|
put_user((termios)->c_line, &(termio)->c_line); \
|
|
copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
|
|
})
|
|
|
|
#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
|
|
#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
|
|
#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
|
|
#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _M68K_TERMIOS_H */
|