[LV-kern-commit] CVS: kernel-2.4/arch/vax/kernel cpu_vxt.c,1.5,1.6

[? <uns...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv31994/arch/vax/kernel

Modified Files:
	cpu_vxt.c 
Log Message:
First attempt at a real serial driver for the SC26C94 in the VXT2000.


Index: cpu_vxt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_vxt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu_vxt.c	22 May 2002 23:16:25 -0000	1.5
+++ cpu_vxt.c	29 May 2002 03:37:40 -0000	1.6
@@ -25,10 +25,11 @@
 void vxt_init_devices(void);
 const char *vxt_cpu_type_str(void);
 
+#ifndef CONFIG_VXT2694
 void vxt_putchar(int c);
 int vxt_getchar(void);
 void init_vxt_console(unsigned long phys_addr);
-
+#endif
 
 struct vxt_machine_vector {
 	struct vax_mv mv;
@@ -44,8 +45,13 @@
 	ka4x_prom_putchar,  /* pre_vm_putchar */
 	ka4x_prom_getchar,  /* pre_vm_getchar */
 
+#ifndef CONFIG_VXT2694
 	vxt_putchar,   /* post_vm_putchar */
 	vxt_getchar,   /* post_vm_getchar */
+#else
+	NULL,
+	NULL,
+#endif
 
 	NULL,          /* console_init */
 
@@ -67,11 +73,18 @@
 	mv_vxt.sidex = *(unsigned int *)SOC_SIDEX_ADDR;
 }
 
+#ifdef CONFIG_VXT2694
+extern void vxt_serial_console_init(void);
+#endif
 
 void vxt_post_vm_init(void)
 {
+#ifndef CONFIG_VXT2694
 	init_vxt_console(0x200A0000);
 	register_console(&vax_console);
+#else
+	vxt_serial_console_init();
+#endif
 }
 
 
@@ -93,6 +106,7 @@
    are intended as a quick way to get post-VM output on the VXT2000 in serial
    console mode until there's a proper driver. */
 
+#ifndef CONFIG_VXT2694
 volatile int *vxt2694_addr = NULL;
 
 void vxt_putchar(int c)
@@ -120,4 +134,4 @@
 
        vxt2694_addr = ioremap(phys_addr, 256);
 }
-
+#endif