[PATCH 05/08] i386/i386at/kd.c: remove forward declarations

[Marin Ramesa]

* i386/i386at/kd.c (kd_getdata, state2leds, kdstart, kdstop): Remove forward 
declarations.
* i386/i386at/kd.h (kd_getdata, state2leds, kdstart, kdstop): Add prototypes.
Include device/tty.h.

---
 i386/i386at/kd.c | 6 ------
 i386/i386at/kd.h | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 6b7f242..064fd22 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -122,10 +122,6 @@ void       (*kd_dsetcursor)() = charsetcursor;
                                /* set cursor position on displayed page */
 void   (*kd_dreset)() = kd_noopreset;  /* prepare for reboot */
 
-/* forward declarations */
-unsigned char kd_getdata(), state2leds();
-
-
 /*
  * Globals used for both character-based controllers and bitmap-based
  * controllers.  Default is EGA.
@@ -450,9 +446,7 @@ kdopen(dev, flag, ior)
        io_req_t ior;
 {
        struct  tty     *tp;
-       void    kdstart();
        spl_t   o_pri;
-       void    kdstop();
 
        tp = &kd_tty;
        o_pri = spltty();
diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
index f5cd5fc..29c3611 100644
--- a/i386/i386at/kd.h
+++ b/i386/i386at/kd.h
@@ -78,6 +78,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <device/cons.h>
 #include <device/io_req.h>
 #include <device/buf.h>
+#include <device/tty.h>
 #include <i386at/kdsoft.h>
 
 /*
@@ -785,4 +786,10 @@ void bmpch2bit(csrpos_t pos, short *xb, short *yb);
 void bmppaintcsr(csrpos_t pos, u_char val);
 u_char *bit2fbptr(short        xb, short yb);
 
+unsigned char kd_getdata(void);
+unsigned char state2leds(int state);
+
+void kdstart(struct tty *tp);
+void kdstop(struct tty *tp, int flags);
+
 #endif /* _KD_H_ */
-- 
1.8.1.4