tty: move stuff around
Subsystems (6)
Arnd Bergmann
maintainercover tty: move stuff around
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.
This moves files from drivers/char to a new hierarchy under drivers/tty, roughly
drivers/tty/*.[ch] generic tty code drivers/tty/hvc virtual drivers using hvc drivers/tty/vt virtual terminal code drivers/tty/hw hardware specific drivers
drivers/tty/hw/{rio,ip2,epca} larger drivers
I am considering the name 'legacy' instead of 'hw', but I'm not completely sure if all the drivers in there are obsolete. I also don't care about any of the other directory locations for stuff. If there are better ideas, I can update my patches.
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?
Arnd
---
Arnd Bergmann (5):
tty: move tty layer code to drivers/tty
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
MAINTAINERS | 28 +-
arch/cris/Kconfig | 2 +
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/char/Kconfig | 573 --------------------
drivers/char/Makefile | 81 +---
drivers/char/pcmcia/Kconfig | 22 -
drivers/char/pcmcia/Makefile | 3 -
drivers/tty/Kconfig | 112 ++++
drivers/tty/Makefile | 26 +
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
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
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
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
157 files changed, 732 insertions(+), 691 deletions(-)
create mode 100644 drivers/tty/Kconfig
create mode 100644 drivers/tty/Makefile
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%)
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%)
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%)
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%)Arnd Bergmann
maintainerPATCH 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.
---
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%)MAINTAINERS +1 -1
@@ -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
drivers/Makefile +1 -0
@@ -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
drivers/char/Kconfig +1 -96
115 lines not on this page · raw message
drivers/char/Makefile +1 -9
@@ -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
drivers/tty/Kconfig new file +96 -0
96 lines not on this page · raw message
drivers/tty/Makefile new file +22 -0
@@ -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
drivers/tty/n_gsm.c renamed from drivers/char/n_gsm.c +0 -0
drivers/tty/n_hdlc.c renamed from drivers/char/n_hdlc.c +0 -0
drivers/tty/n_r3964.c renamed from drivers/char/n_r3964.c +0 -0
drivers/tty/n_tty.c renamed from drivers/char/n_tty.c +0 -0
drivers/tty/pty.c renamed from drivers/char/pty.c +0 -0
drivers/tty/sysrq.c renamed from drivers/char/sysrq.c +0 -0
drivers/tty/tty_audit.c renamed from drivers/char/tty_audit.c +0 -0
drivers/tty/tty_buffer.c renamed from drivers/char/tty_buffer.c +0 -0
drivers/tty/tty_io.c renamed from drivers/char/tty_io.c +0 -0
drivers/tty/tty_ioctl.c renamed from drivers/char/tty_ioctl.c +0 -0
drivers/tty/tty_ldisc.c renamed from drivers/char/tty_ldisc.c +0 -0
drivers/tty/tty_mutex.c renamed from drivers/char/tty_mutex.c +0 -0
drivers/tty/tty_port.c renamed from drivers/char/tty_port.c +0 -0
Signature · 1 line
1.7.1
Arnd Bergmann
maintainerPATCH 2/5 tty/vt: move files to drivers/tty/vt/
In reply to Arnd BergmannThe virtual terminal is a very special tty driver, so it deserves its own directory.
---
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%)drivers/char/Kconfig +1 -83
@@ -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"
drivers/char/Makefile +0 -33
@@ -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
drivers/tty/Makefile +1 -0
@@ -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
drivers/tty/vt/Kconfig new file +84 -0
84 lines not on this page · raw message
drivers/tty/vt/Makefile new file +37 -0
@@ -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
drivers/tty/vt/consolemap.c renamed from drivers/char/consolemap.c +0 -0
drivers/tty/vt/cp437.uni renamed from drivers/char/cp437.uni +0 -0
drivers/tty/vt/defkeymap.c_shipped renamed from drivers/char/defkeymap.c_shipped +0 -0
drivers/tty/vt/defkeymap.map renamed from drivers/char/defkeymap.map +0 -0
drivers/tty/vt/keyboard.c renamed from drivers/char/keyboard.c +0 -0
drivers/tty/vt/selection.c renamed from drivers/char/selection.c +0 -0
drivers/tty/vt/vc_screen.c renamed from drivers/char/vc_screen.c +0 -0
drivers/tty/vt/vt.c renamed from drivers/char/vt.c +0 -0
drivers/tty/vt/vt_ioctl.c renamed from drivers/char/vt_ioctl.c +0 -0
Signature · 1 line
1.7.1
Arnd Bergmann
maintainerPATCH 3/5 tty/hvc: move files to drivers/tty/hvc
In reply to Arnd BergmannAll hvc device drivers fall into the same category of tty drivers, so it makes sense to keep them in a single directory.
---
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%)MAINTAINERS +2 -2
@@ -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)
drivers/char/Kconfig +1 -102
109 lines not on this page · raw message
drivers/char/Makefile +0 -12
@@ -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
drivers/tty/Makefile +2 -0
@@ -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
drivers/tty/hvc/Kconfig new file +104 -0
104 lines not on this page · raw message
drivers/tty/hvc/Makefile new file +12 -0
@@ -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
drivers/tty/hvc/hvc_beat.c renamed from drivers/char/hvc_beat.c +0 -0
drivers/tty/hvc/hvc_console.c renamed from drivers/char/hvc_console.c +0 -0
drivers/tty/hvc/hvc_console.h renamed from drivers/char/hvc_console.h +0 -0
drivers/tty/hvc/hvc_irq.c renamed from drivers/char/hvc_irq.c +0 -0
drivers/tty/hvc/hvc_iseries.c renamed from drivers/char/hvc_iseries.c +0 -0
drivers/tty/hvc/hvc_iucv.c renamed from drivers/char/hvc_iucv.c +0 -0
drivers/tty/hvc/hvc_rtas.c renamed from drivers/char/hvc_rtas.c +0 -0
drivers/tty/hvc/hvc_tile.c renamed from drivers/char/hvc_tile.c +0 -0
drivers/tty/hvc/hvc_udbg.c renamed from drivers/char/hvc_udbg.c +0 -0
drivers/tty/hvc/hvc_vio.c renamed from drivers/char/hvc_vio.c +0 -0
drivers/tty/hvc/hvc_xen.c renamed from drivers/char/hvc_xen.c +0 -0
drivers/tty/hvc/hvcs.c renamed from drivers/char/hvcs.c +0 -0
drivers/tty/hvc/hvsi.c renamed from drivers/char/hvsi.c +0 -0
drivers/tty/hvc/virtio_console.c renamed from drivers/char/virtio_console.c +0 -0
Signature · 1 line
1.7.1
Arnd Bergmann
maintainerPATCH 4/5 tty/hw: move hardware drivers to drivers/tty/hw
In reply to Arnd BergmannRandom obsolete tty drivers are mixed with random
other stuff in drivers/char, this moves all the
tty drivers into one place.
---
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%)MAINTAINERS +11 -11
@@ -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]>
drivers/char/Kconfig +1 -286
293 lines not on this page · raw message
drivers/char/Makefile +2 -26
@@ -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
drivers/char/pcmcia/Kconfig +0 -22
@@ -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
drivers/char/pcmcia/Makefile +0 -3
@@ -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
drivers/tty/Makefile +1 -0
@@ -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
drivers/tty/hw/Kconfig new file +308 -0
308 lines not on this page · raw message
drivers/tty/hw/Makefile new file +27 -0
@@ -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/
drivers/tty/hw/amiserial.c renamed from drivers/char/amiserial.c +0 -0
drivers/tty/hw/bfin_jtag_comm.c renamed from drivers/char/bfin_jtag_comm.c +0 -0
drivers/tty/hw/cd1865.h renamed from drivers/char/cd1865.h +0 -0
drivers/tty/hw/cyclades.c renamed from drivers/char/cyclades.c +0 -0
drivers/tty/hw/epca/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_DIGIEPCA) += epca.o
drivers/tty/hw/epca/digi1.h renamed from drivers/char/digi1.h +0 -0
drivers/tty/hw/epca/digiFep1.h renamed from drivers/char/digiFep1.h +0 -0
drivers/tty/hw/epca/digiPCI.h renamed from drivers/char/digiPCI.h +0 -0
drivers/tty/hw/epca/epca.c renamed from drivers/char/epca.c +0 -0
drivers/tty/hw/epca/epca.h renamed from drivers/char/epca.h +0 -0
drivers/tty/hw/epca/epcaconfig.h renamed from drivers/char/epcaconfig.h +0 -0
drivers/tty/hw/generic_serial.c renamed from drivers/char/generic_serial.c +0 -0
drivers/tty/hw/ip2/Makefile renamed from drivers/char/ip2/Makefile +0 -0
drivers/tty/hw/ip2/i2cmd.c renamed from drivers/char/ip2/i2cmd.c +0 -0
drivers/tty/hw/ip2/i2cmd.h renamed from drivers/char/ip2/i2cmd.h +0 -0
drivers/tty/hw/ip2/i2ellis.c renamed from drivers/char/ip2/i2ellis.c +0 -0
drivers/tty/hw/ip2/i2ellis.h renamed from drivers/char/ip2/i2ellis.h +0 -0
drivers/tty/hw/ip2/i2hw.h renamed from drivers/char/ip2/i2hw.h +0 -0
drivers/tty/hw/ip2/i2lib.c renamed from drivers/char/ip2/i2lib.c +0 -0
drivers/tty/hw/ip2/i2lib.h renamed from drivers/char/ip2/i2lib.h +0 -0
drivers/tty/hw/ip2/i2pack.h renamed from drivers/char/ip2/i2pack.h +0 -0
drivers/tty/hw/ip2/ip2.h renamed from drivers/char/ip2/ip2.h +0 -0
drivers/tty/hw/ip2/ip2ioctl.h renamed from drivers/char/ip2/ip2ioctl.h +0 -0
drivers/tty/hw/ip2/ip2main.c renamed from drivers/char/ip2/ip2main.c +0 -0
drivers/tty/hw/ip2/ip2trace.h renamed from drivers/char/ip2/ip2trace.h +0 -0
drivers/tty/hw/ip2/ip2types.h renamed from drivers/char/ip2/ip2types.h +0 -0
drivers/tty/hw/ipwireless/Makefile renamed from drivers/char/pcmcia/ipwireless/Makefile +0 -0
drivers/tty/hw/ipwireless/hardware.c renamed from drivers/char/pcmcia/ipwireless/hardware.c +0 -0
drivers/tty/hw/ipwireless/hardware.h renamed from drivers/char/pcmcia/ipwireless/hardware.h +0 -0
drivers/tty/hw/ipwireless/main.c renamed from drivers/char/pcmcia/ipwireless/main.c +0 -0
drivers/tty/hw/ipwireless/main.h renamed from drivers/char/pcmcia/ipwireless/main.h +0 -0
drivers/tty/hw/ipwireless/network.c renamed from drivers/char/pcmcia/ipwireless/network.c +0 -0
drivers/tty/hw/ipwireless/network.h renamed from drivers/char/pcmcia/ipwireless/network.h +0 -0
drivers/tty/hw/ipwireless/setup_protocol.h renamed from drivers/char/pcmcia/ipwireless/setup_protocol.h +0 -0
drivers/tty/hw/ipwireless/tty.c renamed from drivers/char/pcmcia/ipwireless/tty.c +0 -0
drivers/tty/hw/ipwireless/tty.h renamed from drivers/char/pcmcia/ipwireless/tty.h +0 -0
drivers/tty/hw/isicom.c renamed from drivers/char/isicom.c +0 -0
drivers/tty/hw/istallion.c renamed from drivers/char/istallion.c +0 -0
drivers/tty/hw/moxa.c renamed from drivers/char/moxa.c +0 -0
drivers/tty/hw/moxa.h renamed from drivers/char/moxa.h +0 -0
drivers/tty/hw/mxser.c renamed from drivers/char/mxser.c +0 -0
drivers/tty/hw/mxser.h renamed from drivers/char/mxser.h +0 -0
drivers/tty/hw/nozomi.c renamed from drivers/char/nozomi.c +0 -0
drivers/tty/hw/rio/Makefile renamed from drivers/char/rio/Makefile +0 -0
drivers/tty/hw/rio/board.h renamed from drivers/char/rio/board.h +0 -0
drivers/tty/hw/rio/cirrus.h renamed from drivers/char/rio/cirrus.h +0 -0
drivers/tty/hw/rio/cmdblk.h renamed from drivers/char/rio/cmdblk.h +0 -0
drivers/tty/hw/rio/cmdpkt.h renamed from drivers/char/rio/cmdpkt.h +0 -0
drivers/tty/hw/rio/daemon.h renamed from drivers/char/rio/daemon.h +0 -0
drivers/tty/hw/rio/errors.h renamed from drivers/char/rio/errors.h +0 -0
drivers/tty/hw/rio/func.h renamed from drivers/char/rio/func.h +0 -0
drivers/tty/hw/rio/host.h renamed from drivers/char/rio/host.h +0 -0
drivers/tty/hw/rio/link.h renamed from drivers/char/rio/link.h +0 -0
drivers/tty/hw/rio/linux_compat.h renamed from drivers/char/rio/linux_compat.h +0 -0
drivers/tty/hw/rio/map.h renamed from drivers/char/rio/map.h +0 -0
drivers/tty/hw/rio/param.h renamed from drivers/char/rio/param.h +0 -0
drivers/tty/hw/rio/parmmap.h renamed from drivers/char/rio/parmmap.h +0 -0
drivers/tty/hw/rio/pci.h renamed from drivers/char/rio/pci.h +0 -0
drivers/tty/hw/rio/phb.h renamed from drivers/char/rio/phb.h +0 -0
drivers/tty/hw/rio/pkt.h renamed from drivers/char/rio/pkt.h +0 -0
drivers/tty/hw/rio/port.h renamed from drivers/char/rio/port.h +0 -0
drivers/tty/hw/rio/protsts.h renamed from drivers/char/rio/protsts.h +0 -0
drivers/tty/hw/rio/rio.h renamed from drivers/char/rio/rio.h +0 -0
drivers/tty/hw/rio/rio_linux.c renamed from drivers/char/rio/rio_linux.c +0 -0
drivers/tty/hw/rio/rio_linux.h renamed from drivers/char/rio/rio_linux.h +0 -0
drivers/tty/hw/rio/rioboard.h renamed from drivers/char/rio/rioboard.h +0 -0
drivers/tty/hw/rio/rioboot.c renamed from drivers/char/rio/rioboot.c +0 -0
drivers/tty/hw/rio/riocmd.c renamed from drivers/char/rio/riocmd.c +0 -0
drivers/tty/hw/rio/rioctrl.c renamed from drivers/char/rio/rioctrl.c +0 -0
drivers/tty/hw/rio/riodrvr.h renamed from drivers/char/rio/riodrvr.h +0 -0
drivers/tty/hw/rio/rioinfo.h renamed from drivers/char/rio/rioinfo.h +0 -0
drivers/tty/hw/rio/rioinit.c renamed from drivers/char/rio/rioinit.c +0 -0
drivers/tty/hw/rio/riointr.c renamed from drivers/char/rio/riointr.c +0 -0
drivers/tty/hw/rio/rioioctl.h renamed from drivers/char/rio/rioioctl.h +0 -0
drivers/tty/hw/rio/rioparam.c renamed from drivers/char/rio/rioparam.c +0 -0
drivers/tty/hw/rio/rioroute.c renamed from drivers/char/rio/rioroute.c +0 -0
drivers/tty/hw/rio/riospace.h renamed from drivers/char/rio/riospace.h +0 -0
drivers/tty/hw/rio/riotable.c renamed from drivers/char/rio/riotable.c +0 -0
drivers/tty/hw/rio/riotty.c renamed from drivers/char/rio/riotty.c +0 -0
drivers/tty/hw/rio/route.h renamed from drivers/char/rio/route.h +0 -0
drivers/tty/hw/rio/rup.h renamed from drivers/char/rio/rup.h +0 -0
drivers/tty/hw/rio/unixrup.h renamed from drivers/char/rio/unixrup.h +0 -0
drivers/tty/hw/riscom8.c renamed from drivers/char/riscom8.c +0 -0
drivers/tty/hw/riscom8.h renamed from drivers/char/riscom8.h +0 -0
drivers/tty/hw/riscom8_reg.h renamed from drivers/char/riscom8_reg.h +0 -0
drivers/tty/hw/rocket.c renamed from drivers/char/rocket.c +0 -0
drivers/tty/hw/rocket.h renamed from drivers/char/rocket.h +0 -0
drivers/tty/hw/rocket_int.h renamed from drivers/char/rocket_int.h +0 -0
drivers/tty/hw/ser_a2232.c renamed from drivers/char/ser_a2232.c +0 -0
drivers/tty/hw/ser_a2232.h renamed from drivers/char/ser_a2232.h +0 -0
drivers/tty/hw/ser_a2232fw.ax renamed from drivers/char/ser_a2232fw.ax +0 -0
drivers/tty/hw/ser_a2232fw.h renamed from drivers/char/ser_a2232fw.h +0 -0
drivers/tty/hw/serial167.c renamed from drivers/char/serial167.c +0 -0
drivers/tty/hw/specialix.c renamed from drivers/char/specialix.c +0 -0
drivers/tty/hw/specialix_io8.h renamed from drivers/char/specialix_io8.h +0 -0
drivers/tty/hw/stallion.c renamed from drivers/char/stallion.c +0 -0
drivers/tty/hw/sx.c renamed from drivers/char/sx.c +0 -0
drivers/tty/hw/sx.h renamed from drivers/char/sx.h +0 -0
drivers/tty/hw/sxboards.h renamed from drivers/char/sxboards.h +0 -0
drivers/tty/hw/sxwindow.h renamed from drivers/char/sxwindow.h +0 -0
drivers/tty/hw/synclink.c renamed from drivers/char/synclink.c +0 -0
drivers/tty/hw/synclink_cs.c renamed from drivers/char/pcmcia/synclink_cs.c +0 -0
drivers/tty/hw/synclink_gt.c renamed from drivers/char/synclink_gt.c +0 -0
drivers/tty/hw/synclinkmp.c renamed from drivers/char/synclinkmp.c +0 -0
drivers/tty/hw/vme_scc.c renamed from drivers/char/vme_scc.c +0 -0
Signature · 1 line
1.7.1
Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw
Quoted 5 lines · Arnd Bergmann
Random obsolete tty drivers are mixed with random
other stuff indrivers/char, this moves all the
tty drivers into one place.Signed-off-by Arnd Bergmann <[email protected]>
Quoted 10 lines
---
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�
Arnd Bergmann
maintainerRe: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw
Quoted 10 lines · Mike Frysinger
Quoted 9 lines
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
Quoted 2 lines
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
Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw
Quoted 3 lines
BTW, the
bfin_jtag_comm.clooks 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
Quoted 3 lines
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
Arnd Bergmann
maintainerRe: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw
Quoted 5 lines · Alan Cox
Quoted 3 lines
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
Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw
Quoted 5 lines · Arnd Bergmann
Quoted 4 lines · Alan Cox
Quoted 3 lines
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.
Quoted 8 lines
Quoted 1 line
Not sure it makes sense - hvc seems the wrong abstraction.
It seems to be very similar to
hvc_tile.cin purpose, which is the most trivial driver we have. Why would that not work?Most of
bfin_jtag_commis about interfacing with the tty layer and providing a kernel thread to do the polling, which is exactly whathvc_console.cdoes.
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
Arnd Bergmann
maintainerRe: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw
Quoted 16 lines · Mike Frysinger
Quoted 5 lines · Arnd Bergmann
Quoted 4 lines · Alan Cox
Quoted 3 lines
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.Quoted 8 lines
Quoted 1 line
Not sure it makes sense - hvc seems the wrong abstraction.
It seems to be very similar to
hvc_tile.cin purpose, which is the most trivial driver we have. Why would that not work?Most of
bfin_jtag_commis about interfacing with the tty layer and providing a kernel thread to do the polling, which is exactly whathvc_console.cdoes.
Quoted 5 lines
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
Re: [PATCH 4/5] tty/hw: move hardware drivers to drivers/tty/hw
Quoted 22 lines · Arnd Bergmann
Quoted 15 lines · Mike Frysinger
Quoted 5 lines · Arnd Bergmann
Quoted 4 lines · Alan Cox
Quoted 3 lines
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.Quoted 8 lines
Quoted 1 line
Not sure it makes sense - hvc seems the wrong abstraction.
It seems to be very similar to
hvc_tile.cin purpose, which is the most trivial driver we have. Why would that not work?Most of
bfin_jtag_commis about interfacing with the tty layer and providing a kernel thread to do the polling, which is exactly whathvc_console.cdoes.Quoted 5 lines
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.
Quoted 6 lines
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
Arnd Bergmann
maintainerPATCH 5/5 tty: rearrange Kconfig structure
In reply to Arnd BergmannThis 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.
--- 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(-)
arch/cris/Kconfig +2 -0
@@ -682,6 +682,8 @@ source "drivers/rtc/Kconfig" # source "drivers/input/Kconfig" +source "drivers/tty/Kconfig" + source "drivers/char/Kconfig" source "fs/Kconfig"
drivers/Kconfig +2 -0
@@ -44,6 +44,8 @@ source "drivers/telephony/Kconfig" source "drivers/input/Kconfig" +source "drivers/tty/Kconfig" + source "drivers/char/Kconfig" source "drivers/i2c/Kconfig"
drivers/char/Kconfig +0 -10
@@ -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
drivers/tty/Kconfig +16 -0
@@ -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
drivers/tty/hw/Kconfig +18 -18
@@ -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
Signature · 1 line
1.7.1
Quoted 5 lines
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.
Quoted 1 line
tty: move tty layer code to
drivers/tty
I would be tempted to put the core stuff in /tty as its not drivers
Quoted 4 lines
tty/vt: move files to
drivers/tty/vt/
tty/hvc: move files todrivers/tty/hvc
tty/hw: move hardware drivers todrivers/tty/hw
tty: rearrangeKconfigstructure
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 ?
Arnd Bergmann
maintainerQuoted 9 lines · Alan Cox
Quoted 5 lines
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.
Quoted 3 lines
Quoted 1 line
tty: move tty layer code to
drivers/ttyI 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)?
Quoted 6 lines
Quoted 4 lines
tty/vt: move files to
drivers/tty/vt/
tty/hvc: move files todrivers/tty/hvc
tty/hw: move hardware drivers todrivers/tty/hw
tty: rearrangeKconfigstructure
drivers/serialshould also walk into tty I think ?
Yes, good point.
Quoted 2 lines
drivers/pcmcia/serialis a bit trickier but I guess should stay as withdrivers/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.
Quoted 3 lines
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
Quoted 2 lines · Arnd Bergmann
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.
Quoted 2 lines
(quoted diff) +2
-0+obj-$(CONFIG_STALLION) += stallion.o +obj-$(CONFIG_ISTALLION) += istallion.o
...
Review
Quoted 2 lines
(quoted diff) +2
-0+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.
Quoted 1 line
+obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
Maybe few users left.
Quoted 1 line
+obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
Still in use. (And supports relatively new devices; not the PCI-e ones though.)
Review
Quoted 3 lines
(quoted diff) +3
-0+obj-$(CONFIG_COMPUTONE) += ip2/ +obj-$(CONFIG_RISCOM8) += riscom8.o +obj-$(CONFIG_ISI) += isicom.o
Unused? isicom is broken last I heard.
thanks,
Signature · 2 lines
js suse labs
Arnd Bergmann
maintainerQuoted 6 lines · Jiri Slaby
Quoted 2 lines · Arnd Bergmann
These are the drivers I was planning to move:
+obj-$(CONFIG_CYCLADES) += cyclades.oThere are some users still with CYY cards. No CYZ card users known to me.
Quoted 8 lines
Quoted 1 line
+obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
Maybe few users left.
Quoted 1 line
+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
Quoted 11 lines · On Mon, 30 Aug 2010 14:15:56 +0200 Arnd Bergmann <[email protected]> wrote:
Quoted 10 lines · Jiri Slaby
Quoted 2 lines · Arnd Bergmann
These are the drivers I was planning to move:
+obj-$(CONFIG_CYCLADES) += cyclades.oThere are some users still with CYY cards. No CYZ card users known to me.
Quoted 1 line
+obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
Maybe few users left.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
+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_corethen? 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.
Arnd Bergmann
maintainerQuoted 7 lines · On Monday 30 August 2010 15:00:54 Alan Cox wrote:
Quoted 3 lines
Are they all candidates for a conversion to
serial_corethen? 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 allserial_coreneeds 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
Quoted 5 lines · Arnd Bergmann
Hi Greg,
After fighting with the BKL removal in tty, I realized that the files in
drivers/charcould 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.
Quoted 3 lines
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
Arnd Bergmann
maintainerQuoted 9 lines · On Monday 30 August 2010 20:47:37 Greg KH wrote:
Quoted 5 lines · Arnd Bergmann
Hi Greg,
After fighting with the BKL removal in tty, I realized that the files in
drivers/charcould use a reorganization to split the tty files from those drivers that have nothing to do with ttys.<snip>
Quoted 8 lines
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
Quoted 9 lines · Arnd Bergmann
With the feedback I have so far, I think we have
drivers/char/tty_*-> tty/*drivers/char/{vtstuff} -> tty/vt/drivers/char/hvc_* -> drivers/tty/hvc/hvc_* drivers/serial/* -> drivers/tty/serial/* drivers/usb/serial -> drivers/usb/serialcyclades,moxa,mxser ->
drivers/tty/hw/
I wouldn't go for hw subdir. IMHO 'drivers' is enough.
Quoted 2 lines
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,
Signature · 2 lines
js suse labs
Quoted 4 lines
drivers/char/tty_*-> tty/*drivers/char/{vtstuff} -> 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
Quoted 7 lines
drivers/usb/serial->drivers/usb/serialcyclades,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.
Quoted 5 lines
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
Quoted 1 line
bfin_jtag_comm->drivers/tty/hvc/hvc_bfin_jtag(?)
Nothing to do with hvc
Quoted 1 line
rocket,ipwireless ->
drivers/staging/tty/*(?)
Rocket is used, ipwireless I think is also used
Alan
Quoted 3 lines · Alan Cox
Quoted 1 line
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,
Signature · 2 lines
js suse labs
Quoted 6 lines · On Tue, 31 Aug 2010 08:08:57 +0200 Jiri Slaby <[email protected]> wrote:
Quoted 3 lines · Alan Cox
Quoted 1 line
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
Quoted 4 lines · Alan Cox
Quoted 1 line · On Tue, 31 Aug 2010 08:08:57 +0200 Jiri Slaby <[email protected]> wrote:
On 08/31/2010 12:28 AM, Alan Cox wrote:
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
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.
Signature · 2 lines
js suse labs
PATCH 1/1 MAINTAINERS: remove isicom
I do not maintain isicom anymore...
--- MAINTAINERS | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
MAINTAINERS +0 -6
@@ -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]
Signature · 1 line
1.7.2.2
Re: [PATCH 1/1] MAINTAINERS: remove isicom
Quoted 14 lines · Jiri Slaby
I do not maintain isicom anymore...
Signed-off-by Jiri Slaby <[email protected]>--- MAINTAINERS | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)MAINTAINERS +0
-0@@ -3923,12 +3923,6 @@ S: Maintained F: Documentation/sound/oss/MultiSound F: sound/oss/msnd*
MAINTAINERS S: Maintained · line 3928
Quoted 10 lines
MAINTAINERS +0
-6-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.
PATCH 1/1 MAINTAINERS: orphan isicom
I do not maintain isicom anymore...
--- MAINTAINERS | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
MAINTAINERS +1 -2
@@ -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
Signature · 1 line
1.7.2.2
Arnd Bergmann
maintainerQuoted 6 lines · Alan Cox
Quoted 4 lines
drivers/char/tty_*-> tty/*drivers/char/{vtstuff} -> 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?
Quoted 9 lines
Quoted 7 lines
drivers/usb/serial->drivers/usb/serialcyclades,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.
Quoted 8 lines
Quoted 5 lines
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.
Quoted 1 line
serial167 is dead/staging stuff, synclink* are used
ok
Quoted 3 lines
Quoted 1 line
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.
Quoted 3 lines
Quoted 1 line
rocket,ipwireless ->
drivers/staging/tty/*(?)Rocket is used, ipwireless I think is also used
ok.
Arnd
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.
Quoted 65 lines · Arnd Bergmann
Quoted 6 lines · Alan Cox
Quoted 4 lines
drivers/char/tty_*-> tty/*drivers/char/{vtstuff} -> 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?
Quoted 9 lines
Quoted 7 lines
drivers/usb/serial->drivers/usb/serialcyclades,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
MAINTAINERSas 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.
Quoted 8 lines
Quoted 5 lines
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.
Quoted 1 line
serial167 is dead/staging stuff, synclink* are used
ok
Quoted 3 lines
Quoted 1 line
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.
Quoted 3 lines
Quoted 1 line
rocket,ipwireless ->
drivers/staging/tty/*(?)Rocket is used, ipwireless I think is also used
ok.
Arnd
Signature · 6 lines
** [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
Quoted 2 lines
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.
Quoted 3 lines
(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)
Quoted 6 lines
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
Arnd Bergmann
maintainerQuoted 2 lines · Rogier Wolff
The question is whether I want the drivers I wrote to stay or to go away?
More or less, yes.
Quoted 3 lines
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
Quoted 10 lines · Arnd Bergmann
Quoted 2 lines · Rogier Wolff
The question is whether I want the drivers I wrote to stay or to go away?
More or less, yes.
Quoted 3 lines
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.
Quoted 8 lines
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
Hey guys!
I see vger has bounced me off the majordomo lists... Again. And I missed it. Again... Sigh... I appreciate getting a direct ping on this...
Quoted 8 lines · Rogier Wolff
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.
My story is very similar with the Computone Intelliport II boards. I was paid (in hardware) by Computone to get their drivers integrated into the mainline kernel and support them. That was a long long time ago. The boards have not been manufactured in over a decade and the company went of of business a long time ago. I'm still in touch with several of the old developers that use to work there.
Quoted 2 lines
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).
Every once in a while I'll hear from someone who picked up some old boards on E-Bay or something inquiring about the drivers and how do they set it up. I strongly discourage anyone from setting up a new project with these boards. They were expensive at the time and replacements are going to be impossible to find. I send every new inquiry over to look at the USB serial converters (there are some really nice 8 port and 16 port units out there as well as the singles) that are cheaper and will be possible to replace if and when they break.
I do hear, once in a very long while, from some of the legacy users of those boards. They love'm. But they're mostly staying on the 2.4 kernel anyways and not upgrading. More often than not, it's some problem getting them to work on some new motherboard after repairing or upgrading a system. I wouldn't be surprised if some of these shops haven't discovered that they can not get replacement boards and migrated over to USB. It actually has been quite some time since I last heard from anyone.
That driver supported 256 serial ports with a couple of different interfaces resulting in 3 whole majors allocated to it. Even back then, that seemed like such a waste for such an obscure board.
At this point in time, I would have no heartburn if that driver was relegated to legacy status and those 3 majors freed up.
Quoted 10 lines
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.
Quoted 4 lines
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.
That was exactly why I got involved with Computone. I had customers on SCO Unix plus my own setup and I wanted to get everyone off that OS.
Quoted 7 lines
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?
Computone Intelliport II boards were also available in PCI. Now days, you can pick up an 8 port USB to serial converter for under $30 that will do just as well as one of those boards use to do.
Quoted 3 lines
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.
They're also not likely to be running the latest and greatest on those serial engines.
Quoted 14 lines
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". )
Quoted 1 line
Roger.
Regards,
Mike
Quoted 67 lines · Arnd Bergmann
Quoted 65 lines · Alan Cox
Quoted 6 lines
Quoted 4 lines
drivers/char/tty_*-> tty/*drivers/char/{vtstuff} -> 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?
Quoted 9 lines
Quoted 7 lines
drivers/usb/serial->drivers/usb/serialcyclades,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
MAINTAINERSas 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.
Quoted 8 lines
Quoted 5 lines
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.
Quoted 1 line
serial167 is dead/staging stuff, synclink* are used
ok
Quoted 3 lines
Quoted 1 line
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.
Quoted 3 lines
Quoted 1 line
rocket,ipwireless ->
drivers/staging/tty/*(?)Rocket is used, ipwireless I think is also used
ok.
Arnd
Signature · 4 lines
Michael H. Warfield (AI4NB) | (770) 985-6132 | [email protected] /\/\|=mhw=|\/\/ | (678) 463-0932 | http://www.wittsend.com/mhw/ NIC whois: MHW9 | An optimist believes we live in the best of all PGP Key: 0x674627FF | possible worlds. A pessimist is sure of it!
Arnd Bergmann
maintainerQuoted 8 lines · Michael H. Warfield
Quoted 6 lines · Rogier Wolff
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.
Quoted 6 lines
My story is very similar with the Computone Intelliport II boards. I was paid (in hardware) by Computone to get their drivers integrated into the mainline kernel and support them. That was a long long time ago. The boards have not been manufactured in over a decade and the company went of of business a long time ago. I'm still in touch with several of the old developers that use to work there.
Ok, so it sounds both of you successfully managed to maintain the device drivers way beyond the life time of the hardware, great work!
Let's send the drivers into their well-earned retirement in drivers/staging where they can die from a natural cause. If someone still has a use for them after all, we can always bring them back and he or she can become the new maintainer ;-).
Arnd
Quoted 19 lines · Arnd Bergmann
Quoted 8 lines · Michael H. Warfield
Quoted 6 lines · Rogier Wolff
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.
Quoted 6 lines
My story is very similar with the Computone Intelliport II boards. I was paid (in hardware) by Computone to get their drivers integrated into the mainline kernel and support them. That was a long long time ago. The boards have not been manufactured in over a decade and the company went of of business a long time ago. I'm still in touch with several of the old developers that use to work there.
Ok, so it sounds both of you successfully managed to maintain the device drivers way beyond the life time of the hardware, great work!
Quoted 6 lines
Let's send the drivers into their well-earned retirement in
drivers/stagingwhere they can die from a natural cause. If someone still has a use for them after all, we can always bring them back and he or she can become the new maintainer ;-).Arnd
Dipping an interested oar in this water, but speaking purely from the user viewpoint;
That is all well and good I suppose, but please ask yourselves if there are suitable _modern_ replacements for this hardware, and are the drivers available in linux?
If there are not suitable replacements, buy able at the likes of newegg et all, then this attitude seems a bit premature.
I presume the same can be said of the rocketport drivers, I haven't seen those boards for sale in yonks, but there are probably at least 1 of them in every television station in the country (USA), doing wire service capture.
Signature · 6 lines
Cheers, Gene "There are four boxes to be used in defense of liberty: soap, ballot, jury, and ammo. Please use in that order." -Ed Howdershelt (Author) The fact that 47 PEOPLE are yelling and sweat is cascading down my SPINAL COLUMN is fairly enjoyable!!
Arnd Bergmann
maintainerQuoted 6 lines · Gene Heskett
Dipping an interested oar in this water, but speaking purely from the user viewpoint;
That is all well and good I suppose, but please ask yourselves if there are suitable modern replacements for this hardware, and are the drivers available in linux?
As far as I understand, these are all fairly simple (by today's standards) serial boards, so the assumption is that anyone running a machine with a 2.6.35 kernel would get a $5 (more for mulitport) USB serial adapter.
Quoted 7 lines
If there are not suitable replacements, buy able at the likes of newegg et all, then this attitude seems a bit premature.
I presume the same can be said of the rocketport drivers, I haven't seen those boards for sale in yonks, but there are probably at least 1 of them in every television station in the country (USA), doing wire service capture.
Ok, good to know, this is the kind of information I was looking for. I agree that as long as there are users, we shouldn't just kill the drivers. For rocket.c, Alan already mentioned that there users left, so it's not going away.
Note that there are also cases where we know that users exist, but for some reason they are all stuck on 2.4 kernels or older anyway, so there is no point in keeping the driver for new kernel releases. Also, we can always add them back if the situation changes or we hear of users we didn't know about.
Arnd
Quoted 5 lines · Arnd Bergmann
Quoted 3 lines · Alan Cox
Quoted 1 line
bfin_jtag_comm->drivers/tty/hvc/hvc_bfin_jtag(?)Nothing to do with hvc
Quoted 7 lines
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
Quoted 10 lines · Arnd Bergmann
Quoted 6 lines · Alan Cox
Quoted 4 lines
drivers/char/tty_*-> tty/*drivers/char/{vtstuff} -> 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?
I don't know much about which drivers are still in active use. People don't really
tell me ;-)
FWIW, if I use my Amiga's serial port, it's just for a serial console, in case all else fails (last time I needed that was several years ago).
We have 3 "classes" of serial drivers:
- generic_serial-based:
o MVME147_SCC
o MVME162_SCC
o BVME6000_SCC
o A2232
All of these were marked BROKEN lately due to generic_serial,
while there's even a
new ATARI_SCC under "active" development...
- plain drivers/char:
o SERIAL167
o AMIGA_BUILTIN_SERIAL
- drivers/serial:
o SERIAL_PMACZILOG (Mac)
Sun 3/3x support might be (re)added to SERIAL_SUNZILOG
Quoted 3 lines · Alan Cox
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 allserial_coreneeds a rewrite not more users.
Funny... so "fortunately" we never found time to move the m68k serial drivers to driver/serial/? Long live procrastination ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Arnd Bergmann
maintainerQuoted 11 lines · Geert Uytterhoeven
On Tue, Aug 31, 2010 at 11:26, Arnd Bergmann <[email protected]> wrote:
- generic_serial-based:o
MVME147_SCC
oMVME162_SCC
oBVME6000_SCC
o A2232All of these were marked BROKEN lately due to
generic_serial,
while there's even a
newATARI_SCCunder "active" development...
Ok, so I'll keep the plan of moving generic_serial to staging.
Quoted 4 lines
- plain
drivers/char:o SERIAL167
oAMIGA_BUILTIN_SERIAL
Since these are the builtin ports for the Amiga and MVME16x platforms, I suppose we should keep them around as long as the platforms themselves are there and the code builds.
Quoted 5 lines
-
drivers/serial:o
SERIAL_PMACZILOG(Mac)Sun 3/3x support might be (re)added to
SERIAL_SUNZILOG
Same category I guess.
Thanks for your feedback!
Arnd
Quoted 2 lines · Arnd Bergmann
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
Arnd Bergmann
maintainerThis is the updated list, I hope I captured all the comments correctly:
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
amiserial,nozomi,synclink,
rocket,ipwireless
cyclades,moxa,mxser,
isicom,bfin_jtag_comm -> drivers/tty/
stallion,istallion,
epca,specialix,ip2,
riscom,serial167 -> drivers/staging/tty/*
generic_serial,vme_scc,
ser_a2232,sx,rio -> drivers/staging/generic_serial/*
Arnd
Quoted 14 lines · Arnd Bergmann
This is the updated list, I hope I captured all the comments correctly:
drivers/char/tty_*-> tty/*drivers/char/{vtstuff} -> tty/vt/drivers/char/hvc_* -> drivers/tty/hvc/hvc_* drivers/serial/* -> drivers/tty/serial/* drivers/usb/serial -> drivers/usb/serialamiserial,nozomi,synclink,
rocket,ipwireless
cyclades,moxa,mxser,
isicom,bfin_jtag_comm ->drivers/tty/
Quoted 6 lines
stallion,istallion,
epca,specialix,ip2,
riscom,serial167 ->drivers/staging/tty/*generic_serial,vme_scc,
ser_a2232,sx,rio ->drivers/staging/generic_serial/*
Looks correct to me. The staging ones will be "depreciated" and will age out over 2 kernel releases unless someone objects.
As this is just a lot of code movement, it probably makes more sense for me to do this myself, right?
thanks for getting all of this together.
greg k-h
Arnd Bergmann
maintainerQuoted 2 lines · Greg KH
As this is just a lot of code movement, it probably makes more sense for me to do this myself, right?
Depends on whether you want a git tree or full patches for this. I'd prefer not doing it myself, if you already offer to do it.
I guess the hardest part is splitting the Makefile and Kconfig files appropriately. I've done that mostly for the first version, so you should probably start from there and move it around some more, splitting out the staging parts.
Arnd
Quoted 11 lines · Arnd Bergmann
Quoted 2 lines · Greg KH
As this is just a lot of code movement, it probably makes more sense for me to do this myself, right?
Depends on whether you want a git tree or full patches for this. I'd prefer not doing it myself, if you already offer to do it.
I guess the hardest part is splitting the
MakefileandKconfigfiles appropriately. I've done that mostly for the first version, so you should probably start from there and move it around some more, splitting out the staging parts.
Ok, I'll do it this weekend. I have a 12 hour plane ride so I need something to do on it...
thanks,
greg k-h
Quoted 8 lines · Arnd Bergmann
amiserial,nozomi,synclink,
rocket,ipwireless
cyclades,moxa,mxser,
isicom,bfin_jtag_comm ->drivers/tty/stallion,istallion,
epca,specialix,ip2,
riscom,serial167 ->drivers/staging/tty/*
I thought we wanted to keep serial167 alive as long as it builds?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoted 11 lines · On Fri, 3 Sep 2010 22:08:38 +0200 Geert Uytterhoeven <[email protected]>…
Quoted 8 lines · Arnd Bergmann
amiserial,nozomi,synclink,
rocket,ipwireless
cyclades,moxa,mxser,
isicom,bfin_jtag_comm ->drivers/tty/stallion,istallion,
epca,specialix,ip2,
riscom,serial167 ->drivers/staging/tty/*I thought we wanted to keep serial167 alive as long as it builds?
Does it build ? Is it secure ? I was under the impression the answer in both cases was no.
Alan
Quoted 9 lines · Alan Cox
Quoted 6 lines · On Fri, 3 Sep 2010 22:08:38 +0200 Geert Uytterhoeven <[email protected]>…
Quoted 5 lines · Arnd Bergmann
amiserial,nozomi,synclink,
rocket,ipwireless
cyclades,moxa,mxser,
isicom,bfin_jtag_comm ->drivers/tty/
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
stallion,istallion,
epca,specialix,ip2,
riscom,serial167 ->drivers/staging/tty/*I thought we wanted to keep serial167 alive as long as it builds?
Does it build ? Is it secure ? I was under the impression the answer in both cases was no.
serial167 builds fine.
Your second question is more difficult to answer, though ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoted 4 lines · Arnd Bergmann
This is the updated list, I hope I captured all the comments correctly:
drivers/char/tty_*-> tty/*drivers/char/{vtstuff} -> tty/vt/
Ok, here's 2 patches that just does these two things.
Does it look correct? For the second patch, shoudl I really be moving the defkeymap and keyboard and selection files as well?
thoughts?
thanks,
greg k-h
PATCH 1/2 TTY: create /tty and move the tty core files there
The tty code should be at the root of the tree, as everyone needs it, and it's always built, and it's not really a "driver"
Based on work done by Arnd Bergmann <[email protected]>
---
Makefile | 2 +-
drivers/char/Makefile | 4 +---
tty/Makefile | 8 ++++++++
{drivers/char => tty}/n_tty.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
11 files changed, 10 insertions(+), 4 deletions(-)
create mode 100644 tty/Makefile
rename {drivers/char => tty}/n_tty.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%)Makefile +1 -1
@@ -483,7 +483,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf # Objects we will link into vmlinux / subdirs we need to visit init-y := init/ -drivers-y := drivers/ sound/ firmware/ +drivers-y := tty/ drivers/ sound/ firmware/ net-y := net/ libs-y := lib/ core-y := usr/
drivers/char/Makefile +1 -3
@@ -7,9 +7,8 @@ # 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
@@ -17,7 +16,6 @@ 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
tty/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +obj-y += tty_io.o +obj-y += n_tty.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_AUDIT) += tty_audit.o
tty/n_tty.c renamed from drivers/char/n_tty.c +0 -0
tty/tty_audit.c renamed from drivers/char/tty_audit.c +0 -0
tty/tty_buffer.c renamed from drivers/char/tty_buffer.c +0 -0
tty/tty_io.c renamed from drivers/char/tty_io.c +0 -0
tty/tty_ioctl.c renamed from drivers/char/tty_ioctl.c +0 -0
tty/tty_ldisc.c renamed from drivers/char/tty_ldisc.c +0 -0
tty/tty_mutex.c renamed from drivers/char/tty_mutex.c +0 -0
tty/tty_port.c renamed from drivers/char/tty_port.c +0 -0
Signature · 1 line
1.7.1
PATCH 2/2 TTY: create tty/vt and move the vt code there
The vt and other related code is moved into the tty/vt directory.
---
drivers/char/Makefile | 18 +----------------
tty/Makefile | 2 +
tty/vt/Makefile | 21 ++++++++++++++++++++
.../char/defkeymap.c_shipped => tty/vt/defkeymap.c | 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
11 files changed, 24 insertions(+), 17 deletions(-)
create mode 100644 tty/vt/Makefile
copy drivers/char/defkeymap.c_shipped => tty/vt/defkeymap.c (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%)drivers/char/Makefile +1 -17
@@ -12,10 +12,8 @@ obj-y += mem.o random.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_MAGIC_SYSRQ) += sysrq.o obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
@@ -114,7 +112,7 @@ 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 +clean-files := consolemap_deftbl.c quiet_cmd_conmk = CONMK $@ cmd_conmk = scripts/conmakehash $< > $@
@@ -122,18 +120,4 @@ quiet_cmd_conmk = CONMK $@ $(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
tty/Makefile +2 -0
@@ -6,3 +6,5 @@ obj-y += tty_buffer.o obj-y += tty_port.o obj-y += tty_mutex.o obj-$(CONFIG_AUDIT) += tty_audit.o +obj-$(CONFIG_VT) += vt/ +obj-$(CONFIG_HW_CONSOLE) += vt/
tty/vt/Makefile new file +21 -0
@@ -0,0 +1,21 @@ +obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o +obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o + +# Files generated that shall be removed upon make clean +clean-files := defkeymap.c + +$(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
tty/vt/defkeymap.c renamed from drivers/char/defkeymap.c_shipped +0 -0
tty/vt/defkeymap.c_shipped renamed from drivers/char/defkeymap.c_shipped +0 -0
tty/vt/defkeymap.map renamed from drivers/char/defkeymap.map +0 -0
tty/vt/keyboard.c renamed from drivers/char/keyboard.c +0 -0
tty/vt/selection.c renamed from drivers/char/selection.c +0 -0
tty/vt/vc_screen.c renamed from drivers/char/vc_screen.c +0 -0
tty/vt/vt.c renamed from drivers/char/vt.c +0 -0
tty/vt/vt_ioctl.c renamed from drivers/char/vt_ioctl.c +0 -0
Signature · 1 line
1.7.1
Arnd Bergmann
maintainerRe: [PATCH 2/2] TTY: create tty/vt and move the vt code there
Quoted 16 lines · Greg KH
drivers/char/Makefile +0
-2@@ -12,10 +12,8 @@ obj-y += mem.o random.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_MAGIC_SYSRQ) += sysrq.o obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
drivers/char/Makefile obj-$(CONFIG_JS_RTC) += js-rtc.o · line 115
Quoted 5 lines
drivers/char/Makefile +1
-1@@ -114,7 +112,7 @@ 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 +clean-files := consolemap_deftbl.c
IMHO the CONFIG_CONSOLE_TRANSLATIONS stuff belongs in the same directory as the VT driver, because it is only used in VT. It also puts all teh unusual Makefile bits into one place.
Arnd
Arnd Bergmann
maintainerRe: [PATCH 1/2] TTY: create /tty and move the tty core files there
In reply to Greg KHQuoted 9 lines · Greg KH
The tty code should be at the root of the tree, as everyone needs it, and it's always built, and it's not really a "driver"
Based on work done by Arnd Bergmann <[email protected]>
Cc Arnd Bergmann <[email protected]>Cc Jiri Slaby <[email protected]>Cc Alan Cox <[email protected]>,Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 12 lines
---
Makefile | 2 +-
drivers/char/Makefile | 4 +---
tty/Makefile | 8 ++++++++
{drivers/char => tty}/n_tty.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 | 0My original patch also moved pty.o, sysrq.o and the n_*.o line disciplines. It's probably debatable where the line disciplines should go (I don't care much, so don't ask me), but pty and sysrq seem like they should really be part of the tty core directory.
Arnd
Quoted 14 lines · Arnd Bergmann
This is the updated list, I hope I captured all the comments correctly:
drivers/char/tty_*-> tty/*drivers/char/{vtstuff} -> tty/vt/drivers/char/hvc_* -> drivers/tty/hvc/hvc_* drivers/serial/* -> drivers/tty/serial/* drivers/usb/serial -> drivers/usb/serialamiserial,nozomi,synclink,
rocket,ipwireless
cyclades,moxa,mxser,
isicom,bfin_jtag_comm ->drivers/tty/
Quoted 6 lines
stallion,istallion,
epca,specialix,ip2,
riscom,serial167 ->drivers/staging/tty/*generic_serial,vme_scc,
ser_a2232,sx,rio ->drivers/staging/generic_serial/*
Ok, I've now moved the rest of these files in the tty-next tree, so we should be completed with this for .39.
If there are any problems, or I missed any files, please let me know.
thanks,
greg k-h