diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-02-26 21:57:11 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-02-26 21:57:11 +0100 |
| commit | dd687a62dfb81ec125f41a257229f58d80b7044d (patch) | |
| tree | a7c7d54acf611248e4c64a508717e8dd076e47c7 /i386/i386at/cons_conf.c | |
| parent | 3d095d907e0047621950b3dcd9ff8b1f3d596797 (diff) | |
Add console=comN boot option to enable serial console
* i386/configfrag.ac (RCLINE, RCADDR): Remove defines.
* i386/i386at/com.c: Include <string.h> and <util/atoi.h>
[!RCLINE] (RCBAUD, comcndev, comcnprobe, comcninit, comcngetc, comcnputc):
Declare and define macro, variable, and functions.
(rcline): New variable.
(kernel_cmdline): New declaration.
(comcnprobe): Detect "console=comN" option and set rcline accordingly, use
rcline instead of RCLINE for serial console selection.
* i386/i386at/cons_conf.c [NCOM>0 && !RCLINE] (comcnprobe, comcninit,
comcngetc, comcnputc): Declare functions.
[NCOM>0 && !RCLINE] (constab): Enable "com" console.
* i386/i386at/kd_event.c (kbdopen): Call kdinit function, for when the
VGA+pckbd console was not initialized.
Diffstat (limited to 'i386/i386at/cons_conf.c')
| -rw-r--r-- | i386/i386at/cons_conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/i386/i386at/cons_conf.c b/i386/i386at/cons_conf.c index ea8ccb5..8a4b37c 100644 --- a/i386/i386at/cons_conf.c +++ b/i386/i386at/cons_conf.c @@ -34,7 +34,7 @@ extern int hypcnprobe(), hypcninit(), hypcngetc(), hypcnputc(); #else /* MACH_HYP */ extern int kdcnprobe(), kdcninit(), kdcngetc(), kdcnputc(); -#if NCOM > 0 && RCLINE >= 0 +#if NCOM > 0 extern int comcnprobe(), comcninit(), comcngetc(), comcnputc(); #endif #endif /* MACH_HYP */ @@ -48,7 +48,7 @@ struct consdev constab[] = { {"hyp", hypcnprobe, hypcninit, hypcngetc, hypcnputc}, #else /* MACH_HYP */ {"kd", kdcnprobe, kdcninit, kdcngetc, kdcnputc}, -#if NCOM > 0 && RCLINE >= 0 && 1 +#if NCOM > 0 {"com", comcnprobe, comcninit, comcngetc, comcnputc}, #endif #endif /* MACH_HYP */ |