Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv5429/drivers/char
Modified Files:
dz.c
Log Message:
Updates to adapt code base from 2.2 to 2.4 tree. Sync up to atp 2.4 tree.
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** dz.c 2001/01/14 17:55:21 1.1.1.1
--- dz.c 2001/01/18 15:52:27 1.2
***************
*** 40,46 ****
--- 40,51 ----
#include <linux/tqueue.h>
#include <linux/interrupt.h>
+
+ #ifdef CONFIG_VAX
+ #define SERIAL 0 /* FIXME: this is wrong */
+ #else
#include <asm-mips/wbflush.h>
/* for definition of SERIAL */
#include <asm/dec/interrupts.h>
+ #endif
/* for definition of struct console */
***************
*** 58,69 ****
#include <asm/uaccess.h>
#include <asm/irq.h>
#include <asm/dec/machtype.h>
#include <asm/dec/kn01.h>
#include <asm/dec/kn02.h>
#ifdef DEBUG_DZ
#include <linux/ptrace.h>
#include <linux/fs.h>
- #include <asm/bootinfo.h>
extern int (*prom_printf) (char *,...);
--- 63,80 ----
#include <asm/uaccess.h>
#include <asm/irq.h>
+
+ #ifdef CONFIG_VAX
+ #include <asm/dz11.h>
+ volatile struct dz11_regs *dz11_addr;
+ #else
#include <asm/dec/machtype.h>
#include <asm/dec/kn01.h>
#include <asm/dec/kn02.h>
+ #include <asm/bootinfo.h>
+ #endif
#ifdef DEBUG_DZ
#include <linux/ptrace.h>
#include <linux/fs.h>
extern int (*prom_printf) (char *,...);
***************
*** 231,235 ****
ch = UCHAR(status); /* grab the char */
! #ifdef 0
if (info->is_console) {
if (ch == 0) return; /* it's a break ... */
--- 242,246 ----
ch = UCHAR(status); /* grab the char */
! #if 0
if (info->is_console) {
if (ch == 0) return; /* it's a break ... */
***************
*** 1353,1361 ****
info->magic = SERIAL_MAGIC;
if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100))
info->port = (unsigned long) KN01_DZ11_BASE;
else
info->port = (unsigned long) KN02_DZ11_BASE;
!
info->line = i;
info->tty = 0;
--- 1364,1376 ----
info->magic = SERIAL_MAGIC;
+ #ifdef CONFIG_VAX
+ info->port = (unsigned long) 0x200A0000;
+ #else
if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100))
info->port = (unsigned long) KN01_DZ11_BASE;
else
info->port = (unsigned long) KN02_DZ11_BASE;
! #endif
!
info->line = i;
info->tty = 0;
***************
*** 1522,1529 ****
/* TOFIX: force to console line */
dz_console = &multi[CONSOLE_LINE];
! if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100))
dz_console->port = KN01_DZ11_BASE;
else
dz_console->port = KN02_DZ11_BASE;
dz_console->line = CONSOLE_LINE;
--- 1537,1548 ----
/* TOFIX: force to console line */
dz_console = &multi[CONSOLE_LINE];
! #ifdef CONFIG_VAX
! dz_console->port = (unsigned long)dz11_addr;
! #else
! if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100))
dz_console->port = KN01_DZ11_BASE;
else
dz_console->port = KN02_DZ11_BASE;
+ #endif
dz_console->line = CONSOLE_LINE;
|
