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

Commit 4564f9e5 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Linus Torvalds
Browse files

[PATCH] consolidate line discipline number definitions 



The line discipline numbers N_* are currently defined for each architecture
individually, but (except for a seeming mistake) identically, in
asm/termios.h.  There is no obvious reason why these numbers should be
architecture specific, nor any apparent relationship with the termios
structure.  The total number of these, NR_LDISCS, is defined in linux/tty.h
anyway.  So I propose the following patch which moves the definitions of
the individual line disciplines to linux/tty.h too.

Three of these numbers (N_MASC, N_PROFIBUS_FDL, and N_SMSBLOCK) are unused
in the current kernel, but the patch still keeps the complete set in case
there are plans to use them yet.

Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4a3b0a49

arch/sparc/kernel/sunos_ioctl.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/errno.h>

#include <linux/string.h>

#include <linux/termios.h>

#include <linux/tty.h>

#include <linux/ioctl.h>

#include <linux/route.h>

#include <linux/sockios.h>

arch/sparc64/kernel/sunos_ioctl32.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/errno.h>

#include <linux/string.h>

#include <linux/termios.h>

#include <linux/tty.h>

#include <linux/ioctl.h>

#include <linux/route.h>

#include <linux/sockios.h>

include/asm-alpha/termios.h

+0 −18
Original line number Diff line number Diff line
@@ -66,24 +66,6 @@ struct termio { 
#define _VEOL2	6

#define _VSWTC	7



/* line disciplines */

#define N_TTY		0

#define N_SLIP		1

#define N_MOUSE		2

#define N_PPP		3

#define N_STRIP		4

#define N_AX25		5

#define N_X25		6	/* X.25 async */

#define N_6PACK		7

#define N_MASC		8	/* Reserved for Mobitex module <kaz@cafe.net> */

#define N_R3964		9	/* Reserved for Simatic R3964 module */

#define N_PROFIBUS_FDL	10	/* Reserved for Profibus <Dave@mvhi.com> */

#define N_IRDA		11	/* Linux IrDa - http://irda.sourceforge.net/ */

#define N_SMSBLOCK	12	/* SMS block mode - for talking to GSM data cards about SMS messages */

#define N_HDLC		13	/* synchronous HDLC */

#define N_SYNC_PPP	14

#define N_HCI		15  /* Bluetooth HCI UART */



#ifdef __KERNEL__

/*	eof=^D		eol=\0		eol2=\0		erase=del

	werase=^W	kill=^U		reprint=^R	sxtc=\0

include/asm-arm/termios.h

+0 −18
Original line number Diff line number Diff line
@@ -49,24 +49,6 @@ struct termio { 


/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */



/* line disciplines */

#define N_TTY		0

#define N_SLIP		1

#define N_MOUSE		2

#define N_PPP		3

#define N_STRIP		4

#define N_AX25		5

#define N_X25		6	/* X.25 async */

#define N_6PACK		7

#define N_MASC		8	/* Reserved for Mobitex module <kaz@cafe.net> */

#define N_R3964		9	/* Reserved for Simatic R3964 module */

#define N_PROFIBUS_FDL	10	/* Reserved for Profibus <Dave@mvhi.com> */

#define N_IRDA		11	/* Linux IrDa - http://irda.sourceforge.net/ */

#define N_SMSBLOCK	12	/* SMS block mode - for talking to GSM data cards about SMS messages */

#define N_HDLC		13	/* synchronous HDLC */

#define N_SYNC_PPP	14

#define N_HCI		15  /* Bluetooth HCI UART */



#ifdef __KERNEL__



/*

include/asm-arm26/termios.h

+0 −18
Original line number Diff line number Diff line
@@ -49,24 +49,6 @@ struct termio { 


/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */



/* line disciplines */

#define N_TTY		0

#define N_SLIP		1

#define N_MOUSE		2

#define N_PPP		3

#define N_STRIP		4

#define N_AX25		5

#define N_X25		6	/* X.25 async */

#define N_6PACK		7

#define N_MASC		8	/* Reserved for Mobitex module <kaz@cafe.net> */

#define N_R3964		9	/* Reserved for Simatic R3964 module */

#define N_PROFIBUS_FDL	10	/* Reserved for Profibus <Dave@mvhi.com> */

#define N_IRDA		11	/* Linux IrDa - http://irda.sourceforge.net/ */

#define N_SMSBLOCK	12	/* SMS block mode - for talking to GSM data cards about SMS messages */

#define N_HDLC		13	/* synchronous HDLC */

#define N_SYNC_PPP	14

#define N_HCI		15  /* Bluetooth HCI UART */



#ifdef __KERNEL__



/*