|
From: <ai...@us...> - 2003-09-27 13:12:41
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv3030/drivers/char
Modified Files:
Makefile dz.c tty_io.c
Log Message:
merge 2.4.22
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile 27 Sep 2003 09:21:13 -0000 1.9
+++ Makefile 27 Sep 2003 13:11:56 -0000 1.10
@@ -252,6 +252,7 @@
obj-$(CONFIG_INTEL_RNG) += i810_rng.o
obj-$(CONFIG_AMD_RNG) += amd768_rng.o
obj-$(CONFIG_AMD_PM768) += amd76x_pm.o
+obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
obj-$(CONFIG_ITE_GPIO) += ite_gpio.o
obj-$(CONFIG_AU1000_GPIO) += au1000_gpio.o
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dz.c 21 Sep 2003 13:12:30 -0000 1.14
+++ dz.c 27 Sep 2003 13:11:56 -0000 1.15
@@ -36,45 +36,38 @@
#include <linux/param.h>
#include <linux/tqueue.h>
#include <linux/interrupt.h>
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#ifdef CONFIG_VAX
-#define SERIAL_RX 0xB0 /* FIXME: this is wrong */
-#define SERIAL_TX 0xB1 /* FIXME: this is wrong */
-#define SERIAL SERIAL_RX
-#define wbflush() do{}while(0)
-#else
-#include <asm-mips/wbflush.h>
-#include <asm/dec/interrupts.h> /* for definition of SERIAL */
-#endif
#include <linux/console.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
-#include <asm/uaccess.h>
-#include <asm/irq.h>
+#include <linux/serial.h>
+
+#include <linux/ptrace.h>
+#include <linux/fs.h>
#ifdef CONFIG_VAX
#include <asm/mv.h>
#include <asm/vsa.h>
#include <asm/dz11.h>
+#define SERIAL_RX 0xB0 /* FIXME: this is wrong */
+#define SERIAL_TX 0xB1 /* FIXME: this is wrong */
+#define SERIAL SERIAL_RX
volatile struct dz11_regs *dz11_addr;
#else
-#include <asm/dec/machtype.h>
+#include <asm/bootinfo.h>
+#include <asm/dec/interrupts.h>
#include <asm/dec/kn01.h>
#include <asm/dec/kn02.h>
-#include <asm/bootinfo.h>
+#include <asm/dec/machtype.h>
+#include <asm/dec/prom.h>
+#define SERIAL dec_interrupt[DEC_IRQ_DZ11]
#endif
-
-#include <linux/ptrace.h>
-#include <linux/fs.h>
-#include <asm/bootinfo.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/uaccess.h>
#define CONSOLE_LINE (3) /* for definition of struct console */
-extern int (*prom_printf) (char *,...);
-#endif
-
#include "dz.h"
#define DZ_INTR_DEBUG 1
@@ -229,13 +222,12 @@
if (!(status & DZ_DVAL))
goto ignore_char;
-
ch = UCHAR(status); /* grab the char */
#if 0
if (info->is_console) {
if (ch == 0)
- return; /* it's a break ... */
+ return; /* it's a break ... */
}
#endif
@@ -1472,10 +1464,10 @@
}
/* reset the chip */
-#ifndef CONFIG_SERIAL_CONSOLE
+#ifndef CONFIG_SERIAL_DEC_CONSOLE
dz_out(info, DZ_CSR, DZ_CLR);
while ((tmp = dz_in(info, DZ_CSR)) & DZ_CLR);
- wbflush();
+ iob();
/* enable scanning */
dz_out(info, DZ_CSR, DZ_MSE);
@@ -1711,12 +1703,12 @@
static struct console dz_sercons =
{
- name: "ttyS",
- write: dz_console_print,
- device: dz_console_device,
- setup: dz_console_setup,
- flags: CON_CONSDEV | CON_PRINTBUFFER,
- index: CONSOLE_LINE,
+ .name = "ttyS",
+ .write = dz_console_print,
+ .device = dz_console_device,
+ .setup = dz_console_setup,
+ .flags = CON_CONSDEV | CON_PRINTBUFFER,
+ .index = CONSOLE_LINE,
};
void __init dz_serial_console_init(void)
@@ -1724,6 +1716,6 @@
register_console(&dz_sercons);
}
-#endif /* CONFIG_SERIAL_CONSOLE */
+#endif /* CONFIG_SERIAL_DEC_CONSOLE */
MODULE_LICENSE("GPL");
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/tty_io.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tty_io.c 27 Sep 2003 09:21:13 -0000 1.12
+++ tty_io.c 27 Sep 2003 13:11:56 -0000 1.13
@@ -142,6 +142,7 @@
extern int serial167_init(void);
extern long serial167_console_init(void);
extern void console_8xx_init(void);
+extern void au1x00_serial_console_init(void);
extern int rs_8xx_init(void);
extern void mac_scc_console_init(void);
extern void hwc_console_init(void);
@@ -154,10 +155,14 @@
extern void sa1100_rs_console_init(void);
extern void sgi_serial_console_init(void);
extern void sci_console_init(void);
+extern void dec_serial_console_init(void);
extern void tx3912_console_init(void);
extern void tx3912_rs_init(void);
extern void txx927_console_init(void);
+extern void txx9_rs_init(void);
+extern void txx9_serial_console_init(void);
extern void sb1250_serial_console_init(void);
+extern void arc_console_init(void);
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -2235,8 +2240,8 @@
#ifdef CONFIG_VT
con_init();
#endif
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
- au1000_serial_console_init();
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
+ au1x00_serial_console_init();
#endif
#ifdef CONFIG_SERIAL_CONSOLE
#if (defined(CONFIG_8xx) || defined(CONFIG_8260))
@@ -2253,9 +2258,6 @@
#elif defined(CONFIG_SERIAL)
serial_console_init();
#endif /* CONFIG_8xx */
-#ifdef CONFIG_SGI_SERIAL
- sgi_serial_console_init();
-#endif
#if defined(CONFIG_MVME162_SCC) || defined(CONFIG_BVME6000_SCC) || defined(CONFIG_MVME147_SCC)
vme_scc_console_init();
#endif
@@ -2266,6 +2268,9 @@
sci_console_init();
#endif
#endif
+#ifdef CONFIG_SERIAL_DEC_CONSOLE
+ dec_serial_console_init();
+#endif
#ifdef CONFIG_TN3270_CONSOLE
tub3270_con_init();
#endif
@@ -2296,8 +2301,14 @@
#ifdef CONFIG_TXX927_SERIAL_CONSOLE
txx927_console_init();
#endif
+#ifdef CONFIG_SERIAL_TXX9_CONSOLE
+ txx9_serial_console_init();
+#endif
#ifdef CONFIG_SIBYTE_SB1250_DUART_CONSOLE
sb1250_serial_console_init();
+#endif
+#ifdef CONFIG_IP22_SERIAL
+ sgi_serial_console_init();
#endif
}
|