added console field to struct tty_driver
Subsystems (7)
A message that is not in the archive (sent off-list or not yet received): [email protected]
Okay. Here is a patch with the tab cleanups.
. ---
|o_o | |:_/ | Give Micro$oft the Bird!!!! // \ \ Use Linux!!!! (| | ) /'_ _/`\
___)=(___/
arch/mips/au1000/common/serial.c +3 -1
@@ -2606,7 +2606,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_AU1000_SERIAL_CONSOLE + serial_driver.console = &sercons; +#endif serial_driver.open = rs_open; serial_driver.close = rs_close; serial_driver.write = rs_write;
arch/mips/baget/vacserial.c +3 -1
@@ -2373,7 +2373,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sercons; +#endif serial_driver.open = rs_open; serial_driver.close = rs_close; serial_driver.write = rs_write;
arch/ppc/8260_io/uart.c +3 -1
@@ -2290,7 +2290,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sercons; +#endif serial_driver.open = rs_8xx_open; serial_driver.close = rs_8xx_close; serial_driver.write = rs_8xx_write;
arch/ppc/8xx_io/uart.c +3 -1
@@ -2536,7 +2536,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sercons; +#endif serial_driver.open = rs_8xx_open; serial_driver.close = rs_8xx_close; serial_driver.write = rs_8xx_write;
drivers/char/amiserial.c +3 -1
@@ -2143,7 +2143,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sercons; +#endif serial_driver.open = rs_open; serial_driver.close = rs_close; serial_driver.write = rs_write;
drivers/char/console.c +3 -1
@@ -2459,7 +2459,9 @@ console_driver.table = console_table; console_driver.termios = console_termios; console_driver.termios_locked = console_termios_locked; - +#ifdef CONFIG_VT_CONSOLE + console_driver.console = &vt_console_driver; +#endif console_driver.open = con_open; console_driver.close = con_close; console_driver.write = con_write;
drivers/char/dz.c +4 -2
@@ -67,7 +67,7 @@extern int (*prom_printf) (char *,...);#endif - +struct console dz_sercons;#include "dz.h"
@@ -1353,7 +1353,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &dz_sercons; +#endif serial_driver.open = dz_open; serial_driver.close = dz_close; serial_driver.write = dz_write;
drivers/char/keyboard.c +0 -2
@@ -67,8 +67,6 @@extern void ctrl_alt_del (void ); -struct console ; -/* * global state includes the following, and various static variables * in this module: prev_scancode, shift_state, diacr, npadch, dead_key_next.
drivers/char/serial.c +3 -1
@@ -5408,7 +5408,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sercons; +#endif serial_driver.open = rs_open; serial_driver.close = rs_close; serial_driver.write = rs_write;
drivers/char/serial167.c +2 -0
@@ -103,6 +103,7 @@DECLARE_TASK_QUEUE (tq_cyclades);struct tty_driver cy_serial_driver, cy_callout_driver; +static struct console sercons;extern int serial_console;static struct cyclades_port *serial_console_info =NULL ;static unsigned int serial_console_cflag =0 ;
@@ -2409,6 +2410,7 @@ cy_serial_driver.table = serial_table; cy_serial_driver.termios = serial_termios; cy_serial_driver.termios_locked = serial_termios_locked; + cy_serial_driver.console = &sercons; cy_serial_driver.open = cy_open; cy_serial_driver.close = cy_close; cy_serial_driver.write = cy_write;
drivers/char/serial_21285.c +4 -1
@@ -45,6 +45,7 @@static struct termios *rs285_termios[1 ];static struct termios *rs285_termios_locked[1 ]; +static struct console rs285_cons;static char wbuf[1000 ], *putp = wbuf, *getp = wbuf, x_char;static struct tty_struct *rs285_tty;
@@ -312,7 +313,9 @@ rs285_driver.table = rs285_table; rs285_driver.termios = rs285_termios; rs285_driver.termios_locked = rs285_termios_locked; - +#ifdef CONFIG_SERIAL_21285_CONSOLE + rs285_driver.console = &rs285_cons; +#endif rs285_driver.open = rs285_open; rs285_driver.close = rs285_close; rs285_driver.write = rs285_write;
drivers/char/serial_amba.c +3 -1
@@ -1789,7 +1789,9 @@ ambanormal_driver.table = ambauart_table; ambanormal_driver.termios = ambauart_termios; ambanormal_driver.termios_locked = ambauart_termios_locked; - +#ifdef CONFIG_SERIAL_AMBA_CONSOLE + ambanormal_driver.console = &ambauart_cons; +#endif ambanormal_driver.open = ambauart_open; ambanormal_driver.close = ambauart_close; ambanormal_driver.write = ambauart_write;
drivers/char/serial_tx3912.c +3 -1
@@ -854,7 +854,9 @@ rs_driver.table = rs_table; rs_driver.termios = rs_termios; rs_driver.termios_locked = rs_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + rs_driver.console = &sercons; +#endif rs_driver.open = rs_open; rs_driver.close = gs_close; rs_driver.write = gs_write;
drivers/char/sh-sci.c +3 -1
@@ -1040,7 +1040,9 @@ sci_driver.table = sci_table; sci_driver.termios = sci_termios; sci_driver.termios_locked = sci_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + sci_driver.console = &sercons; +#endif sci_driver.open = sci_open; sci_driver.close = gs_close; sci_driver.write = gs_write;
drivers/char/vme_scc.c +4 -2
@@ -92,10 +92,10 @@static void scc_break_ctl (struct tty_struct *tty,int break_state);static struct tty_driver scc_driver, scc_callout_driver; -static struct tty_struct *scc_table[2 ] = {NULL , };static struct termios * scc_termios[2 ];static struct termios * scc_termios_locked[2 ]; +static struct console sercons;struct scc_port scc_ports[2 ];int scc_refcount;
@@ -145,7 +145,9 @@ scc_driver.table = scc_table; scc_driver.termios = scc_termios; scc_driver.termios_locked = scc_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + scc_driver.console = &sercons; +#endif scc_driver.open = scc_open; scc_driver.close = gs_close; scc_driver.write = gs_write;
drivers/macintosh/macserial.c +3 -1
@@ -2580,7 +2580,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sercons; +#endif serial_driver.open = rs_open; serial_driver.close = rs_close; serial_driver.write = rs_write;
drivers/s390/char/con3215.c +3 -1
@@ -1145,7 +1145,9 @@ tty3215_driver.table = tty3215_table; tty3215_driver.termios = tty3215_termios; tty3215_driver.termios_locked = tty3215_termios_locked; - +#ifdef CONFIG_TN3215_CONSOLE + tty3215_driver.console = &con3215; +#endif tty3215_driver.open = tty3215_open; tty3215_driver.close = tty3215_close; tty3215_driver.write = tty3215_write;
drivers/s390/char/tubtty.c +4 -1
@@ -53,6 +53,7 @@struct tty_struct *tty3270_table[TUBMAXMINS ];struct termios *tty3270_termios[TUBMAXMINS ];struct termios *tty3270_termios_locked[TUBMAXMINS ]; +extern struct console tub3270_con;#ifdef CONFIG_TN3270_CONSOLE int con3270_major =-1 ;struct tty_driver con3270_driver;
@@ -94,7 +95,9 @@ td->table = tty3270_table; td->termios = tty3270_termios; td->termios_locked = tty3270_termios_locked; - +#ifdef CONFIG_TN3270_CONSOLE + td->console = &tub3270_con; +#endif td->open = tty3270_open; td->close = tty3270_close; td->write = tty3270_write;
drivers/sbus/char/sab82532.c +3 -1
@@ -2251,7 +2251,9 @@ serial_driver.table = sab82532_table; serial_driver.termios = sab82532_termios; serial_driver.termios_locked = sab82532_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sab82532_console; +#endif serial_driver.open = sab82532_open; serial_driver.close = sab82532_close; serial_driver.write = sab82532_write;
drivers/sbus/char/su.c +3 -1
@@ -2506,7 +2506,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sercons; +#endif serial_driver.open = su_open; serial_driver.close = su_close; serial_driver.write = su_write;
drivers/sbus/char/zs.c +3 -1
@@ -2425,7 +2425,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &zs_console; +#endif serial_driver.open = zs_open; serial_driver.close = zs_close; serial_driver.write = zs_write;
drivers/sgi/char/sgiserial.c +4 -1
@@ -98,6 +98,7 @@DECLARE_TASK_QUEUE (tq_serial);struct tty_driver serial_driver, callout_driver; +struct console sgi_console_driver;struct console *sgisercon;static int serial_refcount;
@@ -1886,7 +1887,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sgi_console_driver; +#endif serial_driver.open = rs_open; serial_driver.close = rs_close; serial_driver.write = rs_write;
drivers/tc/zs.c +3 -1
@@ -1893,7 +1893,9 @@ serial_driver.table = serial_table; serial_driver.termios = serial_termios; serial_driver.termios_locked = serial_termios_locked; - +#ifdef CONFIG_SERIAL_CONSOLE + serial_driver.console = &sercons; +#endif serial_driver.open = rs_open; serial_driver.close = rs_close; serial_driver.write = rs_write;
include/linux/tty_driver.h +1 -0
@@ -130,6 +130,7 @@struct termios init_termios;/* Initial termios */ int flags;/* tty driver flags */ int *refcount;/* for loadable tty drivers */ +struct console *console;/* console attached to this tty hardware */ struct proc_dir_entry *proc_entry;/* /proc fs entry */ struct tty_driver *other;/* only used for the PTY driver */