summaryrefslogtreecommitdiff
path: root/i386/i386at
diff options
context:
space:
mode:
authorMarin Ramesa <mpr@hi.t-com.hr>2013-11-29 22:53:50 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-12-05 06:16:26 +0900
commit4bcaa65e3269f8b5d18d182999a5e81b2694c1a0 (patch)
tree762292d13a3457c88a671c7ca1a25826af0fc178 /i386/i386at
parent8c9b556f59821283ca62209efe0a0bf17fad0a49 (diff)
i386/i386at/kd.c: remove forward declarations
* i386/i386at/kd.c (kd_enqsc, kdcheckmagic, do_modifier, bmpch2bit, bmppaintcsr, bit2fbptr): Remove forward declarations. * i386/i386at/kd.h: Include device/buf.h. Include i386at/kdsoft.h. (kdcheckmagic, do_modifier, bmpch2bit, bmppaintcsr, bit2fbptr): Add prototypes. * i386/i386at/kd_event.h (kd_enqsc): Add prototype.
Diffstat (limited to 'i386/i386at')
-rw-r--r--i386/i386at/kd.c22
-rw-r--r--i386/i386at/kd.h20
-rw-r--r--i386/i386at/kd_event.h2
3 files changed, 22 insertions, 22 deletions
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 3890c3d..5605257 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -100,20 +100,15 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define DEBUG 1 /* export feep() */
-void kd_enqsc(); /* enqueues a scancode */
-
#if 0
#define BROKEN_KEYBOARD_RESET
#endif
struct tty kd_tty;
-extern int rebootflag;
+extern int rebootflag;
static void charput(), charmvup(), charmvdown(), charclear(), charsetcursor();
static void kd_noopreset();
-boolean_t kdcheckmagic();
-
-int do_modifier (int, Scancode, boolean_t);
/*
* These routines define the interface to the device-specific layer.
@@ -2688,21 +2683,6 @@ kd_noopreset()
}
-
-/*
- * Generic routines for bitmap devices (i.e., assume no hardware
- * assist). Assumes a simple byte ordering (i.e., a byte at a lower
- * address is to the left of the byte at the next higher address).
- * For the 82786, this works anyway if the characters are 2 bytes
- * wide. (more bubble gum and paper clips.)
- *
- * See the comments above about SLAMBPW.
- */
-
-void bmpch2bit(), bmppaintcsr();
-u_char *bit2fbptr();
-
-
/*
* bmpput: Copy a character from the font to the frame buffer.
*/
diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
index c38f90b..d97fdd5 100644
--- a/i386/i386at/kd.h
+++ b/i386/i386at/kd.h
@@ -77,7 +77,8 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/time.h>
#include <device/cons.h>
#include <device/io_req.h>
-
+#include <device/buf.h>
+#include <i386at/kdsoft.h>
/*
* Where memory for various graphics adapters starts.
@@ -767,4 +768,21 @@ extern io_return_t kdsetstat(
extern int kdportdeath(dev_t dev, mach_port_t port);
extern int kdmmap(dev_t dev, off_t off, int prot);
+boolean_t kdcheckmagic(Scancode scancode);
+
+int do_modifier(int state, Scancode c, boolean_t up);
+
+/*
+ * Generic routines for bitmap devices (i.e., assume no hardware
+ * assist). Assumes a simple byte ordering (i.e., a byte at a lower
+ * address is to the left of the byte at the next higher address).
+ * For the 82786, this works anyway if the characters are 2 bytes
+ * wide. (more bubble gum and paper clips.)
+ *
+ * See the comments above (in i386at/kd.c) about SLAMBPW.
+ */
+void bmpch2bit(csrpos_t pos, short *xb, short *yb);
+void bmppaintcsr(csrpos_t pos, u_char val);
+u_char *bit2fbptr(short xb, short yb);
+
#endif /* _KD_H_ */
diff --git a/i386/i386at/kd_event.h b/i386/i386at/kd_event.h
index ae18047..d2e5123 100644
--- a/i386/i386at/kd_event.h
+++ b/i386/i386at/kd_event.h
@@ -46,4 +46,6 @@ extern io_return_t kbdsetstat(
int *data,
unsigned int count);
+extern void kd_enqsc(Scancode sc);
+
#endif /* _KD_EVENT_H_ */