Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Tilman Schmidt <tilman@imap.cc>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Tilman Schmidt and committed by
Linus Torvalds
4564f9e5 4a3b0a49

+23 -398
+1
arch/sparc/kernel/sunos_ioctl.c
··· 11 11 #include <linux/errno.h> 12 12 #include <linux/string.h> 13 13 #include <linux/termios.h> 14 + #include <linux/tty.h> 14 15 #include <linux/ioctl.h> 15 16 #include <linux/route.h> 16 17 #include <linux/sockios.h>
+1
arch/sparc64/kernel/sunos_ioctl32.c
··· 11 11 #include <linux/errno.h> 12 12 #include <linux/string.h> 13 13 #include <linux/termios.h> 14 + #include <linux/tty.h> 14 15 #include <linux/ioctl.h> 15 16 #include <linux/route.h> 16 17 #include <linux/sockios.h>
-18
include/asm-alpha/termios.h
··· 66 66 #define _VEOL2 6 67 67 #define _VSWTC 7 68 68 69 - /* line disciplines */ 70 - #define N_TTY 0 71 - #define N_SLIP 1 72 - #define N_MOUSE 2 73 - #define N_PPP 3 74 - #define N_STRIP 4 75 - #define N_AX25 5 76 - #define N_X25 6 /* X.25 async */ 77 - #define N_6PACK 7 78 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 79 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 80 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 81 - #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 82 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 83 - #define N_HDLC 13 /* synchronous HDLC */ 84 - #define N_SYNC_PPP 14 85 - #define N_HCI 15 /* Bluetooth HCI UART */ 86 - 87 69 #ifdef __KERNEL__ 88 70 /* eof=^D eol=\0 eol2=\0 erase=del 89 71 werase=^W kill=^U reprint=^R sxtc=\0
-18
include/asm-arm/termios.h
··· 49 49 50 50 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 51 51 52 - /* line disciplines */ 53 - #define N_TTY 0 54 - #define N_SLIP 1 55 - #define N_MOUSE 2 56 - #define N_PPP 3 57 - #define N_STRIP 4 58 - #define N_AX25 5 59 - #define N_X25 6 /* X.25 async */ 60 - #define N_6PACK 7 61 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 62 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 63 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 64 - #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 65 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 66 - #define N_HDLC 13 /* synchronous HDLC */ 67 - #define N_SYNC_PPP 14 68 - #define N_HCI 15 /* Bluetooth HCI UART */ 69 - 70 52 #ifdef __KERNEL__ 71 53 72 54 /*
-18
include/asm-arm26/termios.h
··· 49 49 50 50 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 51 51 52 - /* line disciplines */ 53 - #define N_TTY 0 54 - #define N_SLIP 1 55 - #define N_MOUSE 2 56 - #define N_PPP 3 57 - #define N_STRIP 4 58 - #define N_AX25 5 59 - #define N_X25 6 /* X.25 async */ 60 - #define N_6PACK 7 61 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 62 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 63 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 64 - #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 65 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 66 - #define N_HDLC 13 /* synchronous HDLC */ 67 - #define N_SYNC_PPP 14 68 - #define N_HCI 15 /* Bluetooth HCI UART */ 69 - 70 52 #ifdef __KERNEL__ 71 53 72 54 /*
-18
include/asm-avr32/termios.h
··· 46 46 47 47 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 48 48 49 - /* line disciplines */ 50 - #define N_TTY 0 51 - #define N_SLIP 1 52 - #define N_MOUSE 2 53 - #define N_PPP 3 54 - #define N_STRIP 4 55 - #define N_AX25 5 56 - #define N_X25 6 /* X.25 async */ 57 - #define N_6PACK 7 58 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 59 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 60 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 61 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 62 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 63 - #define N_HDLC 13 /* synchronous HDLC */ 64 - #define N_SYNC_PPP 14 /* synchronous PPP */ 65 - #define N_HCI 15 /* Bluetooth HCI UART */ 66 - 67 49 #ifdef __KERNEL__ 68 50 /* intr=^C quit=^\ erase=del kill=^U 69 51 eof=^D vtime=\0 vmin=\1 sxtc=\0
-18
include/asm-cris/termios.h
··· 40 40 41 41 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 42 42 43 - /* line disciplines */ 44 - #define N_TTY 0 45 - #define N_SLIP 1 46 - #define N_MOUSE 2 47 - #define N_PPP 3 48 - #define N_STRIP 4 49 - #define N_AX25 5 50 - #define N_X25 6 /* X.25 async */ 51 - #define N_6PACK 7 52 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 53 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 54 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 55 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 56 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 57 - #define N_HDLC 13 /* synchronous HDLC */ 58 - #define N_SYNC_PPP 14 /* synchronous PPP */ 59 - #define N_BT 15 /* bluetooth */ 60 - 61 43 #ifdef __KERNEL__ 62 44 63 45 /* intr=^C quit=^\ erase=del kill=^U
-18
include/asm-frv/termios.h
··· 51 51 52 52 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 53 53 54 - /* line disciplines */ 55 - #define N_TTY 0 56 - #define N_SLIP 1 57 - #define N_MOUSE 2 58 - #define N_PPP 3 59 - #define N_STRIP 4 60 - #define N_AX25 5 61 - #define N_X25 6 /* X.25 async */ 62 - #define N_6PACK 7 63 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 64 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 65 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 66 - #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 67 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 68 - #define N_HDLC 13 /* synchronous HDLC */ 69 - #define N_SYNC_PPP 14 70 - #define N_HCI 15 /* Bluetooth HCI UART */ 71 - 72 54 #ifdef __KERNEL__ 73 55 #include <asm-generic/termios.h> 74 56 #endif
-18
include/asm-h8300/termios.h
··· 49 49 50 50 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 51 51 52 - /* line disciplines */ 53 - #define N_TTY 0 54 - #define N_SLIP 1 55 - #define N_MOUSE 2 56 - #define N_PPP 3 57 - #define N_STRIP 4 58 - #define N_AX25 5 59 - #define N_X25 6 /* X.25 async */ 60 - #define N_6PACK 7 61 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 62 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 63 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 64 - #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 65 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 66 - #define N_HDLC 13 /* synchronous HDLC */ 67 - #define N_SYNC_PPP 14 68 - #define N_HCI 15 /* Bluetooth HCI UART */ 69 - 70 52 #ifdef __KERNEL__ 71 53 72 54 /*
-18
include/asm-i386/termios.h
··· 39 39 40 40 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 41 41 42 - /* line disciplines */ 43 - #define N_TTY 0 44 - #define N_SLIP 1 45 - #define N_MOUSE 2 46 - #define N_PPP 3 47 - #define N_STRIP 4 48 - #define N_AX25 5 49 - #define N_X25 6 /* X.25 async */ 50 - #define N_6PACK 7 51 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 52 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 53 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 54 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 55 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 56 - #define N_HDLC 13 /* synchronous HDLC */ 57 - #define N_SYNC_PPP 14 /* synchronous PPP */ 58 - #define N_HCI 15 /* Bluetooth HCI UART */ 59 - 60 42 #ifdef __KERNEL__ 61 43 #include <linux/module.h> 62 44
-18
include/asm-ia64/termios.h
··· 46 46 47 47 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 48 48 49 - /* line disciplines */ 50 - #define N_TTY 0 51 - #define N_SLIP 1 52 - #define N_MOUSE 2 53 - #define N_PPP 3 54 - #define N_STRIP 4 55 - #define N_AX25 5 56 - #define N_X25 6 /* X.25 async */ 57 - #define N_6PACK 7 58 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 59 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 60 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 61 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 62 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS msgs */ 63 - #define N_HDLC 13 /* synchronous HDLC */ 64 - #define N_SYNC_PPP 14 /* synchronous PPP */ 65 - #define N_HCI 15 /* Bluetooth HCI UART */ 66 - 67 49 # ifdef __KERNEL__ 68 50 69 51 /* intr=^C quit=^\ erase=del kill=^U
-18
include/asm-m32r/termios.h
··· 39 39 40 40 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 41 41 42 - /* line disciplines */ 43 - #define N_TTY 0 44 - #define N_SLIP 1 45 - #define N_MOUSE 2 46 - #define N_PPP 3 47 - #define N_STRIP 4 48 - #define N_AX25 5 49 - #define N_X25 6 /* X.25 async */ 50 - #define N_6PACK 7 51 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 52 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 53 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 54 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 55 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 56 - #define N_HDLC 13 /* synchronous HDLC */ 57 - #define N_SYNC_PPP 14 /* synchronous PPP */ 58 - #define N_HCI 15 /* Bluetooth HCI UART */ 59 - 60 42 #ifdef __KERNEL__ 61 43 #include <linux/module.h> 62 44
-18
include/asm-m68k/termios.h
··· 49 49 50 50 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 51 51 52 - /* line disciplines */ 53 - #define N_TTY 0 54 - #define N_SLIP 1 55 - #define N_MOUSE 2 56 - #define N_PPP 3 57 - #define N_STRIP 4 58 - #define N_AX25 5 59 - #define N_X25 6 /* X.25 async */ 60 - #define N_6PACK 7 61 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 62 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 63 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 64 - #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 65 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 66 - #define N_HDLC 13 /* synchronous HDLC */ 67 - #define N_SYNC_PPP 14 68 - #define N_HCI 15 /* Bluetooth HCI UART */ 69 - 70 52 #ifdef __KERNEL__ 71 53 72 54 /*
-18
include/asm-mips/termios.h
··· 87 87 #define TIOCM_OUT2 0x4000 88 88 #define TIOCM_LOOP 0x8000 89 89 90 - /* line disciplines */ 91 - #define N_TTY 0 92 - #define N_SLIP 1 93 - #define N_MOUSE 2 94 - #define N_PPP 3 95 - #define N_STRIP 4 96 - #define N_AX25 5 97 - #define N_X25 6 /* X.25 async */ 98 - #define N_6PACK 7 99 - #define N_MASC 8 /* Reserved fo Mobitex module <kaz@cafe.net> */ 100 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 101 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 102 - #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 103 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 104 - #define N_HDLC 13 /* synchronous HDLC */ 105 - #define N_SYNC_PPP 14 /* synchronous PPP */ 106 - #define N_HCI 15 /* Bluetooth HCI UART */ 107 - 108 90 #ifdef __KERNEL__ 109 91 110 92 #include <linux/string.h>
-18
include/asm-parisc/termios.h
··· 39 39 40 40 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 41 41 42 - /* line disciplines */ 43 - #define N_TTY 0 44 - #define N_SLIP 1 45 - #define N_MOUSE 2 46 - #define N_PPP 3 47 - #define N_STRIP 4 48 - #define N_AX25 5 49 - #define N_X25 6 /* X.25 async */ 50 - #define N_6PACK 7 51 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 52 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 53 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 54 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 55 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 56 - #define N_HDLC 13 /* synchronous HDLC */ 57 - #define N_SYNC_PPP 14 58 - #define N_HCI 15 /* Bluetooth HCI UART */ 59 - 60 42 #ifdef __KERNEL__ 61 43 62 44 /* intr=^C quit=^\ erase=del kill=^U
-18
include/asm-powerpc/termios.h
··· 71 71 #define _VEOL2 8 72 72 #define _VSWTC 9 73 73 74 - /* line disciplines */ 75 - #define N_TTY 0 76 - #define N_SLIP 1 77 - #define N_MOUSE 2 78 - #define N_PPP 3 79 - #define N_STRIP 4 80 - #define N_AX25 5 81 - #define N_X25 6 /* X.25 async */ 82 - #define N_6PACK 7 83 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 84 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 85 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 86 - #define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ 87 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 88 - #define N_HDLC 13 /* synchronous HDLC */ 89 - #define N_SYNC_PPP 14 90 - #define N_HCI 15 /* Bluetooth HCI UART */ 91 - 92 74 #ifdef __KERNEL__ 93 75 /* ^C ^\ del ^U ^D 1 0 0 0 0 ^W ^R ^Z ^Q ^S ^V ^U */ 94 76 #define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\025"
-18
include/asm-s390/termios.h
··· 47 47 48 48 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 49 49 50 - /* line disciplines */ 51 - #define N_TTY 0 52 - #define N_SLIP 1 53 - #define N_MOUSE 2 54 - #define N_PPP 3 55 - #define N_STRIP 4 56 - #define N_AX25 5 57 - #define N_X25 6 /* X.25 async */ 58 - #define N_6PACK 7 59 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 60 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 61 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 62 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 63 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 64 - #define N_HDLC 13 /* synchronous HDLC */ 65 - #define N_SYNC_PPP 14 /* synchronous PPP */ 66 - #define N_HCI 15 /* Bluetooth HCI UART */ 67 - 68 50 #ifdef __KERNEL__ 69 51 70 52 /* intr=^C quit=^\ erase=del kill=^U
-18
include/asm-sh/termios.h
··· 39 39 40 40 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 41 41 42 - /* line disciplines */ 43 - #define N_TTY 0 44 - #define N_SLIP 1 45 - #define N_MOUSE 2 46 - #define N_PPP 3 47 - #define N_STRIP 4 48 - #define N_AX25 5 49 - #define N_X25 6 /* X.25 async */ 50 - #define N_6PACK 7 51 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 52 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 53 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 54 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 55 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 56 - #define N_HDLC 13 /* synchronous HDLC */ 57 - #define N_SYNC_PPP 14 58 - #define N_HCI 15 /* Bluetooth HCI UART */ 59 - 60 42 #ifdef __KERNEL__ 61 43 62 44 /* intr=^C quit=^\ erase=del kill=^U
-18
include/asm-sh64/termios.h
··· 50 50 51 51 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 52 52 53 - /* line disciplines */ 54 - #define N_TTY 0 55 - #define N_SLIP 1 56 - #define N_MOUSE 2 57 - #define N_PPP 3 58 - #define N_STRIP 4 59 - #define N_AX25 5 60 - #define N_X25 6 /* X.25 async */ 61 - #define N_6PACK 7 62 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 63 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 64 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 65 - #define N_IRDA 11 /* Linux IR - http://www.cs.uit.no/~dagb/irda/irda.html */ 66 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 67 - #define N_HDLC 13 /* synchronous HDLC */ 68 - #define N_SYNC_PPP 14 69 - #define N_HCI 15 /* Bluetooth HCI UART */ 70 - 71 53 #ifdef __KERNEL__ 72 54 73 55 /* intr=^C quit=^\ erase=del kill=^U
-18
include/asm-sparc/termios.h
··· 45 45 unsigned short ws_ypixel; 46 46 }; 47 47 48 - /* line disciplines */ 49 - #define N_TTY 0 50 - #define N_SLIP 1 51 - #define N_MOUSE 2 52 - #define N_PPP 3 53 - #define N_STRIP 4 54 - #define N_AX25 5 55 - #define N_X25 6 56 - #define N_6PACK 7 57 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 58 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 59 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 60 - #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 61 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 62 - #define N_HDLC 13 /* synchronous HDLC */ 63 - #define N_SYNC_PPP 14 /* synchronous PPP */ 64 - #define N_HCI 15 /* Bluetooth HCI UART */ 65 - 66 48 #ifdef __KERNEL__ 67 49 #include <linux/module.h> 68 50
-18
include/asm-sparc64/termios.h
··· 45 45 unsigned short ws_ypixel; 46 46 }; 47 47 48 - /* line disciplines */ 49 - #define N_TTY 0 50 - #define N_SLIP 1 51 - #define N_MOUSE 2 52 - #define N_PPP 3 53 - #define N_STRIP 4 54 - #define N_AX25 5 55 - #define N_X25 6 56 - #define N_6PACK 7 57 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 58 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 59 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 60 - #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 61 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 62 - #define N_HDLC 13 /* synchronous HDLC */ 63 - #define N_SYNC_PPP 14 /* synchronous PPP */ 64 - #define N_HCI 15 /* Bluetooth HCI UART */ 65 - 66 48 #ifdef __KERNEL__ 67 49 #include <linux/module.h> 68 50
-18
include/asm-v850/termios.h
··· 39 39 40 40 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 41 41 42 - /* line disciplines */ 43 - #define N_TTY 0 44 - #define N_SLIP 1 45 - #define N_MOUSE 2 46 - #define N_PPP 3 47 - #define N_STRIP 4 48 - #define N_AX25 5 49 - #define N_X25 6 /* X.25 async */ 50 - #define N_6PACK 7 51 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 52 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 53 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 54 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 55 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 56 - #define N_HDLC 13 /* synchronous HDLC */ 57 - #define N_SYNC_PPP 14 /* synchronous PPP */ 58 - #define N_HCI 15 /* Bluetooth HCI UART */ 59 - 60 42 #ifdef __KERNEL__ 61 43 62 44 /* intr=^C quit=^\ erase=del kill=^U
-18
include/asm-x86_64/termios.h
··· 39 39 40 40 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 41 41 42 - /* line disciplines */ 43 - #define N_TTY 0 44 - #define N_SLIP 1 45 - #define N_MOUSE 2 46 - #define N_PPP 3 47 - #define N_STRIP 4 48 - #define N_AX25 5 49 - #define N_X25 6 /* X.25 async */ 50 - #define N_6PACK 7 51 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 52 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 53 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 54 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 55 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 56 - #define N_HDLC 13 /* synchronous HDLC */ 57 - #define N_SYNC_PPP 14 /* synchronous PPP */ 58 - #define N_HCI 15 /* Bluetooth HCI UART */ 59 - 60 42 #ifdef __KERNEL__ 61 43 62 44 /* intr=^C quit=^\ erase=del kill=^U
-19
include/asm-xtensa/termios.h
··· 52 52 53 53 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ 54 54 55 - /* Line disciplines */ 56 - 57 - #define N_TTY 0 58 - #define N_SLIP 1 59 - #define N_MOUSE 2 60 - #define N_PPP 3 61 - #define N_STRIP 4 62 - #define N_AX25 5 63 - #define N_X25 6 /* X.25 async */ 64 - #define N_6PACK 7 65 - #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 66 - #define N_R3964 9 /* Reserved for Simatic R3964 module */ 67 - #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 68 - #define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ 69 - #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ 70 - #define N_HDLC 13 /* synchronous HDLC */ 71 - #define N_SYNC_PPP 14 72 - #define N_HCI 15 /* Bluetooth HCI UART */ 73 - 74 55 #ifdef __KERNEL__ 75 56 76 57 /* intr=^C quit=^\ erase=del kill=^U
+21 -1
include/linux/tty.h
··· 24 24 #define NR_PTYS CONFIG_LEGACY_PTY_COUNT /* Number of legacy ptys */ 25 25 #define NR_UNIX98_PTY_DEFAULT 4096 /* Default maximum for Unix98 ptys */ 26 26 #define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */ 27 - #define NR_LDISCS 16 27 + #define NR_LDISCS 17 28 + 29 + /* line disciplines */ 30 + #define N_TTY 0 31 + #define N_SLIP 1 32 + #define N_MOUSE 2 33 + #define N_PPP 3 34 + #define N_STRIP 4 35 + #define N_AX25 5 36 + #define N_X25 6 /* X.25 async */ 37 + #define N_6PACK 7 38 + #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ 39 + #define N_R3964 9 /* Reserved for Simatic R3964 module */ 40 + #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ 41 + #define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ 42 + #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data */ 43 + /* cards about SMS messages */ 44 + #define N_HDLC 13 /* synchronous HDLC */ 45 + #define N_SYNC_PPP 14 /* synchronous PPP */ 46 + #define N_HCI 15 /* Bluetooth HCI UART */ 47 + #define N_GIGASET_M101 16 /* Siemens Gigaset M101 serial DECT adapter */ 28 48 29 49 /* 30 50 * This character is the same as _POSIX_VDISABLE: it cannot be used as