patch-2.4.20 linux-2.4.20/arch/mips/arc/arc_con.c
Next file: linux-2.4.20/arch/mips/arc/cmdline.c
Previous file: linux-2.4.20/arch/mips/arc/Makefile
Back to the patch index
Back to the overall index
- Lines: 83
- Date:
Thu Nov 28 15:53:09 2002
- Orig file:
linux-2.4.19/arch/mips/arc/arc_con.c
- Orig date:
Fri Apr 13 20:26:07 2001
diff -urN linux-2.4.19/arch/mips/arc/arc_con.c linux-2.4.20/arch/mips/arc/arc_con.c
@@ -2,61 +2,49 @@
* Wrap-around code for a console using the
* ARC io-routines.
*
- * Copyright (c) 1998 Harald Koerfgen
+ * Copyright (c) 1998 Harald Koerfgen
+ * Copyright (c) 2001 Ralf Baechle
+ * Copyright (c) 2002 Thiemo Seufer
*/
-
#include <linux/tty.h>
#include <linux/major.h>
#include <linux/ptrace.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/fs.h>
-
-extern char prom_getchar (void);
-extern void prom_printf (char *, ...);
+#include <asm/sgialib.h>
static void prom_console_write(struct console *co, const char *s,
unsigned count)
{
- unsigned i;
-
- /*
- * Now, do each character
- */
- for (i = 0; i < count; i++) {
- if (*s == 10)
- prom_printf("%c", 13);
- prom_printf("%c", *s++);
+ /* Do each character */
+ while (count--) {
+ if (*s == '\n')
+ prom_putchar('\r');
+ prom_putchar(*s++);
}
}
-static int prom_console_wait_key(struct console *co)
+static kdev_t prom_console_device(struct console *co)
{
- return prom_getchar();
+ return MKDEV(TTY_MAJOR, 64 + co->index);
}
static int __init prom_console_setup(struct console *co, char *options)
{
- return 0;
-}
-
-static kdev_t prom_console_device(struct console *c)
-{
- return MKDEV(TTY_MAJOR, 64 + c->index);
+ if (prom_flags & PROM_FLAG_USE_AS_CONSOLE)
+ return 0;
+ else
+ return 1;
}
static struct console arc_cons = {
- "ttyS",
- prom_console_write,
- NULL,
- prom_console_device,
- prom_console_wait_key,
- NULL,
- prom_console_setup,
- CON_PRINTBUFFER,
- -1,
- 0,
- NULL
+ name: "ttyS",
+ write: prom_console_write,
+ device: prom_console_device,
+ setup: prom_console_setup,
+ flags: CON_PRINTBUFFER,
+ index: -1,
};
/*
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)