 @@ -1,14 +1,14 @@
-/*	$NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $	*/
+/*	$NetBSD: isa_io.c,v 1.12 2012/01/31 04:28:50 matt Exp $	*/
 /*
  * Copyright 1997
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -28,27 +28,27 @@
  *    liable for any damages whatsoever, and in particular, DIGITAL
  *    shall not be liable for special, indirect, consequential, or
  *    incidental damages or damages for lost profits, loss of
  *    revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise,
  *    even if advised of the possibility of such damage.
  */
 /*
  * bus_space I/O functions for isa
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.12 2012/01/31 04:28:50 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <machine/pio.h>
 #include <machine/isa_machdep.h>
 #include <machine/ofw.h>
 #include "igsfb_ofbus.h"
 #if NIGSFB_OFBUS > 0
 extern vaddr_t igsfb_mem_vaddr, igsfb_mmio_vaddr;
 extern paddr_t igsfb_mem_paddr;
 #endif
 @@ -369,34 +369,29 @@ isa_bs_mmap(void *cookie, bus_addr_t add
 	return arm_btop(ret);
+}
 int
 isa_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)
+{
 /*	printf("isa_subregion(tag=%p, bsh=%lx, off=%lx, sz=%lx)\n",
 	    t, bsh, offset, size);*/
 	*nbshp = bsh + offset;
 	return(0);
+}
 int
-isa_bs_alloc(t, rstart, rend, size, alignment, boundary, cacheable,
+isa_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
-    bpap, bshp)
+	bus_size_t alignment, bus_size_t boundary, int cacheable,
-	void *t;
+	bus_addr_t *bpap, bus_space_handle_t *bshp)
 	bus_addr_t rstart, rend;
 	bus_size_t size, alignment, boundary;
 	int cacheable;
 	bus_addr_t *bpap;
 	bus_space_handle_t *bshp;
+{
 	panic("isa_alloc(): Help!");
+}
 void
 isa_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
 	panic("isa_free(): Help!");
+}
 void *
 isa_bs_vaddr(void *t, bus_space_handle_t bsh)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $	*/
+/*	$NetBSD: isadma_machdep.c,v 1.16 2012/01/31 04:28:50 matt Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * 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
 @@ -21,27 +21,27 @@
  * ``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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.16 2012/01/31 04:28:50 matt Exp $");
 #define ISA_DMA_STATS
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 @@ -238,33 +238,28 @@ _isa_bus_dmamap_destroy(bus_dma_tag_t t,
 	 * Free any bounce pages this map might hold.
 	 */
 	if (cookie->id_flags & ID_HAS_BOUNCE)
 		_isa_dma_free_bouncebuf(t, map);
 	free(cookie, M_DMAMAP);
 	_bus_dmamap_destroy(t, map);
+}
 /*
  * Load an ISA DMA map with a linear buffer.
  */
 int
-_isa_bus_dmamap_load(t, map, buf, buflen, p, flags)
+_isa_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
-	bus_dma_tag_t t;
+	bus_size_t buflen, struct proc *p, int flags)
 	bus_dmamap_t map;
 	void *buf;
 	bus_size_t buflen;
 	struct proc *p;
 	int flags;
+{
 	struct arm32_isa_dma_cookie *cookie = map->_dm_cookie;
 	int error;
 	STAT_INCR(isa_dma_stats_loads);
 	/*
 	 * Make sure that on error condition we return "no valid mappings."
 	 */
 	map->dm_mapsize = 0;
 	map->dm_nsegs = 0;
 	/*
 @@ -309,31 +304,28 @@ _isa_bus_dmamap_load(t, map, buf, buflen
 			_isa_dma_free_bouncebuf(t, map);
 		return (error);
+	}
 	/* ...so _isa_bus_dmamap_sync() knows we're bouncing */
 	cookie->id_flags |= ID_IS_BOUNCING;
 	return (0);
+}
 /*
  * Like _isa_bus_dmamap_load(), but for mbufs.
  */
 int
-_isa_bus_dmamap_load_mbuf(t, map, m0, flags)
+_isa_bus_dmamap_load_mbuf( bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m0,
-	bus_dma_tag_t t;
+	int flags)
 	bus_dmamap_t map;
 	struct mbuf *m0;
 	int flags;
+{
 	struct arm32_isa_dma_cookie *cookie = map->_dm_cookie;
 	int error;
 	/*
 	 * Make sure that on error condition we return "no valid mappings."
 	 */
 	map->dm_mapsize = 0;
 	map->dm_nsegs = 0;
 #ifdef DIAGNOSTIC
 	if ((m0->m_flags & M_PKTHDR) == 0)
 		panic("_isa_bus_dmamap_load_mbuf: no packet header");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scr.c,v 1.26 2011/07/26 08:56:26 mrg Exp $	*/
+/*	$NetBSD: scr.c,v 1.27 2012/01/31 04:28:50 matt Exp $	*/
 /*
  * Copyright 1997
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -92,27 +92,27 @@
 **
 **    27-July-97
 **
 **--
 */
 /*
 **
 **  INCLUDE FILES
 **
 */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.26 2011/07/26 08:56:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.27 2012/01/31 04:28:50 matt Exp $");
 #include "opt_ddb.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/file.h> */
 /* #include <sys/uio.h> */
 #include <sys/kernel.h>
 @@ -3680,31 +3680,32 @@ static void myHatWedge(int nFIQs)
 **
 **      nill
 **
 **  FUNCTION VALUE:
 **
 **      nill
 **
 **  SIDE EFFECTS:
 **
 **      nill
 **--
 */
-static void scrTimeout(ftn, sc, arg, count)
+static void
-    void (*ftn)(struct scr_softc*,int);
+scrTimeout(
-    struct scr_softc* sc;
+    void (*ftn)(struct scr_softc*,int),
-    int arg;
+    struct scr_softc* sc,
-    register int count;
+    int arg,
     int count)
+{
     register Callout *new, *p, *t;
     ASSERT(scrClkEnable);
     if (count <= 0)
+    {
         count = 1;
+    }
     /* Fill in the next free fcallout structure. */
 @@ -3768,30 +3769,31 @@ static void scrTimeout(ftn, sc, arg, cou
 **  IMPLICIT OUTPUTS:
 **
 **      nill
 **
 **  FUNCTION VALUE:
 **
 **      nill
 **
 **  SIDE EFFECTS:
 **
 **      nill
 **--
 */
-static void scrUntimeout(ftn, sc, arg)
+static void
-void (*ftn)(struct scr_softc*,int);
+scrUntimeout(
-struct scr_softc* sc;
+    void (*ftn)(struct scr_softc*, int),
-int arg;
+    struct scr_softc* sc,
     int arg)
+{
     register Callout *p, *t;
     ASSERT(scrClkEnable);
     for (p = &scrClkCallTodo; (t = p->c_next) != NULL; p = t)
+    {
         if (t->c_func == ftn && t->c_sc == sc && t->c_arg == arg)
+        {
             /* Increment next entry's count. */
             if (t->c_next && t->c_time > 0)
+            {
                 t->c_next->c_time += t->c_time;
+            }