 @@ -1,14 +1,14 @@
-/* $NetBSD: lunaws.c,v 1.27 2013/09/23 17:27:09 tsutsui Exp $ */
+/* $NetBSD: lunaws.c,v 1.28 2014/02/02 15:35:06 tsutsui Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.27 2013/09/23 17:27:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.28 2014/02/02 15:35:06 tsutsui Exp $");
 #include "wsmouse.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 #include <dev/wscons/wsmousevar.h>
 @@ -108,60 +108,62 @@ static const struct wskbd_consops ws_con
 #if NWSMOUSE > 0
 static int  omms_enable(void *);
 static int  omms_ioctl(void *, u_long, void *, int, struct lwp *);
 static void omms_disable(void *);
 static const struct wsmouse_accessops omms_accessops = {
 	omms_enable,
 	omms_ioctl,
 	omms_disable,
 };
 #endif
-static void wsintr(int);
+static void wsintr(void *);
 static void wssoftintr(void *);
 static int  wsmatch(device_t, cfdata_t, void *);
 static void wsattach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(ws, sizeof(struct ws_softc),
     wsmatch, wsattach, NULL, NULL);
 extern int  syscngetc(dev_t);
 extern void syscnputc(dev_t, int);
 static int
 wsmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct sio_attach_args *args = aux;
 	if (args->channel != 1)
 		return 0;
 	return 1;
+}
 static void
 wsattach(device_t parent, device_t self, void *aux)
+{
 	struct ws_softc *sc = device_private(self);
-	struct sio_softc *scp = device_private(parent);
+	struct sio_softc *siosc = device_private(parent);
 	struct sio_attach_args *args = aux;
 	int channel = args->channel;
 	struct wskbddev_attach_args a;
 	sc->sc_dev = self;
-	sc->sc_ctl = (struct sioreg *)scp->scp_ctl + 1;
+	sc->sc_ctl = &siosc->sc_ctl[channel];
 	memcpy(sc->sc_wr, ch1_regs, sizeof(ch1_regs));
-	scp->scp_intr[1] = wsintr;
+	siosc->sc_intrhand[channel].ih_func = wsintr;
 	siosc->sc_intrhand[channel].ih_arg = sc;
 	setsioreg(sc->sc_ctl, WR0, sc->sc_wr[WR0]);
 	setsioreg(sc->sc_ctl, WR4, sc->sc_wr[WR4]);
 	setsioreg(sc->sc_ctl, WR3, sc->sc_wr[WR3]);
 	setsioreg(sc->sc_ctl, WR5, sc->sc_wr[WR5]);
 	setsioreg(sc->sc_ctl, WR0, sc->sc_wr[WR0]);
 	setsioreg(sc->sc_ctl, WR1, sc->sc_wr[WR1]);
 	syscnputc((dev_t)1, 0x20); /* keep quiet mouse */
 	sc->sc_rxqhead = 0;
 	sc->sc_rxqtail = 0;
 @@ -179,29 +181,29 @@ wsattach(device_t parent, device_t self,
+	{
 	struct wsmousedev_attach_args b;
 	b.accessops = &omms_accessops;
 	b.accesscookie = (void *)sc;
 	sc->sc_wsmousedev =
 	    config_found_ia(self, "wsmousedev", &b, wsmousedevprint);
 	sc->sc_msreport = 0;
+	}
 #endif
+}
 /*ARGSUSED*/
 static void
-wsintr(int chan)
+wsintr(void *arg)
+{
-	struct ws_softc *sc = device_lookup_private(&ws_cd, 0);
+	struct ws_softc *sc = arg;
 	struct sioreg *sio = sc->sc_ctl;
 	uint8_t code;
 	int rr;
 	rr = getsiocsr(sio);
 	if (rr & RR_RXRDY) {
 		do {
 			code = sio->sio_data;
 			if (rr & (RR_FRAMING | RR_OVERRUN | RR_PARITY)) {
 				sio->sio_cmd = WR0_ERRRST;
 				continue;
+			}
 			sc->sc_rxq[sc->sc_rxqtail] = code;

 @@ -1,14 +1,14 @@
-/* $NetBSD: sio.c,v 1.12 2013/09/23 17:27:09 tsutsui Exp $ */
+/* $NetBSD: sio.c,v 1.13 2014/02/02 15:35:06 tsutsui Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,77 +21,77 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.12 2013/09/23 17:27:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.13 2014/02/02 15:35:06 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/cpu.h>
 #include <machine/autoconf.h>
 #include <luna68k/luna68k/isr.h>
 #include <luna68k/dev/siovar.h>
 #include "ioconf.h"
 static int  sio_match(device_t, cfdata_t, void *);
 static void sio_attach(device_t, device_t, void *);
 static int  sio_print(void *, const char *);
 CFATTACH_DECL_NEW(sio, sizeof(struct sio_softc),
     sio_match, sio_attach, NULL, NULL);
-static void nullintr(int);
+static void nullintr(void *);
 static int xsiointr(void *);
 static int
 sio_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (strcmp(ma->ma_name, sio_cd.cd_name))
 		return 0;
 	if (badaddr((void *)ma->ma_addr, 4))
 		return 0;
 	return 1;
+}
 static void
 sio_attach(device_t parent, device_t self, void *aux)
+{
 	struct sio_softc *sc = device_private(self);
 	struct mainbus_attach_args *ma = aux;
 	struct sio_attach_args sio_args;
 	int channel;
 	extern int sysconsole; /* console: 0 for ttya, 1 for desktop */
 	aprint_normal(": uPD7201A\n");
-	sc->scp_dev = self;
+	sc->sc_dev = self;
-	sc->scp_ctl = (void *)ma->ma_addr;
+	sc->sc_ctl = (void *)ma->ma_addr;
 	sc->scp_intr[0] = sc->scp_intr[1] = nullintr;
 	for (channel = 0; channel < 2; channel++) {
 		sc->sc_intrhand[channel].ih_func = nullintr;
 		sio_args.channel = channel;
 		sio_args.hwflags = (channel == sysconsole);
 		config_found(self, (void *)&sio_args, sio_print);
+	}
 	isrlink_autovec(xsiointr, sc, ma->ma_ilvl, ISRPRI_TTYNOBUF);
+}
 static int
 sio_print(void *aux, const char *name)
+{
 	struct sio_attach_args *args = aux;
 @@ -99,22 +99,26 @@ sio_print(void *aux, const char *name)
 		aprint_normal("%s: ", name);
 	if (args->channel != -1)
 		aprint_normal(" channel %d", args->channel);
 	return UNCONF;
+}
 static int
 xsiointr(void *arg)
+{
 	struct sio_softc *sc = arg;
-	(*sc->scp_intr[0])(0);	/* 0: ttya system serial port */
+	/* channel 0: ttya system serial port */
-	(*sc->scp_intr[1])(1);	/* 1: keyboard and mouse */
+	(*sc->sc_intrhand[0].ih_func)(sc->sc_intrhand[0].ih_arg);
 	/* channel 1: keyboard and mouse */
 	(*sc->sc_intrhand[1].ih_func)(sc->sc_intrhand[1].ih_arg);
 	return 1;
+}
 static void
-nullintr(int v)
+nullintr(void *arg)
+{
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: siotty.c,v 1.38 2014/01/02 03:32:35 tsutsui Exp $ */
+/* $NetBSD: siotty.c,v 1.39 2014/02/02 15:35:06 tsutsui Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.38 2014/01/02 03:32:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.39 2014/02/02 15:35:06 tsutsui Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/uio.h>
 #include <sys/callout.h>
 #include <sys/fcntl.h>
 @@ -96,27 +96,27 @@ struct siotty_softc {
 	bool		sc_rx_ready;
 	bool		sc_tx_busy;
 	bool		sc_tx_done;
 };
 #define	SIOTTY_RING_SIZE	2048
 u_int siotty_rbuf_size = SIOTTY_RING_SIZE;
 static struct cnm_state	siotty_cnm_state;
 #include "siotty.h"
 static void siostart(struct tty *);
 static int  sioparam(struct tty *, struct termios *);
-static void siottyintr(int);
+static void siottyintr(void *);
 static void siottysoft(void *);
 static void siotty_rxsoft(struct siotty_softc *, struct tty *);
 static void siotty_txsoft(struct siotty_softc *, struct tty *);
 static int  siomctl(struct siotty_softc *, int, int);
 static int  siotty_match(device_t, cfdata_t, void *);
 static void siotty_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(siotty, sizeof(struct siotty_softc),
     siotty_match, siotty_attach, NULL, NULL);
 dev_type_open(sioopen);
 dev_type_close(sioclose);
 @@ -135,35 +135,38 @@ const struct cdevsw siotty_cdevsw = {
 static int
 siotty_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct sio_attach_args *args = aux;
 	if (args->channel != 0) /* XXX allow tty on Ch.B XXX */
 		return 0;
 	return 1;
+}
 static void
 siotty_attach(device_t parent, device_t self, void *aux)
+{
-	struct sio_softc *scp = device_private(parent);
+	struct sio_softc *siosc = device_private(parent);
 	struct siotty_softc *sc = device_private(self);
 	struct sio_attach_args *args = aux;
 	int channel;
 	struct tty *tp;
 	sc->sc_dev = self;
-	sc->sc_ctl = (struct sioreg *)scp->scp_ctl + args->channel;
+	channel = args->channel;
 	sc->sc_ctl = &siosc->sc_ctl[channel];
 	memcpy(sc->sc_wr, ch0_regs, sizeof(ch0_regs));
-	scp->scp_intr[args->channel] = siottyintr;
+	siosc->sc_intrhand[channel].ih_func = siottyintr;
 	siosc->sc_intrhand[channel].ih_arg = sc;
 	if (args->hwflags == 1)
 		sc->sc_hwflags |= SIOTTY_HW_CONSOLE;
 	if ((sc->sc_hwflags & SIOTTY_HW_CONSOLE) != 0) {
 		aprint_normal(" (console)");
 		sc->sc_flags = TIOCFLAG_SOFTCAR;
 	} else {
 		setsioreg(sc->sc_ctl, WR0, WR0_CHANRST);
 		setsioreg(sc->sc_ctl, WR2A, WR2_VEC86 | WR2_INTR_1);
 		setsioreg(sc->sc_ctl, WR2B, 0);
 		setsioreg(sc->sc_ctl, WR0, sc->sc_wr[WR0]);
 		setsioreg(sc->sc_ctl, WR4, sc->sc_wr[WR4]);
 		setsioreg(sc->sc_ctl, WR3, sc->sc_wr[WR3]);
 @@ -189,39 +192,36 @@ siotty_attach(device_t parent, device_t
 	tp->t_hwiflow = NULL /* XXX siohwiflow XXX */;
 	if ((sc->sc_hwflags & SIOTTY_HW_CONSOLE) != 0)
 		tp->t_dev = cn_tab->cn_dev;
 	sc->sc_tty = tp;
 	tty_attach(tp);
 	sc->sc_si = softint_establish(SOFTINT_SERIAL, siottysoft, sc);
+}
 /*--------------------  low level routine --------------------*/
 static void
-siottyintr(int chan)
+siottyintr(void *arg)
+{
 	struct siotty_softc *sc;
 	struct sioreg *sio;
 	uint8_t *put, *end;
 	uint8_t c;
 	uint16_t rr;
 	int cc;
-	sc = device_lookup_private(&siotty_cd, chan);
+	sc = arg;
 	if (sc == NULL)
 		return;
 	end = sc->sc_rbufend;
 	put = sc->sc_rbput;
 	cc = sc->sc_rbavail;
 	sio = sc->sc_ctl;
 	rr = getsiocsr(sio);
 	if ((rr & RR_BREAK) != 0) {
 		sio->sio_cmd = WR0_RSTINT;
 		cn_check_magic(sc->sc_tty->t_dev, CNC_BREAK, siotty_cnm_state);
+	}
 	if (rr & RR_RXRDY) {
 		do {
 			if (cc > 0) {

 @@ -1,14 +1,14 @@
-/* $NetBSD: siovar.h,v 1.7 2013/12/31 14:24:09 tsutsui Exp $ */
+/* $NetBSD: siovar.h,v 1.8 2014/02/02 15:35:06 tsutsui Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,34 +19,37 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 struct sio_softc {
 	device_t scp_dev;
 	void *scp_ctl;
 	void (*scp_intr[2])(int);
 };
 struct sio_attach_args {
 	int channel;
 	int hwflags;
 };
 struct sioreg {
 	volatile uint8_t sio_data;
 	uint8_t	pad0;
 	volatile uint8_t sio_cmd;
 	uint8_t pad1;
 #define sio_stat sio_cmd
 };
 struct sio_softc {
 	device_t sc_dev;
 	struct sioreg *sc_ctl;
 	struct {
 		void (*ih_func)(void *);
 		void *ih_arg;
 	} sc_intrhand[2];
 };
 uint16_t getsiocsr(struct sioreg *);
 void setsioreg(struct sioreg *, int, int);