Commit c9874d3f authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

termios: start unifying non-UAPI parts of asm/termios.h 



* new header (linut/termios_internal.h), pulled by the users of those
suckers
* defaults for INIT_C_CC and externs for conversion helpers moved over
there
* remove termios-base.h (empty now)

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/YxDmptU7dNGZ+/Hn@ZenIV


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d5d6682

arch/alpha/include/asm/termios.h

+1 −7
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef _ALPHA_TERMIOS_H

#define _ALPHA_TERMIOS_H



#include <linux/uaccess.h>

#include <uapi/asm/termios.h>



/*	eof=^D		eol=\0		eol2=\0		erase=del
@@ -12,11 +13,4 @@ 
*/

#define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\025\001\000"



int user_termio_to_kernel_termios(struct ktermios *, struct termio __user *);

int kernel_termios_to_user_termio(struct termio __user *, struct ktermios *);

int user_termios_to_kernel_termios(struct ktermios *, struct termios2 __user *);

int kernel_termios_to_user_termios(struct termios2 __user *, struct ktermios *);

int user_termios_to_kernel_termios_1(struct ktermios *, struct termios __user *);

int kernel_termios_to_user_termios_1(struct termios __user *, struct ktermios *);



#endif	/* _ALPHA_TERMIOS_H */

arch/alpha/kernel/termios.c

+1 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/uaccess.h>

#include <linux/termios.h>

#include <linux/termios_internal.h>



int user_termio_to_kernel_termios(struct ktermios *termios,

						struct termio __user *termio)

arch/ia64/include/asm/termios.h

+0 −16
Original line number Diff line number Diff line
@@ -10,20 +10,4 @@ 


#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"



int user_termio_to_kernel_termios(struct ktermios *, struct termio __user *);

int kernel_termios_to_user_termio(struct termio __user *, struct ktermios *);

int user_termios_to_kernel_termios(struct ktermios *, struct termios2 __user *);

int kernel_termios_to_user_termios(struct termios2 __user *, struct ktermios *);

int user_termios_to_kernel_termios_1(struct ktermios *, struct termios __user *);

int kernel_termios_to_user_termios_1(struct termios __user *, struct ktermios *);



#endif /* _ASM_IA64_TERMIOS_H */

arch/mips/include/asm/termios.h

+0 −9
Original line number Diff line number Diff line
@@ -21,13 +21,4 @@ 
 */

#define INIT_C_CC "\003\034\177\025\1\0\0\0\021\023\032\0\022\017\027\026\004\0"



#include <linux/string.h>



int user_termio_to_kernel_termios(struct ktermios *, struct termio __user *);

int kernel_termios_to_user_termio(struct termio __user *, struct ktermios *);

int user_termios_to_kernel_termios(struct ktermios *, struct termios2 __user *);

int kernel_termios_to_user_termios(struct termios2 __user *, struct ktermios *);

int user_termios_to_kernel_termios_1(struct ktermios *, struct termios __user *);

int kernel_termios_to_user_termios_1(struct termios __user *, struct ktermios *);



#endif /* _ASM_TERMIOS_H */

arch/parisc/include/asm/termios.h

+0 −16
Original line number Diff line number Diff line
@@ -4,20 +4,4 @@ 


#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"



int user_termio_to_kernel_termios(struct ktermios *, struct termio __user *);

int kernel_termios_to_user_termio(struct termio __user *, struct ktermios *);

int user_termios_to_kernel_termios(struct ktermios *, struct termios2 __user *);

int kernel_termios_to_user_termios(struct termios2 __user *, struct ktermios *);

int user_termios_to_kernel_termios_1(struct ktermios *, struct termios __user *);

int kernel_termios_to_user_termios_1(struct termios __user *, struct ktermios *);



#endif	/* _PARISC_TERMIOS_H */