diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-30 23:08:59 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-30 23:15:11 +0200 |
| commit | 8110904381e06d9c0216db626d287ad6d8f0dcf8 (patch) | |
| tree | 5cfdcb851e1d74dc0799d1ea7fb78255ca778ed9 /i386/i386at/cons_conf.c | |
| parent | 2f048b588ac972347a7acaf65d0c91680c4e1c27 (diff) | |
Console declaration cleanup
* device/cons.h: Add multiple inclusion _DEVICE_CONS_H macro protector.
(struct consdev): Add function members prototypes.
* i386/i386/xen.h: Include <mach/xen.h>.
* i386/i386at/com.c (comcnprobe, comcninit, comcngetc, comcnputc): Move
prototypes...
* i386/i386at/com.h: ... here. Include <device/cons.h>.
* i386/i386at/cons_conf.c [MACH_HYP]: Include <xen/console.h>.
[!MACH_HYP]: Include "kd.h".
[!MACH_HYP && NCOM > 0]: Include "com.h".
(hypcnprobe, hypcninit, hypcngetc, hypcnputc, kdcnprobe, kdcninit, kdcngetc,
kdcnputc comcnprobe, comcninit, comcngetc, comcnputc): Remove prototypes.
* i386/i386at/kd.c (kdcnputc): Make it return int, -1 on error, 0 on
success.
(kdcnprobe, kdcninit, kdcngetc, kdcnputc): Move prototypes...
* i386/i386at/kd.h: ... here. Include <device/cons.h>.
* xen/console.c (hypcnprobe): Remove unused `my_console' local variable.
* xen/console.h: Include <device/cons.h>
(hypcnputc, hypcngetc, hypcnprobe, hypcninit): Add prototypes.
Diffstat (limited to 'i386/i386at/cons_conf.c')
| -rw-r--r-- | i386/i386at/cons_conf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/i386/i386at/cons_conf.c b/i386/i386at/cons_conf.c index 8a4b37c..cf42bb6 100644 --- a/i386/i386at/cons_conf.c +++ b/i386/i386at/cons_conf.c @@ -31,11 +31,11 @@ #include <device/cons.h> #ifdef MACH_HYP -extern int hypcnprobe(), hypcninit(), hypcngetc(), hypcnputc(); +#include <xen/console.h> #else /* MACH_HYP */ -extern int kdcnprobe(), kdcninit(), kdcngetc(), kdcnputc(); +#include "kd.h" #if NCOM > 0 -extern int comcnprobe(), comcninit(), comcngetc(), comcnputc(); +#include "com.h" #endif #endif /* MACH_HYP */ |