 @@ -1,14 +1,14 @@
-/*	$NetBSD: isa_machdep.c,v 1.17 2009/03/14 21:04:17 dsl Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.18 2009/03/16 06:18:32 cegger Exp $	*/
 /*	NetBSD isa_machdep.c,v 1.11 2004/06/20 18:04:08 thorpej 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 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:
 @@ -56,27 +56,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.17 2009/03/14 21:04:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18 2009/03/16 06:18:32 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <machine/bus.h>
 #include <machine/bus_private.h>
 #include <machine/pio.h>
 @@ -133,33 +133,28 @@ isa_intr_alloc(isa_chipset_tag_t ic, int
 	panic("isa_intr_alloc: notyet");
 	return (0);
+}
 const struct evcnt *
 isa_intr_evcnt(isa_chipset_tag_t ic, int irq)
+{
 	/* XXX for now, no evcnt parent reported */
 	return NULL;
+}
 void *
-isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
+isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level,
-	isa_chipset_tag_t ic;
+	int (*ih_fun)(void *), void *ih_arg)
 	int irq;
 	int type;
 	int level;
 	int (*ih_fun)(void *);
 	void *ih_arg;
+{
 	int evtch;
 	char evname[8];
 	struct xen_intr_handle ih;
 #if NIOAPIC > 0
 	struct ioapic_softc *pic = NULL;
 #endif
 	ih.pirq = 0;
 #if NIOAPIC > 0
 	if (mp_busses != NULL) {
 		if (intr_find_mpmapping(mp_isa_bus, irq, &ih) == 0 ||

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pciide_machdep.c,v 1.13 2009/03/14 14:46:08 dsl Exp $	*/
+/*	$NetBSD: pciide_machdep.c,v 1.14 2009/03/16 06:18:32 cegger Exp $	*/
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
+ *
  * 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -31,55 +31,52 @@
  */
 /*
  * PCI IDE controller driver (i386 machine-dependent portion).
+ *
  * Author: Christopher G. Demetriou, March 2, 1998 (derived from NetBSD
  * sys/dev/pci/ppb.c, revision 1.16).
+ *
  * See "PCI IDE Controller Specification, Revision 1.0 3/4/94" from the
  * PCI SIG.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.13 2009/03/14 14:46:08 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.14 2009/03/16 06:18:32 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciidereg.h>
 #include <dev/pci/pciidevar.h>
 #include <xen/evtchn.h>
 #ifdef XEN3
 #include "ioapic.h"
 #endif
 #if NIOAPIC > 0
 #include <machine/i82093var.h>
 #include <machine/mpbiosvar.h>
 #endif
 void *
-pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
+pciide_machdep_compat_intr_establish(struct device *dev,
-	struct device *dev;
+	struct pci_attach_args *pa, int chan,
-	struct pci_attach_args *pa;
+	int (*func)(void *), void *arg)
 	int chan;
 	int (*func)(void *);
 	void *arg;
+{
 	struct pintrhand *ih;
 	char evname[8];
         struct xen_intr_handle xenih;
 #if NIOAPIC > 0
 	struct ioapic_softc *pic = NULL;
 #endif
 	int evtch;
 #ifndef XEN3
 	physdev_op_t physdev_op;
 	physdev_op.cmd = PHYSDEVOP_PCI_INITIALISE_DEVICE;

 @@ -1,14 +1,14 @@
-/*      $NetBSD: xengnt.c,v 1.13 2009/01/19 18:27:02 jym Exp $      */
+/*      $NetBSD: xengnt.c,v 1.14 2009/03/16 06:18:32 cegger Exp $      */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,27 +21,27 @@
  * 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 AUTHOR 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: xengnt.c,v 1.13 2009/01/19 18:27:02 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xengnt.c,v 1.14 2009/03/16 06:18:32 cegger Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/extent.h>
 #include <sys/kernel.h>
 #include <uvm/uvm.h>
 #include <xen/hypervisor.h>
 #include <xen/xen.h>
 #include <xen/granttables.h>
 @@ -66,27 +66,27 @@ grant_ref_t *gnt_entries;
 int last_gnt_entry;
 /* empty entry in the list */
 #define XENGNT_NO_ENTRY 0xffffffff
 /* VM address of the grant table */
 grant_entry_t *grant_table;
 static grant_ref_t xengnt_get_entry(void);
 static void xengnt_free_entry(grant_ref_t);
 static void xengnt_resume(void);
 static int xengnt_more_entries(void);
 void
-xengnt_init()
+xengnt_init(void)
+{
 	struct gnttab_query_size query;
 	int rc;
 	int nr_grant_entries;
 	int i;
 	query.dom = DOMID_SELF;
 	rc = HYPERVISOR_grant_table_op(GNTTABOP_query_size, &query, 1);
 	if ((rc < 0) || (query.status != GNTST_okay))
 		gnt_max_grant_frames = 4; /* Legacy max number of frames */
 	else
 		gnt_max_grant_frames = query.max_nr_frames;
 	gnt_nr_grant_frames = 0;
 @@ -104,27 +104,27 @@ xengnt_init()
 		panic("xengnt_init() no space for bitmask");
 	for (i = 0; i <= nr_grant_entries; i++)
 		gnt_entries[i] = XENGNT_NO_ENTRY;
 	last_gnt_entry = 0;
 	xengnt_resume();
+}
 /*
  * Resume grant table state
  */
 static void
-xengnt_resume()
+xengnt_resume(void)
+{
 	int previous_nr_grant_frames = gnt_nr_grant_frames;
 	gnt_nr_grant_frames = 0;
 	while (gnt_nr_grant_frames < previous_nr_grant_frames) {
 		if (xengnt_more_entries() != 0)
 			panic("xengnt_resume: can't restore grant frames");
+	}
+}
 /*
  * Add another page to the grant table
  * Returns 0 on success, ENOMEM on failure
  */
 @@ -182,27 +182,27 @@ xengnt_more_entries(void)
 		KASSERT(gnt_entries[last_gnt_entry] == XENGNT_NO_ENTRY);
 		gnt_entries[last_gnt_entry] = i;
 		last_gnt_entry++;
+	}
 	gnt_nr_grant_frames = nframes_new;
 	free(pages, M_DEVBUF);
 	return 0;
+}
 /*
  * Returns a reference to the first free entry in grant table
  */
 static grant_ref_t
-xengnt_get_entry()
+xengnt_get_entry(void)
+{
 	grant_ref_t entry;
 	int s = splvm();
 	static struct timeval xengnt_nonmemtime;
 	static const struct timeval xengnt_nonmemintvl = {5,0};
 	if (last_gnt_entry == 0) {
 		if (xengnt_more_entries()) {
 			splx(s);
 			if (ratecheck(&xengnt_nonmemtime, &xengnt_nonmemintvl))
 				printf("xengnt_get_entry: out of grant "
 				    "table entries\n");
 			return XENGNT_NO_ENTRY;

 @@ -1,14 +1,14 @@
-/* $NetBSD: privcmd.c,v 1.36 2009/03/04 10:32:36 jym Exp $ */
+/* $NetBSD: privcmd.c,v 1.37 2009/03/16 06:18:32 cegger Exp $ */
 /*-
  * Copyright (c) 2004 Christian Limpach.
  * All rights reserved.
+ *
  * 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.
 @@ -22,27 +22,27 @@
  * 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 AUTHOR 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: privcmd.c,v 1.36 2009/03/04 10:32:36 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.37 2009/03/16 06:18:32 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <sys/stat.h>
 #include <sys/proc.h>
 #include <miscfs/specfs/specdev.h>
 #include <miscfs/kernfs/kernfs.h>
 #include <uvm/uvm.h>
 @@ -608,27 +608,27 @@ privcmd_map_obj(struct vm_map *map, vadd
+	}
 	if (newstart != start) {
 		printf("uvm_map didn't give us back our vm space\n");
 		return EINVAL;
+	}
 	return 0;
+}
 static const struct kernfs_fileop privcmd_fileops[] = {
   { .kf_fileop = KERNFS_FILEOP_IOCTL, .kf_vop = privcmd_ioctl },
 };
 void
-xenprivcmd_init()
+xenprivcmd_init(void)
+{
 	kernfs_entry_t *dkt;
 	kfstype kfst;
 	if (!xendomain_is_privileged())
 		return;
 	kfst = KERNFS_ALLOCTYPE(privcmd_fileops);
 	KERNFS_ALLOCENTRY(dkt, M_TEMP, M_WAITOK);
 	KERNFS_INITENTRY(dkt, DT_REG, "privcmd", NULL, kfst, VREG,
 	    PRIVCMD_MODE);
 	kernfs_addentry(kernxen_pkt, dkt);