 @@ -1,14 +1,14 @@
-/* $NetBSD: amlogic_com.c,v 1.3 2015/03/01 23:39:28 jmcneill Exp $ */
+/* $NetBSD: amlogic_com.c,v 1.4 2015/03/03 21:56:25 jmcneill Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -23,84 +23,73 @@
  * 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 "locators.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: amlogic_com.c,v 1.3 2015/03/01 23:39:28 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: amlogic_com.c,v 1.4 2015/03/03 21:56:25 jmcneill Exp $");
 #define AMLOGIC_COM_INTRPOLL
 #define AMLOGIC_COM_INTRPOLL_RATE	10
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/termios.h>
 #include <sys/kauth.h>
 #include <sys/lwp.h>
 #include <sys/tty.h>
 #include <dev/cons.h>
 #include <arm/amlogic/amlogic_reg.h>
 #include <arm/amlogic/amlogic_var.h>
 #include <arm/amlogic/amlogic_comreg.h>
 #include <arm/amlogic/amlogic_comvar.h>
 static int	amlogic_com_match(device_t, cfdata_t, void *);
 static void	amlogic_com_attach(device_t, device_t, void *);
 static int	amlogic_com_intr(void *);
 #ifdef AMLOGIC_COM_INTRPOLL
 static void	amlogic_com_intrpoll(void *);
 #endif
 static int	amlogic_com_cngetc(dev_t);
 static void	amlogic_com_cnputc(dev_t, int);
 static void	amlogic_com_cnpollc(dev_t, int);
 static void	amlogic_com_start(struct tty *);
 static int	amlogic_com_param(struct tty *, struct termios *);
 extern struct cfdriver amlogiccom_cd;
 struct amlogic_com_softc {
 	device_t sc_dev;
 	bus_space_tag_t	sc_bst;
 	bus_space_handle_t sc_bsh;
 	void *sc_ih;
 	struct tty *sc_tty;
 	int sc_ospeed;
 	tcflag_t sc_cflag;
 	u_char sc_buf[1024];
 #ifdef AMLOGIC_COM_INTRPOLL
 	callout_t sc_intrpoll_ch;
 #endif
 };
 static struct amlogic_com_softc amlogic_com_cnsc;
 static struct cnm_state amlogic_com_cnm_state;
 struct consdev amlogic_com_consdev = {
 	.cn_getc = amlogic_com_cngetc,
 	.cn_putc = amlogic_com_cnputc,
 	.cn_pollc = amlogic_com_cnpollc,
 	.cn_dev = NODEV,
 	.cn_pri = CN_NORMAL,
 };
 @@ -146,38 +135,33 @@ amlogic_com_attach(device_t parent, devi
 	struct amlogic_com_softc * const sc = device_private(self);
 	struct amlogicio_attach_args * const aio = aux;
 	const struct amlogic_locators * const loc = &aio->aio_loc;
 	const bus_addr_t iobase = AMLOGIC_CORE_BASE + loc->loc_offset;
 	struct tty *tp;
 	int major, minor;
 	uint32_t misc, control;
 	sc->sc_dev = self;
 	sc->sc_bst = aio->aio_core_bst;
 	bus_space_subregion(aio->aio_core_bst, aio->aio_bsh,
 	    loc->loc_offset, loc->loc_size, &sc->sc_bsh);
 #ifdef AMLOGIC_COM_INTRPOLL
 	callout_init(&sc->sc_intrpoll_ch, CALLOUT_MPSAFE);
 	callout_setfunc(&sc->sc_intrpoll_ch, amlogic_com_intrpoll, sc);
 #else
 	sc->sc_ih = intr_establish(loc->loc_intr, IPL_SERIAL,
 	    IST_EDGE | IST_MPSAFE, amlogic_com_intr, sc);
 	if (sc->sc_ih == NULL) {
 		aprint_error(": failed to establish interrupt %d\n",
 		    loc->loc_intr);
 		return;
+	}
 #endif
 	if (amlogic_com_cmajor == -1) {
 		/* allocate a major number */
 		int bmajor = -1, cmajor = -1;
 		int error = devsw_attach("amlogiccom", NULL, &bmajor,
 		    &amlogiccom_cdevsw, &cmajor);
 		if (error) {
 			aprint_error(": couldn't allocate major number\n");
 			return;
+		}
 		amlogic_com_cmajor = cmajor;
+	}
 @@ -188,51 +172,39 @@ amlogic_com_attach(device_t parent, devi
 	tp->t_oproc = amlogic_com_start;
 	tp->t_param = amlogic_com_param;
 	tp->t_dev = makedev(major, minor);
 	tp->t_sc = sc;
 	tty_attach(tp);
 	aprint_naive("\n");
 	if (amlogic_com_is_console(iobase)) {
 		cn_tab->cn_dev = tp->t_dev;
 		aprint_normal(": console");
+	}
 	aprint_normal("\n");
 #ifdef AMLOGIC_COM_INTRPOLL
 	aprint_normal_dev(self, "polling\n");
 #else
 	aprint_normal_dev(self, "interrupting at irq %d\n", loc->loc_intr);
 #endif
 	misc = bus_space_read_4(sc->sc_bst, sc->sc_bsh, UART_MISC_REG);
 	misc &= ~UART_MISC_TX_IRQ_CNT;
 	misc |= __SHIFTIN(0, UART_MISC_TX_IRQ_CNT);
 	misc &= ~UART_MISC_RX_IRQ_CNT;
 	misc |= __SHIFTIN(1, UART_MISC_RX_IRQ_CNT);
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh, UART_MISC_REG, misc);
 	control = bus_space_read_4(sc->sc_bst, sc->sc_bsh, UART_CONTROL_REG);
 	control &= ~UART_CONTROL_TX_INT_EN;
 #ifdef AMLOGIC_COM_INTRPOLL
 	control &= ~UART_CONTROL_RX_INT_EN;
 #else
 	control |= UART_CONTROL_RX_INT_EN;
 #endif
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh, UART_CONTROL_REG, control);
 #ifdef AMLOGIC_COM_INTRPOLL
 	callout_schedule(&sc->sc_intrpoll_ch, AMLOGIC_COM_INTRPOLL_RATE);
 #endif
+}
 static int
 amlogic_com_cngetc(dev_t dev)
+{
 	bus_space_tag_t bst = amlogic_com_cnsc.sc_bst;
 	bus_space_handle_t bsh = amlogic_com_cnsc.sc_bsh;
 	uint32_t status;
 	int s, c;
 	s = splserial();
 	status = bus_space_read_4(bst, bsh, UART_STATUS_REG);
 @@ -461,28 +433,13 @@ amlogic_com_intr(void *priv)
 		status = bus_space_read_4(sc->sc_bst, sc->sc_bsh,
 		    UART_STATUS_REG);
 		if (status & UART_STATUS_RX_EMPTY) {
 			break;
+		}
 		c = bus_space_read_4(sc->sc_bst, sc->sc_bsh, UART_RFIFO_REG);
 		cn_check_magic(tp->t_dev, c, amlogic_com_cnm_state);
 		tp->t_linesw->l_rint(c & 0xff, tp);
+	}
 	return 0;
+}
 #ifdef AMLOGIC_COM_INTRPOLL
 static void
 amlogic_com_intrpoll(void *priv)
 	struct amlogic_com_softc *sc = priv;
 	int s;
 	s = splserial();
 	amlogic_com_intr(sc);
 	splx(s);
 	callout_schedule(&sc->sc_intrpoll_ch, AMLOGIC_COM_INTRPOLL_RATE);
 #endif