[Linuxconsole-commit]CVS: ruby/linux/drivers/char Kconfig,1.2,1.3 Makefile,1.51,1.52 sysrq.c,1.26,1.27 tty_io.c,1.55,1.56

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv10917/linux/drivers/char

Modified Files:
	Kconfig Makefile sysrq.c tty_io.c 
Log Message:
Synced to 2.5.51

Index: Kconfig
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig	23 Nov 2002 00:55:50 -0000	1.2
+++ Kconfig	10 Dec 2002 21:06:15 -0000	1.3
@@ -6,7 +6,7 @@
 
 config VT
 	bool "Virtual terminal"
-	depends on INPUT 
+	depends on INPUT=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

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile	23 Nov 2002 00:55:50 -0000	1.51
+++ Makefile	10 Dec 2002 21:06:16 -0000	1.52
@@ -12,11 +12,11 @@
 # 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
 
-obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
+obj-$(CONFIG_VT) += vt_ioctl.o decvte.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
 obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
 obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
 obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
@@ -77,7 +77,7 @@
 obj-$(CONFIG_NWFLASH) += nwflash.o
 obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
 
-obj-$(CONFIG_WATCHDOGS)	+= watchdog/
+obj-$(CONFIG_WATCHDOG)	+= watchdog/
 obj-$(CONFIG_MWAVE) += mwave/
 obj-$(CONFIG_AGP) += agp/
 obj-$(CONFIG_DRM) += drm/

Index: sysrq.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/sysrq.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27

Index: tty_io.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/tty_io.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- tty_io.c	23 Nov 2002 00:55:50 -0000	1.55
+++ tty_io.c	10 Dec 2002 21:06:17 -0000	1.56
@@ -368,6 +368,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)
 {
@@ -535,6 +537,8 @@
 	schedule_work(&tty->hangup_work);
 }
 
+EXPORT_SYMBOL(tty_hangup);
+
 void tty_vhangup(struct tty_struct * tty)
 {
 #ifdef TTY_DEBUG_HANGUP
@@ -551,6 +555,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.
@@ -1881,6 +1887,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.
@@ -1941,34 +1949,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)
@@ -2199,7 +2217,7 @@
 #ifdef CONFIG_TN3270_CONSOLE
 	tub3270_con_init();
 #endif
-#ifdef CONFIG_TN3215
+#ifdef CONFIG_TN3215_CONSOLE
 	con3215_init();
 #endif
 #ifdef CONFIG_SCLP_CONSOLE
@@ -2329,10 +2347,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