 @@ -1,14 +1,14 @@
-/*	$NetBSD: footbridge_com.c,v 1.35 2012/10/10 21:53:09 skrll Exp $	*/
+/*	$NetBSD: footbridge_com.c,v 1.36 2013/11/17 08:32:55 skrll Exp $	*/
 /*-
  * Copyright (c) 1997 Mark Brinicombe
  * Copyright (c) 1997 Causality Limited
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * COM driver, using the footbridge UART
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.35 2012/10/10 21:53:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.36 2013/11/17 08:32:55 skrll Exp $");
 #include "opt_ddb.h"
 #include "opt_ddbparam.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 @@ -732,32 +732,32 @@ fcominitcons(bus_space_tag_t iot, bus_sp
 	delay(10000);
 	(void)splx(s);
+}
 #endif
 int
 fcomcngetc(dev_t dev)
+{
 	int s = splserial();
 	bus_space_tag_t iot = fcomconstag;
 	bus_space_handle_t ioh = fcomconsioh;
-	u_char stat, c;
+	u_char c;
 	while ((bus_space_read_4(iot, ioh, UART_FLAGS) & UART_RX_FULL) != 0)
+		;
 	c = bus_space_read_4(iot, ioh, UART_DATA);
-	stat = bus_space_read_4(iot, ioh, UART_RX_STAT);
+	(void)bus_space_read_4(iot, ioh, UART_RX_STAT);
 	(void)splx(s);
 #if defined(DDB) && DDB_KEYCODE > 0
 		/*
 		 * Temporary hack so that I can force the kernel into
 		 * the debugger via the serial port
 		 */
 		if (c == DDB_KEYCODE) Debugger();
 #endif
 	return (c);
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isa_machdep.c,v 1.19 2012/10/27 17:17:37 chs Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.20 2013/11/17 08:32:55 skrll Exp $	*/
 /*-
  * Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Mark Brinicombe, Charles M. Hannum and by Jason R. Thorpe of the
  * Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * 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
 @@ -55,27 +55,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)isa.c	7.2 (Berkeley) 5/13/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.19 2012/10/27 17:17:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.20 2013/11/17 08:32:55 skrll Exp $");
 #include "opt_irqstats.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 @@ -419,50 +419,49 @@ isa_intr_disestablish(isa_chipset_tag_t
 	if (TAILQ_EMPTY(&(iq->iq_list)))
 		iq->iq_ist = IST_NONE;
+}
 /*
  * isa_intr_init()
+ *
  * Initialise the ISA ICU and attach an ISA interrupt handler to the
  * ISA interrupt line on the footbridge.
  */
 void
 isa_intr_init(void)
+{
 	static void *isa_ih;
  	struct intrq *iq;
  	int i;
  	/*
  	 * should get the parent here, but initialisation order being so
  	 * strange I need to check if it's available
  	 */
  	for (i = 0; i < ICU_LEN; i++) {
  		iq = &isa_intrq[i];
  		TAILQ_INIT(&iq->iq_list);
  		sprintf(iq->iq_name, "irq %d", i);
  		evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
  		    NULL, "isa", iq->iq_name);
+ 	}
 	isa_icu_init();
 	intr_calculatemasks();
 	/* something to break the build in an informative way */
 #ifndef ISA_FOOTBRIDGE_IRQ
 #warning Before using isa with footbridge you must define ISA_FOOTBRIDGE_IRQ
 #endif
-	isa_ih = footbridge_intr_claim(ISA_FOOTBRIDGE_IRQ, IPL_BIO, "isabus",
+	footbridge_intr_claim(ISA_FOOTBRIDGE_IRQ, IPL_BIO, "isabus",
 	    isa_irqdispatch, NULL);
+}
 /* Static array of ISA DMA segments. We only have one on CATS */
 #if NISADMA > 0
 struct arm32_dma_range machdep_isa_dma_ranges[1];
 #endif
 void
 isa_footbridge_init(u_int iobase, u_int membase)
+{
 #if NISADMA > 0