Module Name: src
Committed By: tsutsui
Date: Tue May 14 13:28:01 UTC 2013
Modified Files:
src/sys/arch/luna68k/dev: lunaws.c
Log Message:
Use softint(9) to pass received data into wskbd(9) and wsmouse(9) layers.
It might be problematic to call them from an interrupt handler at IPL_SERIAL.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/luna68k/dev/lunaws.c
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/luna68k/dev/lunaws.c
diff -u src/sys/arch/luna68k/dev/lunaws.c:1.25 src/sys/arch/luna68k/dev/lunaws.c:1.26
--- src/sys/arch/luna68k/dev/lunaws.c:1.25 Sat Oct 13 06:16:18 2012
+++ src/sys/arch/luna68k/dev/lunaws.c Tue May 14 13:28:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.25 2012/10/13 06:16:18 tsutsui Exp $ */
+/* $NetBSD: lunaws.c,v 1.26 2013/05/14 13:28:01 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.25 2012/10/13 06:16:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.26 2013/05/14 13:28:01 tsutsui Exp $");
#include "wsmouse.h"
@@ -51,6 +51,10 @@ __KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1
#include "ioconf.h"
+#define OMKBD_RXQ_LEN 64
+#define OMKBD_RXQ_LEN_MASK (OMKBD_RXQ_LEN - 1)
+#define OMKBD_NEXTRXQ(x) (((x) + 1) & OMKBD_RXQ_LEN_MASK)
+
static const uint8_t ch1_regs[6] = {
WR0_RSTINT, /* Reset E/S Interrupt */
WR1_RXALLS, /* Rx per char, No Tx */
@@ -65,11 +69,15 @@ struct ws_softc {
struct sioreg *sc_ctl;
uint8_t sc_wr[6];
device_t sc_wskbddev;
+ uint8_t sc_rxq[OMKBD_RXQ_LEN];
+ u_int sc_rxqhead;
+ u_int sc_rxqtail;
#if NWSMOUSE > 0
device_t sc_wsmousedev;
int sc_msreport;
- int buttons, dx, dy;
+ int sc_msbuttons, sc_msdx, sc_msdy;
#endif
+ void *sc_si;
};
static void omkbd_input(void *, int);
@@ -111,6 +119,7 @@ static const struct wsmouse_accessops om
#endif
static void wsintr(int);
+static void wssoftintr(void *);
static int wsmatch(device_t, cfdata_t, void *);
static void wsattach(device_t, device_t, void *);
@@ -153,6 +162,11 @@ wsattach(device_t parent, device_t self,
syscnputc((dev_t)1, 0x20); /* keep quiet mouse */
+ sc->sc_rxqhead = 0;
+ sc->sc_rxqtail = 0;
+
+ sc->sc_si = softint_establish(SOFTINT_SERIAL, wssoftintr, sc);
+
aprint_normal("\n");
a.console = (args->hwflags == 1);
@@ -179,7 +193,7 @@ wsintr(int chan)
{
struct ws_softc *sc = device_lookup_private(&ws_cd, 0);
struct sioreg *sio = sc->sc_ctl;
- u_int code;
+ uint8_t code;
int rr;
rr = getsiocsr(sio);
@@ -190,43 +204,10 @@ wsintr(int chan)
sio->sio_cmd = WR0_ERRRST;
continue;
}
-#if NWSMOUSE > 0
- /*
- * if (code >= 0x80 && code <= 0x87), then
- * it's the first byte of 3 byte long mouse report
- * code[0] & 07 -> LMR button condition
- * code[1], [2] -> x,y delta
- * otherwise, key press or release event.
- */
- if (sc->sc_msreport == 0) {
- if (code < 0x80 || code > 0x87) {
- omkbd_input(sc, code);
- continue;
- }
- code = (code & 07) ^ 07;
- /* LMR->RML: wsevent counts 0 for leftmost */
- sc->buttons = (code & 02);
- if (code & 01)
- sc->buttons |= 04;
- if (code & 04)
- sc->buttons |= 01;
- sc->sc_msreport = 1;
- } else if (sc->sc_msreport == 1) {
- sc->dx = (signed char)code;
- sc->sc_msreport = 2;
- } else if (sc->sc_msreport == 2) {
- sc->dy = (signed char)code;
- wsmouse_input(sc->sc_wsmousedev,
- sc->buttons,
- sc->dx, sc->dy, 0, 0,
- WSMOUSE_INPUT_DELTA);
-
- sc->sc_msreport = 0;
- }
-#else
- omkbd_input(sc, code);
-#endif
+ sc->sc_rxq[sc->sc_rxqtail] = code;
+ sc->sc_rxqtail = OMKBD_NEXTRXQ(sc->sc_rxqtail);
} while ((rr = getsiocsr(sio)) & RR_RXRDY);
+ softint_schedule(sc->sc_si);
}
if (rr & RR_TXRDY)
sio->sio_cmd = WR0_RSTPEND;
@@ -234,6 +215,53 @@ wsintr(int chan)
}
static void
+wssoftintr(void *arg)
+{
+ struct ws_softc *sc = arg;
+ uint8_t code;
+
+ while (sc->sc_rxqhead != sc->sc_rxqtail) {
+ code = sc->sc_rxq[sc->sc_rxqhead];
+ sc->sc_rxqhead = OMKBD_NEXTRXQ(sc->sc_rxqhead);
+#if NWSMOUSE > 0
+ /*
+ * if (code >= 0x80 && code <= 0x87), then
+ * it's the first byte of 3 byte long mouse report
+ * code[0] & 07 -> LMR button condition
+ * code[1], [2] -> x,y delta
+ * otherwise, key press or release event.
+ */
+ if (sc->sc_msreport == 0) {
+ if (code < 0x80 || code > 0x87) {
+ omkbd_input(sc, code);
+ continue;
+ }
+ code = (code & 07) ^ 07;
+ /* LMR->RML: wsevent counts 0 for leftmost */
+ sc->sc_msbuttons = (code & 02);
+ if (code & 01)
+ sc->sc_msbuttons |= 04;
+ if (code & 04)
+ sc->sc_msbuttons |= 01;
+ sc->sc_msreport = 1;
+ } else if (sc->sc_msreport == 1) {
+ sc->sc_msdx = (int8_t)code;
+ sc->sc_msreport = 2;
+ } else if (sc->sc_msreport == 2) {
+ sc->sc_msdy = (int8_t)code;
+ wsmouse_input(sc->sc_wsmousedev,
+ sc->sc_msbuttons, sc->sc_msdx, sc->sc_msdy, 0, 0,
+ WSMOUSE_INPUT_DELTA);
+
+ sc->sc_msreport = 0;
+ }
+#else
+ omkbd_input(sc, code);
+#endif
+ }
+}
+
+static void
omkbd_input(void *v, int data)
{
struct ws_softc *sc = v;
