patch-2.4.0-test12 linux/arch/m68k/mvme147/config.c

• Lines: 48
• Date: Mon Nov 27 17:11:26 2000
• Orig file: v2.4.0-test11/linux/arch/m68k/mvme147/config.c
• Orig date: Mon Jan 31 10:32:53 2000

diff -u --recursive --new-file v2.4.0-test11/linux/arch/m68k/mvme147/config.c linux/arch/m68k/mvme147/config.c
@@ -201,15 +201,6 @@
 
 /*-------------------  Serial console stuff ------------------------*/
 
-void m147_scc_write(struct console *co, const char *str, unsigned cnt);
-
-
-void mvme147_init_console_port (struct console *co, int cflag)
-{
-	co->write = m147_scc_write;
-}
-
-
 static void scc_delay (void)
 {
 	int n;
@@ -250,3 +241,31 @@
 	restore_flags(flags);
 }
 
+
+static int m147_scc_wait_key (struct console *co)
+{
+	volatile unsigned char *p = (volatile char *)M147_SCC_A_ADDR;
+	unsigned long	flags;
+	int		c;
+
+	/* wait for rx buf filled */
+	while ((*p & 0x01) == 0)
+		;
+
+	save_flags(flags);
+	cli();
+
+	*p = 8;
+	scc_delay();
+	c = *p;
+
+	restore_flags(flags);
+	return c;
+}
+
+
+void mvme147_init_console_port (struct console *co, int cflag)
+{
+	co->write    = m147_scc_write;
+	co->wait_key = m147_scc_wait_key;
+}