forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[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 <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
- Loading branch information
1 parent
4a3b0a4
commit 4564f9e
Showing
25 changed files
with
23 additions
and
398 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#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__ | ||
|
||
/* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#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__ | ||
|
||
/* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,24 +46,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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#define N_IRDA 11 /* Linux IR - 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 /* synchronous PPP */ | ||
#define N_HCI 15 /* Bluetooth HCI UART */ | ||
|
||
#ifdef __KERNEL__ | ||
/* intr=^C quit=^\ erase=del kill=^U | ||
eof=^D vtime=\0 vmin=\1 sxtc=\0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,24 +40,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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#define N_IRDA 11 /* Linux IR - 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 /* synchronous PPP */ | ||
#define N_BT 15 /* bluetooth */ | ||
|
||
#ifdef __KERNEL__ | ||
|
||
/* intr=^C quit=^\ erase=del kill=^U | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,24 +51,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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#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-generic/termios.h> | ||
#endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#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__ | ||
|
||
/* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,24 +39,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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#define N_IRDA 11 /* Linux IR - 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 /* synchronous PPP */ | ||
#define N_HCI 15 /* Bluetooth HCI UART */ | ||
|
||
#ifdef __KERNEL__ | ||
#include <linux/module.h> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,24 +46,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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ | ||
#define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS msgs */ | ||
#define N_HDLC 13 /* synchronous HDLC */ | ||
#define N_SYNC_PPP 14 /* synchronous PPP */ | ||
#define N_HCI 15 /* Bluetooth HCI UART */ | ||
|
||
# ifdef __KERNEL__ | ||
|
||
/* intr=^C quit=^\ erase=del kill=^U | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,24 +39,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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#define N_IRDA 11 /* Linux IR - 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 /* synchronous PPP */ | ||
#define N_HCI 15 /* Bluetooth HCI UART */ | ||
|
||
#ifdef __KERNEL__ | ||
#include <linux/module.h> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#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__ | ||
|
||
/* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -87,24 +87,6 @@ struct termio { | |
#define TIOCM_OUT2 0x4000 | ||
#define TIOCM_LOOP 0x8000 | ||
|
||
/* 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 fo Mobitex module <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#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 /* synchronous PPP */ | ||
#define N_HCI 15 /* Bluetooth HCI UART */ | ||
|
||
#ifdef __KERNEL__ | ||
|
||
#include <linux/string.h> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,24 +39,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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#define N_IRDA 11 /* Linux IR - 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__ | ||
|
||
/* intr=^C quit=^\ erase=del kill=^U | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -71,24 +71,6 @@ struct termio { | |
#define _VEOL2 8 | ||
#define _VSWTC 9 | ||
|
||
/* 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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ | ||
#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__ | ||
/* ^C ^\ del ^U ^D 1 0 0 0 0 ^W ^R ^Z ^Q ^S ^V ^U */ | ||
#define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\025" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,24 +47,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 <[email protected]> */ | ||
#define N_R3964 9 /* Reserved for Simatic R3964 module */ | ||
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <[email protected]> */ | ||
#define N_IRDA 11 /* Linux IR - 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 /* synchronous PPP */ | ||
#define N_HCI 15 /* Bluetooth HCI UART */ | ||
|
||
#ifdef __KERNEL__ | ||
|
||
/* intr=^C quit=^\ erase=del kill=^U | ||
|
Oops, something went wrong.