diff options
| author | Tilman Schmidt <tilman@imap.cc> | 2007-02-10 04:45:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:26 -0500 |
| commit | 4564f9e5fd00767d11fcf61e0d52787706dfcc87 (patch) | |
| tree | e7d2dd2c80099c23a7dadfb53f8faa74dba7d484 /include/asm-x86_64/termios.h | |
| parent | 4a3b0a490d49ada8bbf3f426be1a0ace4dcd0a55 (diff) | |
[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>
Diffstat (limited to 'include/asm-x86_64/termios.h')
| -rw-r--r-- | include/asm-x86_64/termios.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-x86_64/termios.h b/include/asm-x86_64/termios.h index 443b225537f0..35ee59b78329 100644 --- a/include/asm-x86_64/termios.h +++ b/include/asm-x86_64/termios.h | |||
| @@ -39,24 +39,6 @@ struct termio { | |||
| 39 | 39 | ||
| 40 | /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ | 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 | #ifdef __KERNEL__ | 42 | #ifdef __KERNEL__ |
| 61 | 43 | ||
| 62 | /* intr=^C quit=^\ erase=del kill=^U | 44 | /* intr=^C quit=^\ erase=del kill=^U |