Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv31393/drivers/char
Modified Files:
Makefile tty_io.c
Removed Files:
hp_keyb.c hp_psaux.c
Log Message:
Merge with 2.5.51
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile 26 Jun 2003 23:07:10 -0000 1.31
+++ Makefile 7 Jul 2003 23:47:31 -0000 1.32
@@ -12,7 +12,7 @@
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
-export-objs := busmouse.o vt.o generic_serial.o ip2main.o \
+export-objs := busmouse.o vt.o generic_serial.o ip2main.o consolemap.o\
ite_gpio.o keyboard.o misc.o nvram.o random.o rtc.o \
selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tty_io.c 22 Jun 2003 16:18:53 -0000 1.14
+++ tty_io.c 7 Jul 2003 23:47:31 -0000 1.15
@@ -372,6 +372,8 @@
return -ERESTARTSYS;
}
+EXPORT_SYMBOL(tty_check_change);
+
static ssize_t hung_up_tty_read(struct file * file, char * buf,
size_t count, loff_t *ppos)
{
@@ -540,6 +542,8 @@
schedule_work(&tty->hangup_work);
}
+EXPORT_SYMBOL(tty_hangup);
+
void tty_vhangup(struct tty_struct * tty)
{
#ifdef TTY_DEBUG_HANGUP
@@ -556,6 +560,8 @@
return (filp->f_op == &hung_up_tty_fops);
}
+EXPORT_SYMBOL(tty_hung_up_p);
+
/*
* This function is typically called only by the session leader, when
* it wants to disassociate itself from its controlling tty.
@@ -1503,6 +1509,13 @@
return -EFAULT;
if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg)))
return 0;
+#ifdef CONFIG_VT
+ if (tty->driver.type == TTY_DRIVER_TYPE_CONSOLE) {
+ unsigned int currcons = minor(tty->device) - tty->driver.minor_start;
+ if (vc_resize(currcons, tmp_ws.ws_col, tmp_ws.ws_row))
+ return -ENXIO;
+ }
+#endif
if (tty->pgrp > 0)
kill_pg(tty->pgrp, SIGWINCH, 1);
if ((real_tty->pgrp != tty->pgrp) && (real_tty->pgrp > 0))
@@ -1886,6 +1899,8 @@
schedule_work(&tty->SAK_work);
}
+EXPORT_SYMBOL(do_SAK);
+
/*
* This routine is called out of the software interrupt to flush data
* from the flip buffer to the line discipline.
@@ -1946,34 +1961,44 @@
#endif
};
-static int n_baud_table = sizeof(baud_table)/sizeof(int);
+static int n_baud_table = ARRAY_SIZE(baud_table);
-int tty_get_baud_rate(struct tty_struct *tty)
+int tty_termios_baud_rate(struct termios *termios)
{
- unsigned int cflag, i;
+ unsigned int cbaud = termios->c_cflag & CBAUD;
- cflag = tty->termios->c_cflag;
+ if (cbaud & CBAUDEX) {
+ cbaud &= ~CBAUDEX;
- i = cflag & CBAUD;
- if (i & CBAUDEX) {
- i &= ~CBAUDEX;
- if (i < 1 || i+15 >= n_baud_table)
- tty->termios->c_cflag &= ~CBAUDEX;
+ if (cbaud < 1 || cbaud + 15 > n_baud_table)
+ termios->c_cflag &= ~CBAUDEX;
else
- i += 15;
+ cbaud += 15;
}
- if (i==15 && tty->alt_speed) {
+
+ return baud_table[cbaud];
+}
+
+EXPORT_SYMBOL(tty_termios_baud_rate);
+
+int tty_get_baud_rate(struct tty_struct *tty)
+{
+ int baud = tty_termios_baud_rate(tty->termios);
+
+ if (baud == 38400 && tty->alt_speed) {
if (!tty->warned) {
printk(KERN_WARNING "Use of setserial/setrocket to "
"set SPD_* flags is deprecated\n");
tty->warned = 1;
}
- return(tty->alt_speed);
+ baud = tty->alt_speed;
}
- return baud_table[i];
+ return baud;
}
+EXPORT_SYMBOL(tty_get_baud_rate);
+
void tty_flip_buffer_push(struct tty_struct *tty)
{
if (tty->low_latency)
@@ -2206,7 +2231,7 @@
#ifdef CONFIG_TN3270_CONSOLE
tub3270_con_init();
#endif
-#ifdef CONFIG_TN3215
+#ifdef CONFIG_TN3215_CONSOLE
con3215_init();
#endif
#ifdef CONFIG_SCLP_CONSOLE
@@ -2347,10 +2372,7 @@
#ifdef CONFIG_TN3270
tub3270_init();
#endif
-#ifdef CONFIG_TN3215
- tty3215_init();
-#endif
-#ifdef CONFIG_SCLP
+#ifdef CONFIG_SCLP_TTY
sclp_tty_init();
#endif
#ifdef CONFIG_A2232
--- hp_keyb.c DELETED ---
--- hp_psaux.c DELETED ---
|
