summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-08-30 23:08:59 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-08-30 23:15:11 +0200
commit8110904381e06d9c0216db626d287ad6d8f0dcf8 (patch)
tree5cfdcb851e1d74dc0799d1ea7fb78255ca778ed9 /i386
parent2f048b588ac972347a7acaf65d0c91680c4e1c27 (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')
-rw-r--r--i386/i386/xen.h1
-rw-r--r--i386/i386at/com.c4
-rw-r--r--i386/i386at/com.h6
-rw-r--r--i386/i386at/cons_conf.c6
-rw-r--r--i386/i386at/kd.c10
-rw-r--r--i386/i386at/kd.h5
6 files changed, 19 insertions, 13 deletions
diff --git a/i386/i386/xen.h b/i386/i386/xen.h
index 731e5a2..69a1c41 100644
--- a/i386/i386/xen.h
+++ b/i386/i386/xen.h
@@ -25,6 +25,7 @@
#include <mach/machine/vm_types.h>
#include <mach/vm_param.h>
#include <mach/inline.h>
+#include <mach/xen.h>
#include <machine/vm_param.h>
#include <intel/pmap.h>
#include <kern/debug.h>
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index f6d5656..3030270 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -70,10 +70,6 @@ int comtimer_state[NCOM];
#define RCBAUD B9600
static int rcline = -1;
static struct bus_device *comcndev;
-int comcnprobe(struct consdev *cp);
-int comcninit(struct consdev *cp);
-int comcngetc(dev_t dev, int wait);
-int comcnputc(dev_t dev, int c);
/* XX */
extern char *kernel_cmdline;
diff --git a/i386/i386at/com.h b/i386/i386at/com.h
index e53e948..49f23ee 100644
--- a/i386/i386at/com.h
+++ b/i386/i386at/com.h
@@ -27,6 +27,7 @@
#define _COM_H_
#include <mach/std_types.h>
+#include <device/cons.h>
/*
* Set receive modem state from modem status register.
@@ -42,4 +43,9 @@ extern void commodem_intr(int unit, int stat);
extern int comgetc(int unit);
+extern int comcnprobe(struct consdev *cp);
+extern int comcninit(struct consdev *cp);
+extern int comcngetc(dev_t dev, int wait);
+extern int comcnputc(dev_t dev, int c);
+
#endif /* _COM_H_ */
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 */
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index af5b792..bd10b5f 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -113,10 +113,6 @@ static void charput(), charmvup(), charmvdown(), charclear(), charsetcursor();
static void kd_noopreset();
boolean_t kdcheckmagic();
-int kdcnprobe(struct consdev *cp);
-int kdcninit(struct consdev *cp);
-int kdcngetc(dev_t dev, int wait);
-void kdcnputc(dev_t dev, int c);
int do_modifier (int, Scancode, boolean_t);
/*
@@ -2970,16 +2966,18 @@ kdcngetc(dev_t dev, int wait)
return kdcnmaygetc();
}
-void
+int
kdcnputc(dev_t dev, int c)
{
if (!kd_initialized)
- return;
+ return -1;
/* Note that tab is handled in kd_putc */
if (c == '\n')
kd_putc('\r');
kd_putc(c);
+
+ return 0;
}
/*
diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
index 98c8bfe..bc265b0 100644
--- a/i386/i386at/kd.h
+++ b/i386/i386at/kd.h
@@ -75,6 +75,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <mach/boolean.h>
#include <sys/types.h>
#include <sys/time.h>
+#include <device/cons.h>
/*
@@ -729,7 +730,11 @@ extern void kd_handle_ack (void);
extern int kd_kbd_magic (int);
extern int kdstate2idx (int, boolean_t);
extern void kd_parserest (u_char *);
+extern int kdcnprobe(struct consdev *cp);
+extern int kdcninit(struct consdev *cp);
+extern int kdcngetc(dev_t dev, int wait);
extern int kdcnmaygetc (void);
+extern int kdcnputc(dev_t dev, int c);
extern void kd_slmwd (void *start, int count, int value);
extern void kd_slmscu (void *from, void *to, int count);