consolidate line discipline number definitions
Subsystems (2)
RFC PATCH 1/1 consolidate line discipline number definitions
The line discipline code numbers N_* are currently defined separately for each architecture in include/asm-${arch}/termios.h which is in turn included by include/linux/termios.h via the symlink include/asm. I don't see any reason why these definitions need to be architecture specific. They are identical for all architectures, with a single exception: include/asm-cris/termios.h doesn't define N_HCI, but instead defines N_BT with the same value (15). This however appears to be a mistake rather than deliberate, as N_BT isn't used anyhere in the 2.6.19 source tree.
Therefore I propose to consolidate these definitions by moving them into the architecture independent part as by the patch below. This would significantly reduce the effort for adding new line disciplines and the danger of unnecessary divergence between architectures as well as errors like the one cited above.
A few source files include <asm/termios.h> directly instead of <linux/termios.h> and would therefore miss the moved definitions. These are:
arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h arch/parisc/hpux/ioctl.c
arch/sparc64/solaris/ioctl.c arch/sparc64/solaris/socksys.c arch/sparc64/solaris/timod.c
drivers/char/n_hdlc.c
drivers/serial/crisv10.h
Of these, only drivers/char/n_hdlc.c actually references a line discipline number and is therefore also patched below to include <linux/termios.h> instead. For the others, I would like opinions on whether to change them to <linux/termios.h> too.
I would also like comments from someone versed in UML on whether include/asm-um/termios.h, which includes "asm/arch/termios.h", will need modification.
Thanks
Tilman
From: Tilman Schmidt <[email protected]>
Consolidate line discipline number definitions from architecture-specific termios.h files into architecture independent termios.h file.
Signed-off-by Tilman Schmidt <[email protected]>
---
drivers/char/n_hdlc.c | 2 +- include/asm-alpha/termios.h | 18 ------------------ include/asm-arm/termios.h | 18 ------------------ include/asm-arm26/termios.h | 18 ------------------ include/asm-avr32/termios.h | 18 ------------------ include/asm-cris/termios.h | 18 ------------------ include/asm-frv/termios.h | 18 ------------------ include/asm-h8300/termios.h | 18 ------------------ include/asm-i386/termios.h | 18 ------------------ include/asm-ia64/termios.h | 18 ------------------ include/asm-m32r/termios.h | 18 ------------------ include/asm-m68k/termios.h | 18 ------------------ include/asm-mips/termios.h | 18 ------------------ include/asm-parisc/termios.h | 18 ------------------ include/asm-powerpc/termios.h | 18 ------------------ include/asm-s390/termios.h | 18 ------------------ include/asm-sh/termios.h | 18 ------------------ include/asm-sh64/termios.h | 18 ------------------ include/asm-sparc/termios.h | 18 ------------------ include/asm-sparc64/termios.h | 18 ------------------ include/asm-v850/termios.h | 18 ------------------ include/asm-x86_64/termios.h | 18 ------------------ include/asm-xtensa/termios.h | 19 ------------------- include/linux/termios.h | 19 +++++++++++++++++++ 24 files changed, 20 insertions(+), 398 deletions(-)
drivers/char/n_hdlc.c +1 -1
@@ -103,9 +103,9 @@#include <linux/signal.h> /* used in new tty drivers */ #include <linux/if.h> #include <linux/bitops.h> +#include <linux/termios.h> #include <asm/system.h> -#include <asm/termios.h> #include <asm/uaccess.h> /*
include/asm-alpha/termios.h +0 -18
@@ -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
include/asm-arm/termios.h +0 -18
@@ -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__/*
include/asm-arm26/termios.h +0 -18
@@ -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__/*
include/asm-avr32/termios.h +0 -18
@@ -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
include/asm-cris/termios.h +0 -18
@@ -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
include/asm-frv/termios.h +0 -18
@@ -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 */ -#include <asm-generic/termios.h> #endif /* _ASM_TERMIOS_H */
include/asm-h8300/termios.h +0 -18
@@ -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__/*
include/asm-i386/termios.h +0 -18
@@ -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>
include/asm-ia64/termios.h +0 -18
@@ -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
include/asm-m32r/termios.h +0 -18
@@ -41,24 +41,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>
include/asm-m68k/termios.h +0 -18
@@ -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__/*
include/asm-mips/termios.h +0 -18
@@ -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>
include/asm-parisc/termios.h +0 -18
@@ -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
include/asm-powerpc/termios.h +0 -18
@@ -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"
include/asm-s390/termios.h +0 -18
@@ -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
include/asm-sh/termios.h +0 -18
@@ -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
include/asm-sh64/termios.h +0 -18
@@ -50,24 +50,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://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__/* intr=^C quit=^\ erase=del kill=^U
include/asm-sparc/termios.h +0 -18
@@ -45,24 +45,6 @@ struct winsize {unsigned short ws_ypixel; }; -/* 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 -#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/* synchronous PPP */ -#define N_HCI 15/* Bluetooth HCI UART */ -#ifdef __KERNEL__#include <linux/module.h>
include/asm-sparc64/termios.h +0 -18
@@ -45,24 +45,6 @@ struct winsize {unsigned short ws_ypixel; }; -/* 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 -#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/* synchronous PPP */ -#define N_HCI 15/* Bluetooth HCI UART */ -#ifdef __KERNEL__#include <linux/module.h>
include/asm-v850/termios.h +0 -18
@@ -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__/* intr=^C quit=^\ erase=del kill=^U
include/asm-x86_64/termios.h +0 -18
@@ -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__/* intr=^C quit=^\ erase=del kill=^U
include/asm-xtensa/termios.h +0 -19
@@ -52,25 +52,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
include/linux/termios.h +19 -0
@@ -4,4 +4,23 @@#include <linux/types.h> #include <asm/termios.h> +/* 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/* synchronous PPP */ +#define N_HCI 15/* Bluetooth HCI UART */ +#endif
Signature · 4 lines
Tilman Schmidt E-Mail: [email protected] Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeoeffnet mindestens haltbar bis: (siehe Rueckseite)
PATCH 1/1 consolidate line discipline number definitions (v2)
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.
Thanks
Tilman
From: Tilman Schmidt <[email protected]>
Move line discipline number definitions from architecture specific asm/termios.h files to linux/tty.h.
Signed-off-by Tilman Schmidt <[email protected]>
---
asm-alpha/termios.h | 18 ------------------ asm-arm/termios.h | 18 ------------------ asm-arm26/termios.h | 18 ------------------ asm-avr32/termios.h | 18 ------------------ asm-cris/termios.h | 18 ------------------ asm-frv/termios.h | 18 ------------------ asm-h8300/termios.h | 18 ------------------ asm-i386/termios.h | 18 ------------------ asm-ia64/termios.h | 18 ------------------ asm-m32r/termios.h | 18 ------------------ asm-m68k/termios.h | 18 ------------------ asm-mips/termios.h | 18 ------------------ asm-parisc/termios.h | 18 ------------------ asm-powerpc/termios.h | 18 ------------------ asm-s390/termios.h | 18 ------------------ asm-sh/termios.h | 18 ------------------ asm-sh64/termios.h | 18 ------------------ asm-sparc/termios.h | 18 ------------------ asm-sparc64/termios.h | 18 ------------------ asm-v850/termios.h | 18 ------------------ asm-x86_64/termios.h | 18 ------------------ asm-xtensa/termios.h | 19 ------------------- linux/tty.h | 22 +++++++++++++++++++++- 23 files changed, 21 insertions(+), 398 deletions(-)
include/asm-alpha/termios.h +0 -18
@@ -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
include/asm-arm/termios.h +0 -18
@@ -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__/*
include/asm-arm26/termios.h +0 -18
@@ -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__/*
include/asm-avr32/termios.h +0 -18
@@ -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
include/asm-cris/termios.h +0 -18
@@ -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
include/asm-frv/termios.h +0 -18
@@ -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 */ -#include <asm-generic/termios.h> #endif /* _ASM_TERMIOS_H */
include/asm-h8300/termios.h +0 -18
@@ -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__/*
include/asm-i386/termios.h +0 -18
@@ -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>
include/asm-ia64/termios.h +0 -18
@@ -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
include/asm-m32r/termios.h +0 -18
@@ -41,24 +41,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>
include/asm-m68k/termios.h +0 -18
@@ -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__/*
include/asm-mips/termios.h +0 -18
@@ -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>
include/asm-parisc/termios.h +0 -18
@@ -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
include/asm-powerpc/termios.h +0 -18
@@ -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"
include/asm-s390/termios.h +0 -18
@@ -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
include/asm-sh/termios.h +0 -18
@@ -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
include/asm-sh64/termios.h +0 -18
@@ -50,24 +50,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://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__/* intr=^C quit=^\ erase=del kill=^U
include/asm-sparc/termios.h +0 -18
@@ -45,24 +45,6 @@ struct winsize {unsigned short ws_ypixel; }; -/* 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 -#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/* synchronous PPP */ -#define N_HCI 15/* Bluetooth HCI UART */ -#ifdef __KERNEL__#include <linux/module.h>
include/asm-sparc64/termios.h +0 -18
@@ -45,24 +45,6 @@ struct winsize {unsigned short ws_ypixel; }; -/* 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 -#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/* synchronous PPP */ -#define N_HCI 15/* Bluetooth HCI UART */ -#ifdef __KERNEL__#include <linux/module.h>
include/asm-v850/termios.h +0 -18
@@ -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__/* intr=^C quit=^\ erase=del kill=^U
include/asm-x86_64/termios.h +0 -18
@@ -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__/* intr=^C quit=^\ erase=del kill=^U
include/asm-xtensa/termios.h +0 -19
@@ -52,25 +52,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
include/linux/tty.h +21 -1
@@ -24,7 +24,27 @@#define NR_PTYS CONFIG_LEGACY_PTY_COUNT/* Number of legacy ptys */ #define NR_UNIX98_PTY_DEFAULT 4096/* Default maximum for Unix98 ptys */ #define NR_UNIX98_PTY_MAX (1 << MINORBITS)/* Absolute limit */ -#define NR_LDISCS 16 +#define NR_LDISCS 17 + +/* 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/* synchronous PPP */ +#define N_HCI 15/* Bluetooth HCI UART */ +#define N_GIGASET_M101 16/* Siemens Gigaset M101 serial DECT adapter */ /* * This character is the same as _POSIX_VDISABLE: it cannot be used as