* [PATCH][RFC] consolidate line discipline number definitions
@ 2006-12-16 0:53 Tilman Schmidt
2006-12-20 21:15 ` [Patch] consolidate line discipline number definitions (v2) Tilman Schmidt
0 siblings, 1 reply; 2+ messages in thread
From: Tilman Schmidt @ 2006-12-16 0:53 UTC (permalink / raw)
To: LKML, linux-serial
[-- Attachment #1: Type: text/plain, Size: 29947 bytes --]
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 <tilman@imap.cc>
Consolidate line discipline number definitions from
architecture-specific termios.h files into architecture
independent termios.h file.
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
---
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(-)
diff -pur linux-2.6.19-orig/drivers/char/n_hdlc.c linux-2.6.19/drivers/char/n_hdlc.c
--- linux-2.6.19-orig/drivers/char/n_hdlc.c 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/drivers/char/n_hdlc.c 2006-12-15 19:12:39.000000000 +0100
@@ -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>
/*
diff -pur linux-2.6.19-orig/include/asm-alpha/termios.h linux-2.6.19/include/asm-alpha/termios.h
--- linux-2.6.19-orig/include/asm-alpha/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-alpha/termios.h 2006-12-15 18:55:12.000000000 +0100
@@ -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
diff -pur linux-2.6.19-orig/include/asm-arm/termios.h linux-2.6.19/include/asm-arm/termios.h
--- linux-2.6.19-orig/include/asm-arm/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-arm/termios.h 2006-12-15 18:58:57.000000000 +0100
@@ -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__
/*
diff -pur linux-2.6.19-orig/include/asm-arm26/termios.h linux-2.6.19/include/asm-arm26/termios.h
--- linux-2.6.19-orig/include/asm-arm26/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-arm26/termios.h 2006-12-15 18:58:03.000000000 +0100
@@ -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__
/*
diff -pur linux-2.6.19-orig/include/asm-avr32/termios.h linux-2.6.19/include/asm-avr32/termios.h
--- linux-2.6.19-orig/include/asm-avr32/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-avr32/termios.h 2006-12-15 19:00:52.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/asm-cris/termios.h linux-2.6.19/include/asm-cris/termios.h
--- linux-2.6.19-orig/include/asm-cris/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-cris/termios.h 2006-12-15 19:01:21.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/asm-frv/termios.h linux-2.6.19/include/asm-frv/termios.h
--- linux-2.6.19-orig/include/asm-frv/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-frv/termios.h 2006-12-15 19:01:37.000000000 +0100
@@ -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 <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 */
-
#include <asm-generic/termios.h>
#endif /* _ASM_TERMIOS_H */
diff -pur linux-2.6.19-orig/include/asm-h8300/termios.h linux-2.6.19/include/asm-h8300/termios.h
--- linux-2.6.19-orig/include/asm-h8300/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-h8300/termios.h 2006-12-15 19:04:15.000000000 +0100
@@ -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__
/*
diff -pur linux-2.6.19-orig/include/asm-i386/termios.h linux-2.6.19/include/asm-i386/termios.h
--- linux-2.6.19-orig/include/asm-i386/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-i386/termios.h 2006-12-15 19:04:43.000000000 +0100
@@ -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 <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 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>
diff -pur linux-2.6.19-orig/include/asm-ia64/termios.h linux-2.6.19/include/asm-ia64/termios.h
--- linux-2.6.19-orig/include/asm-ia64/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-ia64/termios.h 2006-12-15 19:05:33.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/asm-m32r/termios.h linux-2.6.19/include/asm-m32r/termios.h
--- linux-2.6.19-orig/include/asm-m32r/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-m32r/termios.h 2006-12-15 19:05:47.000000000 +0100
@@ -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 <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 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>
diff -pur linux-2.6.19-orig/include/asm-m68k/termios.h linux-2.6.19/include/asm-m68k/termios.h
--- linux-2.6.19-orig/include/asm-m68k/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-m68k/termios.h 2006-12-15 19:06:02.000000000 +0100
@@ -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__
/*
diff -pur linux-2.6.19-orig/include/asm-mips/termios.h linux-2.6.19/include/asm-mips/termios.h
--- linux-2.6.19-orig/include/asm-mips/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-mips/termios.h 2006-12-15 19:06:13.000000000 +0100
@@ -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 <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 /* synchronous PPP */
-#define N_HCI 15 /* Bluetooth HCI UART */
-
#ifdef __KERNEL__
#include <linux/string.h>
diff -pur linux-2.6.19-orig/include/asm-parisc/termios.h linux-2.6.19/include/asm-parisc/termios.h
--- linux-2.6.19-orig/include/asm-parisc/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-parisc/termios.h 2006-12-15 19:06:25.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/asm-powerpc/termios.h linux-2.6.19/include/asm-powerpc/termios.h
--- linux-2.6.19-orig/include/asm-powerpc/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-powerpc/termios.h 2006-12-15 19:07:32.000000000 +0100
@@ -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 <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://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"
diff -pur linux-2.6.19-orig/include/asm-s390/termios.h linux-2.6.19/include/asm-s390/termios.h
--- linux-2.6.19-orig/include/asm-s390/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-s390/termios.h 2006-12-15 19:07:49.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/asm-sh/termios.h linux-2.6.19/include/asm-sh/termios.h
--- linux-2.6.19-orig/include/asm-sh/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-sh/termios.h 2006-12-15 19:08:21.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/asm-sh64/termios.h linux-2.6.19/include/asm-sh64/termios.h
--- linux-2.6.19-orig/include/asm-sh64/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-sh64/termios.h 2006-12-15 19:08:08.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/asm-sparc/termios.h linux-2.6.19/include/asm-sparc/termios.h
--- linux-2.6.19-orig/include/asm-sparc/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-sparc/termios.h 2006-12-15 19:09:32.000000000 +0100
@@ -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 <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 /* synchronous PPP */
-#define N_HCI 15 /* Bluetooth HCI UART */
-
#ifdef __KERNEL__
#include <linux/module.h>
diff -pur linux-2.6.19-orig/include/asm-sparc64/termios.h linux-2.6.19/include/asm-sparc64/termios.h
--- linux-2.6.19-orig/include/asm-sparc64/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-sparc64/termios.h 2006-12-15 19:08:38.000000000 +0100
@@ -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 <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 /* synchronous PPP */
-#define N_HCI 15 /* Bluetooth HCI UART */
-
#ifdef __KERNEL__
#include <linux/module.h>
diff -pur linux-2.6.19-orig/include/asm-v850/termios.h linux-2.6.19/include/asm-v850/termios.h
--- linux-2.6.19-orig/include/asm-v850/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-v850/termios.h 2006-12-15 19:09:51.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/asm-x86_64/termios.h linux-2.6.19/include/asm-x86_64/termios.h
--- linux-2.6.19-orig/include/asm-x86_64/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-x86_64/termios.h 2006-12-15 19:10:05.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/asm-xtensa/termios.h linux-2.6.19/include/asm-xtensa/termios.h
--- linux-2.6.19-orig/include/asm-xtensa/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-xtensa/termios.h 2006-12-15 19:10:25.000000000 +0100
@@ -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 <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 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
diff -pur linux-2.6.19-orig/include/linux/termios.h linux-2.6.19/include/linux/termios.h
--- linux-2.6.19-orig/include/linux/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/linux/termios.h 2006-12-15 18:59:29.000000000 +0100
@@ -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 <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 /* synchronous PPP */
+#define N_HCI 15 /* Bluetooth HCI UART */
+
#endif
--
Tilman Schmidt E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeoeffnet mindestens haltbar bis: (siehe Rueckseite)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 253 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Patch] consolidate line discipline number definitions (v2)
2006-12-16 0:53 [PATCH][RFC] consolidate line discipline number definitions Tilman Schmidt
@ 2006-12-20 21:15 ` Tilman Schmidt
0 siblings, 0 replies; 2+ messages in thread
From: Tilman Schmidt @ 2006-12-20 21:15 UTC (permalink / raw)
To: Andrew Morton, linux-kernel, linux-serial
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 <tilman@imap.cc>
Move line discipline number definitions from architecture specific
asm/termios.h files to linux/tty.h.
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
---
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(-)
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-alpha/termios.h linux-2.6.19/include/asm-alpha/termios.h
--- linux-2.6.19-orig/include/asm-alpha/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-alpha/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-arm/termios.h linux-2.6.19/include/asm-arm/termios.h
--- linux-2.6.19-orig/include/asm-arm/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-arm/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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__
/*
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-arm26/termios.h linux-2.6.19/include/asm-arm26/termios.h
--- linux-2.6.19-orig/include/asm-arm26/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-arm26/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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__
/*
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-avr32/termios.h linux-2.6.19/include/asm-avr32/termios.h
--- linux-2.6.19-orig/include/asm-avr32/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-avr32/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-cris/termios.h linux-2.6.19/include/asm-cris/termios.h
--- linux-2.6.19-orig/include/asm-cris/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-cris/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-frv/termios.h linux-2.6.19/include/asm-frv/termios.h
--- linux-2.6.19-orig/include/asm-frv/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-frv/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 */
-
#include <asm-generic/termios.h>
#endif /* _ASM_TERMIOS_H */
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-h8300/termios.h linux-2.6.19/include/asm-h8300/termios.h
--- linux-2.6.19-orig/include/asm-h8300/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-h8300/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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__
/*
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-i386/termios.h linux-2.6.19/include/asm-i386/termios.h
--- linux-2.6.19-orig/include/asm-i386/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-i386/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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>
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-ia64/termios.h linux-2.6.19/include/asm-ia64/termios.h
--- linux-2.6.19-orig/include/asm-ia64/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-ia64/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-m32r/termios.h linux-2.6.19/include/asm-m32r/termios.h
--- linux-2.6.19-orig/include/asm-m32r/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-m32r/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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>
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-m68k/termios.h linux-2.6.19/include/asm-m68k/termios.h
--- linux-2.6.19-orig/include/asm-m68k/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-m68k/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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__
/*
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-mips/termios.h linux-2.6.19/include/asm-mips/termios.h
--- linux-2.6.19-orig/include/asm-mips/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-mips/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 /* synchronous PPP */
-#define N_HCI 15 /* Bluetooth HCI UART */
-
#ifdef __KERNEL__
#include <linux/string.h>
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-parisc/termios.h linux-2.6.19/include/asm-parisc/termios.h
--- linux-2.6.19-orig/include/asm-parisc/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-parisc/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-powerpc/termios.h linux-2.6.19/include/asm-powerpc/termios.h
--- linux-2.6.19-orig/include/asm-powerpc/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-powerpc/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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://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"
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-s390/termios.h linux-2.6.19/include/asm-s390/termios.h
--- linux-2.6.19-orig/include/asm-s390/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-s390/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-sh/termios.h linux-2.6.19/include/asm-sh/termios.h
--- linux-2.6.19-orig/include/asm-sh/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-sh/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-sh64/termios.h linux-2.6.19/include/asm-sh64/termios.h
--- linux-2.6.19-orig/include/asm-sh64/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-sh64/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-sparc/termios.h linux-2.6.19/include/asm-sparc/termios.h
--- linux-2.6.19-orig/include/asm-sparc/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-sparc/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 /* synchronous PPP */
-#define N_HCI 15 /* Bluetooth HCI UART */
-
#ifdef __KERNEL__
#include <linux/module.h>
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-sparc64/termios.h linux-2.6.19/include/asm-sparc64/termios.h
--- linux-2.6.19-orig/include/asm-sparc64/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-sparc64/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 /* synchronous PPP */
-#define N_HCI 15 /* Bluetooth HCI UART */
-
#ifdef __KERNEL__
#include <linux/module.h>
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-v850/termios.h linux-2.6.19/include/asm-v850/termios.h
--- linux-2.6.19-orig/include/asm-v850/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-v850/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-x86_64/termios.h linux-2.6.19/include/asm-x86_64/termios.h
--- linux-2.6.19-orig/include/asm-x86_64/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-x86_64/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/asm-xtensa/termios.h linux-2.6.19/include/asm-xtensa/termios.h
--- linux-2.6.19-orig/include/asm-xtensa/termios.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/asm-xtensa/termios.h 2006-12-17 20:48:17.000000000 +0100
@@ -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 <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 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
diff -rupX /home/ts/dont-diff linux-2.6.19-orig/include/linux/tty.h linux-2.6.19/include/linux/tty.h
--- linux-2.6.19-orig/include/linux/tty.h 2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19/include/linux/tty.h 2006-12-17 21:00:38.000000000 +0100
@@ -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 <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 /* 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-12-20 21:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-16 0:53 [PATCH][RFC] consolidate line discipline number definitions Tilman Schmidt
2006-12-20 21:15 ` [Patch] consolidate line discipline number definitions (v2) Tilman Schmidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).