Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20e42aed authored by Greg Ungerer's avatar Greg Ungerer Committed by Geert Uytterhoeven
Browse files

m68k: switch to using the asm-generic termios.h 



We don't need a local termios.h, switch to using the asm-generic versions.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 599a0c4e

arch/m68k/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ generic-y += shmparam.h 
generic-y += siginfo.h

generic-y += spinlock.h

generic-y += statfs.h

generic-y += termios.h

generic-y += topology.h

generic-y += types.h

generic-y += word-at-a-time.h

arch/m68k/include/asm/termios.h

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
#ifndef _M68K_TERMIOS_H

#define _M68K_TERMIOS_H



#include <uapi/asm/termios.h>



/*	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"



/*

 * 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 /* _M68K_TERMIOS_H */

arch/m68k/include/uapi/asm/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ generic-y += shmbuf.h 
generic-y += socket.h

generic-y += sockios.h

generic-y += termbits.h

generic-y += termios.h



header-y += a.out.h

header-y += byteorder.h
@@ -23,5 +24,4 @@ header-y += sigcontext.h 
header-y += signal.h

header-y += stat.h

header-y += swab.h

header-y += termios.h

header-y += unistd.h

arch/m68k/include/uapi/asm/termios.h

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
#ifndef _UAPI_M68K_TERMIOS_H

#define _UAPI_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 */

};





/* 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 */





#endif /* _UAPI_M68K_TERMIOS_H */