[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 25/68] i386/i386at/kd.c: remove forward declarations
From: |
Marin Ramesa |
Subject: |
[PATCH 25/68] i386/i386at/kd.c: remove forward declarations |
Date: |
Fri, 29 Nov 2013 22:53:50 +0100 |
* 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.
---
i386/i386at/kd.c | 22 +---------------------
i386/i386at/kd.h | 20 +++++++++++++++++++-
i386/i386at/kd_event.h | 2 ++
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_ */
--
1.8.1.4
- [PATCH 18/68] i386/i386/io_perm.c: remove forward declaration, (continued)
[PATCH 21/68] kern: new header file exception.h, Marin Ramesa, 2013/11/29
[PATCH 20/68] i386/i386/pcb.c: remove forward declarations, Marin Ramesa, 2013/11/29
[PATCH 22/68] kern/exception.c: remove forward declarations, Marin Ramesa, 2013/11/29
[PATCH 23/68] i386/i386at/autoconf.c, com.c, lpr.c: remove forward declarations, Marin Ramesa, 2013/11/29
[PATCH 25/68] i386/i386at/kd.c: remove forward declarations,
Marin Ramesa <=
[PATCH 24/68] i386/i386at/conf.c: remove forward declarations, Marin Ramesa, 2013/11/29
[PATCH 26/68] i386/i386at/kd_event.c: remove forward declarations, Marin Ramesa, 2013/11/29
[PATCH 27/68] i386/i386at/kd_mouse.c: remove forward declarations, Marin Ramesa, 2013/11/29
[PATCH 28/68] i386/i386at: remove forward declarations, Marin Ramesa, 2013/11/29
[PATCH 29/68] i386/i386at/pic_isa.c: remove forward declaration, Marin Ramesa, 2013/11/29
[PATCH 30/68] i386/intel/pmap.c: remove forward declarations, Marin Ramesa, 2013/11/29
[PATCH 32/68] ipc/ipc_table.c: remove forward declaration, Marin Ramesa, 2013/11/29
[PATCH 31/68] ipc/ipc_kmsg.c: remove forward declarations, Marin Ramesa, 2013/11/29
[PATCH 33/68] ipc/mach_msg.c: remove forward declarations, Marin Ramesa, 2013/11/29