From 4b9758c8ec6103c26228e1cda9731ab8bf1113e9 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Tue, 25 Mar 2014 22:25:44 +0100
Subject: i386: improve the immediate console

Improve the immediate console to the point that it can be enabled and
display e.g. assertion failures from very early on (i.e. from
`c_boot_entry').

* device/cons.h (romgetc, romputc): New declarations.
* i386/configfrag.ac: Add configuration variable.
* i386/i386at/conf.c (dev_name_list): Add entry.
* i386/i386at/cons_conf.c (constab): Add entry.
* i386/i386at/immc.c: Add missing includes.
(immc_cnprobe, immc_cninit, immc_cngetc, immc_romputc): New functions.
(immc_cnputc): Fix signature, use virtual addresses.
* i386/i386at/immc.h: New file.
* i386/i386at/kd.c: Use `#if ENABLE_IMMEDIATE_CONSOLE'.
* i386/i386at/kd.h (kd_setpos): Add missing declaration.
* i386/i386at/model_dep.c (c_boot_entry): Install immediate console as
early boot console.
---
 i386/i386at/cons_conf.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'i386/i386at/cons_conf.c')

diff --git a/i386/i386at/cons_conf.c b/i386/i386at/cons_conf.c
index cf42bb6..1d7dd38 100644
--- a/i386/i386at/cons_conf.c
+++ b/i386/i386at/cons_conf.c
@@ -39,6 +39,10 @@
 #endif
 #endif	/* MACH_HYP */
 
+#if	ENABLE_IMMEDIATE_CONSOLE
+#include "immc.h"
+#endif	/* ENABLE_IMMEDIATE_CONSOLE */
+
 /*
  * The rest of the consdev fields are filled in by the respective
  * cnprobe routine.
@@ -47,6 +51,9 @@ struct	consdev constab[] = {
 #ifdef	MACH_HYP
 	{"hyp",	hypcnprobe,	hypcninit,	hypcngetc,	hypcnputc},
 #else	/* MACH_HYP */
+#if	ENABLE_IMMEDIATE_CONSOLE
+	{"immc", immc_cnprobe,	immc_cninit,	immc_cngetc,	immc_cnputc},
+#endif	/* ENABLE_IMMEDIATE_CONSOLE */
 	{"kd",	kdcnprobe,	kdcninit,	kdcngetc,	kdcnputc},
 #if NCOM > 0
 	{"com",	comcnprobe,	comcninit,	comcngetc,	comcnputc},
-- 
cgit v1.2.3