patch-2.2.18 linux/arch/m68k/bvme6000/config.c

• Lines: 94
• Date: Fri Oct 13 23:30:47 2000
• Orig file: v2.2.17/arch/m68k/bvme6000/config.c
• Orig date: Fri Apr 21 12:45:46 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/arch/m68k/bvme6000/config.c linux/arch/m68k/bvme6000/config.c
@@ -25,6 +25,7 @@
 #include <linux/init.h>
 #include <linux/major.h>
 
+#include <asm/bootinfo.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/setup.h>
@@ -64,6 +65,15 @@
 
 static void (*tick_handler)(int, void *, struct pt_regs *);
 
+
+int bvme6000_parse_bootinfo(const struct bi_record *bi)
+{
+	if (bi->tag == BI_VME_TYPE)
+		return 0;
+	else
+		return 1;
+}
+
 int bvme6000_kbdrate (struct kbd_repeat *k)
 {
 	return 0;
@@ -164,7 +174,7 @@
         unsigned long *old = (unsigned long *)0xf8000000;
 
         /* Wait for button release */
-	while (*config_reg_ptr & BVME_ABORT_STATUS)
+	while (*(volatile unsigned char *)BVME_LOCAL_IRQ_STAT & BVME_ABORT_STATUS)
 		;
 
         *(new+4) = *(old+4);            /* Illegal instruction */
@@ -405,15 +415,6 @@
 
 /*-------------------  Serial console stuff ------------------------*/
 
-static void bvme_scc_write(struct console *co, const char *str, unsigned cnt);
-
-
-void bvme6000_init_console_port (struct console *co, int cflag)
-{
-        co->write = bvme_scc_write;
-}
-
-
 static void scc_delay (void)
 {
         int n;
@@ -423,6 +424,7 @@
 		trash = n;
 }
 
+
 static void scc_write (char ch)
 {
         volatile char *p = (volatile char *)BVME_SCC_A_ADDR;
@@ -431,10 +433,7 @@
                 scc_delay();
         }
         while (!(*p & 4));
-        scc_delay();
-        *p = 8;
-        scc_delay();
-        *p = ch;
+        *(p + 4) = ch;
 }
 
 
@@ -452,5 +451,24 @@
                 scc_write (*str++);
         }
         restore_flags(flags);
+}
+
+
+static int bvme_scc_wait_key (struct console *co)
+{
+	volatile unsigned char *p = (volatile char *)BVME_SCC_A_ADDR;
+
+	/* wait for rx buf filled */
+	while ((*p & 0x01) == 0)
+		;
+
+	return  *(p + 4);
+}
+
+
+void bvme6000_init_console_port (struct console *co, int cflag)
+{
+        co->write    = bvme_scc_write;
+        co->wait_key = bvme_scc_wait_key;
 }