Module Name: src
Committed By: tsutsui
Date: Sat Jun 25 14:39:19 UTC 2022
Modified Files:
src/sys/arch/atari/dev: kbd.c kbdvar.h
Log Message:
Move declarations to proper places.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/atari/dev/kbd.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/dev/kbdvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/dev/kbd.c
diff -u src/sys/arch/atari/dev/kbd.c:1.50 src/sys/arch/atari/dev/kbd.c:1.51
--- src/sys/arch/atari/dev/kbd.c:1.50 Sat Jun 25 14:27:43 2022
+++ src/sys/arch/atari/dev/kbd.c Sat Jun 25 14:39:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.50 2022/06/25 14:27:43 tsutsui Exp $ */
+/* $NetBSD: kbd.c,v 1.51 2022/06/25 14:39:19 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.50 2022/06/25 14:27:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.51 2022/06/25 14:39:19 tsutsui Exp $");
#include "mouse.h"
#include "ite.h"
@@ -70,6 +70,31 @@ __KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.50
#include <atari/dev/wskbdmap_atari.h>
#endif
+/*
+ * The ringbuffer is the interface between the hard and soft interrupt handler.
+ * The hard interrupt runs straight from the MFP interrupt.
+ */
+#define KBD_RING_SIZE 256 /* Sz of input ring buffer, must be power of 2 */
+#define KBD_RING_MASK 255 /* Modulo mask for above */
+
+struct kbd_softc {
+ int k_event_mode; /* if 1, collect events, */
+ /* else pass to ite */
+ struct evvar k_events; /* event queue state */
+ uint8_t k_soft_cs; /* control-reg. copy */
+ uint8_t k_package[20]; /* XXX package being build */
+ uint8_t k_pkg_size; /* Size of the package */
+ uint8_t k_pkg_idx; /* Running pkg assembly index */
+ uint8_t k_pkg_type; /* Type of package */
+ const uint8_t *k_sendp; /* Output pointer */
+ int k_send_cnt; /* Chars left for output */
+#if NWSKBD > 0
+ device_t k_wskbddev; /* pointer to wskbd for sending strokes */
+ int k_pollingmode; /* polling mode on? whatever it is... */
+#endif
+ void *k_sicookie; /* softint(9) cookie */
+};
+
/* WSKBD */
/*
* If NWSKBD>0 we try to attach an wskbd device to us. What follows
@@ -113,9 +138,6 @@ static dev_type_ioctl(kbdioctl);
static dev_type_poll(kbdpoll);
static dev_type_kqfilter(kbdkqfilter);
-/* Interrupt handler */
-void kbdintr(int);
-
static void kbdsoft(void *);
static void kbdattach(device_t, device_t, void *);
static int kbdmatch(device_t, cfdata_t, void *);
Index: src/sys/arch/atari/dev/kbdvar.h
diff -u src/sys/arch/atari/dev/kbdvar.h:1.10 src/sys/arch/atari/dev/kbdvar.h:1.11
--- src/sys/arch/atari/dev/kbdvar.h:1.10 Sat Oct 27 17:17:42 2012
+++ src/sys/arch/atari/dev/kbdvar.h Sat Jun 25 14:39:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdvar.h,v 1.10 2012/10/27 17:17:42 chs Exp $ */
+/* $NetBSD: kbdvar.h,v 1.11 2022/06/25 14:39:19 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -29,31 +29,6 @@
#define _KBDVAR_H
/*
- * The ringbuffer is the interface between the hard and soft interrupt handler.
- * The hard interrupt runs straight from the MFP interrupt.
- */
-#define KBD_RING_SIZE 256 /* Sz of input ring buffer, must be power of 2 */
-#define KBD_RING_MASK 255 /* Modulo mask for above */
-
-struct kbd_softc {
- int k_event_mode; /* if 1, collect events, */
- /* else pass to ite */
- struct evvar k_events; /* event queue state */
- uint8_t k_soft_cs; /* control-reg. copy */
- uint8_t k_package[20]; /* XXX package being build */
- uint8_t k_pkg_size; /* Size of the package */
- uint8_t k_pkg_idx; /* Running pkg assembly index */
- uint8_t k_pkg_type; /* Type of package */
- const uint8_t *k_sendp; /* Output pointer */
- int k_send_cnt; /* Chars left for output */
-#if NWSKBD>0
- device_t k_wskbddev; /* pointer to wskbd for sending strokes */
- int k_pollingmode; /* polling mode on? whatever it isss... */
-#endif
- void *k_sicookie; /* softint(9) cookie */
-};
-
-/*
* Package types
*/
#define KBD_MEM_PKG 0 /* Memory read package */
@@ -73,6 +48,9 @@ void kbd_write(const uint8_t *, int);
int kbdgetcn(void);
void kbdbell(void);
void kbdenable(void);
+
+/* Interrupt handler */
+void kbdintr(int); /* called from locore.s */
#endif /* _KERNEL */
#endif /* _KBDVAR_H */
