LinuxLists.cc - [RFC 0/5] tty: move stuff around

[permalink] [raw]

Subject: [PATCH 2/5] tty/vt: move files to drivers/tty/vt/

The virtual terminal is a very special tty driver, so
it deserves its own directory.

Signed-off-by: Armd Bergmann <[email protected]>
---
drivers/char/Kconfig | 84 +-------------------------
drivers/char/Makefile | 33 ----------
drivers/tty/Makefile | 1 +
drivers/tty/vt/Kconfig | 84 ++++++++++++++++++++++++++
drivers/tty/vt/Makefile | 37 +++++++++++
drivers/{char => tty/vt}/consolemap.c | 0
drivers/{char => tty/vt}/cp437.uni | 0
drivers/{char => tty/vt}/defkeymap.c_shipped | 0
drivers/{char => tty/vt}/defkeymap.map | 0
drivers/{char => tty/vt}/keyboard.c | 0
drivers/{char => tty/vt}/selection.c | 0
drivers/{char => tty/vt}/vc_screen.c | 0
drivers/{char => tty/vt}/vt.c | 0
drivers/{char => tty/vt}/vt_ioctl.c | 0
14 files changed, 123 insertions(+), 116 deletions(-)
create mode 100644 drivers/tty/vt/Kconfig
create mode 100644 drivers/tty/vt/Makefile
rename drivers/{char => tty/vt}/consolemap.c (100%)
rename drivers/{char => tty/vt}/cp437.uni (100%)
rename drivers/{char => tty/vt}/defkeymap.c_shipped (100%)
rename drivers/{char => tty/vt}/defkeymap.map (100%)
rename drivers/{char => tty/vt}/keyboard.c (100%)
rename drivers/{char => tty/vt}/selection.c (100%)
rename drivers/{char => tty/vt}/vc_screen.c (100%)
rename drivers/{char => tty/vt}/vt.c (100%)
rename drivers/{char => tty/vt}/vt_ioctl.c (100%)

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7beee39..52fa94d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -4,89 +4,7 @@

menu "Character devices"

-config VT
- bool "Virtual terminal" if EMBEDDED
- depends on !S390
- select INPUT
- default y
- ---help---
- If you say Y here, you will get support for terminal devices with
- display and keyboard devices. These are called "virtual" because you
- can run several virtual terminals (also called virtual consoles) on
- one physical terminal. This is rather useful, for example one
- virtual terminal can collect system messages and warnings, another
- one can be used for a text-mode user session, and a third could run
- an X session, all in parallel. Switching between virtual terminals
- is done with certain key combinations, usually Alt-<function key>.
-
- The setterm command ("man setterm") can be used to change the
- properties (such as colors or beeping) of a virtual terminal. The
- man page console_codes(4) ("man console_codes") contains the special
- character sequences that can be used to change those properties
- directly. The fonts used on virtual terminals can be changed with
- the setfont ("man setfont") command and the key bindings are defined
- with the loadkeys ("man loadkeys") command.
-
- You need at least one virtual terminal device in order to make use
- of your keyboard and monitor. Therefore, only people configuring an
- embedded system would want to say N here in order to save some
- memory; the only way to log into such a system is then via a serial
- or network connection.
-
- If unsure, say Y, or else you won't be able to do much with your new
- shiny Linux system :-)
-
-config CONSOLE_TRANSLATIONS
- depends on VT
- default y
- bool "Enable character translations in console" if EMBEDDED
- ---help---
- This enables support for font mapping and Unicode translation
- on virtual consoles.
-
-config VT_CONSOLE
- bool "Support for console on virtual terminal" if EMBEDDED
- depends on VT
- default y
- ---help---
- The system console is the device which receives all kernel messages
- and warnings and which allows logins in single user mode. If you
- answer Y here, a virtual terminal (the device used to interact with
- a physical terminal) can be used as system console. This is the most
- common mode of operations, so you should say Y here unless you want
- the kernel messages be output only to a serial port (in which case
- you should say Y to "Console on serial port", below).
-
- If you do say Y here, by default the currently visible virtual
- terminal (/dev/tty0) will be used as system console. You can change
- that with a kernel command line option such as "console=tty3" which
- would use the third virtual terminal as system console. (Try "man
- bootparam" or see the documentation of your boot loader (lilo or
- loadlin) about how to pass options to the kernel at boot time.)
-
- If unsure, say Y.
-
-config HW_CONSOLE
- bool
- depends on VT && !S390 && !UML
- default y
-
-config VT_HW_CONSOLE_BINDING
- bool "Support for binding and unbinding console drivers"
- depends on HW_CONSOLE
- default n
- ---help---
- The virtual terminal is the device that interacts with the physical
- terminal through console drivers. On these systems, at least one
- console driver is loaded. In other configurations, additional console
- drivers may be enabled, such as the framebuffer console. If more than
- 1 console driver is enabled, setting this to 'y' will allow you to
- select the console driver that will serve as the backend for the
- virtual terminals.
-
- See <file:Documentation/console/console.txt> for more
- information. For framebuffer console users, please refer to
- <file:Documentation/fb/fbcon.txt>.
+source "drivers/tty/vt/Kconfig"

config DEVKMEM
bool "/dev/kmem virtual device support"
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index b7e6058..f507df7 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -2,18 +2,10 @@
# Makefile for the kernel character device drivers.
#

-#
-# This file contains the font map for the default (hardware) font
-#
-FONTMAPFILE = cp437.uni
-
obj-y += mem.o random.o

obj-y += misc.o
-obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o
obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
-obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
-obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
@@ -106,28 +98,3 @@ obj-$(CONFIG_RAMOOPS) += ramoops.o

obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o
-
-# Files generated that shall be removed upon make clean
-clean-files := consolemap_deftbl.c defkeymap.c
-
-quiet_cmd_conmk = CONMK $@
- cmd_conmk = scripts/conmakehash $< > $@
-
-$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
- $(call cmd,conmk)
-
-$(obj)/defkeymap.o: $(obj)/defkeymap.c
-
-# Uncomment if you're changing the keymap and have an appropriate
-# loadkeys version for the map. By default, we'll use the shipped
-# versions.
-# GENERATE_KEYMAP := 1
-
-ifdef GENERATE_KEYMAP
-
-$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
- loadkeys --mktable $< > [email protected]
- sed -e 's/^static *//' [email protected] > $@
- rm [email protected]
-
-endif
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 562a96f..5845211 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -12,6 +12,7 @@ obj-y += tty_mutex.o
obj-$(CONFIG_LEGACY_PTYS) += pty.o
obj-$(CONFIG_UNIX98_PTYS) += pty.o

+obj-$(CONFIG_VT) += vt/
obj-$(CONFIG_AUDIT) += tty_audit.o

obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
diff --git a/drivers/tty/vt/Kconfig b/drivers/tty/vt/Kconfig
new file mode 100644
index 0000000..7373eeb
--- /dev/null
+++ b/drivers/tty/vt/Kconfig
@@ -0,0 +1,84 @@
+config VT
+ bool "Virtual terminal" if EMBEDDED
+ depends on !S390
+ select INPUT
+ default y
+ ---help---
+ If you say Y here, you will get support for terminal devices with
+ display and keyboard devices. These are called "virtual" because you
+ can run several virtual terminals (also called virtual consoles) on
+ one physical terminal. This is rather useful, for example one
+ virtual terminal can collect system messages and warnings, another
+ one can be used for a text-mode user session, and a third could run
+ an X session, all in parallel. Switching between virtual terminals
+ is done with certain key combinations, usually Alt-<function key>.
+
+ The setterm command ("man setterm") can be used to change the
+ properties (such as colors or beeping) of a virtual terminal. The
+ man page console_codes(4) ("man console_codes") contains the special
+ character sequences that can be used to change those properties
+ directly. The fonts used on virtual terminals can be changed with
+ the setfont ("man setfont") command and the key bindings are defined
+ with the loadkeys ("man loadkeys") command.
+
+ You need at least one virtual terminal device in order to make use
+ of your keyboard and monitor. Therefore, only people configuring an
+ embedded system would want to say N here in order to save some
+ memory; the only way to log into such a system is then via a serial
+ or network connection.
+
+ If unsure, say Y, or else you won't be able to do much with your new
+ shiny Linux system :-)
+
+config CONSOLE_TRANSLATIONS
+ depends on VT
+ default y
+ bool "Enable character translations in console" if EMBEDDED
+ ---help---
+ This enables support for font mapping and Unicode translation
+ on virtual consoles.
+
+config VT_CONSOLE
+ bool "Support for console on virtual terminal" if EMBEDDED
+ depends on VT
+ default y
+ ---help---
+ The system console is the device which receives all kernel messages
+ and warnings and which allows logins in single user mode. If you
+ answer Y here, a virtual terminal (the device used to interact with
+ a physical terminal) can be used as system console. This is the most
+ common mode of operations, so you should say Y here unless you want
+ the kernel messages be output only to a serial port (in which case
+ you should say Y to "Console on serial port", below).
+
+ If you do say Y here, by default the currently visible virtual
+ terminal (/dev/tty0) will be used as system console. You can change
+ that with a kernel command line option such as "console=tty3" which
+ would use the third virtual terminal as system console. (Try "man
+ bootparam" or see the documentation of your boot loader (lilo or
+ loadlin) about how to pass options to the kernel at boot time.)
+
+ If unsure, say Y.
+
+config HW_CONSOLE
+ bool
+ depends on VT && !S390 && !UML
+ default y
+
+config VT_HW_CONSOLE_BINDING
+ bool "Support for binding and unbinding console drivers"
+ depends on HW_CONSOLE
+ default n
+ ---help---
+ The virtual terminal is the device that interacts with the physical
+ terminal through console drivers. On these systems, at least one
+ console driver is loaded. In other configurations, additional console
+ drivers may be enabled, such as the framebuffer console. If more than
+ 1 console driver is enabled, setting this to 'y' will allow you to
+ select the console driver that will serve as the backend for the
+ virtual terminals.
+
+ See <file:Documentation/console/console.txt> for more
+ information. For framebuffer console users, please refer to
+ <file:Documentation/fb/fbcon.txt>.
+
diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
new file mode 100644
index 0000000..4d6714f
--- /dev/null
+++ b/drivers/tty/vt/Makefile
@@ -0,0 +1,37 @@
+#
+# Makefile for virtual terminal device driver
+#
+
+#
+# This file contains the font map for the default (hardware) font
+#
+FONTMAPFILE = cp437.uni
+
+obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o
+obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
+obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
+
+# Files generated that shall be removed upon make clean
+clean-files := consolemap_deftbl.c defkeymap.c
+
+quiet_cmd_conmk = CONMK $@
+ cmd_conmk = scripts/conmakehash $< > $@
+
+$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
+ $(call cmd,conmk)
+
+$(obj)/defkeymap.o: $(obj)/defkeymap.c
+
+# Uncomment if you're changing the keymap and have an appropriate
+# loadkeys version for the map. By default, we'll use the shipped
+# versions.
+# GENERATE_KEYMAP := 1
+
+ifdef GENERATE_KEYMAP
+
+$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
+ loadkeys --mktable $< > [email protected]
+ sed -e 's/^static *//' [email protected] > $@
+ rm [email protected]
+
+endif
diff --git a/drivers/char/consolemap.c b/drivers/tty/vt/consolemap.c
similarity index 100%
rename from drivers/char/consolemap.c
rename to drivers/tty/vt/consolemap.c
diff --git a/drivers/char/cp437.uni b/drivers/tty/vt/cp437.uni
similarity index 100%
rename from drivers/char/cp437.uni
rename to drivers/tty/vt/cp437.uni
diff --git a/drivers/char/defkeymap.c_shipped b/drivers/tty/vt/defkeymap.c_shipped
similarity index 100%
rename from drivers/char/defkeymap.c_shipped
rename to drivers/tty/vt/defkeymap.c_shipped
diff --git a/drivers/char/defkeymap.map b/drivers/tty/vt/defkeymap.map
similarity index 100%
rename from drivers/char/defkeymap.map
rename to drivers/tty/vt/defkeymap.map
diff --git a/drivers/char/keyboard.c b/drivers/tty/vt/keyboard.c
similarity index 100%
rename from drivers/char/keyboard.c
rename to drivers/tty/vt/keyboard.c
diff --git a/drivers/char/selection.c b/drivers/tty/vt/selection.c
similarity index 100%
rename from drivers/char/selection.c
rename to drivers/tty/vt/selection.c
diff --git a/drivers/char/vc_screen.c b/drivers/tty/vt/vc_screen.c
similarity index 100%
rename from drivers/char/vc_screen.c
rename to drivers/tty/vt/vc_screen.c
diff --git a/drivers/char/vt.c b/drivers/tty/vt/vt.c
similarity index 100%
rename from drivers/char/vt.c
rename to drivers/tty/vt/vt.c
diff --git a/drivers/char/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
similarity index 100%
rename from drivers/char/vt_ioctl.c
rename to drivers/tty/vt/vt_ioctl.c
--
1.7.1

2010-08-29 21:07:26

[permalink] [raw]

Subject: [PATCH 5/5] tty: rearrange Kconfig structure

This makes the layout of Kconfig reflect the
new directory structure for the tty device
drivers.

Most significantly, the tty drivers now have
their own menu below the device drivers menu,
instead of being mixed with the other character
device drivers.

All serial drivers that are still registering
to the tty layer instead of to the serial or
hvc drivers are now in the 'nonstandard serial
port' category.

Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/cris/Kconfig | 2 ++
drivers/Kconfig | 2 ++
drivers/char/Kconfig | 10 ----------
drivers/tty/Kconfig | 16 ++++++++++++++++
drivers/tty/hw/Kconfig | 36 ++++++++++++++++++------------------
5 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index aefe3b1..71fa087 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -682,6 +682,8 @@ source "drivers/rtc/Kconfig"
#
source "drivers/input/Kconfig"

+source "drivers/tty/Kconfig"
+
source "drivers/char/Kconfig"

source "fs/Kconfig"
diff --git a/drivers/Kconfig b/drivers/Kconfig
index a2b902f..f37a125 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -44,6 +44,8 @@ source "drivers/telephony/Kconfig"

source "drivers/input/Kconfig"

+source "drivers/tty/Kconfig"
+
source "drivers/char/Kconfig"

source "drivers/i2c/Kconfig"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 834fb9e..31a0370 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -4,8 +4,6 @@

menu "Character devices"

-source "drivers/tty/vt/Kconfig"
-
config DEVKMEM
bool "/dev/kmem virtual device support"
default y
@@ -15,8 +13,6 @@ config DEVKMEM
kind of kernel debugging operations.
When in doubt, say "N".

-source "drivers/tty/hw/Kconfig"
-
config SGI_SNSC
bool "SGI Altix system controller communication support"
depends on (IA64_SGI_SN2 || IA64_GENERIC)
@@ -39,10 +35,6 @@ config SGI_MBCS
If you have an SGI Altix with an attached SABrick
say Y or M here, otherwise say N.

-source "drivers/serial/Kconfig"
-
-source "drivers/tty/Kconfig"
-
config BRIQ_PANEL
tristate 'Total Impact briQ front panel driver'
depends on PPC_CHRP
@@ -147,8 +139,6 @@ config PPDEV

If unsure, say N.

-source "drivers/tty/hvc/Kconfig"
-
config IBM_BSR
tristate "IBM POWER Barrier Synchronization Register support"
depends on PPC_PSERIES
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index a245618..2bb7262 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -1,3 +1,7 @@
+menu "TTY device drivers"
+
+source "drivers/tty/vt/Kconfig"
+
config UNIX98_PTYS
bool "Unix98 PTY support" if EMBEDDED
default y
@@ -63,6 +67,14 @@ config LEGACY_PTY_COUNT
When not in use, each legacy PTY occupies 12 bytes on 32-bit
architectures and 24 bytes on 64-bit architectures.

+source "drivers/tty/hvc/Kconfig"
+
+source "drivers/serial/Kconfig"
+
+source "drivers/tty/hw/Kconfig"
+
+menu "Non-standard TTY line disciplines"
+
config R3964
tristate "Siemens R3964 line discipline"
---help---
@@ -94,3 +106,7 @@ config N_GSM
help
This line discipline provides support for the GSM MUX protocol and
presents the mux as a set of 61 individual tty devices.
+
+endmenu
+
+endmenu
diff --git a/drivers/tty/hw/Kconfig b/drivers/tty/hw/Kconfig
index 4328aa4..cffb96b 100644
--- a/drivers/tty/hw/Kconfig
+++ b/drivers/tty/hw/Kconfig
@@ -1,17 +1,4 @@
-config BFIN_JTAG_COMM
- tristate "Blackfin JTAG Communication"
- depends on BLACKFIN
- help
- Add support for emulating a TTY device over the Blackfin JTAG.
-
- To compile this driver as a module, choose M here: the
- module will be called bfin_jtag_comm.
-
-config BFIN_JTAG_COMM_CONSOLE
- bool "Console on Blackfin JTAG"
- depends on BFIN_JTAG_COMM=y
-
-config SERIAL_NONSTANDARD
+menuconfig SERIAL_NONSTANDARD
bool "Non-standard serial port support"
depends on HAS_IOMEM
---help---
@@ -28,6 +15,19 @@ config SERIAL_NONSTANDARD

Most people can say N here.

+config BFIN_JTAG_COMM
+ tristate "Blackfin JTAG Communication"
+ depends on BLACKFIN && SERIAL_NONSTANDARD
+ help
+ Add support for emulating a TTY device over the Blackfin JTAG.
+
+ To compile this driver as a module, choose M here: the
+ module will be called bfin_jtag_comm.
+
+config BFIN_JTAG_COMM_CONSOLE
+ bool "Console on Blackfin JTAG"
+ depends on BFIN_JTAG_COMM=y
+
config COMPUTONE
tristate "Computone IntelliPort Plus serial support"
depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
@@ -261,7 +261,7 @@ config ISTALLION

config NOZOMI
tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
- depends on PCI && EXPERIMENTAL
+ depends on PCI && EXPERIMENTAL && SERIAL_NONSTANDARD
help
If you have a HSDPA driver Broadband Wireless Data Card -
Globe Trotter PCMCIA card, say Y here.
@@ -271,7 +271,7 @@ config NOZOMI

config A2232
tristate "Commodore A2232 serial support (EXPERIMENTAL)"
- depends on EXPERIMENTAL && ZORRO && BROKEN
+ depends on EXPERIMENTAL && ZORRO && BROKEN && SERIAL_NONSTANDARD
---help---
This option supports the 2232 7-port serial card shipped with the
Amiga 2000 and other Zorro-bus machines, dating from 1989. At
@@ -287,7 +287,7 @@ config A2232

config SYNCLINK_CS
tristate "SyncLink PC Card support"
- depends on PCMCIA
+ depends on PCMCIA && SERIAL_NONSTANDARD
help
Enable support for the SyncLink PC Card serial adapter, running
asynchronous and HDLC communications up to 512Kbps. The port is
@@ -300,7 +300,7 @@ config SYNCLINK_CS

config IPWIRELESS
tristate "IPWireless 3G UMTS PCMCIA card support"
- depends on PCMCIA && NETDEVICES
+ depends on PCMCIA && NETDEVICES && SERIAL_NONSTANDARD
select PPP
help
This is a driver for 3G UMTS PCMCIA card from IPWireless company. In
--
1.7.1

2010-08-29 21:07:28

[permalink] [raw]

Subject: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw

Random obsolete tty drivers are mixed with random
other stuff in drivers/char, this moves all the
tty drivers into one place.

Signed-off-by: Arnd Bergmann <[email protected]>
---
MAINTAINERS | 22 +-
drivers/char/Kconfig | 287 +------------------
drivers/char/Makefile | 28 +--
drivers/char/pcmcia/Kconfig | 22 --
drivers/char/pcmcia/Makefile | 3 -
drivers/tty/Makefile | 1 +
drivers/tty/hw/Kconfig | 308 ++++++++++++++++++++
drivers/tty/hw/Makefile | 27 ++
drivers/{char => tty/hw}/amiserial.c | 0
drivers/{char => tty/hw}/bfin_jtag_comm.c | 0
drivers/{char => tty/hw}/cd1865.h | 0
drivers/{char => tty/hw}/cyclades.c | 0
drivers/tty/hw/epca/Makefile | 1 +
drivers/{char => tty/hw/epca}/digi1.h | 0
drivers/{char => tty/hw/epca}/digiFep1.h | 0
drivers/{char => tty/hw/epca}/digiPCI.h | 0
drivers/{char => tty/hw/epca}/epca.c | 0
drivers/{char => tty/hw/epca}/epca.h | 0
drivers/{char => tty/hw/epca}/epcaconfig.h | 0
drivers/{char => tty/hw}/generic_serial.c | 0
drivers/{char => tty/hw}/ip2/Makefile | 0
drivers/{char => tty/hw}/ip2/i2cmd.c | 0
drivers/{char => tty/hw}/ip2/i2cmd.h | 0
drivers/{char => tty/hw}/ip2/i2ellis.c | 0
drivers/{char => tty/hw}/ip2/i2ellis.h | 0
drivers/{char => tty/hw}/ip2/i2hw.h | 0
drivers/{char => tty/hw}/ip2/i2lib.c | 0
drivers/{char => tty/hw}/ip2/i2lib.h | 0
drivers/{char => tty/hw}/ip2/i2pack.h | 0
drivers/{char => tty/hw}/ip2/ip2.h | 0
drivers/{char => tty/hw}/ip2/ip2ioctl.h | 0
drivers/{char => tty/hw}/ip2/ip2main.c | 0
drivers/{char => tty/hw}/ip2/ip2trace.h | 0
drivers/{char => tty/hw}/ip2/ip2types.h | 0
.../{char/pcmcia => tty/hw}/ipwireless/Makefile | 0
.../{char/pcmcia => tty/hw}/ipwireless/hardware.c | 0
.../{char/pcmcia => tty/hw}/ipwireless/hardware.h | 0
drivers/{char/pcmcia => tty/hw}/ipwireless/main.c | 0
drivers/{char/pcmcia => tty/hw}/ipwireless/main.h | 0
.../{char/pcmcia => tty/hw}/ipwireless/network.c | 0
.../{char/pcmcia => tty/hw}/ipwireless/network.h | 0
.../pcmcia => tty/hw}/ipwireless/setup_protocol.h | 0
drivers/{char/pcmcia => tty/hw}/ipwireless/tty.c | 0
drivers/{char/pcmcia => tty/hw}/ipwireless/tty.h | 0
drivers/{char => tty/hw}/isicom.c | 0
drivers/{char => tty/hw}/istallion.c | 0
drivers/{char => tty/hw}/moxa.c | 0
drivers/{char => tty/hw}/moxa.h | 0
drivers/{char => tty/hw}/mxser.c | 0
drivers/{char => tty/hw}/mxser.h | 0
drivers/{char => tty/hw}/nozomi.c | 0
drivers/{char => tty/hw}/rio/Makefile | 0
drivers/{char => tty/hw}/rio/board.h | 0
drivers/{char => tty/hw}/rio/cirrus.h | 0
drivers/{char => tty/hw}/rio/cmdblk.h | 0
drivers/{char => tty/hw}/rio/cmdpkt.h | 0
drivers/{char => tty/hw}/rio/daemon.h | 0
drivers/{char => tty/hw}/rio/errors.h | 0
drivers/{char => tty/hw}/rio/func.h | 0
drivers/{char => tty/hw}/rio/host.h | 0
drivers/{char => tty/hw}/rio/link.h | 0
drivers/{char => tty/hw}/rio/linux_compat.h | 0
drivers/{char => tty/hw}/rio/map.h | 0
drivers/{char => tty/hw}/rio/param.h | 0
drivers/{char => tty/hw}/rio/parmmap.h | 0
drivers/{char => tty/hw}/rio/pci.h | 0
drivers/{char => tty/hw}/rio/phb.h | 0
drivers/{char => tty/hw}/rio/pkt.h | 0
drivers/{char => tty/hw}/rio/port.h | 0
drivers/{char => tty/hw}/rio/protsts.h | 0
drivers/{char => tty/hw}/rio/rio.h | 0
drivers/{char => tty/hw}/rio/rio_linux.c | 0
drivers/{char => tty/hw}/rio/rio_linux.h | 0
drivers/{char => tty/hw}/rio/rioboard.h | 0
drivers/{char => tty/hw}/rio/rioboot.c | 0
drivers/{char => tty/hw}/rio/riocmd.c | 0
drivers/{char => tty/hw}/rio/rioctrl.c | 0
drivers/{char => tty/hw}/rio/riodrvr.h | 0
drivers/{char => tty/hw}/rio/rioinfo.h | 0
drivers/{char => tty/hw}/rio/rioinit.c | 0
drivers/{char => tty/hw}/rio/riointr.c | 0
drivers/{char => tty/hw}/rio/rioioctl.h | 0
drivers/{char => tty/hw}/rio/rioparam.c | 0
drivers/{char => tty/hw}/rio/rioroute.c | 0
drivers/{char => tty/hw}/rio/riospace.h | 0
drivers/{char => tty/hw}/rio/riotable.c | 0
drivers/{char => tty/hw}/rio/riotty.c | 0
drivers/{char => tty/hw}/rio/route.h | 0
drivers/{char => tty/hw}/rio/rup.h | 0
drivers/{char => tty/hw}/rio/unixrup.h | 0
drivers/{char => tty/hw}/riscom8.c | 0
drivers/{char => tty/hw}/riscom8.h | 0
drivers/{char => tty/hw}/riscom8_reg.h | 0
drivers/{char => tty/hw}/rocket.c | 0
drivers/{char => tty/hw}/rocket.h | 0
drivers/{char => tty/hw}/rocket_int.h | 0
drivers/{char => tty/hw}/ser_a2232.c | 0
drivers/{char => tty/hw}/ser_a2232.h | 0
drivers/{char => tty/hw}/ser_a2232fw.ax | 0
drivers/{char => tty/hw}/ser_a2232fw.h | 0
drivers/{char => tty/hw}/serial167.c | 0
drivers/{char => tty/hw}/specialix.c | 0
drivers/{char => tty/hw}/specialix_io8.h | 0
drivers/{char => tty/hw}/stallion.c | 0
drivers/{char => tty/hw}/sx.c | 0
drivers/{char => tty/hw}/sx.h | 0
drivers/{char => tty/hw}/sxboards.h | 0
drivers/{char => tty/hw}/sxwindow.h | 0
drivers/{char => tty/hw}/synclink.c | 0
drivers/{char/pcmcia => tty/hw}/synclink_cs.c | 0
drivers/{char => tty/hw}/synclink_gt.c | 0
drivers/{char => tty/hw}/synclinkmp.c | 0
drivers/{char => tty/hw}/vme_scc.c | 0
113 files changed, 351 insertions(+), 348 deletions(-)
create mode 100644 drivers/tty/hw/Kconfig
create mode 100644 drivers/tty/hw/Makefile
rename drivers/{char => tty/hw}/amiserial.c (100%)
rename drivers/{char => tty/hw}/bfin_jtag_comm.c (100%)
rename drivers/{char => tty/hw}/cd1865.h (100%)
rename drivers/{char => tty/hw}/cyclades.c (100%)
create mode 100644 drivers/tty/hw/epca/Makefile
rename drivers/{char => tty/hw/epca}/digi1.h (100%)
rename drivers/{char => tty/hw/epca}/digiFep1.h (100%)
rename drivers/{char => tty/hw/epca}/digiPCI.h (100%)
rename drivers/{char => tty/hw/epca}/epca.c (100%)
rename drivers/{char => tty/hw/epca}/epca.h (100%)
rename drivers/{char => tty/hw/epca}/epcaconfig.h (100%)
rename drivers/{char => tty/hw}/generic_serial.c (100%)
rename drivers/{char => tty/hw}/ip2/Makefile (100%)
rename drivers/{char => tty/hw}/ip2/i2cmd.c (100%)
rename drivers/{char => tty/hw}/ip2/i2cmd.h (100%)
rename drivers/{char => tty/hw}/ip2/i2ellis.c (100%)
rename drivers/{char => tty/hw}/ip2/i2ellis.h (100%)
rename drivers/{char => tty/hw}/ip2/i2hw.h (100%)
rename drivers/{char => tty/hw}/ip2/i2lib.c (100%)
rename drivers/{char => tty/hw}/ip2/i2lib.h (100%)
rename drivers/{char => tty/hw}/ip2/i2pack.h (100%)
rename drivers/{char => tty/hw}/ip2/ip2.h (100%)
rename drivers/{char => tty/hw}/ip2/ip2ioctl.h (100%)
rename drivers/{char => tty/hw}/ip2/ip2main.c (100%)
rename drivers/{char => tty/hw}/ip2/ip2trace.h (100%)
rename drivers/{char => tty/hw}/ip2/ip2types.h (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/Makefile (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/hardware.c (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/hardware.h (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/main.c (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/main.h (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/network.c (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/network.h (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/setup_protocol.h (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/tty.c (100%)
rename drivers/{char/pcmcia => tty/hw}/ipwireless/tty.h (100%)
rename drivers/{char => tty/hw}/isicom.c (100%)
rename drivers/{char => tty/hw}/istallion.c (100%)
rename drivers/{char => tty/hw}/moxa.c (100%)
rename drivers/{char => tty/hw}/moxa.h (100%)
rename drivers/{char => tty/hw}/mxser.c (100%)
rename drivers/{char => tty/hw}/mxser.h (100%)
rename drivers/{char => tty/hw}/nozomi.c (100%)
rename drivers/{char => tty/hw}/rio/Makefile (100%)
rename drivers/{char => tty/hw}/rio/board.h (100%)
rename drivers/{char => tty/hw}/rio/cirrus.h (100%)
rename drivers/{char => tty/hw}/rio/cmdblk.h (100%)
rename drivers/{char => tty/hw}/rio/cmdpkt.h (100%)
rename drivers/{char => tty/hw}/rio/daemon.h (100%)
rename drivers/{char => tty/hw}/rio/errors.h (100%)
rename drivers/{char => tty/hw}/rio/func.h (100%)
rename drivers/{char => tty/hw}/rio/host.h (100%)
rename drivers/{char => tty/hw}/rio/link.h (100%)
rename drivers/{char => tty/hw}/rio/linux_compat.h (100%)
rename drivers/{char => tty/hw}/rio/map.h (100%)
rename drivers/{char => tty/hw}/rio/param.h (100%)
rename drivers/{char => tty/hw}/rio/parmmap.h (100%)
rename drivers/{char => tty/hw}/rio/pci.h (100%)
rename drivers/{char => tty/hw}/rio/phb.h (100%)
rename drivers/{char => tty/hw}/rio/pkt.h (100%)
rename drivers/{char => tty/hw}/rio/port.h (100%)
rename drivers/{char => tty/hw}/rio/protsts.h (100%)
rename drivers/{char => tty/hw}/rio/rio.h (100%)
rename drivers/{char => tty/hw}/rio/rio_linux.c (100%)
rename drivers/{char => tty/hw}/rio/rio_linux.h (100%)
rename drivers/{char => tty/hw}/rio/rioboard.h (100%)
rename drivers/{char => tty/hw}/rio/rioboot.c (100%)
rename drivers/{char => tty/hw}/rio/riocmd.c (100%)
rename drivers/{char => tty/hw}/rio/rioctrl.c (100%)
rename drivers/{char => tty/hw}/rio/riodrvr.h (100%)
rename drivers/{char => tty/hw}/rio/rioinfo.h (100%)
rename drivers/{char => tty/hw}/rio/rioinit.c (100%)
rename drivers/{char => tty/hw}/rio/riointr.c (100%)
rename drivers/{char => tty/hw}/rio/rioioctl.h (100%)
rename drivers/{char => tty/hw}/rio/rioparam.c (100%)
rename drivers/{char => tty/hw}/rio/rioroute.c (100%)
rename drivers/{char => tty/hw}/rio/riospace.h (100%)
rename drivers/{char => tty/hw}/rio/riotable.c (100%)
rename drivers/{char => tty/hw}/rio/riotty.c (100%)
rename drivers/{char => tty/hw}/rio/route.h (100%)
rename drivers/{char => tty/hw}/rio/rup.h (100%)
rename drivers/{char => tty/hw}/rio/unixrup.h (100%)
rename drivers/{char => tty/hw}/riscom8.c (100%)
rename drivers/{char => tty/hw}/riscom8.h (100%)
rename drivers/{char => tty/hw}/riscom8_reg.h (100%)
rename drivers/{char => tty/hw}/rocket.c (100%)
rename drivers/{char => tty/hw}/rocket.h (100%)
rename drivers/{char => tty/hw}/rocket_int.h (100%)
rename drivers/{char => tty/hw}/ser_a2232.c (100%)
rename drivers/{char => tty/hw}/ser_a2232.h (100%)
rename drivers/{char => tty/hw}/ser_a2232fw.ax (100%)
rename drivers/{char => tty/hw}/ser_a2232fw.h (100%)
rename drivers/{char => tty/hw}/serial167.c (100%)
rename drivers/{char => tty/hw}/specialix.c (100%)
rename drivers/{char => tty/hw}/specialix_io8.h (100%)
rename drivers/{char => tty/hw}/stallion.c (100%)
rename drivers/{char => tty/hw}/sx.c (100%)
rename drivers/{char => tty/hw}/sx.h (100%)
rename drivers/{char => tty/hw}/sxboards.h (100%)
rename drivers/{char => tty/hw}/sxwindow.h (100%)
rename drivers/{char => tty/hw}/synclink.c (100%)
rename drivers/{char/pcmcia => tty/hw}/synclink_cs.c (100%)
rename drivers/{char => tty/hw}/synclink_gt.c (100%)
rename drivers/{char => tty/hw}/synclinkmp.c (100%)
rename drivers/{char => tty/hw}/vme_scc.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 637a866..b2bcd4e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -186,7 +186,7 @@ A2232 SERIAL BOARD DRIVER
M: Enver Haase <[email protected]>
L: [email protected]
S: Maintained
-F: drivers/char/ser_a2232*
+F: drivers/tty/hw/ser_a2232*

AACRAID SCSI RAID DRIVER
M: Adaptec OEM Raid Solutions <[email protected]>
@@ -1634,7 +1634,7 @@ M: "Michael H. Warfield" <[email protected]>
W: http://www.wittsend.com/computone.html
S: Maintained
F: Documentation/serial/computone.txt
-F: drivers/char/ip2/
+F: drivers/tty/hw/ip2/

CONEXANT ACCESSRUNNER USB DRIVER
M: Simon Arlott <[email protected]>
@@ -1809,7 +1809,7 @@ F: drivers/net/wan/cycx*
CYCLADES ASYNC MUX DRIVER
W: http://www.cyclades.com/
S: Orphan
-F: drivers/char/cyclades.c
+F: drivers/tty/hw/cyclades.c
F: include/linux/cyclades.h

CYCLADES PC300 DRIVER
@@ -1923,8 +1923,8 @@ L: [email protected]
W: http://www.digi.com
S: Orphan
F: Documentation/serial/digiepca.txt
-F: drivers/char/epca*
-F: drivers/char/digi*
+F: drivers/tty/hw/epca*
+F: drivers/tty/hw/digi*

DIRECTORY NOTIFICATION (DNOTIFY)
M: Eric Paris <[email protected]>
@@ -3151,7 +3151,7 @@ M: Jiri Kosina <[email protected]>
M: David Sterba <[email protected]>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
-F: drivers/char/pcmcia/ipwireless/
+F: drivers/tty/hw/ipwireless/

IPX NETWORK LAYER
M: Arnaldo Carvalho de Melo <[email protected]>
@@ -3866,7 +3866,7 @@ MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
M: Jiri Slaby <[email protected]>
S: Maintained
F: Documentation/serial/moxa-smartio
-F: drivers/char/mxser.*
+F: drivers/tty/hw/mxser.*

MSI LAPTOP SUPPORT
M: Lennart Poettering <[email protected]>
@@ -3909,7 +3909,7 @@ F: sound/oss/msnd*
MULTITECH MULTIPORT CARD (ISICOM)
M: Jiri Slaby <[email protected]>
S: Maintained
-F: drivers/char/isicom.c
+F: drivers/tty/hw/isicom.c
F: include/linux/isicom.h

MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
@@ -4850,14 +4850,14 @@ F: drivers/mtd/nand/r852.h
RISCOM8 DRIVER
S: Orphan
F: Documentation/serial/riscom8.txt
-F: drivers/char/riscom8*
+F: drivers/tty/hw/riscom8*

ROCKETPORT DRIVER
P: Comtrol Corp.
W: http://www.comtrol.com
S: Maintained
F: Documentation/serial/rocket.txt
-F: drivers/char/rocket*
+F: drivers/tty/hw/rocket*

ROSE NETWORK LAYER
M: Ralf Baechle <[email protected]>
@@ -5448,7 +5448,7 @@ SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
M: Roger Wolff <[email protected]>
S: Supported
F: Documentation/serial/specialix.txt
-F: drivers/char/specialix*
+F: drivers/tty/hw/specialix*

SPI SUBSYSTEM
M: David Brownell <[email protected]>
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 3ce0219..834fb9e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -15,292 +15,7 @@ config DEVKMEM
kind of kernel debugging operations.
When in doubt, say "N".

-config BFIN_JTAG_COMM
- tristate "Blackfin JTAG Communication"
- depends on BLACKFIN
- help
- Add support for emulating a TTY device over the Blackfin JTAG.
-
- To compile this driver as a module, choose M here: the
- module will be called bfin_jtag_comm.
-
-config BFIN_JTAG_COMM_CONSOLE
- bool "Console on Blackfin JTAG"
- depends on BFIN_JTAG_COMM=y
-
-config SERIAL_NONSTANDARD
- bool "Non-standard serial port support"
- depends on HAS_IOMEM
- ---help---
- Say Y here if you have any non-standard serial boards -- boards
- which aren't supported using the standard "dumb" serial driver.
- This includes intelligent serial boards such as Cyclades,
- Digiboards, etc. These are usually used for systems that need many
- serial ports because they serve many terminals or dial-in
- connections.
-
- Note that the answer to this question won't directly affect the
- kernel: saying N will just cause the configurator to skip all
- the questions about non-standard serial boards.
-
- Most people can say N here.
-
-config COMPUTONE
- tristate "Computone IntelliPort Plus serial support"
- depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
- ---help---
- This driver supports the entire family of Intelliport II/Plus
- controllers with the exception of the MicroChannel controllers and
- products previous to the Intelliport II. These are multiport cards,
- which give you many serial ports. You would need something like this
- to connect more than two modems to your Linux box, for instance in
- order to become a dial-in server. If you have a card like that, say
- Y here and read <file:Documentation/serial/computone.txt>.
-
- To compile this driver as module, choose M here: the
- module will be called ip2.
-
-config ROCKETPORT
- tristate "Comtrol RocketPort support"
- depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
- help
- This driver supports Comtrol RocketPort and RocketModem PCI boards.
- These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
- modems. For information about the RocketPort/RocketModem boards
- and this driver read <file:Documentation/serial/rocket.txt>.
-
- To compile this driver as a module, choose M here: the
- module will be called rocket.
-
- If you want to compile this driver into the kernel, say Y here. If
- you don't have a Comtrol RocketPort/RocketModem card installed, say N.
-
-config CYCLADES
- tristate "Cyclades async mux support"
- depends on SERIAL_NONSTANDARD && (PCI || ISA)
- select FW_LOADER
- ---help---
- This driver supports Cyclades Z and Y multiserial boards.
- You would need something like this to connect more than two modems to
- your Linux box, for instance in order to become a dial-in server.
-
- For information about the Cyclades-Z card, read
- <file:Documentation/serial/README.cycladesZ>.
-
- To compile this driver as a module, choose M here: the
- module will be called cyclades.
-
- If you haven't heard about it, it's safe to say N.
-
-config CYZ_INTR
- bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
- depends on EXPERIMENTAL && CYCLADES
- help
- The Cyclades-Z family of multiport cards allows 2 (two) driver op
- modes: polling and interrupt. In polling mode, the driver will check
- the status of the Cyclades-Z ports every certain amount of time
- (which is called polling cycle and is configurable). In interrupt
- mode, it will use an interrupt line (IRQ) in order to check the
- status of the Cyclades-Z ports. The default op mode is polling. If
- unsure, say N.
-
-config DIGIEPCA
- tristate "Digiboard Intelligent Async Support"
- depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
- ---help---
- This is a driver for Digi International's Xx, Xeve, and Xem series
- of cards which provide multiple serial ports. You would need
- something like this to connect more than two modems to your Linux
- box, for instance in order to become a dial-in server. This driver
- supports the original PC (ISA) boards as well as PCI, and EISA. If
- you have a card like this, say Y here and read the file
- <file:Documentation/serial/digiepca.txt>.
-
- To compile this driver as a module, choose M here: the
- module will be called epca.
-
-config MOXA_INTELLIO
- tristate "Moxa Intellio support"
- depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
- select FW_LOADER
- help
- Say Y here if you have a Moxa Intellio multiport serial card.
-
- To compile this driver as a module, choose M here: the
- module will be called moxa.
-
-config MOXA_SMARTIO
- tristate "Moxa SmartIO support v. 2.0"
- depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
- help
- Say Y here if you have a Moxa SmartIO multiport serial card and/or
- want to help develop a new version of this driver.
-
- This is upgraded (1.9.1) driver from original Moxa drivers with
- changes finally resulting in PCI probing.
-
- This driver can also be built as a module. The module will be called
- mxser. If you want to do that, say M here.
-
-config ISI
- tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
- depends on SERIAL_NONSTANDARD && PCI
- select FW_LOADER
- help
- This is a driver for the Multi-Tech cards which provide several
- serial ports. The driver is experimental and can currently only be
- built as a module. The module will be called isicom.
- If you want to do that, choose M here.
-
-config SYNCLINK
- tristate "Microgate SyncLink card support"
- depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
- help
- Provides support for the SyncLink ISA and PCI multiprotocol serial
- adapters. These adapters support asynchronous and HDLC bit
- synchronous communication up to 10Mbps (PCI adapter).
-
- This driver can only be built as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called synclink. If you want to do that, say M
- here.
-
-config SYNCLINKMP
- tristate "SyncLink Multiport support"
- depends on SERIAL_NONSTANDARD && PCI
- help
- Enable support for the SyncLink Multiport (2 or 4 ports)
- serial adapter, running asynchronous and HDLC communications up
- to 2.048Mbps. Each ports is independently selectable for
- RS-232, V.35, RS-449, RS-530, and X.21
-
- This driver may be built as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called synclinkmp. If you want to do that, say M
- here.
-
-config SYNCLINK_GT
- tristate "SyncLink GT/AC support"
- depends on SERIAL_NONSTANDARD && PCI
- help
- Support for SyncLink GT and SyncLink AC families of
- synchronous and asynchronous serial adapters
- manufactured by Microgate Systems, Ltd. (http://www.microgate.com)
-
-config RISCOM8
- tristate "SDL RISCom/8 card support"
- depends on SERIAL_NONSTANDARD
- help
- This is a driver for the SDL Communications RISCom/8 multiport card,
- which gives you many serial ports. You would need something like
- this to connect more than two modems to your Linux box, for instance
- in order to become a dial-in server. If you have a card like that,
- say Y here and read the file <file:Documentation/serial/riscom8.txt>.
-
- Also it's possible to say M here and compile this driver as kernel
- loadable module; the module will be called riscom8.
-
-config SPECIALIX
- tristate "Specialix IO8+ card support"
- depends on SERIAL_NONSTANDARD
- help
- This is a driver for the Specialix IO8+ multiport card (both the
- ISA and the PCI version) which gives you many serial ports. You
- would need something like this to connect more than two modems to
- your Linux box, for instance in order to become a dial-in server.
-
- If you have a card like that, say Y here and read the file
- <file:Documentation/serial/specialix.txt>. Also it's possible to say
- M here and compile this driver as kernel loadable module which will be
- called specialix.
-
-config SX
- tristate "Specialix SX (and SI) card support"
- depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
- help
- This is a driver for the SX and SI multiport serial cards.
- Please read the file <file:Documentation/serial/sx.txt> for details.
-
- This driver can only be built as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called sx. If you want to do that, say M here.
-
-config RIO
- tristate "Specialix RIO system support"
- depends on SERIAL_NONSTANDARD && BROKEN
- help
- This is a driver for the Specialix RIO, a smart serial card which
- drives an outboard box that can support up to 128 ports. Product
- information is at <http://www.perle.com/support/documentation.html#multiport>.
- There are both ISA and PCI versions.
-
-config RIO_OLDPCI
- bool "Support really old RIO/PCI cards"
- depends on RIO
- help
- Older RIO PCI cards need some initialization-time configuration to
- determine the IRQ and some control addresses. If you have a RIO and
- this doesn't seem to work, try setting this to Y.
-
-config STALDRV
- bool "Stallion multiport serial support"
- depends on SERIAL_NONSTANDARD
- help
- Stallion cards give you many serial ports. You would need something
- like this to connect more than two modems to your Linux box, for
- instance in order to become a dial-in server. If you say Y here,
- you will be asked for your specific card model in the next
- questions. Make sure to read <file:Documentation/serial/stallion.txt>
- in this case. If you have never heard about all this, it's safe to
- say N.
-
-config STALLION
- tristate "Stallion EasyIO or EC8/32 support"
- depends on STALDRV && (ISA || EISA || PCI)
- help
- If you have an EasyIO or EasyConnection 8/32 multiport Stallion
- card, then this is for you; say Y. Make sure to read
- <file:Documentation/serial/stallion.txt>.
-
- To compile this driver as a module, choose M here: the
- module will be called stallion.
-
-config ISTALLION
- tristate "Stallion EC8/64, ONboard, Brumby support"
- depends on STALDRV && (ISA || EISA || PCI)
- help
- If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
- serial multiport card, say Y here. Make sure to read
- <file:Documentation/serial/stallion.txt>.
-
- To compile this driver as a module, choose M here: the
- module will be called istallion.
-
-config NOZOMI
- tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
- depends on PCI && EXPERIMENTAL
- help
- If you have a HSDPA driver Broadband Wireless Data Card -
- Globe Trotter PCMCIA card, say Y here.
-
- To compile this driver as a module, choose M here, the module
- will be called nozomi.
-
-config A2232
- tristate "Commodore A2232 serial support (EXPERIMENTAL)"
- depends on EXPERIMENTAL && ZORRO && BROKEN
- ---help---
- This option supports the 2232 7-port serial card shipped with the
- Amiga 2000 and other Zorro-bus machines, dating from 1989. At
- a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
- each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
- ports were connected with 8 pin DIN connectors on the card bracket,
- for which 8 pin to DB25 adapters were supplied. The card also had
- jumpers internally to toggle various pinning configurations.
-
- This driver can be built as a module; but then "generic_serial"
- will also be built as a module. This has to be loaded before
- "ser_a2232". If you want to do this, answer M here.
+source "drivers/tty/hw/Kconfig"

config SGI_SNSC
bool "SGI Altix system controller communication support"
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d2fd481..65e1955 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -2,34 +2,10 @@
# Makefile for the kernel character device drivers.
#

-obj-y += mem.o random.o
+obj-y += mem.o
+obj-y += random.o

obj-y += misc.o
-obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
-obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
-obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
-obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
-obj-$(CONFIG_ROCKETPORT) += rocket.o
-obj-$(CONFIG_SERIAL167) += serial167.o
-obj-$(CONFIG_CYCLADES) += cyclades.o
-obj-$(CONFIG_STALLION) += stallion.o
-obj-$(CONFIG_ISTALLION) += istallion.o
-obj-$(CONFIG_NOZOMI) += nozomi.o
-obj-$(CONFIG_DIGIEPCA) += epca.o
-obj-$(CONFIG_SPECIALIX) += specialix.o
-obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
-obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
-obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
-obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
-obj-$(CONFIG_COMPUTONE) += ip2/
-obj-$(CONFIG_RISCOM8) += riscom8.o
-obj-$(CONFIG_ISI) += isicom.o
-obj-$(CONFIG_SYNCLINK) += synclink.o
-obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
-obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
-obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
-obj-$(CONFIG_SX) += sx.o generic_serial.o
-obj-$(CONFIG_RIO) += rio/ generic_serial.o
obj-$(CONFIG_RAW_DRIVER) += raw.o
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
obj-$(CONFIG_MSPEC) += mspec.o
diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig
index ffa0efc..51934cf 100644
--- a/drivers/char/pcmcia/Kconfig
+++ b/drivers/char/pcmcia/Kconfig
@@ -5,19 +5,6 @@
menu "PCMCIA character devices"
depends on HOTPLUG && PCMCIA!=n

-config SYNCLINK_CS
- tristate "SyncLink PC Card support"
- depends on PCMCIA
- help
- Enable support for the SyncLink PC Card serial adapter, running
- asynchronous and HDLC communications up to 512Kbps. The port is
- selectable for RS-232, V.35, RS-449, RS-530, and X.21
-
- This driver may be built as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called synclinkmp. If you want to do that, say M
- here.
-
config CARDMAN_4000
tristate "Omnikey Cardman 4000 support"
depends on PCMCIA
@@ -43,14 +30,5 @@ config CARDMAN_4040
(http://www.omnikey.com/), or a current development version of OpenCT
(http://www.opensc.org/).

-config IPWIRELESS
- tristate "IPWireless 3G UMTS PCMCIA card support"
- depends on PCMCIA && NETDEVICES
- select PPP
- help
- This is a driver for 3G UMTS PCMCIA card from IPWireless company. In
- some countries (for example Czech Republic, T-Mobile ISP) this card
- is shipped for service called UMTS 4G.
-
endmenu

diff --git a/drivers/char/pcmcia/Makefile b/drivers/char/pcmcia/Makefile
index be8f287..82a9016 100644
--- a/drivers/char/pcmcia/Makefile
+++ b/drivers/char/pcmcia/Makefile
@@ -4,8 +4,5 @@
# Makefile for the Linux PCMCIA char device drivers.
#

-obj-y += ipwireless/
-
-obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
obj-$(CONFIG_CARDMAN_4000) += cm4000_cs.o
obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 938cb73..130078b 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -8,6 +8,7 @@ obj-y += tty_ldisc.o
obj-y += tty_buffer.o
obj-y += tty_port.o
obj-y += tty_mutex.o
+obj-y += hw/

obj-$(CONFIG_LEGACY_PTYS) += pty.o
obj-$(CONFIG_UNIX98_PTYS) += pty.o
diff --git a/drivers/tty/hw/Kconfig b/drivers/tty/hw/Kconfig
new file mode 100644
index 0000000..4328aa4
--- /dev/null
+++ b/drivers/tty/hw/Kconfig
@@ -0,0 +1,308 @@
+config BFIN_JTAG_COMM
+ tristate "Blackfin JTAG Communication"
+ depends on BLACKFIN
+ help
+ Add support for emulating a TTY device over the Blackfin JTAG.
+
+ To compile this driver as a module, choose M here: the
+ module will be called bfin_jtag_comm.
+
+config BFIN_JTAG_COMM_CONSOLE
+ bool "Console on Blackfin JTAG"
+ depends on BFIN_JTAG_COMM=y
+
+config SERIAL_NONSTANDARD
+ bool "Non-standard serial port support"
+ depends on HAS_IOMEM
+ ---help---
+ Say Y here if you have any non-standard serial boards -- boards
+ which aren't supported using the standard "dumb" serial driver.
+ This includes intelligent serial boards such as Cyclades,
+ Digiboards, etc. These are usually used for systems that need many
+ serial ports because they serve many terminals or dial-in
+ connections.
+
+ Note that the answer to this question won't directly affect the
+ kernel: saying N will just cause the configurator to skip all
+ the questions about non-standard serial boards.
+
+ Most people can say N here.
+
+config COMPUTONE
+ tristate "Computone IntelliPort Plus serial support"
+ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+ ---help---
+ This driver supports the entire family of Intelliport II/Plus
+ controllers with the exception of the MicroChannel controllers and
+ products previous to the Intelliport II. These are multiport cards,
+ which give you many serial ports. You would need something like this
+ to connect more than two modems to your Linux box, for instance in
+ order to become a dial-in server. If you have a card like that, say
+ Y here and read <file:Documentation/serial/computone.txt>.
+
+ To compile this driver as module, choose M here: the
+ module will be called ip2.
+
+config ROCKETPORT
+ tristate "Comtrol RocketPort support"
+ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+ help
+ This driver supports Comtrol RocketPort and RocketModem PCI boards.
+ These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
+ modems. For information about the RocketPort/RocketModem boards
+ and this driver read <file:Documentation/serial/rocket.txt>.
+
+ To compile this driver as a module, choose M here: the
+ module will be called rocket.
+
+ If you want to compile this driver into the kernel, say Y here. If
+ you don't have a Comtrol RocketPort/RocketModem card installed, say N.
+
+config CYCLADES
+ tristate "Cyclades async mux support"
+ depends on SERIAL_NONSTANDARD && (PCI || ISA)
+ select FW_LOADER
+ ---help---
+ This driver supports Cyclades Z and Y multiserial boards.
+ You would need something like this to connect more than two modems to
+ your Linux box, for instance in order to become a dial-in server.
+
+ For information about the Cyclades-Z card, read
+ <file:Documentation/serial/README.cycladesZ>.
+
+ To compile this driver as a module, choose M here: the
+ module will be called cyclades.
+
+ If you haven't heard about it, it's safe to say N.
+
+config CYZ_INTR
+ bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && CYCLADES
+ help
+ The Cyclades-Z family of multiport cards allows 2 (two) driver op
+ modes: polling and interrupt. In polling mode, the driver will check
+ the status of the Cyclades-Z ports every certain amount of time
+ (which is called polling cycle and is configurable). In interrupt
+ mode, it will use an interrupt line (IRQ) in order to check the
+ status of the Cyclades-Z ports. The default op mode is polling. If
+ unsure, say N.
+
+config DIGIEPCA
+ tristate "Digiboard Intelligent Async Support"
+ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+ ---help---
+ This is a driver for Digi International's Xx, Xeve, and Xem series
+ of cards which provide multiple serial ports. You would need
+ something like this to connect more than two modems to your Linux
+ box, for instance in order to become a dial-in server. This driver
+ supports the original PC (ISA) boards as well as PCI, and EISA. If
+ you have a card like this, say Y here and read the file
+ <file:Documentation/serial/digiepca.txt>.
+
+ To compile this driver as a module, choose M here: the
+ module will be called epca.
+
+config MOXA_INTELLIO
+ tristate "Moxa Intellio support"
+ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+ select FW_LOADER
+ help
+ Say Y here if you have a Moxa Intellio multiport serial card.
+
+ To compile this driver as a module, choose M here: the
+ module will be called moxa.
+
+config MOXA_SMARTIO
+ tristate "Moxa SmartIO support v. 2.0"
+ depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
+ help
+ Say Y here if you have a Moxa SmartIO multiport serial card and/or
+ want to help develop a new version of this driver.
+
+ This is upgraded (1.9.1) driver from original Moxa drivers with
+ changes finally resulting in PCI probing.
+
+ This driver can also be built as a module. The module will be called
+ mxser. If you want to do that, say M here.
+
+config ISI
+ tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
+ depends on SERIAL_NONSTANDARD && PCI
+ select FW_LOADER
+ help
+ This is a driver for the Multi-Tech cards which provide several
+ serial ports. The driver is experimental and can currently only be
+ built as a module. The module will be called isicom.
+ If you want to do that, choose M here.
+
+config SYNCLINK
+ tristate "Microgate SyncLink card support"
+ depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
+ help
+ Provides support for the SyncLink ISA and PCI multiprotocol serial
+ adapters. These adapters support asynchronous and HDLC bit
+ synchronous communication up to 10Mbps (PCI adapter).
+
+ This driver can only be built as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called synclink. If you want to do that, say M
+ here.
+
+config SYNCLINKMP
+ tristate "SyncLink Multiport support"
+ depends on SERIAL_NONSTANDARD && PCI
+ help
+ Enable support for the SyncLink Multiport (2 or 4 ports)
+ serial adapter, running asynchronous and HDLC communications up
+ to 2.048Mbps. Each ports is independently selectable for
+ RS-232, V.35, RS-449, RS-530, and X.21
+
+ This driver may be built as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called synclinkmp. If you want to do that, say M
+ here.
+
+config SYNCLINK_GT
+ tristate "SyncLink GT/AC support"
+ depends on SERIAL_NONSTANDARD && PCI
+ help
+ Support for SyncLink GT and SyncLink AC families of
+ synchronous and asynchronous serial adapters
+ manufactured by Microgate Systems, Ltd. (http://www.microgate.com)
+
+config RISCOM8
+ tristate "SDL RISCom/8 card support"
+ depends on SERIAL_NONSTANDARD
+ help
+ This is a driver for the SDL Communications RISCom/8 multiport card,
+ which gives you many serial ports. You would need something like
+ this to connect more than two modems to your Linux box, for instance
+ in order to become a dial-in server. If you have a card like that,
+ say Y here and read the file <file:Documentation/serial/riscom8.txt>.
+
+ Also it's possible to say M here and compile this driver as kernel
+ loadable module; the module will be called riscom8.
+
+config SPECIALIX
+ tristate "Specialix IO8+ card support"
+ depends on SERIAL_NONSTANDARD
+ help
+ This is a driver for the Specialix IO8+ multiport card (both the
+ ISA and the PCI version) which gives you many serial ports. You
+ would need something like this to connect more than two modems to
+ your Linux box, for instance in order to become a dial-in server.
+
+ If you have a card like that, say Y here and read the file
+ <file:Documentation/serial/specialix.txt>. Also it's possible to say
+ M here and compile this driver as kernel loadable module which will be
+ called specialix.
+
+config SX
+ tristate "Specialix SX (and SI) card support"
+ depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
+ help
+ This is a driver for the SX and SI multiport serial cards.
+ Please read the file <file:Documentation/serial/sx.txt> for details.
+
+ This driver can only be built as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called sx. If you want to do that, say M here.
+
+config RIO
+ tristate "Specialix RIO system support"
+ depends on SERIAL_NONSTANDARD && BROKEN
+ help
+ This is a driver for the Specialix RIO, a smart serial card which
+ drives an outboard box that can support up to 128 ports. Product
+ information is at <http://www.perle.com/support/documentation.html#multiport>.
+ There are both ISA and PCI versions.
+
+config RIO_OLDPCI
+ bool "Support really old RIO/PCI cards"
+ depends on RIO
+ help
+ Older RIO PCI cards need some initialization-time configuration to
+ determine the IRQ and some control addresses. If you have a RIO and
+ this doesn't seem to work, try setting this to Y.
+
+config STALDRV
+ bool "Stallion multiport serial support"
+ depends on SERIAL_NONSTANDARD
+ help
+ Stallion cards give you many serial ports. You would need something
+ like this to connect more than two modems to your Linux box, for
+ instance in order to become a dial-in server. If you say Y here,
+ you will be asked for your specific card model in the next
+ questions. Make sure to read <file:Documentation/serial/stallion.txt>
+ in this case. If you have never heard about all this, it's safe to
+ say N.
+
+config STALLION
+ tristate "Stallion EasyIO or EC8/32 support"
+ depends on STALDRV && (ISA || EISA || PCI)
+ help
+ If you have an EasyIO or EasyConnection 8/32 multiport Stallion
+ card, then this is for you; say Y. Make sure to read
+ <file:Documentation/serial/stallion.txt>.
+
+ To compile this driver as a module, choose M here: the
+ module will be called stallion.
+
+config ISTALLION
+ tristate "Stallion EC8/64, ONboard, Brumby support"
+ depends on STALDRV && (ISA || EISA || PCI)
+ help
+ If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
+ serial multiport card, say Y here. Make sure to read
+ <file:Documentation/serial/stallion.txt>.
+
+ To compile this driver as a module, choose M here: the
+ module will be called istallion.
+
+config NOZOMI
+ tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
+ depends on PCI && EXPERIMENTAL
+ help
+ If you have a HSDPA driver Broadband Wireless Data Card -
+ Globe Trotter PCMCIA card, say Y here.
+
+ To compile this driver as a module, choose M here, the module
+ will be called nozomi.
+
+config A2232
+ tristate "Commodore A2232 serial support (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && ZORRO && BROKEN
+ ---help---
+ This option supports the 2232 7-port serial card shipped with the
+ Amiga 2000 and other Zorro-bus machines, dating from 1989. At
+ a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
+ each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
+ ports were connected with 8 pin DIN connectors on the card bracket,
+ for which 8 pin to DB25 adapters were supplied. The card also had
+ jumpers internally to toggle various pinning configurations.
+
+ This driver can be built as a module; but then "generic_serial"
+ will also be built as a module. This has to be loaded before
+ "ser_a2232". If you want to do this, answer M here.
+
+config SYNCLINK_CS
+ tristate "SyncLink PC Card support"
+ depends on PCMCIA
+ help
+ Enable support for the SyncLink PC Card serial adapter, running
+ asynchronous and HDLC communications up to 512Kbps. The port is
+ selectable for RS-232, V.35, RS-449, RS-530, and X.21
+
+ This driver may be built as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called synclinkmp. If you want to do that, say M
+ here.
+
+config IPWIRELESS
+ tristate "IPWireless 3G UMTS PCMCIA card support"
+ depends on PCMCIA && NETDEVICES
+ select PPP
+ help
+ This is a driver for 3G UMTS PCMCIA card from IPWireless company. In
+ some countries (for example Czech Republic, T-Mobile ISP) this card
+ is shipped for service called UMTS 4G.
diff --git a/drivers/tty/hw/Makefile b/drivers/tty/hw/Makefile
new file mode 100644
index 0000000..de6c412
--- /dev/null
+++ b/drivers/tty/hw/Makefile
@@ -0,0 +1,27 @@
+obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
+obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
+obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
+obj-$(CONFIG_ROCKETPORT) += rocket.o
+obj-$(CONFIG_SERIAL167) += serial167.o
+obj-$(CONFIG_CYCLADES) += cyclades.o
+obj-$(CONFIG_STALLION) += stallion.o
+obj-$(CONFIG_ISTALLION) += istallion.o
+obj-$(CONFIG_NOZOMI) += nozomi.o
+obj-$(CONFIG_DIGIEPCA) += epca/
+obj-$(CONFIG_SPECIALIX) += specialix.o
+obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
+obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
+obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
+obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
+obj-$(CONFIG_COMPUTONE) += ip2/
+obj-$(CONFIG_RISCOM8) += riscom8.o
+obj-$(CONFIG_ISI) += isicom.o
+obj-$(CONFIG_SYNCLINK) += synclink.o
+obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
+obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
+obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
+obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
+obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
+obj-$(CONFIG_SX) += sx.o generic_serial.o
+obj-$(CONFIG_RIO) += rio/ generic_serial.o
+obj-$(CONFIG_IPWIRELESS) += ipwireless/
diff --git a/drivers/char/amiserial.c b/drivers/tty/hw/amiserial.c
similarity index 100%
rename from drivers/char/amiserial.c
rename to drivers/tty/hw/amiserial.c
diff --git a/drivers/char/bfin_jtag_comm.c b/drivers/tty/hw/bfin_jtag_comm.c
similarity index 100%
rename from drivers/char/bfin_jtag_comm.c
rename to drivers/tty/hw/bfin_jtag_comm.c
diff --git a/drivers/char/cd1865.h b/drivers/tty/hw/cd1865.h
similarity index 100%
rename from drivers/char/cd1865.h
rename to drivers/tty/hw/cd1865.h
diff --git a/drivers/char/cyclades.c b/drivers/tty/hw/cyclades.c
similarity index 100%
rename from drivers/char/cyclades.c
rename to drivers/tty/hw/cyclades.c
diff --git a/drivers/tty/hw/epca/Makefile b/drivers/tty/hw/epca/Makefile
new file mode 100644
index 0000000..daa8ed8
--- /dev/null
+++ b/drivers/tty/hw/epca/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_DIGIEPCA) += epca.o
diff --git a/drivers/char/digi1.h b/drivers/tty/hw/epca/digi1.h
similarity index 100%
rename from drivers/char/digi1.h
rename to drivers/tty/hw/epca/digi1.h
diff --git a/drivers/char/digiFep1.h b/drivers/tty/hw/epca/digiFep1.h
similarity index 100%
rename from drivers/char/digiFep1.h
rename to drivers/tty/hw/epca/digiFep1.h
diff --git a/drivers/char/digiPCI.h b/drivers/tty/hw/epca/digiPCI.h
similarity index 100%
rename from drivers/char/digiPCI.h
rename to drivers/tty/hw/epca/digiPCI.h
diff --git a/drivers/char/epca.c b/drivers/tty/hw/epca/epca.c
similarity index 100%
rename from drivers/char/epca.c
rename to drivers/tty/hw/epca/epca.c
diff --git a/drivers/char/epca.h b/drivers/tty/hw/epca/epca.h
similarity index 100%
rename from drivers/char/epca.h
rename to drivers/tty/hw/epca/epca.h
diff --git a/drivers/char/epcaconfig.h b/drivers/tty/hw/epca/epcaconfig.h
similarity index 100%
rename from drivers/char/epcaconfig.h
rename to drivers/tty/hw/epca/epcaconfig.h
diff --git a/drivers/char/generic_serial.c b/drivers/tty/hw/generic_serial.c
similarity index 100%
rename from drivers/char/generic_serial.c
rename to drivers/tty/hw/generic_serial.c
diff --git a/drivers/char/ip2/Makefile b/drivers/tty/hw/ip2/Makefile
similarity index 100%
rename from drivers/char/ip2/Makefile
rename to drivers/tty/hw/ip2/Makefile
diff --git a/drivers/char/ip2/i2cmd.c b/drivers/tty/hw/ip2/i2cmd.c
similarity index 100%
rename from drivers/char/ip2/i2cmd.c
rename to drivers/tty/hw/ip2/i2cmd.c
diff --git a/drivers/char/ip2/i2cmd.h b/drivers/tty/hw/ip2/i2cmd.h
similarity index 100%
rename from drivers/char/ip2/i2cmd.h
rename to drivers/tty/hw/ip2/i2cmd.h
diff --git a/drivers/char/ip2/i2ellis.c b/drivers/tty/hw/ip2/i2ellis.c
similarity index 100%
rename from drivers/char/ip2/i2ellis.c
rename to drivers/tty/hw/ip2/i2ellis.c
diff --git a/drivers/char/ip2/i2ellis.h b/drivers/tty/hw/ip2/i2ellis.h
similarity index 100%
rename from drivers/char/ip2/i2ellis.h
rename to drivers/tty/hw/ip2/i2ellis.h
diff --git a/drivers/char/ip2/i2hw.h b/drivers/tty/hw/ip2/i2hw.h
similarity index 100%
rename from drivers/char/ip2/i2hw.h
rename to drivers/tty/hw/ip2/i2hw.h
diff --git a/drivers/char/ip2/i2lib.c b/drivers/tty/hw/ip2/i2lib.c
similarity index 100%
rename from drivers/char/ip2/i2lib.c
rename to drivers/tty/hw/ip2/i2lib.c
diff --git a/drivers/char/ip2/i2lib.h b/drivers/tty/hw/ip2/i2lib.h
similarity index 100%
rename from drivers/char/ip2/i2lib.h
rename to drivers/tty/hw/ip2/i2lib.h
diff --git a/drivers/char/ip2/i2pack.h b/drivers/tty/hw/ip2/i2pack.h
similarity index 100%
rename from drivers/char/ip2/i2pack.h
rename to drivers/tty/hw/ip2/i2pack.h
diff --git a/drivers/char/ip2/ip2.h b/drivers/tty/hw/ip2/ip2.h
similarity index 100%
rename from drivers/char/ip2/ip2.h
rename to drivers/tty/hw/ip2/ip2.h
diff --git a/drivers/char/ip2/ip2ioctl.h b/drivers/tty/hw/ip2/ip2ioctl.h
similarity index 100%
rename from drivers/char/ip2/ip2ioctl.h
rename to drivers/tty/hw/ip2/ip2ioctl.h
diff --git a/drivers/char/ip2/ip2main.c b/drivers/tty/hw/ip2/ip2main.c
similarity index 100%
rename from drivers/char/ip2/ip2main.c
rename to drivers/tty/hw/ip2/ip2main.c
diff --git a/drivers/char/ip2/ip2trace.h b/drivers/tty/hw/ip2/ip2trace.h
similarity index 100%
rename from drivers/char/ip2/ip2trace.h
rename to drivers/tty/hw/ip2/ip2trace.h
diff --git a/drivers/char/ip2/ip2types.h b/drivers/tty/hw/ip2/ip2types.h
similarity index 100%
rename from drivers/char/ip2/ip2types.h
rename to drivers/tty/hw/ip2/ip2types.h
diff --git a/drivers/char/pcmcia/ipwireless/Makefile b/drivers/tty/hw/ipwireless/Makefile
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/Makefile
rename to drivers/tty/hw/ipwireless/Makefile
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/tty/hw/ipwireless/hardware.c
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/hardware.c
rename to drivers/tty/hw/ipwireless/hardware.c
diff --git a/drivers/char/pcmcia/ipwireless/hardware.h b/drivers/tty/hw/ipwireless/hardware.h
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/hardware.h
rename to drivers/tty/hw/ipwireless/hardware.h
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/tty/hw/ipwireless/main.c
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/main.c
rename to drivers/tty/hw/ipwireless/main.c
diff --git a/drivers/char/pcmcia/ipwireless/main.h b/drivers/tty/hw/ipwireless/main.h
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/main.h
rename to drivers/tty/hw/ipwireless/main.h
diff --git a/drivers/char/pcmcia/ipwireless/network.c b/drivers/tty/hw/ipwireless/network.c
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/network.c
rename to drivers/tty/hw/ipwireless/network.c
diff --git a/drivers/char/pcmcia/ipwireless/network.h b/drivers/tty/hw/ipwireless/network.h
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/network.h
rename to drivers/tty/hw/ipwireless/network.h
diff --git a/drivers/char/pcmcia/ipwireless/setup_protocol.h b/drivers/tty/hw/ipwireless/setup_protocol.h
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/setup_protocol.h
rename to drivers/tty/hw/ipwireless/setup_protocol.h
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/tty/hw/ipwireless/tty.c
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/tty.c
rename to drivers/tty/hw/ipwireless/tty.c
diff --git a/drivers/char/pcmcia/ipwireless/tty.h b/drivers/tty/hw/ipwireless/tty.h
similarity index 100%
rename from drivers/char/pcmcia/ipwireless/tty.h
rename to drivers/tty/hw/ipwireless/tty.h
diff --git a/drivers/char/isicom.c b/drivers/tty/hw/isicom.c
similarity index 100%
rename from drivers/char/isicom.c
rename to drivers/tty/hw/isicom.c
diff --git a/drivers/char/istallion.c b/drivers/tty/hw/istallion.c
similarity index 100%
rename from drivers/char/istallion.c
rename to drivers/tty/hw/istallion.c
diff --git a/drivers/char/moxa.c b/drivers/tty/hw/moxa.c
similarity index 100%
rename from drivers/char/moxa.c
rename to drivers/tty/hw/moxa.c
diff --git a/drivers/char/moxa.h b/drivers/tty/hw/moxa.h
similarity index 100%
rename from drivers/char/moxa.h
rename to drivers/tty/hw/moxa.h
diff --git a/drivers/char/mxser.c b/drivers/tty/hw/mxser.c
similarity index 100%
rename from drivers/char/mxser.c
rename to drivers/tty/hw/mxser.c
diff --git a/drivers/char/mxser.h b/drivers/tty/hw/mxser.h
similarity index 100%
rename from drivers/char/mxser.h
rename to drivers/tty/hw/mxser.h
diff --git a/drivers/char/nozomi.c b/drivers/tty/hw/nozomi.c
similarity index 100%
rename from drivers/char/nozomi.c
rename to drivers/tty/hw/nozomi.c
diff --git a/drivers/char/rio/Makefile b/drivers/tty/hw/rio/Makefile
similarity index 100%
rename from drivers/char/rio/Makefile
rename to drivers/tty/hw/rio/Makefile
diff --git a/drivers/char/rio/board.h b/drivers/tty/hw/rio/board.h
similarity index 100%
rename from drivers/char/rio/board.h
rename to drivers/tty/hw/rio/board.h
diff --git a/drivers/char/rio/cirrus.h b/drivers/tty/hw/rio/cirrus.h
similarity index 100%
rename from drivers/char/rio/cirrus.h
rename to drivers/tty/hw/rio/cirrus.h
diff --git a/drivers/char/rio/cmdblk.h b/drivers/tty/hw/rio/cmdblk.h
similarity index 100%
rename from drivers/char/rio/cmdblk.h
rename to drivers/tty/hw/rio/cmdblk.h
diff --git a/drivers/char/rio/cmdpkt.h b/drivers/tty/hw/rio/cmdpkt.h
similarity index 100%
rename from drivers/char/rio/cmdpkt.h
rename to drivers/tty/hw/rio/cmdpkt.h
diff --git a/drivers/char/rio/daemon.h b/drivers/tty/hw/rio/daemon.h
similarity index 100%
rename from drivers/char/rio/daemon.h
rename to drivers/tty/hw/rio/daemon.h
diff --git a/drivers/char/rio/errors.h b/drivers/tty/hw/rio/errors.h
similarity index 100%
rename from drivers/char/rio/errors.h
rename to drivers/tty/hw/rio/errors.h
diff --git a/drivers/char/rio/func.h b/drivers/tty/hw/rio/func.h
similarity index 100%
rename from drivers/char/rio/func.h
rename to drivers/tty/hw/rio/func.h
diff --git a/drivers/char/rio/host.h b/drivers/tty/hw/rio/host.h
similarity index 100%
rename from drivers/char/rio/host.h
rename to drivers/tty/hw/rio/host.h
diff --git a/drivers/char/rio/link.h b/drivers/tty/hw/rio/link.h
similarity index 100%
rename from drivers/char/rio/link.h
rename to drivers/tty/hw/rio/link.h
diff --git a/drivers/char/rio/linux_compat.h b/drivers/tty/hw/rio/linux_compat.h
similarity index 100%
rename from drivers/char/rio/linux_compat.h
rename to drivers/tty/hw/rio/linux_compat.h
diff --git a/drivers/char/rio/map.h b/drivers/tty/hw/rio/map.h
similarity index 100%
rename from drivers/char/rio/map.h
rename to drivers/tty/hw/rio/map.h
diff --git a/drivers/char/rio/param.h b/drivers/tty/hw/rio/param.h
similarity index 100%
rename from drivers/char/rio/param.h
rename to drivers/tty/hw/rio/param.h
diff --git a/drivers/char/rio/parmmap.h b/drivers/tty/hw/rio/parmmap.h
similarity index 100%
rename from drivers/char/rio/parmmap.h
rename to drivers/tty/hw/rio/parmmap.h
diff --git a/drivers/char/rio/pci.h b/drivers/tty/hw/rio/pci.h
similarity index 100%
rename from drivers/char/rio/pci.h
rename to drivers/tty/hw/rio/pci.h
diff --git a/drivers/char/rio/phb.h b/drivers/tty/hw/rio/phb.h
similarity index 100%
rename from drivers/char/rio/phb.h
rename to drivers/tty/hw/rio/phb.h
diff --git a/drivers/char/rio/pkt.h b/drivers/tty/hw/rio/pkt.h
similarity index 100%
rename from drivers/char/rio/pkt.h
rename to drivers/tty/hw/rio/pkt.h
diff --git a/drivers/char/rio/port.h b/drivers/tty/hw/rio/port.h
similarity index 100%
rename from drivers/char/rio/port.h
rename to drivers/tty/hw/rio/port.h
diff --git a/drivers/char/rio/protsts.h b/drivers/tty/hw/rio/protsts.h
similarity index 100%
rename from drivers/char/rio/protsts.h
rename to drivers/tty/hw/rio/protsts.h
diff --git a/drivers/char/rio/rio.h b/drivers/tty/hw/rio/rio.h
similarity index 100%
rename from drivers/char/rio/rio.h
rename to drivers/tty/hw/rio/rio.h
diff --git a/drivers/char/rio/rio_linux.c b/drivers/tty/hw/rio/rio_linux.c
similarity index 100%
rename from drivers/char/rio/rio_linux.c
rename to drivers/tty/hw/rio/rio_linux.c
diff --git a/drivers/char/rio/rio_linux.h b/drivers/tty/hw/rio/rio_linux.h
similarity index 100%
rename from drivers/char/rio/rio_linux.h
rename to drivers/tty/hw/rio/rio_linux.h
diff --git a/drivers/char/rio/rioboard.h b/drivers/tty/hw/rio/rioboard.h
similarity index 100%
rename from drivers/char/rio/rioboard.h
rename to drivers/tty/hw/rio/rioboard.h
diff --git a/drivers/char/rio/rioboot.c b/drivers/tty/hw/rio/rioboot.c
similarity index 100%
rename from drivers/char/rio/rioboot.c
rename to drivers/tty/hw/rio/rioboot.c
diff --git a/drivers/char/rio/riocmd.c b/drivers/tty/hw/rio/riocmd.c
similarity index 100%
rename from drivers/char/rio/riocmd.c
rename to drivers/tty/hw/rio/riocmd.c
diff --git a/drivers/char/rio/rioctrl.c b/drivers/tty/hw/rio/rioctrl.c
similarity index 100%
rename from drivers/char/rio/rioctrl.c
rename to drivers/tty/hw/rio/rioctrl.c
diff --git a/drivers/char/rio/riodrvr.h b/drivers/tty/hw/rio/riodrvr.h
similarity index 100%
rename from drivers/char/rio/riodrvr.h
rename to drivers/tty/hw/rio/riodrvr.h
diff --git a/drivers/char/rio/rioinfo.h b/drivers/tty/hw/rio/rioinfo.h
similarity index 100%
rename from drivers/char/rio/rioinfo.h
rename to drivers/tty/hw/rio/rioinfo.h
diff --git a/drivers/char/rio/rioinit.c b/drivers/tty/hw/rio/rioinit.c
similarity index 100%
rename from drivers/char/rio/rioinit.c
rename to drivers/tty/hw/rio/rioinit.c
diff --git a/drivers/char/rio/riointr.c b/drivers/tty/hw/rio/riointr.c
similarity index 100%
rename from drivers/char/rio/riointr.c
rename to drivers/tty/hw/rio/riointr.c
diff --git a/drivers/char/rio/rioioctl.h b/drivers/tty/hw/rio/rioioctl.h
similarity index 100%
rename from drivers/char/rio/rioioctl.h
rename to drivers/tty/hw/rio/rioioctl.h
diff --git a/drivers/char/rio/rioparam.c b/drivers/tty/hw/rio/rioparam.c
similarity index 100%
rename from drivers/char/rio/rioparam.c
rename to drivers/tty/hw/rio/rioparam.c
diff --git a/drivers/char/rio/rioroute.c b/drivers/tty/hw/rio/rioroute.c
similarity index 100%
rename from drivers/char/rio/rioroute.c
rename to drivers/tty/hw/rio/rioroute.c
diff --git a/drivers/char/rio/riospace.h b/drivers/tty/hw/rio/riospace.h
similarity index 100%
rename from drivers/char/rio/riospace.h
rename to drivers/tty/hw/rio/riospace.h
diff --git a/drivers/char/rio/riotable.c b/drivers/tty/hw/rio/riotable.c
similarity index 100%
rename from drivers/char/rio/riotable.c
rename to drivers/tty/hw/rio/riotable.c
diff --git a/drivers/char/rio/riotty.c b/drivers/tty/hw/rio/riotty.c
similarity index 100%
rename from drivers/char/rio/riotty.c
rename to drivers/tty/hw/rio/riotty.c
diff --git a/drivers/char/rio/route.h b/drivers/tty/hw/rio/route.h
similarity index 100%
rename from drivers/char/rio/route.h
rename to drivers/tty/hw/rio/route.h
diff --git a/drivers/char/rio/rup.h b/drivers/tty/hw/rio/rup.h
similarity index 100%
rename from drivers/char/rio/rup.h
rename to drivers/tty/hw/rio/rup.h
diff --git a/drivers/char/rio/unixrup.h b/drivers/tty/hw/rio/unixrup.h
similarity index 100%
rename from drivers/char/rio/unixrup.h
rename to drivers/tty/hw/rio/unixrup.h
diff --git a/drivers/char/riscom8.c b/drivers/tty/hw/riscom8.c
similarity index 100%
rename from drivers/char/riscom8.c
rename to drivers/tty/hw/riscom8.c
diff --git a/drivers/char/riscom8.h b/drivers/tty/hw/riscom8.h
similarity index 100%
rename from drivers/char/riscom8.h
rename to drivers/tty/hw/riscom8.h
diff --git a/drivers/char/riscom8_reg.h b/drivers/tty/hw/riscom8_reg.h
similarity index 100%
rename from drivers/char/riscom8_reg.h
rename to drivers/tty/hw/riscom8_reg.h
diff --git a/drivers/char/rocket.c b/drivers/tty/hw/rocket.c
similarity index 100%
rename from drivers/char/rocket.c
rename to drivers/tty/hw/rocket.c
diff --git a/drivers/char/rocket.h b/drivers/tty/hw/rocket.h
similarity index 100%
rename from drivers/char/rocket.h
rename to drivers/tty/hw/rocket.h
diff --git a/drivers/char/rocket_int.h b/drivers/tty/hw/rocket_int.h
similarity index 100%
rename from drivers/char/rocket_int.h
rename to drivers/tty/hw/rocket_int.h
diff --git a/drivers/char/ser_a2232.c b/drivers/tty/hw/ser_a2232.c
similarity index 100%
rename from drivers/char/ser_a2232.c
rename to drivers/tty/hw/ser_a2232.c
diff --git a/drivers/char/ser_a2232.h b/drivers/tty/hw/ser_a2232.h
similarity index 100%
rename from drivers/char/ser_a2232.h
rename to drivers/tty/hw/ser_a2232.h
diff --git a/drivers/char/ser_a2232fw.ax b/drivers/tty/hw/ser_a2232fw.ax
similarity index 100%
rename from drivers/char/ser_a2232fw.ax
rename to drivers/tty/hw/ser_a2232fw.ax
diff --git a/drivers/char/ser_a2232fw.h b/drivers/tty/hw/ser_a2232fw.h
similarity index 100%
rename from drivers/char/ser_a2232fw.h
rename to drivers/tty/hw/ser_a2232fw.h
diff --git a/drivers/char/serial167.c b/drivers/tty/hw/serial167.c
similarity index 100%
rename from drivers/char/serial167.c
rename to drivers/tty/hw/serial167.c
diff --git a/drivers/char/specialix.c b/drivers/tty/hw/specialix.c
similarity index 100%
rename from drivers/char/specialix.c
rename to drivers/tty/hw/specialix.c
diff --git a/drivers/char/specialix_io8.h b/drivers/tty/hw/specialix_io8.h
similarity index 100%
rename from drivers/char/specialix_io8.h
rename to drivers/tty/hw/specialix_io8.h
diff --git a/drivers/char/stallion.c b/drivers/tty/hw/stallion.c
similarity index 100%
rename from drivers/char/stallion.c
rename to drivers/tty/hw/stallion.c
diff --git a/drivers/char/sx.c b/drivers/tty/hw/sx.c
similarity index 100%
rename from drivers/char/sx.c
rename to drivers/tty/hw/sx.c
diff --git a/drivers/char/sx.h b/drivers/tty/hw/sx.h
similarity index 100%
rename from drivers/char/sx.h
rename to drivers/tty/hw/sx.h
diff --git a/drivers/char/sxboards.h b/drivers/tty/hw/sxboards.h
similarity index 100%
rename from drivers/char/sxboards.h
rename to drivers/tty/hw/sxboards.h
diff --git a/drivers/char/sxwindow.h b/drivers/tty/hw/sxwindow.h
similarity index 100%
rename from drivers/char/sxwindow.h
rename to drivers/tty/hw/sxwindow.h
diff --git a/drivers/char/synclink.c b/drivers/tty/hw/synclink.c
similarity index 100%
rename from drivers/char/synclink.c
rename to drivers/tty/hw/synclink.c
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/tty/hw/synclink_cs.c
similarity index 100%
rename from drivers/char/pcmcia/synclink_cs.c
rename to drivers/tty/hw/synclink_cs.c
diff --git a/drivers/char/synclink_gt.c b/drivers/tty/hw/synclink_gt.c
similarity index 100%
rename from drivers/char/synclink_gt.c
rename to drivers/tty/hw/synclink_gt.c
diff --git a/drivers/char/synclinkmp.c b/drivers/tty/hw/synclinkmp.c
similarity index 100%
rename from drivers/char/synclinkmp.c
rename to drivers/tty/hw/synclinkmp.c
diff --git a/drivers/char/vme_scc.c b/drivers/tty/hw/vme_scc.c
similarity index 100%
rename from drivers/char/vme_scc.c
rename to drivers/tty/hw/vme_scc.c
--
1.7.1

2010-08-29 21:07:29

[permalink] [raw]

Subject: [PATCH 3/5] tty/hvc: move files to drivers/tty/hvc

All hvc device drivers fall into the same category
of tty drivers, so it makes sense to keep them
in a single directory.

Signed-off-by: Arnd Bergmann <[email protected]>
---
MAINTAINERS | 4 +-
drivers/char/Kconfig | 103 +---------------------------
drivers/char/Makefile | 12 ---
drivers/tty/Makefile | 2 +
drivers/tty/hvc/Kconfig | 104 ++++++++++++++++++++++++++++
drivers/tty/hvc/Makefile | 12 +++
drivers/{char => tty/hvc}/hvc_beat.c | 0
drivers/{char => tty/hvc}/hvc_console.c | 0
drivers/{char => tty/hvc}/hvc_console.h | 0
drivers/{char => tty/hvc}/hvc_irq.c | 0
drivers/{char => tty/hvc}/hvc_iseries.c | 0
drivers/{char => tty/hvc}/hvc_iucv.c | 0
drivers/{char => tty/hvc}/hvc_rtas.c | 0
drivers/{char => tty/hvc}/hvc_tile.c | 0
drivers/{char => tty/hvc}/hvc_udbg.c | 0
drivers/{char => tty/hvc}/hvc_vio.c | 0
drivers/{char => tty/hvc}/hvc_xen.c | 0
drivers/{char => tty/hvc}/hvcs.c | 0
drivers/{char => tty/hvc}/hvsi.c | 0
drivers/{char => tty/hvc}/virtio_console.c | 0
20 files changed, 121 insertions(+), 116 deletions(-)
create mode 100644 drivers/tty/hvc/Kconfig
create mode 100644 drivers/tty/hvc/Makefile
rename drivers/{char => tty/hvc}/hvc_beat.c (100%)
rename drivers/{char => tty/hvc}/hvc_console.c (100%)
rename drivers/{char => tty/hvc}/hvc_console.h (100%)
rename drivers/{char => tty/hvc}/hvc_irq.c (100%)
rename drivers/{char => tty/hvc}/hvc_iseries.c (100%)
rename drivers/{char => tty/hvc}/hvc_iucv.c (100%)
rename drivers/{char => tty/hvc}/hvc_rtas.c (100%)
rename drivers/{char => tty/hvc}/hvc_tile.c (100%)
rename drivers/{char => tty/hvc}/hvc_udbg.c (100%)
rename drivers/{char => tty/hvc}/hvc_vio.c (100%)
rename drivers/{char => tty/hvc}/hvc_xen.c (100%)
rename drivers/{char => tty/hvc}/hvcs.c (100%)
rename drivers/{char => tty/hvc}/hvsi.c (100%)
rename drivers/{char => tty/hvc}/virtio_console.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 794f630..637a866 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2566,7 +2566,7 @@ F: mm/hwpoison-inject.c
HYPERVISOR VIRTUAL CONSOLE DRIVER
L: [email protected]
S: Odd Fixes
-F: drivers/char/hvc_*
+F: drivers/tty/hvc/hvc_*

iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
M: Peter Jones <[email protected]>
@@ -6183,7 +6183,7 @@ VIRTIO CONSOLE DRIVER
M: Amit Shah <[email protected]>
L: [email protected]
S: Maintained
-F: drivers/char/virtio_console.c
+F: drivers/tty/hvc/virtio_console.c
F: include/linux/virtio_console.h

VIRTIO HOST (VHOST)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 52fa94d..3ce0219 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -432,108 +432,7 @@ config PPDEV

If unsure, say N.

-config HVC_DRIVER
- bool
- help
- Generic "hypervisor virtual console" infrastructure for various
- hypervisors (pSeries, iSeries, Xen, lguest).
- It will automatically be selected if one of the back-end console drivers
- is selected.
-
-config HVC_IRQ
- bool
-
-config HVC_CONSOLE
- bool "pSeries Hypervisor Virtual Console support"
- depends on PPC_PSERIES
- select HVC_DRIVER
- select HVC_IRQ
- help
- pSeries machines when partitioned support a hypervisor virtual
- console. This driver allows each pSeries partition to have a console
- which is accessed via the HMC.
-
-config HVC_ISERIES
- bool "iSeries Hypervisor Virtual Console support"
- depends on PPC_ISERIES
- default y
- select HVC_DRIVER
- select HVC_IRQ
- select VIOPATH
- help
- iSeries machines support a hypervisor virtual console.
-
-config HVC_RTAS
- bool "IBM RTAS Console support"
- depends on PPC_RTAS
- select HVC_DRIVER
- help
- IBM Console device driver which makes use of RTAS
-
-config HVC_BEAT
- bool "Toshiba's Beat Hypervisor Console support"
- depends on PPC_CELLEB
- select HVC_DRIVER
- help
- Toshiba's Cell Reference Set Beat Console device driver
-
-config HVC_IUCV
- bool "z/VM IUCV Hypervisor console support (VM only)"
- depends on S390
- select HVC_DRIVER
- select IUCV
- default y
- help
- This driver provides a Hypervisor console (HVC) back-end to access
- a Linux (console) terminal via a z/VM IUCV communication path.
-
-config HVC_XEN
- bool "Xen Hypervisor Console support"
- depends on XEN
- select HVC_DRIVER
- select HVC_IRQ
- default y
- help
- Xen virtual console device driver
-
-config HVC_UDBG
- bool "udbg based fake hypervisor console"
- depends on PPC && EXPERIMENTAL
- select HVC_DRIVER
- default n
-
-config VIRTIO_CONSOLE
- tristate "Virtio console"
- depends on VIRTIO
- select HVC_DRIVER
- help
- Virtio console for use with lguest and other hypervisors.
-
- Also serves as a general-purpose serial device for data
- transfer between the guest and host. Character devices at
- /dev/vportNpn will be created when corresponding ports are
- found, where N is the device number and n is the port number
- within that device. If specified by the host, a sysfs
- attribute called 'name' will be populated with a name for
- the port which can be used by udev scripts to create a
- symlink to the device.
-
-config HVCS
- tristate "IBM Hypervisor Virtual Console Server support"
- depends on PPC_PSERIES && HVC_CONSOLE
- help
- Partitionable IBM Power5 ppc64 machines allow hosting of
- firmware virtual consoles from one Linux partition by
- another Linux partition. This driver allows console data
- from Linux partitions to be accessed through TTY device
- interfaces in the device tree of a Linux partition running
- this driver.
-
- To compile this driver as a module, choose M here: the
- module will be called hvcs. Additionally, this module
- will depend on arch specific APIs exported from hvcserver.ko
- which will also be compiled when this driver is built as a
- module.
+source "drivers/tty/hvc/Kconfig"

config IBM_BSR
tristate "IBM POWER Barrier Synchronization Register support"
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index f507df7..d2fd481 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -30,24 +30,12 @@ obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o
obj-$(CONFIG_RIO) += rio/ generic_serial.o
-obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o
-obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o
-obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o
-obj-$(CONFIG_HVC_TILE) += hvc_tile.o
-obj-$(CONFIG_HVC_BEAT) += hvc_beat.o
-obj-$(CONFIG_HVC_DRIVER) += hvc_console.o
-obj-$(CONFIG_HVC_IRQ) += hvc_irq.o
-obj-$(CONFIG_HVC_XEN) += hvc_xen.o
-obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
-obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
-obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
obj-$(CONFIG_RAW_DRIVER) += raw.o
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
obj-$(CONFIG_MSPEC) += mspec.o
obj-$(CONFIG_MMTIMER) += mmtimer.o
obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o
obj-$(CONFIG_VIOTAPE) += viotape.o
-obj-$(CONFIG_HVCS) += hvcs.o
obj-$(CONFIG_IBM_BSR) += bsr.o
obj-$(CONFIG_SGI_MBCS) += mbcs.o
obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 5845211..938cb73 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -17,6 +17,8 @@ obj-$(CONFIG_AUDIT) += tty_audit.o

obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o

+obj-$(CONFIG_HVC_DRIVER) += hvc/
+
obj-y += n_tty.o
obj-$(CONFIG_N_HDLC) += n_hdlc.o
obj-$(CONFIG_N_GSM) += n_gsm.o
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
new file mode 100644
index 0000000..5341b5d
--- /dev/null
+++ b/drivers/tty/hvc/Kconfig
@@ -0,0 +1,104 @@
+config HVC_DRIVER
+ bool
+ help
+ Generic "hypervisor virtual console" infrastructure for various
+ hypervisors (pSeries, iSeries, Xen, lguest).
+ It will automatically be selected if one of the back-end console drivers
+ is selected.
+
+config HVC_IRQ
+ bool
+
+config HVC_CONSOLE
+ bool "pSeries Hypervisor Virtual Console support"
+ depends on PPC_PSERIES
+ select HVC_DRIVER
+ select HVC_IRQ
+ help
+ pSeries machines when partitioned support a hypervisor virtual
+ console. This driver allows each pSeries partition to have a console
+ which is accessed via the HMC.
+
+config HVC_ISERIES
+ bool "iSeries Hypervisor Virtual Console support"
+ depends on PPC_ISERIES
+ default y
+ select HVC_DRIVER
+ select HVC_IRQ
+ select VIOPATH
+ help
+ iSeries machines support a hypervisor virtual console.
+
+config HVC_RTAS
+ bool "IBM RTAS Console support"
+ depends on PPC_RTAS
+ select HVC_DRIVER
+ help
+ IBM Console device driver which makes use of RTAS
+
+config HVC_BEAT
+ bool "Toshiba's Beat Hypervisor Console support"
+ depends on PPC_CELLEB
+ select HVC_DRIVER
+ help
+ Toshiba's Cell Reference Set Beat Console device driver
+
+config HVC_IUCV
+ bool "z/VM IUCV Hypervisor console support (VM only)"
+ depends on S390
+ select HVC_DRIVER
+ select IUCV
+ default y
+ help
+ This driver provides a Hypervisor console (HVC) back-end to access
+ a Linux (console) terminal via a z/VM IUCV communication path.
+
+config HVC_XEN
+ bool "Xen Hypervisor Console support"
+ depends on XEN
+ select HVC_DRIVER
+ select HVC_IRQ
+ default y
+ help
+ Xen virtual console device driver
+
+config HVC_UDBG
+ bool "udbg based fake hypervisor console"
+ depends on PPC && EXPERIMENTAL
+ select HVC_DRIVER
+ default n
+
+config VIRTIO_CONSOLE
+ tristate "Virtio console"
+ depends on VIRTIO
+ select HVC_DRIVER
+ help
+ Virtio console for use with lguest and other hypervisors.
+
+ Also serves as a general-purpose serial device for data
+ transfer between the guest and host. Character devices at
+ /dev/vportNpn will be created when corresponding ports are
+ found, where N is the device number and n is the port number
+ within that device. If specified by the host, a sysfs
+ attribute called 'name' will be populated with a name for
+ the port which can be used by udev scripts to create a
+ symlink to the device.
+
+config HVCS
+ tristate "IBM Hypervisor Virtual Console Server support"
+ depends on PPC_PSERIES && HVC_CONSOLE
+ help
+ Partitionable IBM Power5 ppc64 machines allow hosting of
+ firmware virtual consoles from one Linux partition by
+ another Linux partition. This driver allows console data
+ from Linux partitions to be accessed through TTY device
+ interfaces in the device tree of a Linux partition running
+ this driver.
+
+ To compile this driver as a module, choose M here: the
+ module will be called hvcs. Additionally, this module
+ will depend on arch specific APIs exported from hvcserver.ko
+ which will also be compiled when this driver is built as a
+ module.
+
+
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
new file mode 100644
index 0000000..1e7b978
--- /dev/null
+++ b/drivers/tty/hvc/Makefile
@@ -0,0 +1,12 @@
+obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o
+obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o
+obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o
+obj-$(CONFIG_HVC_TILE) += hvc_tile.o
+obj-$(CONFIG_HVC_BEAT) += hvc_beat.o
+obj-$(CONFIG_HVC_DRIVER) += hvc_console.o
+obj-$(CONFIG_HVC_IRQ) += hvc_irq.o
+obj-$(CONFIG_HVC_XEN) += hvc_xen.o
+obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
+obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
+obj-$(CONFIG_HVCS) += hvcs.o
+obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
diff --git a/drivers/char/hvc_beat.c b/drivers/tty/hvc/hvc_beat.c
similarity index 100%
rename from drivers/char/hvc_beat.c
rename to drivers/tty/hvc/hvc_beat.c
diff --git a/drivers/char/hvc_console.c b/drivers/tty/hvc/hvc_console.c
similarity index 100%
rename from drivers/char/hvc_console.c
rename to drivers/tty/hvc/hvc_console.c
diff --git a/drivers/char/hvc_console.h b/drivers/tty/hvc/hvc_console.h
similarity index 100%
rename from drivers/char/hvc_console.h
rename to drivers/tty/hvc/hvc_console.h
diff --git a/drivers/char/hvc_irq.c b/drivers/tty/hvc/hvc_irq.c
similarity index 100%
rename from drivers/char/hvc_irq.c
rename to drivers/tty/hvc/hvc_irq.c
diff --git a/drivers/char/hvc_iseries.c b/drivers/tty/hvc/hvc_iseries.c
similarity index 100%
rename from drivers/char/hvc_iseries.c
rename to drivers/tty/hvc/hvc_iseries.c
diff --git a/drivers/char/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
similarity index 100%
rename from drivers/char/hvc_iucv.c
rename to drivers/tty/hvc/hvc_iucv.c
diff --git a/drivers/char/hvc_rtas.c b/drivers/tty/hvc/hvc_rtas.c
similarity index 100%
rename from drivers/char/hvc_rtas.c
rename to drivers/tty/hvc/hvc_rtas.c
diff --git a/drivers/char/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
similarity index 100%
rename from drivers/char/hvc_tile.c
rename to drivers/tty/hvc/hvc_tile.c
diff --git a/drivers/char/hvc_udbg.c b/drivers/tty/hvc/hvc_udbg.c
similarity index 100%
rename from drivers/char/hvc_udbg.c
rename to drivers/tty/hvc/hvc_udbg.c
diff --git a/drivers/char/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
similarity index 100%
rename from drivers/char/hvc_vio.c
rename to drivers/tty/hvc/hvc_vio.c
diff --git a/drivers/char/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
similarity index 100%
rename from drivers/char/hvc_xen.c
rename to drivers/tty/hvc/hvc_xen.c
diff --git a/drivers/char/hvcs.c b/drivers/tty/hvc/hvcs.c
similarity index 100%
rename from drivers/char/hvcs.c
rename to drivers/tty/hvc/hvcs.c
diff --git a/drivers/char/hvsi.c b/drivers/tty/hvc/hvsi.c
similarity index 100%
rename from drivers/char/hvsi.c
rename to drivers/tty/hvc/hvsi.c
diff --git a/drivers/char/virtio_console.c b/drivers/tty/hvc/virtio_console.c
similarity index 100%
rename from drivers/char/virtio_console.c
rename to drivers/tty/hvc/virtio_console.c
--
1.7.1

2010-08-29 21:07:30

[permalink] [raw]

Subject: [PATCH 1/5] tty: move tty layer code to drivers/tty

This separates the core tty code from tty and other
character device drivers, in order to get a cleaner
structure.

Signed-off-by: Arnd Bergmann <[email protected]>
---
MAINTAINERS | 2 +-
drivers/Makefile | 1 +
drivers/char/Kconfig | 97 +-----------------------------------
drivers/char/Makefile | 10 +---
drivers/tty/Kconfig | 96 +++++++++++++++++++++++++++++++++++
drivers/tty/Makefile | 22 ++++++++
drivers/{char => tty}/n_gsm.c | 0
drivers/{char => tty}/n_hdlc.c | 0
drivers/{char => tty}/n_r3964.c | 0
drivers/{char => tty}/n_tty.c | 0
drivers/{char => tty}/pty.c | 0
drivers/{char => tty}/sysrq.c | 0
drivers/{char => tty}/tty_audit.c | 0
drivers/{char => tty}/tty_buffer.c | 0
drivers/{char => tty}/tty_io.c | 0
drivers/{char => tty}/tty_ioctl.c | 0
drivers/{char => tty}/tty_ldisc.c | 0
drivers/{char => tty}/tty_mutex.c | 0
drivers/{char => tty}/tty_port.c | 0
19 files changed, 122 insertions(+), 106 deletions(-)
create mode 100644 drivers/tty/Kconfig
create mode 100644 drivers/tty/Makefile
rename drivers/{char => tty}/n_gsm.c (100%)
rename drivers/{char => tty}/n_hdlc.c (100%)
rename drivers/{char => tty}/n_r3964.c (100%)
rename drivers/{char => tty}/n_tty.c (100%)
rename drivers/{char => tty}/pty.c (100%)
rename drivers/{char => tty}/sysrq.c (100%)
rename drivers/{char => tty}/tty_audit.c (100%)
rename drivers/{char => tty}/tty_buffer.c (100%)
rename drivers/{char => tty}/tty_io.c (100%)
rename drivers/{char => tty}/tty_ioctl.c (100%)
rename drivers/{char => tty}/tty_ldisc.c (100%)
rename drivers/{char => tty}/tty_mutex.c (100%)
rename drivers/{char => tty}/tty_port.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 39d8c5c..794f630 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5734,7 +5734,7 @@ TTY LAYER
M: Greg Kroah-Hartman <[email protected]>
S: Maintained
T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
-F: drivers/char/tty_*
+F: drivers/tty/tty_*
F: drivers/serial/serial_core.c
F: include/linux/serial_core.h
F: include/linux/serial.h
diff --git a/drivers/Makefile b/drivers/Makefile
index ae47344..4e186dd 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_REGULATOR) += regulator/

# char/ comes before serial/ etc so that the VT console is the boot-time
# default.
+obj-y += tty/
obj-y += char/

# gpu/ comes after char for AGP vs DRM startup
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 3d44ec7..7beee39 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -269,26 +269,6 @@ config SYNCLINK_GT
synchronous and asynchronous serial adapters
manufactured by Microgate Systems, Ltd. (http://www.microgate.com)

-config N_HDLC
- tristate "HDLC line discipline support"
- depends on SERIAL_NONSTANDARD
- help
- Allows synchronous HDLC communications with tty device drivers that
- support synchronous HDLC such as the Microgate SyncLink adapter.
-
- This driver can be built as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called n_hdlc. If you want to do that, say M
- here.
-
-config N_GSM
- tristate "GSM MUX line discipline support (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- depends on NET
- help
- This line discipline provides support for the GSM MUX protocol and
- presents the mux as a set of 61 individual tty devices.
-
config RISCOM8
tristate "SDL RISCom/8 card support"
depends on SERIAL_NONSTANDARD
@@ -428,70 +408,7 @@ config SGI_MBCS

source "drivers/serial/Kconfig"

-config UNIX98_PTYS
- bool "Unix98 PTY support" if EMBEDDED
- default y
- ---help---
- A pseudo terminal (PTY) is a software device consisting of two
- halves: a master and a slave. The slave device behaves identical to
- a physical terminal; the master device is used by a process to
- read data from and write data to the slave, thereby emulating a
- terminal. Typical programs for the master side are telnet servers
- and xterms.
-
- Linux has traditionally used the BSD-like names /dev/ptyxx for
- masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
- has a number of problems. The GNU C library glibc 2.1 and later,
- however, supports the Unix98 naming standard: in order to acquire a
- pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
- terminal is then made available to the process and the pseudo
- terminal slave can be accessed as /dev/pts/<number>. What was
- traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
-
- All modern Linux systems use the Unix98 ptys. Say Y unless
- you're on an embedded system and want to conserve memory.
-
-config DEVPTS_MULTIPLE_INSTANCES
- bool "Support multiple instances of devpts"
- depends on UNIX98_PTYS
- default n
- ---help---
- Enable support for multiple instances of devpts filesystem.
- If you want to have isolated PTY namespaces (eg: in containers),
- say Y here. Otherwise, say N. If enabled, each mount of devpts
- filesystem with the '-o newinstance' option will create an
- independent PTY namespace.
-
-config LEGACY_PTYS
- bool "Legacy (BSD) PTY support"
- default y
- ---help---
- A pseudo terminal (PTY) is a software device consisting of two
- halves: a master and a slave. The slave device behaves identical to
- a physical terminal; the master device is used by a process to
- read data from and write data to the slave, thereby emulating a
- terminal. Typical programs for the master side are telnet servers
- and xterms.
-
- Linux has traditionally used the BSD-like names /dev/ptyxx
- for masters and /dev/ttyxx for slaves of pseudo
- terminals. This scheme has a number of problems, including
- security. This option enables these legacy devices; on most
- systems, it is safe to say N.
-
-
-config LEGACY_PTY_COUNT
- int "Maximum number of legacy PTY in use"
- depends on LEGACY_PTYS
- range 0 256
- default "256"
- ---help---
- The maximum number of legacy PTYs that can be used at any one time.
- The default is 256, and should be more than enough. Embedded
- systems may want to reduce this to save memory.
-
- When not in use, each legacy PTY occupies 12 bytes on 32-bit
- architectures and 24 bytes on 64-bit architectures.
+source "drivers/tty/Kconfig"

config BRIQ_PANEL
tristate 'Total Impact briQ front panel driver'
@@ -917,18 +834,6 @@ config XILINX_HWICAP

If unsure, say N.

-config R3964
- tristate "Siemens R3964 line discipline"
- ---help---
- This driver allows synchronous communication with devices using the
- Siemens R3964 packet protocol. Unless you are dealing with special
- hardware like PLCs, you are unlikely to need this.
-
- To compile this driver as a module, choose M here: the
- module will be called n_r3964.
-
- If unsure, say N.
-
config APPLICOM
tristate "Applicom intelligent fieldbus card support"
depends on PCI
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index dc96416..b7e6058 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -7,18 +7,13 @@
#
FONTMAPFILE = cp437.uni

-obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o
+obj-y += mem.o random.o

-obj-y += tty_mutex.o
-obj-$(CONFIG_LEGACY_PTYS) += pty.o
-obj-$(CONFIG_UNIX98_PTYS) += pty.o
obj-y += misc.o
obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o
obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
-obj-$(CONFIG_AUDIT) += tty_audit.o
-obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
@@ -40,8 +35,6 @@ obj-$(CONFIG_ISI) += isicom.o
obj-$(CONFIG_SYNCLINK) += synclink.o
obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
-obj-$(CONFIG_N_HDLC) += n_hdlc.o
-obj-$(CONFIG_N_GSM) += n_gsm.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o
obj-$(CONFIG_RIO) += rio/ generic_serial.o
@@ -73,7 +66,6 @@ obj-$(CONFIG_PRINTER) += lp.o
obj-$(CONFIG_APM_EMULATION) += apm-emulation.o

obj-$(CONFIG_DTLK) += dtlk.o
-obj-$(CONFIG_R3964) += n_r3964.o
obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
new file mode 100644
index 0000000..a245618
--- /dev/null
+++ b/drivers/tty/Kconfig
@@ -0,0 +1,96 @@
+config UNIX98_PTYS
+ bool "Unix98 PTY support" if EMBEDDED
+ default y
+ ---help---
+ A pseudo terminal (PTY) is a software device consisting of two
+ halves: a master and a slave. The slave device behaves identical to
+ a physical terminal; the master device is used by a process to
+ read data from and write data to the slave, thereby emulating a
+ terminal. Typical programs for the master side are telnet servers
+ and xterms.
+
+ Linux has traditionally used the BSD-like names /dev/ptyxx for
+ masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
+ has a number of problems. The GNU C library glibc 2.1 and later,
+ however, supports the Unix98 naming standard: in order to acquire a
+ pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
+ terminal is then made available to the process and the pseudo
+ terminal slave can be accessed as /dev/pts/<number>. What was
+ traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
+
+ All modern Linux systems use the Unix98 ptys. Say Y unless
+ you're on an embedded system and want to conserve memory.
+
+config DEVPTS_MULTIPLE_INSTANCES
+ bool "Support multiple instances of devpts"
+ depends on UNIX98_PTYS
+ default n
+ ---help---
+ Enable support for multiple instances of devpts filesystem.
+ If you want to have isolated PTY namespaces (eg: in containers),
+ say Y here. Otherwise, say N. If enabled, each mount of devpts
+ filesystem with the '-o newinstance' option will create an
+ independent PTY namespace.
+
+config LEGACY_PTYS
+ bool "Legacy (BSD) PTY support"
+ default y
+ ---help---
+ A pseudo terminal (PTY) is a software device consisting of two
+ halves: a master and a slave. The slave device behaves identical to
+ a physical terminal; the master device is used by a process to
+ read data from and write data to the slave, thereby emulating a
+ terminal. Typical programs for the master side are telnet servers
+ and xterms.
+
+ Linux has traditionally used the BSD-like names /dev/ptyxx
+ for masters and /dev/ttyxx for slaves of pseudo
+ terminals. This scheme has a number of problems, including
+ security. This option enables these legacy devices; on most
+ systems, it is safe to say N.
+
+
+config LEGACY_PTY_COUNT
+ int "Maximum number of legacy PTY in use"
+ depends on LEGACY_PTYS
+ range 0 256
+ default "256"
+ ---help---
+ The maximum number of legacy PTYs that can be used at any one time.
+ The default is 256, and should be more than enough. Embedded
+ systems may want to reduce this to save memory.
+
+ When not in use, each legacy PTY occupies 12 bytes on 32-bit
+ architectures and 24 bytes on 64-bit architectures.
+
+config R3964
+ tristate "Siemens R3964 line discipline"
+ ---help---
+ This driver allows synchronous communication with devices using the
+ Siemens R3964 packet protocol. Unless you are dealing with special
+ hardware like PLCs, you are unlikely to need this.
+
+ To compile this driver as a module, choose M here: the
+ module will be called n_r3964.
+
+ If unsure, say N.
+
+config N_HDLC
+ tristate "HDLC line discipline support"
+ depends on SERIAL_NONSTANDARD
+ help
+ Allows synchronous HDLC communications with tty device drivers that
+ support synchronous HDLC such as the Microgate SyncLink adapter.
+
+ This driver can be built as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called n_hdlc. If you want to do that, say M
+ here.
+
+config N_GSM
+ tristate "GSM MUX line discipline support (EXPERIMENTAL)"
+ depends on EXPERIMENTAL
+ depends on NET
+ help
+ This line discipline provides support for the GSM MUX protocol and
+ presents the mux as a set of 61 individual tty devices.
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
new file mode 100644
index 0000000..562a96f
--- /dev/null
+++ b/drivers/tty/Makefile
@@ -0,0 +1,22 @@
+#
+# Makefile for the kernel tty device drivers.
+#
+
+obj-y += tty_io.o
+obj-y += tty_ioctl.o
+obj-y += tty_ldisc.o
+obj-y += tty_buffer.o
+obj-y += tty_port.o
+obj-y += tty_mutex.o
+
+obj-$(CONFIG_LEGACY_PTYS) += pty.o
+obj-$(CONFIG_UNIX98_PTYS) += pty.o
+
+obj-$(CONFIG_AUDIT) += tty_audit.o
+
+obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
+
+obj-y += n_tty.o
+obj-$(CONFIG_N_HDLC) += n_hdlc.o
+obj-$(CONFIG_N_GSM) += n_gsm.o
+obj-$(CONFIG_R3964) += n_r3964.o
diff --git a/drivers/char/n_gsm.c b/drivers/tty/n_gsm.c
similarity index 100%
rename from drivers/char/n_gsm.c
rename to drivers/tty/n_gsm.c
diff --git a/drivers/char/n_hdlc.c b/drivers/tty/n_hdlc.c
similarity index 100%
rename from drivers/char/n_hdlc.c
rename to drivers/tty/n_hdlc.c
diff --git a/drivers/char/n_r3964.c b/drivers/tty/n_r3964.c
similarity index 100%
rename from drivers/char/n_r3964.c
rename to drivers/tty/n_r3964.c
diff --git a/drivers/char/n_tty.c b/drivers/tty/n_tty.c
similarity index 100%
rename from drivers/char/n_tty.c
rename to drivers/tty/n_tty.c
diff --git a/drivers/char/pty.c b/drivers/tty/pty.c
similarity index 100%
rename from drivers/char/pty.c
rename to drivers/tty/pty.c
diff --git a/drivers/char/sysrq.c b/drivers/tty/sysrq.c
similarity index 100%
rename from drivers/char/sysrq.c
rename to drivers/tty/sysrq.c
diff --git a/drivers/char/tty_audit.c b/drivers/tty/tty_audit.c
similarity index 100%
rename from drivers/char/tty_audit.c
rename to drivers/tty/tty_audit.c
diff --git a/drivers/char/tty_buffer.c b/drivers/tty/tty_buffer.c
similarity index 100%
rename from drivers/char/tty_buffer.c
rename to drivers/tty/tty_buffer.c
diff --git a/drivers/char/tty_io.c b/drivers/tty/tty_io.c
similarity index 100%
rename from drivers/char/tty_io.c
rename to drivers/tty/tty_io.c
diff --git a/drivers/char/tty_ioctl.c b/drivers/tty/tty_ioctl.c
similarity index 100%
rename from drivers/char/tty_ioctl.c
rename to drivers/tty/tty_ioctl.c
diff --git a/drivers/char/tty_ldisc.c b/drivers/tty/tty_ldisc.c
similarity index 100%
rename from drivers/char/tty_ldisc.c
rename to drivers/tty/tty_ldisc.c
diff --git a/drivers/char/tty_mutex.c b/drivers/tty/tty_mutex.c
similarity index 100%
rename from drivers/char/tty_mutex.c
rename to drivers/tty/tty_mutex.c
diff --git a/drivers/char/tty_port.c b/drivers/tty/tty_port.c
similarity index 100%
rename from drivers/char/tty_port.c
rename to drivers/tty/tty_port.c
--
1.7.1

2010-08-29 21:52:17

[permalink] [raw]

Subject: Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw

On Sun, Aug 29, 2010 at 17:06, Arnd Bergmann wrote:
> Random obsolete tty drivers are mixed with random
> other stuff in drivers/char, this moves all the
> tty drivers into one place.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> MAINTAINERS | 22 +-
> drivers/char/Kconfig | 287 +------------------
> drivers/char/Makefile | 28 +--
> drivers/char/pcmcia/Kconfig | 22 --
> drivers/char/pcmcia/Makefile | 3 -
> drivers/tty/Makefile | 1 +
> drivers/tty/hw/Kconfig | 308 ++++++++++++++++++++
> drivers/tty/hw/Makefile | 27 ++
> drivers/{char => tty/hw}/amiserial.c | 0

does it need to be in tty/hw/ ? seems like there's so little in tty/
to not bother with a further hw/ ...
-mike
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?

2010-08-29 23:00:59

by Alan

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

> Of course, moving stuff around always has the tendency to
> break patches against it, so we might not want to do this after
> all.
>
> Any other opinions?

Linus actually suggested this should get done in some form a while ago
back when I was tty maintainer but about the same time as I decided not
to be.

> tty: move tty layer code to drivers/tty

I would be tempted to put the core stuff in /tty as its not drivers

> tty/vt: move files to drivers/tty/vt/
> tty/hvc: move files to drivers/tty/hvc
> tty/hw: move hardware drivers to drivers/tty/hw
> tty: rearrange Kconfig structure

drivers/serial should also walk into tty I think ?

drivers/pcmcia/serial is a bit trickier but I guess should stay as with
drivers/usb/serial

There are several unbuildable ancient drivers. Perhaps if we are having
the great rename those should simply get deleted first, as there is no
way to test them in their current config ?

2010-08-30 08:55:54

[permalink] [raw]

Subject: Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw

On Sunday 29 August 2010, Mike Frysinger wrote:
> > MAINTAINERS | 22 +-
> > drivers/char/Kconfig | 287 +------------------
> > drivers/char/Makefile | 28 +--
> > drivers/char/pcmcia/Kconfig | 22 --
> > drivers/char/pcmcia/Makefile | 3 -
> > drivers/tty/Makefile | 1 +
> > drivers/tty/hw/Kconfig | 308 ++++++++++++++++++++
> > drivers/tty/hw/Makefile | 27 ++
> > drivers/{char => tty/hw}/amiserial.c | 0
>
> does it need to be in tty/hw/ ? seems like there's so little in tty/
> to not bother with a further hw/ ...

Well, the idea here was to split the stuff that is commonly used
from the obsolete drivers.

BTW, the bfin_jtag_comm.c looks less obsolete than the rest of those
drivers, so I wasn't completely sure whether or not to move it into
the same place as the others.
My impression was that it should actually be converted into an hvc
driver as a cleanup and moved to drivers/tty/hvc. It can probably
get reduced to one third of its size if you do that.

Arnd

2010-08-30 10:36:27

by Alan

[permalink] [raw]

Subject: Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw

> BTW, the bfin_jtag_comm.c looks less obsolete than the rest of those
> drivers, so I wasn't completely sure whether or not to move it into
> the same place as the others.

bfin_jtag is current

> My impression was that it should actually be converted into an hvc
> driver as a cleanup and moved to drivers/tty/hvc. It can probably
> get reduced to one third of its size if you do that.

Not sure it makes sense - hvc seems the wrong abstraction.

Alan

2010-08-30 11:37:35

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Monday 30 August 2010, Alan Cox wrote:
> > Of course, moving stuff around always has the tendency to
> > break patches against it, so we might not want to do this after
> > all.
> >
> > Any other opinions?
>
> Linus actually suggested this should get done in some form a while ago
> back when I was tty maintainer but about the same time as I decided not
> to be.

ok.

> > tty: move tty layer code to drivers/tty
>
> I would be tempted to put the core stuff in /tty as its not drivers

Do you consider vt to be core (I guess yes)? What about hvc (I guess no)?

> > tty/vt: move files to drivers/tty/vt/
> > tty/hvc: move files to drivers/tty/hvc
> > tty/hw: move hardware drivers to drivers/tty/hw
> > tty: rearrange Kconfig structure
>
> drivers/serial should also walk into tty I think ?

Yes, good point.

> drivers/pcmcia/serial is a bit trickier but I guess should stay as with
> drivers/usb/serial

I don't see drivers/pcmcia/serial. Are you thinking of the tty drivers
in drivers/char/pcmcia? I moved both of these to drivers/tty/hw
in my patch.

> There are several unbuildable ancient drivers. Perhaps if we are having
> the great rename those should simply get deleted first, as there is no
> way to test them in their current config ?

These are the drivers I was planning to move:
+obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
+obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
+obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
+obj-$(CONFIG_ROCKETPORT) += rocket.o
+obj-$(CONFIG_SERIAL167) += serial167.o
+obj-$(CONFIG_CYCLADES) += cyclades.o
+obj-$(CONFIG_STALLION) += stallion.o
+obj-$(CONFIG_ISTALLION) += istallion.o
+obj-$(CONFIG_NOZOMI) += nozomi.o
+obj-$(CONFIG_DIGIEPCA) += epca/
+obj-$(CONFIG_SPECIALIX) += specialix.o
+obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
+obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
+obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
+obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
+obj-$(CONFIG_COMPUTONE) += ip2/
+obj-$(CONFIG_RISCOM8) += riscom8.o
+obj-$(CONFIG_ISI) += isicom.o
+obj-$(CONFIG_SYNCLINK) += synclink.o
+obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
+obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
+obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
+obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
+obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
+obj-$(CONFIG_SX) += sx.o generic_serial.o
+obj-$(CONFIG_RIO) += rio/ generic_serial.o
+obj-$(CONFIG_IPWIRELESS) += ipwireless/

Which of these do you think should get deleted?

AFAICT, the only ones that are getting nontrivial updates once in
a while are amiserial, bfin_jtag_comm, isicom, cyclades. moxa, mxser,
nozomi, serial167, stallion and synclink, while the users of
generic_serial.o seem to be the ones getting the least attention.

Arnd

2010-08-30 11:55:15

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On 08/30/2010 01:37 PM, Arnd Bergmann wrote:
> These are the drivers I was planning to move:
> +obj-$(CONFIG_CYCLADES) += cyclades.o

There are some users still with CYY cards. No CYZ card users known to me.

> +obj-$(CONFIG_STALLION) += stallion.o
> +obj-$(CONFIG_ISTALLION) += istallion.o
...
> +obj-$(CONFIG_DIGIEPCA) += epca/
> +obj-$(CONFIG_SPECIALIX) += specialix.o

These 4 may go probably. I remember Alan suggested epca to be removed
few years ago.

> +obj-$(CONFIG_MOXA_INTELLIO) += moxa.o

Maybe few users left.

> +obj-$(CONFIG_MOXA_SMARTIO) += mxser.o

Still in use. (And supports relatively new devices; not the PCI-e ones
though.)

> +obj-$(CONFIG_COMPUTONE) += ip2/
> +obj-$(CONFIG_RISCOM8) += riscom8.o
> +obj-$(CONFIG_ISI) += isicom.o

Unused? isicom is broken last I heard.

thanks,
--
js
suse labs

2010-08-30 12:16:03

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Monday 30 August 2010, Jiri Slaby wrote:
> On 08/30/2010 01:37 PM, Arnd Bergmann wrote:
> > These are the drivers I was planning to move:
> > +obj-$(CONFIG_CYCLADES) += cyclades.o
>
> There are some users still with CYY cards. No CYZ card users known to me.
>
> > +obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
>
> Maybe few users left.
>
> > +obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
>
> Still in use. (And supports relatively new devices; not the PCI-e ones
> though.)

Are they all candidates for a conversion to serial_core then?
Or are they not sufficiently 8250-like?

Arnd

2010-08-30 12:28:39

[permalink] [raw]

Subject: Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw

On Monday 30 August 2010, Alan Cox wrote:
> > My impression was that it should actually be converted into an hvc
> > driver as a cleanup and moved to drivers/tty/hvc. It can probably
> > get reduced to one third of its size if you do that.
>
> Not sure it makes sense - hvc seems the wrong abstraction.

It seems to be very similar to hvc_tile.c in purpose, which is
the most trivial driver we have. Why would that not work?

Most of bfin_jtag_comm is about interfacing with the tty layer
and providing a kernel thread to do the polling, which is exactly
what hvc_console.c does.

Arnd

2010-08-30 12:42:51

by Alan

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Mon, 30 Aug 2010 14:15:56 +0200
Arnd Bergmann <[email protected]> wrote:

> On Monday 30 August 2010, Jiri Slaby wrote:
> > On 08/30/2010 01:37 PM, Arnd Bergmann wrote:
> > > These are the drivers I was planning to move:
> > > +obj-$(CONFIG_CYCLADES) += cyclades.o
> >
> > There are some users still with CYY cards. No CYZ card users known to me.
> >
> > > +obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
> >
> > Maybe few users left.
> >
> > > +obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
> >
> > Still in use. (And supports relatively new devices; not the PCI-e ones
> > though.)
>
> Are they all candidates for a conversion to serial_core then?
> Or are they not sufficiently 8250-like?

Please don't convert stuff to serial_core - it's got some horrible
problems with adapting to the new locking model, its buffering model
pre-dates kfifo and all in all serial_core needs a rewrite not more users.

2010-08-30 14:56:51

[permalink] [raw]

Subject: Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw

On Mon, Aug 30, 2010 at 08:28, Arnd Bergmann wrote:
> On Monday 30 August 2010, Alan Cox wrote:
>> > My impression was that it should actually be converted into an hvc
>> > driver as a cleanup and moved to drivers/tty/hvc. It can probably
>> > get reduced to one third of its size if you do that.
>>
>> Not sure it makes sense - hvc seems the wrong abstraction.
>
> It seems to be very similar to hvc_tile.c in purpose, which is
> the most trivial driver we have. Why would that not work?
>
> Most of bfin_jtag_comm is about interfacing with the tty layer
> and providing a kernel thread to do the polling, which is exactly
> what hvc_console.c does.

i have no idea what "hvc" is, but my limited knowledge was that it was
for large powerpc servers, so i didnt bother looking at it too much.
i simply wanted a way to create a tty on top of the hardware channel.
if there is a framework that doesnt break this usage and lets me
simplify my driver, then either works for me.
-mike

2010-08-30 15:25:04

[permalink] [raw]

Subject: Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw

On Monday 30 August 2010, Mike Frysinger wrote:
>
> On Mon, Aug 30, 2010 at 08:28, Arnd Bergmann wrote:
> > On Monday 30 August 2010, Alan Cox wrote:
> >> > My impression was that it should actually be converted into an hvc
> >> > driver as a cleanup and moved to drivers/tty/hvc. It can probably
> >> > get reduced to one third of its size if you do that.
> >>
> >> Not sure it makes sense - hvc seems the wrong abstraction.
> >
> > It seems to be very similar to hvc_tile.c in purpose, which is
> > the most trivial driver we have. Why would that not work?
> >
> > Most of bfin_jtag_comm is about interfacing with the tty layer
> > and providing a kernel thread to do the polling, which is exactly
> > what hvc_console.c does.
>
> i have no idea what "hvc" is, but my limited knowledge was that it was
> for large powerpc servers, so i didnt bother looking at it too much.
> i simply wanted a way to create a tty on top of the hardware channel.
> if there is a framework that doesnt break this usage and lets me
> simplify my driver, then either works for me.

HVC started out as the console for large powerpc, but has turned into
a generic framework for TTY drivers that are based on simple read/write
operations with or without interrupts.

Please take a look at drivers/char/hvc_tile.c, which was added recently
for a scenario quite similar to yours (debug port, not irq).

Arnd

2010-08-30 15:26:27

[permalink] [raw]

Subject: Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw

On Mon, Aug 30, 2010 at 11:25, Arnd Bergmann wrote:
> On Monday 30 August 2010, Mike Frysinger wrote:
>> On Mon, Aug 30, 2010 at 08:28, Arnd Bergmann wrote:
>> > On Monday 30 August 2010, Alan Cox wrote:
>> >> > My impression was that it should actually be converted into an hvc
>> >> > driver as a cleanup and moved to drivers/tty/hvc. It can probably
>> >> > get reduced to one third of its size if you do that.
>> >>
>> >> Not sure it makes sense - hvc seems the wrong abstraction.
>> >
>> > It seems to be very similar to hvc_tile.c in purpose, which is
>> > the most trivial driver we have. Why would that not work?
>> >
>> > Most of bfin_jtag_comm is about interfacing with the tty layer
>> > and providing a kernel thread to do the polling, which is exactly
>> > what hvc_console.c does.
>>
>> i have no idea what "hvc" is, but my limited knowledge was that it was
>> for large powerpc servers, so i didnt bother looking at it too much.
>> i simply wanted a way to create a tty on top of the hardware channel.
>> if there is a framework that doesnt break this usage and lets me
>> simplify my driver, then either works for me.
>
> HVC started out as the console for large powerpc, but has turned into
> a generic framework for TTY drivers that are based on simple read/write
> operations with or without interrupts.
>
> Please take a look at drivers/char/hvc_tile.c, which was added recently
> for a scenario quite similar to yours (debug port, not irq).

will do, thanks
-mike

2010-08-30 20:00:04

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Sun, Aug 29, 2010 at 11:06:30PM +0200, Arnd Bergmann wrote:
> Hi Greg,
>
> After fighting with the BKL removal in tty, I realized that the
> files in drivers/char could use a reorganization to split the
> tty files from those drivers that have nothing to do with ttys.

<snip>

I like the idea, and after you've worked out with Alan which ones should
be "deleted" and others moved around, I'll be glad to apply these types
of patches.

Oh, we shouldn't just delete the drivers, we can move them to
drivers/staging/ where they will then be removed after 2 kernel releases
if no one steps up to fix/maintain them. That's the "proper" way to
depreciate a driver.

> Of course, moving stuff around always has the tendency to
> break patches against it, so we might not want to do this after
> all.

Nah, it's no problem to this, git can handle renames just fine :)

thanks,

greg k-h

2010-08-30 21:04:56

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Monday 30 August 2010 15:00:54 Alan Cox wrote:
> >
> > Are they all candidates for a conversion to serial_core then?
> > Or are they not sufficiently 8250-like?
>
> Please don't convert stuff to serial_core - it's got some horrible
> problems with adapting to the new locking model, its buffering model
> pre-dates kfifo and all in all serial_core needs a rewrite not more users.

Ok. I was under the illusion that drivers/serial contained the good
stuff while drivers/char/ had all the bad serial drivers that nobody
cared to convert. Do I understand you correctly that there is actually
not a single serial driver that can serve as a good example for other
drivers then?

Arnd

2010-08-30 21:33:34

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Monday 30 August 2010 20:47:37 Greg KH wrote:
> On Sun, Aug 29, 2010 at 11:06:30PM +0200, Arnd Bergmann wrote:
> > Hi Greg,
> >
> > After fighting with the BKL removal in tty, I realized that the
> > files in drivers/char could use a reorganization to split the
> > tty files from those drivers that have nothing to do with ttys.
>
> <snip>
>
> I like the idea, and after you've worked out with Alan which ones should
> be "deleted" and others moved around, I'll be glad to apply these types
> of patches.
>
> Oh, we shouldn't just delete the drivers, we can move them to
> drivers/staging/ where they will then be removed after 2 kernel releases
> if no one steps up to fix/maintain them. That's the "proper" way to
> depreciate a driver.

Ok, I was already wondering if this would be the right way.

With the feedback I have so far, I think we have

drivers/char/tty_* -> tty/*
drivers/char/{vt stuff} -> tty/vt/
drivers/char/hvc_* -> drivers/tty/hvc/hvc_*
drivers/serial/* -> drivers/tty/serial/*
drivers/usb/serial -> drivers/usb/serial

cyclades,moxa,mxser -> drivers/tty/hw/

stallion,istallion,
epca,specialix,ip2,
riscom,isicom -> drivers/staging/tty/*

generic_serial,vme_scc,
ser_a2232,sx,rio -> drivers/staging/generic_serial/*

amiserial,nozomi,
serial167,synclink -> drivers/tty/hw (?)

bfin_jtag_comm -> drivers/tty/hvc/hvc_bfin_jtag (?)

rocket,ipwireless -> drivers/staging/tty/* (?)

I'll wait a few days for other suggestions and then prepare
a new patch series.

Arnd

2010-08-30 21:39:01

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On 08/30/2010 11:33 PM, Arnd Bergmann wrote:
> With the feedback I have so far, I think we have
>
> drivers/char/tty_* -> tty/*
> drivers/char/{vt stuff} -> tty/vt/
> drivers/char/hvc_* -> drivers/tty/hvc/hvc_*
> drivers/serial/* -> drivers/tty/serial/*
> drivers/usb/serial -> drivers/usb/serial
>
> cyclades,moxa,mxser -> drivers/tty/hw/

I wouldn't go for hw subdir. IMHO 'drivers' is enough.

> amiserial,nozomi,
> serial167,synclink -> drivers/tty/hw (?)

Yeah, sorry I forgot about nozomi. It is used by some 3G cards or
anything currently. It was added only few years ago and people report
bugs against that too :), so is in use.

regards,
--
js
suse labs

2010-08-30 22:09:52

by Alan

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

> drivers/char/tty_* -> tty/*
> drivers/char/{vt stuff} -> tty/vt/
> drivers/char/hvc_* -> drivers/tty/hvc/hvc_*
> drivers/serial/* -> drivers/tty/serial/*

There are dead bits in there too we should prune 68xxx stuff mostly

> drivers/usb/serial -> drivers/usb/serial
>
> cyclades,moxa,mxser -> drivers/tty/hw/
>
> stallion,istallion,
> epca,specialix,ip2,
> riscom,isicom -> drivers/staging/tty/*

isicom has users and gets tested a bit, not sure about ip2/specialix.

> generic_serial,vme_scc,
> ser_a2232,sx,rio -> drivers/staging/generic_serial/*
>
> amiserial,nozomi,
> serial167,synclink -> drivers/tty/hw (?)

Why /hw - its a tty driver so drivers/tty - the non hw stuff is now in
tty/

serial167 is dead/staging stuff, synclink* are used

> bfin_jtag_comm -> drivers/tty/hvc/hvc_bfin_jtag (?)

Nothing to do with hvc

> rocket,ipwireless -> drivers/staging/tty/* (?)

Rocket is used, ipwireless I think is also used

Alan

2010-08-31 04:11:20

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Mon, Aug 30, 2010 at 11:33:22PM +0200, Arnd Bergmann wrote:
> I'll wait a few days for other suggestions and then prepare
> a new patch series.

Sounds great, thanks for doing this.

greg k-h

2010-08-31 06:10:17

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On 08/31/2010 12:28 AM, Alan Cox wrote:
>> riscom,isicom -> drivers/staging/tty/*
>
> isicom has users and gets tested a bit

Are you sure about isicom:
https://bugzilla.kernel.org/show_bug.cgi?id=11067
? The last kernel he tried was 2.6.28 and there isicom sleeps forever in
isicom_open.

thanks,
--
js
suse labs

2010-08-31 09:15:24

by Alan

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Tue, 31 Aug 2010 08:08:57 +0200
Jiri Slaby <[email protected]> wrote:

> On 08/31/2010 12:28 AM, Alan Cox wrote:
> >> riscom,isicom -> drivers/staging/tty/*
> >
> > isicom has users and gets tested a bit
>
> Are you sure about isicom:

There certainly were people using it, which suggests maybe it needs
looking at not binning.

Alan

2010-08-31 09:19:13

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On 08/31/2010 11:33 AM, Alan Cox wrote:
> On Tue, 31 Aug 2010 08:08:57 +0200
> Jiri Slaby <[email protected]> wrote:
>
>> On 08/31/2010 12:28 AM, Alan Cox wrote:
>>>> riscom,isicom -> drivers/staging/tty/*
>>>
>>> isicom has users and gets tested a bit
>>
>> Are you sure about isicom:
>
> There certainly were people using it, which suggests maybe it needs
> looking at not binning.

Ok, thanks. Anyway I'll remove myself as a maintainer, since I'm not
anymore.

--
js
suse labs

2010-08-31 09:20:05

[permalink] [raw]

Subject: [PATCH 1/1] MAINTAINERS: remove isicom

I do not maintain isicom anymore...

Signed-off-by: Jiri Slaby <[email protected]>
---
MAINTAINERS | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index e24eb2d..8bab6f3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3923,12 +3923,6 @@ S: Maintained
F: Documentation/sound/oss/MultiSound
F: sound/oss/msnd*

-MULTITECH MULTIPORT CARD (ISICOM)
-M: Jiri Slaby <[email protected]>
-S: Maintained
-F: drivers/char/isicom.c
-F: include/linux/isicom.h
-
MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
M: Felipe Balbi <[email protected]>
L: [email protected]
--
1.7.2.2

2010-08-31 09:26:55

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Tuesday 31 August 2010, Alan Cox wrote:
> > drivers/char/tty_* -> tty/*
> > drivers/char/{vt stuff} -> tty/vt/
> > drivers/char/hvc_* -> drivers/tty/hvc/hvc_*
> > drivers/serial/* -> drivers/tty/serial/*
>
> There are dead bits in there too we should prune 68xxx stuff mostly

Geert, can you comment on the 68k serial drivers? Which
ones are to stay, which ones can get phased out?

> > drivers/usb/serial -> drivers/usb/serial
> >
> > cyclades,moxa,mxser -> drivers/tty/hw/
> >
> > stallion,istallion,
> > epca,specialix,ip2,
> > riscom,isicom -> drivers/staging/tty/*
>
> isicom has users and gets tested a bit, not sure about ip2/specialix.

I'll leave isicom then.

Specialix is marked in MAINTAINERS as supported by Roger, ip2
is maintained by Michael, maybe they have a preference for their
drivers.

Both drivers have a web page that is ~10 years old, which hints
that there is probably not much new hardware around.

> > generic_serial,vme_scc,
> > ser_a2232,sx,rio -> drivers/staging/generic_serial/*
> >
> > amiserial,nozomi,
> > serial167,synclink -> drivers/tty/hw (?)
>
> Why /hw - its a tty driver so drivers/tty - the non hw stuff is now in
> tty/

Right, makes sense.

> serial167 is dead/staging stuff, synclink* are used

ok

> > bfin_jtag_comm -> drivers/tty/hvc/hvc_bfin_jtag (?)
>
> Nothing to do with hvc

Not yet ;-)

You didn't reply to my question why it couldn't be. I'll let Mike
judge this one when he has looked at the hvc infrastructure.

I wouldn't move it to that directory unless the code gets changed
first, but I wanted to write down where I think it should end up.

> > rocket,ipwireless -> drivers/staging/tty/* (?)
>
> Rocket is used, ipwireless I think is also used

ok.

Arnd

2010-08-31 10:42:09

by Rogier Wolff

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

Hi,

The question is whether I want the drivers I wrote to stay or to
go away?

I was paid years ago to make Linux support the Specialix cards. It
started with one card from their line of "solutions", but the others
followed.

I personally don't use "serial" very much anymore. If I do, I end up
getting an USB-serial converter for $3 in China (includes shipping).

But my personal interest in the serial protocol is that I interface
with microcontrollers. The mess of the +/- 12V levels is a nuisance.

Other people might use "serial" devices because they are stuck with a
historical setup. If you have a factory with a well-designed computer
system, it is very well possible that some installations are still
running with a serial terminal on every desk. Some desks will have a
windows PC and a terminal application, but the serial interface to the
central "mainframe" will still be maintained.

Those central "mainframes" might be Linux PCs. The Linux PCs replaced
older hardware and software. Maybe they were running SCO or another
Unix variant, and through the years the application was ported to
Linux.

In those setups, I can imagine a 8-port or 32-port serial card to be
useful. It would be nice that people supporting that sort of setup
would be able to install Ubuntu 10.10 and have their hardware simply
work. Buying new multiport serial cards seems unneccesary unless they
are ISA. But specialix cards are available in PCI. So if you already
have PCI cards why force them to new hardware if they have hardware
that works?

Oh! One more thing. The sysops at shops that use these multiport
serial cards are not the types to monitor Linux-kernel and make waves
if support for their card is going to be dropped.

Now I've missed the first part of this discussion... Is there a change
imminent that requires rewriting of all the drivers?

(If rewriting serial drivers, PLEASE make it so that the
userspace-kernel interface just passes a baud rate integer, not the
one-of-16-possible baudrate-flags. The old stuff can be emulated in a
library. Secondly serial port drivers should NOT have to worry about
DCD changes and what to do with sleeping processes. The driver should
have an kernel function to call: "hey, one of the control lines
changed level. These are the new ones". And "These characters
arrived". And the driver has an entry point: "please send these
characters". )

Roger.

On Tue, Aug 31, 2010 at 11:26:45AM +0200, Arnd Bergmann wrote:
> On Tuesday 31 August 2010, Alan Cox wrote:
> > > drivers/char/tty_* -> tty/*
> > > drivers/char/{vt stuff} -> tty/vt/
> > > drivers/char/hvc_* -> drivers/tty/hvc/hvc_*
> > > drivers/serial/* -> drivers/tty/serial/*
> >
> > There are dead bits in there too we should prune 68xxx stuff mostly
>
> Geert, can you comment on the 68k serial drivers? Which
> ones are to stay, which ones can get phased out?
>
> > > drivers/usb/serial -> drivers/usb/serial
> > >
> > > cyclades,moxa,mxser -> drivers/tty/hw/
> > >
> > > stallion,istallion,
> > > epca,specialix,ip2,
> > > riscom,isicom -> drivers/staging/tty/*
> >
> > isicom has users and gets tested a bit, not sure about ip2/specialix.
>
> I'll leave isicom then.
>
> Specialix is marked in MAINTAINERS as supported by Roger, ip2
> is maintained by Michael, maybe they have a preference for their
> drivers.
>
> Both drivers have a web page that is ~10 years old, which hints
> that there is probably not much new hardware around.
>
> > > generic_serial,vme_scc,
> > > ser_a2232,sx,rio -> drivers/staging/generic_serial/*
> > >
> > > amiserial,nozomi,
> > > serial167,synclink -> drivers/tty/hw (?)
> >
> > Why /hw - its a tty driver so drivers/tty - the non hw stuff is now in
> > tty/
>
> Right, makes sense.
>
> > serial167 is dead/staging stuff, synclink* are used
>
> ok
>
> > > bfin_jtag_comm -> drivers/tty/hvc/hvc_bfin_jtag (?)
> >
> > Nothing to do with hvc
>
> Not yet ;-)
>
> You didn't reply to my question why it couldn't be. I'll let Mike
> judge this one when he has looked at the hvc infrastructure.
>
> I wouldn't move it to that directory unless the code gets changed
> first, but I wanted to write down where I think it should end up.
>
> > > rocket,ipwireless -> drivers/staging/tty/* (?)
> >
> > Rocket is used, ipwireless I think is also used
>
> ok.
>
> Arnd
>

--
** [email protected] ** http://www.BitWizard.nl/ ** +31-15-2600998 **
** Delftechpark 26 2628 XH Delft, The Netherlands. KVK: 27239233 **
*-- BitWizard writes Linux device drivers for any device you may have! --*
Q: It doesn't work. A: Look buddy, doesn't work is an ambiguous statement.
Does it sit on the couch all day? Is it unemployed? Please be specific!
Define 'it' and what it isn't doing. --------- Adapted from lxrbot FAQ

2010-08-31 11:10:43

by Alan

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

> Now I've missed the first part of this discussion... Is there a change
> imminent that requires rewriting of all the drivers?

Mostly locking - it's not a trivial entry point thing. The gs layer for
example was full of races and needed rewriting so just got declared
broken.

> (If rewriting serial drivers, PLEASE make it so that the
> userspace-kernel interface just passes a baud rate integer, not the
> one-of-16-possible baudrate-flags. The old stuff can be emulated in a

Did that several years ago. I think you still need to use the ioctl
because several years is apparently a bit short for glibc to get with it
even though a glibc person thought up how to do the new interface 8)

> library. Secondly serial port drivers should NOT have to worry about
> DCD changes and what to do with sleeping processes. The driver should
> have an kernel function to call: "hey, one of the control lines
> changed level. These are the new ones". And "These characters
> arrived". And the driver has an entry point: "please send these
> characters". )

Mostly done. See tty_port_*

Alan

2010-08-31 11:54:54

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Tuesday 31 August 2010, Rogier Wolff wrote:
> The question is whether I want the drivers I wrote to stay or to
> go away?

More or less, yes.

> I was paid years ago to make Linux support the Specialix cards. It
> started with one card from their line of "solutions", but the others
> followed.

The most important question is whether you think that there are people
somewhere in the world that are using the device drivers on machines
with recent kernels.

If you still get bug reports for the drivers, that would be a clear
indication to make them stay, while if you haven't heard from a user
during the last five years, it's probably obsolete enough that it
can be removed (after a few kernels of grace period in drivers/staging).

Arnd

2010-08-31 13:32:39

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Tue, Aug 31, 2010 at 01:54:47PM +0200, Arnd Bergmann wrote:
> On Tuesday 31 August 2010, Rogier Wolff wrote:
> > The question is whether I want the drivers I wrote to stay or to
> > go away?
>
> More or less, yes.
>
> > I was paid years ago to make Linux support the Specialix cards. It
> > started with one card from their line of "solutions", but the others
> > followed.
>
> The most important question is whether you think that there are people
> somewhere in the world that are using the device drivers on machines
> with recent kernels.
>
> If you still get bug reports for the drivers, that would be a clear
> indication to make them stay, while if you haven't heard from a user
> during the last five years, it's probably obsolete enough that it
> can be removed (after a few kernels of grace period in drivers/staging).

And it is always possible to revert a removal at a later time and fix up
a driver if someone does show up in a few years asking where the driver
went.

thanks,

greg k-h

2010-08-31 15:03:47

by Joe Perches

[permalink] [raw]

Subject: Re: [PATCH 1/1] MAINTAINERS: remove isicom

On Tue, 2010-08-31 at 11:19 +0200, Jiri Slaby wrote:
> I do not maintain isicom anymore...
>
> Signed-off-by: Jiri Slaby <[email protected]>
> ---
> MAINTAINERS | 6 ------
> 1 files changed, 0 insertions(+), 6 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index e24eb2d..8bab6f3 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3923,12 +3923,6 @@ S: Maintained
> F: Documentation/sound/oss/MultiSound
> F: sound/oss/msnd*
>
> -MULTITECH MULTIPORT CARD (ISICOM)
> -M: Jiri Slaby <[email protected]>
> -S: Maintained
> -F: drivers/char/isicom.c
> -F: include/linux/isicom.h
> -
> MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
> M: Felipe Balbi <[email protected]>
> L: [email protected]

Perhaps it's better to remove your name
and set the status to Orphan instead.

2010-08-31 15:08:58

[permalink] [raw]

Subject: [PATCH 1/1] MAINTAINERS: orphan isicom

I do not maintain isicom anymore...

Signed-off-by: Jiri Slaby <[email protected]>
---
MAINTAINERS | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index e24eb2d..8313ce3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3924,8 +3924,7 @@ F: Documentation/sound/oss/MultiSound
F: sound/oss/msnd*

MULTITECH MULTIPORT CARD (ISICOM)
-M: Jiri Slaby <[email protected]>
-S: Maintained
+S: Orphan
F: drivers/char/isicom.c
F: include/linux/isicom.h

--
1.7.2.2

2010-08-31 15:54:15

[permalink] [raw]

Subject: Re: [RFC 0/5] tty: move stuff around

On Tue, Aug 31, 2010 at 05:26, Arnd Bergmann wrote:
> On Tuesday 31 August 2010, Alan Cox wrote:
>> > bfin_jtag_comm -> drivers/tty/hvc/hvc_bfin_jtag (?)
>>
>> Nothing to do with hvc
>
> Not yet ;-)
>
> You didn't reply to my question why it couldn't be. I'll let Mike
> judge this one when he has looked at the hvc infrastructure.
>
> I wouldn't move it to that directory unless the code gets changed
> first, but I wanted to write down where I think it should end up.

right ... as long as it isnt hvc, it should be .../tty/hw/. when/if
it is converted to hvc, i'll also take care of moving it to the hvc/
subdir.

ive opened a tracker item for the issue, but no promise as to when
i'll look into it :p.
-mike

2011-02-23 01:14:07