summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authordsl <dsl@NetBSD.org>2009-03-16 23:11:09 +0000
committerdsl <dsl@NetBSD.org>2009-03-16 23:11:09 +0000
commit7cc9af7d6484d647533e2cc7e39ca9756eef8fe5 (patch)
treeb42b2e3fa1be867ebdac07c8c6139ccedd917bf0 /sys
parentfd24f7c9171367d7748eaf9a220cde2ab9311f13 (diff)
ANSIfy functions with function-pointer arguments
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/alpha/disksubr.c16
-rw-r--r--sys/arch/alpha/alpha/vm_machdep.c9
-rw-r--r--sys/arch/alpha/pci/pci_2100_a50.c10
-rw-r--r--sys/arch/alpha/pci/pci_550.c18
-rw-r--r--sys/arch/alpha/pci/pci_6600.c18
-rw-r--r--sys/arch/alpha/pci/pci_a12.c10
-rw-r--r--sys/arch/alpha/pci/pci_alphabook1.c10
-rw-r--r--sys/arch/alpha/pci/pci_axppci_33.c10
-rw-r--r--sys/arch/alpha/pci/pci_eb164.c18
-rw-r--r--sys/arch/alpha/pci/pci_eb64plus.c10
-rw-r--r--sys/arch/alpha/pci/pci_eb66.c10
-rw-r--r--sys/arch/alpha/pci/pciide_machdep.c11
-rw-r--r--sys/arch/alpha/pci/sio_pic.c11
-rw-r--r--sys/arch/alpha/tc/tc_3000_300.c10
-rw-r--r--sys/arch/alpha/tc/tc_3000_500.c10
-rw-r--r--sys/arch/amiga/amiga/disksubr.c22
-rw-r--r--sys/arch/amiga/amiga/machdep.c11
-rw-r--r--sys/arch/arm/footbridge/isa/isa_machdep.c12
-rw-r--r--sys/arch/arm/ofw/ofw_irqhandler.c12
-rw-r--r--sys/arch/atari/atari/disksubr.c22
-rw-r--r--sys/arch/atari/isa/isa_hades.c10
-rw-r--r--sys/arch/atari/isa/isa_milan.c10
-rw-r--r--sys/arch/atari/pci/pci_hades.c11
-rw-r--r--sys/arch/atari/pci/pci_milan.c11
-rw-r--r--sys/arch/atari/pci/pciide_machdep.c11
-rw-r--r--sys/arch/cats/pci/pciide_machdep.c11
-rw-r--r--sys/arch/cesfic/cesfic/isr.c10
-rw-r--r--sys/arch/evbarm/ixm1200/ixm1200_pci.c11
-rw-r--r--sys/arch/evbarm/tsarm/isa/isa_machdep.c12
-rw-r--r--sys/arch/ia64/ia64/vm_machdep.c7
-rw-r--r--sys/arch/luna68k/dev/lunafb.c11
-rw-r--r--sys/arch/luna68k/luna68k/disksubr.c16
-rw-r--r--sys/arch/luna68k/luna68k/isr.c15
-rw-r--r--sys/arch/macppc/macppc/disksubr.c34
-rw-r--r--sys/arch/mips/mips/mips_machdep.c7
-rw-r--r--sys/arch/mips/mips/mips_mcclock.c9
-rw-r--r--sys/arch/mipsco/isa/isa_machdep.c14
-rw-r--r--sys/arch/mipsco/mipsco/disksubr.c16
-rw-r--r--sys/arch/mipsco/mipsco/machdep.c9
-rw-r--r--sys/arch/mipsco/obio/obio.c12
-rw-r--r--sys/arch/mmeye/dev/mmeyepcmcia.c11
-rw-r--r--sys/arch/mvme68k/dev/vme_pcc.c11
-rw-r--r--sys/arch/netwinder/pci/pciide_machdep.c11
-rw-r--r--sys/arch/next68k/next68k/disksubr.c16
-rw-r--r--sys/arch/pmax/ibus/ibus.c11
-rw-r--r--sys/arch/pmax/pmax/dec_3100.c11
-rw-r--r--sys/arch/pmax/pmax/dec_3max.c11
-rw-r--r--sys/arch/pmax/pmax/dec_3maxplus.c11
-rw-r--r--sys/arch/pmax/pmax/dec_3min.c11
-rw-r--r--sys/arch/pmax/pmax/dec_5100.c11
-rw-r--r--sys/arch/pmax/pmax/dec_maxine.c11
-rw-r--r--sys/arch/pmax/pmax/disksubr.c22
-rw-r--r--sys/arch/pmax/pmax/machdep.c11
-rw-r--r--sys/arch/pmax/tc/ioasic.c11
-rw-r--r--sys/arch/pmax/tc/tcbus.c11
-rw-r--r--sys/arch/sandpoint/pci/pciide_machdep.c11
-rw-r--r--sys/arch/sandpoint/stand/netboot/pci.c15
-rw-r--r--sys/arch/sbmips/sbmips/disksubr.c16
-rw-r--r--sys/arch/shark/isa/isa_irqhandler.c12
-rw-r--r--sys/arch/shark/isa/isa_shark_machdep.c12
-rw-r--r--sys/arch/sparc64/sparc64/vm_machdep.c11
-rw-r--r--sys/compat/ndis/kern_ndis.c17
-rw-r--r--sys/dev/ic/hd44780_subr.c9
-rw-r--r--sys/dev/isa/ega.c11
-rw-r--r--sys/dev/mvme/mvmebus.c20
-rw-r--r--sys/dev/mvme/vme_two_isr.c17
-rw-r--r--sys/dev/pci/btvmei.c20
-rw-r--r--sys/dev/pci/btvmeii.c20
-rw-r--r--sys/dev/pci/tga.c15
-rw-r--r--sys/dev/pci/universe_pci.c11
-rw-r--r--sys/dev/sbus/stp4020.c11
-rw-r--r--sys/dev/sun/disksubr.c16
72 files changed, 245 insertions, 687 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index f20163dcaff..c602989c9d8 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.38 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.39 2009/03/16 23:11:09 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.38 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.39 2009/03/16 23:11:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,11 +53,7 @@ extern struct device *bootdv;
* Returns null on success and an error string on failure.
*/
const char *
-readdisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct buf *bp;
struct disklabel *dlp;
@@ -203,11 +199,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru
* label. Hope the user was careful.
*/
int
-writedisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct buf *bp;
struct disklabel *dlp;
diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c
index cf7637145e5..deb92875559 100644
--- a/sys/arch/alpha/alpha/vm_machdep.c
+++ b/sys/arch/alpha/alpha/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.98 2009/03/14 14:45:52 dsl Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.99 2009/03/16 23:11:09 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.98 2009/03/14 14:45:52 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.99 2009/03/16 23:11:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,10 +155,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
}
void
-cpu_setfunc(l, func, arg)
- struct lwp *l;
- void (*func)(void *);
- void *arg;
+cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
{
struct user *up = l->l_addr;
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index c68d9f93190..e288f43a7ff 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a50.c,v 1.35 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: pci_2100_a50.c,v 1.36 2009/03/16 23:11:09 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.35 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.36 2009/03/16 23:11:09 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -236,11 +236,7 @@ dec_2100_a50_intr_evcnt(void *acv, pci_intr_handle_t ih)
}
void *
-dec_2100_a50_intr_establish(acv, ih, level, func, arg)
- void *acv, *arg;
- pci_intr_handle_t ih;
- int level;
- int (*func)(void *);
+dec_2100_a50_intr_establish(void *acv, pci_intr_handle_t ih, int level, int (*func)(void *), void *arg)
{
#if 0
struct apecs_config *acp = acv;
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index f56e50a7b2a..613e74fc899 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_550.c,v 1.31 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: pci_550.c,v 1.32 2009/03/16 23:11:09 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.31 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.32 2009/03/16 23:11:09 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -288,11 +288,7 @@ dec_550_intr_evcnt(void *ccv, pci_intr_handle_t ih)
}
void *
-dec_550_intr_establish(ccv, ih, level, func, arg)
- void *ccv, *arg;
- pci_intr_handle_t ih;
- int level;
- int (*func)(void *);
+dec_550_intr_establish(void *ccv, pci_intr_handle_t ih, int level, int (*func)(void *), void *arg)
{
#if 0
struct cia_config *ccp = ccv;
@@ -356,13 +352,7 @@ dec_550_intr_disestablish(void *ccv, void *cookie)
}
void *
-dec_550_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
- void *v;
- struct device *dev;
- struct pci_attach_args *pa;
- int chan;
- int (*func)(void *);
- void *arg;
+dec_550_pciide_compat_intr_establish(void *v, struct device *dev, struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
pci_chipset_tag_t pc = pa->pa_pc;
void *cookie = NULL;
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index af8bb1da24e..ef8658f8306 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_6600.c,v 1.18 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: pci_6600.c,v 1.19 2009/03/16 23:11:09 dsl Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.18 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.19 2009/03/16 23:11:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -214,11 +214,7 @@ dec_6600_intr_evcnt(void *acv, pci_intr_handle_t ih)
}
void *
-dec_6600_intr_establish(acv, ih, level, func, arg)
- void *acv, *arg;
- pci_intr_handle_t ih;
- int level;
- int (*func)(void *);
+dec_6600_intr_establish(void *acv, pci_intr_handle_t ih, int level, int (*func)(void *), void *arg)
{
void *cookie;
@@ -313,13 +309,7 @@ dec_6600_intr_disable(int irq)
}
void *
-dec_6600_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
- void *v;
- struct device *dev;
- struct pci_attach_args *pa;
- int chan;
- int (*func)(void *);
- void *arg;
+dec_6600_pciide_compat_intr_establish(void *v, struct device *dev, struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
pci_chipset_tag_t pc = pa->pa_pc;
void *cookie = NULL;
diff --git a/sys/arch/alpha/pci/pci_a12.c b/sys/arch/alpha/pci/pci_a12.c
index c610b84bbe9..1bac819785a 100644
--- a/sys/arch/alpha/pci/pci_a12.c
+++ b/sys/arch/alpha/pci/pci_a12.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_a12.c,v 1.10 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: pci_a12.c,v 1.11 2009/03/16 23:11:09 dsl Exp $ */
/* [Notice revision 2.0]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -38,7 +38,7 @@
#include "opt_avalon_a12.h" /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_a12.c,v 1.10 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_a12.c,v 1.11 2009/03/16 23:11:09 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -161,11 +161,7 @@ avalon_a12_intr_evcnt(void *ccv, pci_intr_handle_t ih)
}
void *
-avalon_a12_intr_establish(ccv, ih, level, func, arg)
- void *ccv, *arg;
- pci_intr_handle_t ih;
- int level;
- int (*func)(void *);
+avalon_a12_intr_establish(void *ccv, pci_intr_handle_t ih, int level, int (*func)(void *), void *arg)
{
a12_intr_pci.f = func;
a12_intr_pci.a = arg;
diff --git a/sys/arch/alpha/pci/pci_alphabook1.c b/sys/arch/alpha/pci/pci_alphabook1.c
index 7e0a544b4c7..abcaa9ea815 100644
--- a/sys/arch/alpha/pci/pci_alphabook1.c
+++ b/sys/arch/alpha/pci/pci_alphabook1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_alphabook1.c,v 1.12 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: pci_alphabook1.c,v 1.13 2009/03/16 23:11:09 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_alphabook1.c,v 1.12 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_alphabook1.c,v 1.13 2009/03/16 23:11:09 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -195,11 +195,7 @@ dec_alphabook1_intr_evcnt(void *lcv, pci_intr_handle_t ih)
}
void *
-dec_alphabook1_intr_establish(lcv, ih, level, func, arg)
- void *lcv, *arg;
- pci_intr_handle_t ih;
- int level;
- int (*func)(void *);
+dec_alphabook1_intr_establish(void *lcv, pci_intr_handle_t ih, int level, int (*func)(void *), void *arg)
{
#if 0
struct lca_config *lcp = lcv;
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index 4e9a1e27ef2..c37885a9acd 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_axppci_33.c,v 1.32 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: pci_axppci_33.c,v 1.33 2009/03/16 23:11:09 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.32 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.33 2009/03/16 23:11:09 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -236,11 +236,7 @@ dec_axppci_33_intr_evcnt(void *lcv, pci_intr_handle_t ih)
}
void *
-dec_axppci_33_intr_establish(lcv, ih, level, func, arg)
- void *lcv, *arg;
- pci_intr_handle_t ih;
- int level;
- int (*func)(void *);
+dec_axppci_33_intr_establish(void *lcv, pci_intr_handle_t ih, int level, int (*func)(void *), void *arg)
{
#if 0
struct lca_config *lcp = lcv;
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index f8ed53adca9..086ecf13778 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb164.c,v 1.39 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: pci_eb164.c,v 1.40 2009/03/16 23:11:09 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.39 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.40 2009/03/16 23:11:09 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -260,11 +260,7 @@ dec_eb164_intr_evcnt(void *ccv, pci_intr_handle_t ih)
}
void *
-dec_eb164_intr_establish(ccv, ih, level, func, arg)
- void *ccv, *arg;
- pci_intr_handle_t ih;
- int level;
- int (*func)(void *);
+dec_eb164_intr_establish(void *ccv, pci_intr_handle_t ih, int level, int (*func)(void *), void *arg)
{
#if 0
struct cia_config *ccp = ccv;
@@ -311,13 +307,7 @@ dec_eb164_intr_disestablish(void *ccv, void *cookie)
}
void *
-dec_eb164_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
- void *v;
- struct device *dev;
- struct pci_attach_args *pa;
- int chan;
- int (*func)(void *);
- void *arg;
+dec_eb164_pciide_compat_intr_establish(void *v, struct device *dev, struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
pci_chipset_tag_t pc = pa->pa_pc;
void *cookie = NULL;
diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c
index b8bfcb9674e..f502f7e9711 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.c
+++ b/sys/arch/alpha/pci/pci_eb64plus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb64plus.c,v 1.19 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: pci_eb64plus.c,v 1.20 2009/03/16 23:11:09 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.19 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.20 2009/03/16 23:11:09 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -207,11 +207,7 @@ dec_eb64plus_intr_evcnt(void *acv, pci_intr_handle_t ih)
}
void *
-dec_eb64plus_intr_establish(acv, ih, level, func, arg)
- void *acv, *arg;
- pci_intr_handle_t ih;
- int level;
- int (*func)(void *);
+dec_eb64plus_intr_establish(void *acv, pci_intr_handle_t ih, int level, int (*func)(void *), void *arg)
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_eb66.c b/sys/arch/alpha/pci/pci_eb66.c
index 0da7ddaea85..661ccde41a4 100644
--- a/sys/arch/alpha/pci/pci_eb66.c
+++ b/sys/arch/alpha/pci/pci_eb66.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb66.c,v 1.19 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: pci_eb66.c,v 1.20 2009/03/16 23:11:09 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.19 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.20 2009/03/16 23:11:09 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -207,11 +207,7 @@ dec_eb66_intr_evcnt(void *lcv, pci_intr_handle_t ih)
}
void *
-dec_eb66_intr_establish(lcv, ih, level, func, arg)
- void *lcv, *arg;
- pci_intr_handle_t ih;
- int level;
- int (*func)(void *);
+dec_eb66_intr_establish(void *lcv, pci_intr_handle_t ih, int level, int (*func)(void *), void *arg)
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pciide_machdep.c b/sys/arch/alpha/pci/pciide_machdep.c
index e71fff7df7c..62cf0805bea 100644
--- a/sys/arch/alpha/pci/pciide_machdep.c
+++ b/sys/arch/alpha/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.3 2009/03/14 14:45:53 dsl Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.4 2009/03/16 23:11:09 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.3 2009/03/14 14:45:53 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.4 2009/03/16 23:11:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,12 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.3 2009/03/14 14:45:53 dsl Exp $
#include <dev/isa/isavar.h>
void *
-pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
- struct device *dev;
- struct pci_attach_args *pa;
- int chan;
- int (*func)(void *);
- void *arg;
+pciide_machdep_compat_intr_establish(struct device *dev, struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
pci_chipset_tag_t pc = pa->pa_pc;
diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c
index 7511fcb8d00..38b41595e04 100644
--- a/sys/arch/alpha/pci/sio_pic.c
+++ b/sys/arch/alpha/pci/sio_pic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sio_pic.c,v 1.39 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: sio_pic.c,v 1.40 2009/03/16 23:11:09 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.39 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.40 2009/03/16 23:11:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -434,12 +434,7 @@ sio_intr_evcnt(void *v, int irq)
}
void *
-sio_intr_establish(v, irq, type, level, fn, arg)
- void *v, *arg;
- int irq;
- int type;
- int level;
- int (*fn)(void *);
+sio_intr_establish(void *v, int irq, int type, int level, int (*fn)(void *), void *arg)
{
void *cookie;
diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c
index fdcb83e7cbb..8bc3a65973c 100644
--- a/sys/arch/alpha/tc/tc_3000_300.c
+++ b/sys/arch/alpha/tc/tc_3000_300.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_300.c,v 1.29 2009/03/14 15:36:00 dsl Exp $ */
+/* $NetBSD: tc_3000_300.c,v 1.30 2009/03/16 23:11:09 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.29 2009/03/14 15:36:00 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.30 2009/03/16 23:11:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,11 +132,7 @@ tc_3000_300_intr_evcnt(struct device *tcadev, void *cookie)
}
void
-tc_3000_300_intr_establish(tcadev, cookie, level, func, arg)
- struct device *tcadev;
- void *cookie, *arg;
- tc_intrlevel_t level;
- int (*func)(void *);
+tc_3000_300_intr_establish(struct device *tcadev, void *cookie, tc_intrlevel_t level, int (*func)(void *), void *arg)
{
volatile u_int32_t *imskp;
u_long dev = (u_long)cookie;
diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c
index 193e7bc1851..032ae1e10ac 100644
--- a/sys/arch/alpha/tc/tc_3000_500.c
+++ b/sys/arch/alpha/tc/tc_3000_500.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_500.c,v 1.28 2009/03/14 21:04:03 dsl Exp $ */
+/* $NetBSD: tc_3000_500.c,v 1.29 2009/03/16 23:11:09 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.28 2009/03/14 21:04:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.29 2009/03/16 23:11:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,11 +156,7 @@ tc_3000_500_intr_evcnt(struct device *tcadev, void *cookie)
}
void
-tc_3000_500_intr_establish(tcadev, cookie, level, func, arg)
- struct device *tcadev;
- void *cookie, *arg;
- tc_intrlevel_t level;
- int (*func)(void *);
+tc_3000_500_intr_establish(struct device *tcadev, void *cookie, tc_intrlevel_t level, int (*func)(void *), void *arg)
{
u_long dev = (u_long)cookie;
diff --git a/sys/arch/amiga/amiga/disksubr.c b/sys/arch/amiga/amiga/disksubr.c
index 2cfb556285d..45f7e9d3449 100644
--- a/sys/arch/amiga/amiga/disksubr.c
+++ b/sys/arch/amiga/amiga/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.58 2009/03/14 21:04:03 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.59 2009/03/16 23:11:10 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.58 2009/03/14 21:04:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.59 2009/03/16 23:11:10 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,11 +128,7 @@ struct rdbmap *getrdbmap(dev_t, void (*)(struct buf *), struct disklabel *,
* Returns null on success and an error string on failure.
*/
const char *
-readdisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct adostype adt;
struct partition *pp = NULL;
@@ -539,11 +535,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru
* label. Hope the user was carefull.
*/
int
-writedisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct rdbmap *bmap;
struct buf *bp;
@@ -689,11 +681,7 @@ getadostype(u_long dostype)
* lseg or end the chain for part, badb, fshd)
*/
struct rdbmap *
-getrdbmap(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+getrdbmap(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct buf *bp;
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 3797d0f8516..269ea65dd96 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.216 2009/03/14 15:36:00 dsl Exp $ */
+/* $NetBSD: machdep.c,v 1.217 2009/03/16 23:11:10 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -86,7 +86,7 @@
#include "opt_panicbutton.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.216 2009/03/14 15:36:00 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.217 2009/03/16 23:11:10 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -976,9 +976,7 @@ alloc_sicallback()
}
void
-add_sicallback (function, rock1, rock2)
- void (*function)(void *rock1, void *rock2);
- void *rock1, *rock2;
+add_sicallback (void (*function)(void *rock1, void *rock2), void *rock1, void *rock2)
{
struct si_callback *si;
int s;
@@ -1022,8 +1020,7 @@ add_sicallback (function, rock1, rock2)
void
-rem_sicallback(function)
- void (*function)(void *rock1, void *rock2);
+rem_sicallback(void (*function)(void *rock1, void *rock2))
{
struct si_callback *si, *psi, *nsi;
int s;
diff --git a/sys/arch/arm/footbridge/isa/isa_machdep.c b/sys/arch/arm/footbridge/isa/isa_machdep.c
index e55241fef76..7a3b49f340c 100644
--- a/sys/arch/arm/footbridge/isa/isa_machdep.c
+++ b/sys/arch/arm/footbridge/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.11 2009/03/14 21:04:05 dsl Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.12 2009/03/16 23:11:10 dsl Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.11 2009/03/14 21:04:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.12 2009/03/16 23:11:10 dsl Exp $");
#include "opt_irqstats.h"
@@ -335,13 +335,7 @@ isa_intr_evcnt(isa_chipset_tag_t ic, int irq)
* XXX PRONE TO RACE CONDITIONS, UGLY, 'INTERESTING' INSERTION ALGORITHM.
*/
void *
-isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
- isa_chipset_tag_t ic;
- int irq;
- int type;
- int level;
- int (*ih_fun)(void *);
- void *ih_arg;
+isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg)
{
struct intrq *iq;
struct intrhand *ih;
diff --git a/sys/arch/arm/ofw/ofw_irqhandler.c b/sys/arch/arm/ofw/ofw_irqhandler.c
index 8bc92dbb7ed..15d39f47892 100644
--- a/sys/arch/arm/ofw/ofw_irqhandler.c
+++ b/sys/arch/arm/ofw/ofw_irqhandler.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_irqhandler.c,v 1.15 2009/03/14 15:36:02 dsl Exp $ */
+/* $NetBSD: ofw_irqhandler.c,v 1.16 2009/03/16 23:11:10 dsl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_irqhandler.c,v 1.15 2009/03/14 15:36:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_irqhandler.c,v 1.16 2009/03/16 23:11:10 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -293,13 +293,7 @@ irq_release(int irq, irqhandler_t *handler)
void *
-intr_claim(irq, level, ih_func, ih_arg, group, name)
- int irq;
- int level;
- int (*ih_func)(void *);
- void *ih_arg;
- const char *group;
- const char *name;
+intr_claim(int irq, int level, int (*ih_func)(void *), void *ih_arg, const char *group, const char *name)
{
irqhandler_t *ih;
diff --git a/sys/arch/atari/atari/disksubr.c b/sys/arch/atari/atari/disksubr.c
index e6dfeb33e7a..2272e03169f 100644
--- a/sys/arch/atari/atari/disksubr.c
+++ b/sys/arch/atari/atari/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.38 2009/03/14 21:04:05 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.39 2009/03/16 23:11:10 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.38 2009/03/14 21:04:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.39 2009/03/16 23:11:10 dsl Exp $");
#ifndef DISKLABEL_NBDA
#define DISKLABEL_NBDA /* required */
@@ -74,11 +74,7 @@ static u_int ahdi_getparts(dev_t, void (*)(struct buf *), u_int,
* Returns NULL on success and an error string on failure.
*/
const char *
-readdisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
int e;
@@ -195,11 +191,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru
* Write disk label back to device after modification.
*/
int
-writedisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct buf *bp;
u_int blk;
@@ -353,11 +345,7 @@ ck_label(struct disklabel *dl, struct cpu_disklabel *cdl)
* +1 if no valid AHDI label was found.
*/
int
-ahdi_label(dev, strat, dl, cdl)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *dl;
- struct cpu_disklabel *cdl;
+ahdi_label(dev_t dev, void (*strat)(struct buf *), struct disklabel *dl, struct cpu_disklabel *cdl)
{
struct ahdi_ptbl apt;
u_int i;
diff --git a/sys/arch/atari/isa/isa_hades.c b/sys/arch/atari/isa/isa_hades.c
index 882205d944c..9dee502e641 100644
--- a/sys/arch/atari/isa/isa_hades.c
+++ b/sys/arch/atari/isa/isa_hades.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_hades.c,v 1.7 2009/03/14 15:36:03 dsl Exp $ */
+/* $NetBSD: isa_hades.c,v 1.8 2009/03/16 23:11:10 dsl Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_hades.c,v 1.7 2009/03/14 15:36:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_hades.c,v 1.8 2009/03/16 23:11:10 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -149,11 +149,7 @@ isa_intr_alloc(isa_chipset_tag_t ic, int mask, int type, int *irq)
return (1);
}
void *
-isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
- isa_chipset_tag_t ic;
- int irq, type, level;
- int (*ih_fun)(void *);
- void *ih_arg;
+isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg)
{
isa_intr_info_t *iinfo_p;
struct intrhand *ihand;
diff --git a/sys/arch/atari/isa/isa_milan.c b/sys/arch/atari/isa/isa_milan.c
index d8c745ffc70..0342aee00ab 100644
--- a/sys/arch/atari/isa/isa_milan.c
+++ b/sys/arch/atari/isa/isa_milan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_milan.c,v 1.12 2009/03/14 21:04:06 dsl Exp $ */
+/* $NetBSD: isa_milan.c,v 1.13 2009/03/16 23:11:10 dsl Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_milan.c,v 1.12 2009/03/14 21:04:06 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_milan.c,v 1.13 2009/03/16 23:11:10 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -195,11 +195,7 @@ isa_intr_alloc(isa_chipset_tag_t ic, int mask, int type, int *irq)
}
void *
-isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
- isa_chipset_tag_t ic;
- int irq, type, level;
- int (*ih_fun)(void *);
- void *ih_arg;
+isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg)
{
isa_intr_info_t *iinfo_p;
diff --git a/sys/arch/atari/pci/pci_hades.c b/sys/arch/atari/pci/pci_hades.c
index 786e0b42463..deb07df8632 100644
--- a/sys/arch/atari/pci/pci_hades.c
+++ b/sys/arch/atari/pci/pci_hades.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_hades.c,v 1.10 2009/03/14 15:36:03 dsl Exp $ */
+/* $NetBSD: pci_hades.c,v 1.11 2009/03/16 23:11:10 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_hades.c,v 1.10 2009/03/14 15:36:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_hades.c,v 1.11 2009/03/16 23:11:10 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -147,12 +147,7 @@ pci_intr_setattr(pci_chipset_tag_t pc, pci_intr_handle_t *ih,
}
void *
-pci_intr_establish(pc, ih, level, ih_fun, ih_arg)
- pci_chipset_tag_t pc;
- pci_intr_handle_t ih;
- int level;
- int (*ih_fun)(void *);
- void *ih_arg;
+pci_intr_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih, int level, int (*ih_fun)(void *), void *ih_arg)
{
pci_intr_info_t *iinfo_p;
struct intrhand *ihand;
diff --git a/sys/arch/atari/pci/pci_milan.c b/sys/arch/atari/pci/pci_milan.c
index 2137dc4a373..586529b7c8d 100644
--- a/sys/arch/atari/pci/pci_milan.c
+++ b/sys/arch/atari/pci/pci_milan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_milan.c,v 1.11 2009/03/14 15:36:03 dsl Exp $ */
+/* $NetBSD: pci_milan.c,v 1.12 2009/03/16 23:11:10 dsl Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_milan.c,v 1.11 2009/03/14 15:36:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_milan.c,v 1.12 2009/03/16 23:11:10 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -98,12 +98,7 @@ pci_intr_setattr(pci_chipset_tag_t pc, pci_intr_handle_t *ih,
}
void *
-pci_intr_establish(pc, ih, level, ih_fun, ih_arg)
- pci_chipset_tag_t pc;
- pci_intr_handle_t ih;
- int level;
- int (*ih_fun)(void *);
- void *ih_arg;
+pci_intr_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih, int level, int (*ih_fun)(void *), void *ih_arg)
{
if (ih == 0 || ih >= 16 || ih == 2)
panic("pci_intr_establish: bogus handle 0x%x", ih);
diff --git a/sys/arch/atari/pci/pciide_machdep.c b/sys/arch/atari/pci/pciide_machdep.c
index bbe5d1a1a8a..bf8d1df8e51 100644
--- a/sys/arch/atari/pci/pciide_machdep.c
+++ b/sys/arch/atari/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.4 2009/03/14 14:45:56 dsl Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.5 2009/03/16 23:11:10 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.4 2009/03/14 14:45:56 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.5 2009/03/16 23:11:10 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,12 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.4 2009/03/14 14:45:56 dsl Exp $
#include <dev/isa/isavar.h>
void *
-pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
- struct device *dev;
- struct pci_attach_args *pa;
- int chan;
- int (*func)(void *);
- void *arg;
+pciide_machdep_compat_intr_establish(struct device *dev, struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
int irq;
void *cookie;
diff --git a/sys/arch/cats/pci/pciide_machdep.c b/sys/arch/cats/pci/pciide_machdep.c
index 86d46ed9a24..3760a15c714 100644
--- a/sys/arch/cats/pci/pciide_machdep.c
+++ b/sys/arch/cats/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:45:58 dsl Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.6 2009/03/16 23:11:11 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:45:58 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.6 2009/03/16 23:11:11 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,12 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:45:58 dsl Exp $
#include "isa.h"
void *
-pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
- struct device *dev;
- struct pci_attach_args *pa;
- int chan;
- int (*func)(void *);
- void *arg;
+pciide_machdep_compat_intr_establish(struct device *dev, struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
#if NISA > 0
int irq;
diff --git a/sys/arch/cesfic/cesfic/isr.c b/sys/arch/cesfic/cesfic/isr.c
index 5d5953d8332..aacf271ed44 100644
--- a/sys/arch/cesfic/cesfic/isr.c
+++ b/sys/arch/cesfic/cesfic/isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.13 2009/03/14 21:04:08 dsl Exp $ */
+/* $NetBSD: isr.c,v 1.14 2009/03/16 23:11:11 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.13 2009/03/14 21:04:08 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.14 2009/03/16 23:11:11 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,11 +68,7 @@ isrinit()
* Called by driver attach functions.
*/
void *
-isrlink(func, arg, ipl, priority)
- int (*func)(void *);
- void *arg;
- int ipl;
- int priority;
+isrlink(int (*func)(void *), void *arg, int ipl, int priority)
{
struct isr *newisr, *curisr;
isr_list_t *list;
diff --git a/sys/arch/evbarm/ixm1200/ixm1200_pci.c b/sys/arch/evbarm/ixm1200/ixm1200_pci.c
index 7fe23f1f874..0781fd8e334 100644
--- a/sys/arch/evbarm/ixm1200/ixm1200_pci.c
+++ b/sys/arch/evbarm/ixm1200/ixm1200_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_pci.c,v 1.5 2009/03/14 15:36:05 dsl Exp $ */
+/* $NetBSD: ixm1200_pci.c,v 1.6 2009/03/16 23:11:11 dsl Exp $ */
#define PCI_DEBUG
/*
* Copyright (c) 2002, 2003
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.5 2009/03/14 15:36:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.6 2009/03/16 23:11:11 dsl Exp $");
/*
* IXM1200 PCI interrupt support.
@@ -111,12 +111,7 @@ ixm1200_pci_intr_evcnt(void *v, pci_intr_handle_t ih)
}
void *
-ixm1200_pci_intr_establish(v, ih, ipl, func, arg)
- void *v;
- pci_intr_handle_t ih;
- int ipl;
- int (*func)(void *);
- void *arg;
+ixm1200_pci_intr_establish(void *v, pci_intr_handle_t ih, int ipl, int (*func)(void *), void *arg)
{
#ifdef PCI_DEBUG
printf("ixm1200_pci_intr_establish(v=%p, irq=%d, ipl=%d, func=%p, arg=%p)\n",
diff --git a/sys/arch/evbarm/tsarm/isa/isa_machdep.c b/sys/arch/evbarm/tsarm/isa/isa_machdep.c
index 739bc78830e..a640f413574 100644
--- a/sys/arch/evbarm/tsarm/isa/isa_machdep.c
+++ b/sys/arch/evbarm/tsarm/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.7 2009/03/14 21:04:09 dsl Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.8 2009/03/16 23:11:11 dsl Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.7 2009/03/14 21:04:09 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.8 2009/03/16 23:11:11 dsl Exp $");
#include "opt_irqstats.h"
@@ -143,13 +143,7 @@ isa_intr_evcnt(isa_chipset_tag_t ic, int irq)
* Set up an interrupt handler to start being called.
*/
void *
-isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
- isa_chipset_tag_t ic;
- int irq;
- int type;
- int level;
- int (*ih_fun)(void *);
- void *ih_arg;
+isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg)
{
int epirq = -1, i;
/* Find real EP93XX irq number */
diff --git a/sys/arch/ia64/ia64/vm_machdep.c b/sys/arch/ia64/ia64/vm_machdep.c
index 0beef37f7ff..2c501f2bcfb 100644
--- a/sys/arch/ia64/ia64/vm_machdep.c
+++ b/sys/arch/ia64/ia64/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.4 2009/03/14 14:46:00 dsl Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.5 2009/03/16 23:11:11 dsl Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -70,10 +70,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
}
void
-cpu_setfunc(l, func, arg)
- struct lwp *l;
- void (*func)(void *);
- void *arg;
+cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
{
return;
}
diff --git a/sys/arch/luna68k/dev/lunafb.c b/sys/arch/luna68k/dev/lunafb.c
index 5425e61cb90..60c3be562a0 100644
--- a/sys/arch/luna68k/dev/lunafb.c
+++ b/sys/arch/luna68k/dev/lunafb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.19 2009/03/14 21:04:10 dsl Exp $ */
+/* $NetBSD: lunafb.c,v 1.20 2009/03/16 23:11:11 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.19 2009/03/14 21:04:10 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.20 2009/03/16 23:11:11 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -461,12 +461,7 @@ omfb_free_screen(void *v, void *cookie)
}
static int
-omfb_show_screen(v, cookie, waitok, cb, cbarg)
- void *v;
- void *cookie;
- int waitok;
- void (*cb)(void *, int, int);
- void *cbarg;
+omfb_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), void *cbarg)
{
return 0;
}
diff --git a/sys/arch/luna68k/luna68k/disksubr.c b/sys/arch/luna68k/luna68k/disksubr.c
index cc099c2fff4..10bfd35662d 100644
--- a/sys/arch/luna68k/luna68k/disksubr.c
+++ b/sys/arch/luna68k/luna68k/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.26 2009/03/14 21:04:11 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.27 2009/03/16 23:11:12 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.26 2009/03/14 21:04:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.27 2009/03/16 23:11:12 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,11 +174,7 @@ static int disklabel_bsd_to_om(struct disklabel *, char *);
* Returns null on success and an error string on failure.
*/
const char *
-readdisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct buf *bp;
struct disklabel *dlp;
@@ -283,11 +279,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru
* Current label is already in clp->cd_block[]
*/
int
-writedisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct buf *bp;
struct disklabel *dlp;
diff --git a/sys/arch/luna68k/luna68k/isr.c b/sys/arch/luna68k/luna68k/isr.c
index a6a715f95d0..98172a95947 100644
--- a/sys/arch/luna68k/luna68k/isr.c
+++ b/sys/arch/luna68k/luna68k/isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.16 2009/03/14 21:04:11 dsl Exp $ */
+/* $NetBSD: isr.c,v 1.17 2009/03/16 23:11:12 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.16 2009/03/14 21:04:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.17 2009/03/16 23:11:12 dsl Exp $");
/*
* Link and dispatch interrupts.
@@ -75,11 +75,7 @@ isrinit()
* Called by driver attach functions.
*/
void
-isrlink_autovec(func, arg, ipl, priority)
- int (*func)(void *);
- void *arg;
- int ipl;
- int priority;
+isrlink_autovec(int (*func)(void *), void *arg, int ipl, int priority)
{
struct isr_autovec *newisr, *curisr;
isr_autovec_list_t *list;
@@ -150,10 +146,7 @@ isrlink_autovec(func, arg, ipl, priority)
* Called by bus interrupt establish functions.
*/
void
-isrlink_vectored(func, arg, ipl, vec)
- int (*func)(void *);
- void *arg;
- int ipl, vec;
+isrlink_vectored(int (*func)(void *), void *arg, int ipl, int vec)
{
struct isr_vectored *isr;
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index 9fb37532e07..c6d1565aafc 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.46 2009/03/14 21:04:12 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.47 2009/03/16 23:11:12 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.46 2009/03/14 21:04:12 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.47 2009/03/16 23:11:12 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -323,11 +323,7 @@ getNamedType(struct part_map_entry *part, int num_parts, struct disklabel *lp, i
* disk. This whole algorithm should probably be changed in the future.
*/
static const char *
-read_mac_label(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+read_mac_label(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct part_map_entry *part;
struct partition *pp;
@@ -400,11 +396,7 @@ done:
* this should suffice to mount_msdos Zip and other removable media.
*/
static const char *
-read_dos_label(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+read_dos_label(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct mbr_partition *dp;
struct buf *bp;
@@ -504,11 +496,7 @@ read_dos_label(dev, strat, lp, osdep)
* Get real NetBSD disk label
*/
static int
-get_netbsd_label(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+get_netbsd_label(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct buf *bp;
struct disklabel *dlp;
@@ -561,11 +549,7 @@ done:
* then we assume that it's a real disklabel and return it.
*/
const char *
-readdisklabel(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct buf *bp;
const char *msg = NULL;
@@ -654,11 +638,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru
* Write disk label back to device after modification.
*/
int
-writedisklabel(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct buf *bp;
int error;
diff --git a/sys/arch/mips/mips/mips_machdep.c b/sys/arch/mips/mips/mips_machdep.c
index b4cc36a6eb1..4962e2a9879 100644
--- a/sys/arch/mips/mips/mips_machdep.c
+++ b/sys/arch/mips/mips/mips_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.209 2009/03/14 15:36:10 dsl Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.210 2009/03/16 23:11:12 dsl Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.209 2009/03/14 15:36:10 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.210 2009/03/16 23:11:12 dsl Exp $");
#include "opt_cputype.h"
@@ -973,8 +973,7 @@ mips_vector_init(void)
}
void
-mips_set_wbflush(flush_fn)
- void (*flush_fn)(void);
+mips_set_wbflush(void (*flush_fn)(void))
{
#undef wbflush
mips_locore_jumpvec.wbflush = flush_fn;
diff --git a/sys/arch/mips/mips/mips_mcclock.c b/sys/arch/mips/mips/mips_mcclock.c
index 5de681899e7..c7077544c60 100644
--- a/sys/arch/mips/mips/mips_mcclock.c
+++ b/sys/arch/mips/mips/mips_mcclock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_mcclock.c,v 1.17 2009/03/14 15:36:10 dsl Exp $ */
+/* $NetBSD: mips_mcclock.c,v 1.18 2009/03/16 23:11:12 dsl Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_mcclock.c,v 1.17 2009/03/14 15:36:10 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_mcclock.c,v 1.18 2009/03/16 23:11:12 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,10 +77,7 @@ mc_cpuspeed(vaddr_t mcclock_addr, int cpuintmask)
* before the clock is attached, so we can't use the normal clock driver.
*/
unsigned
-mips_mc_cpuspeed(mcclock_addr, clockmask, tickpollfn)
- void *mcclock_addr;
- int clockmask;
- int (*tickpollfn)(void *mcclock_addr, int clockmask);
+mips_mc_cpuspeed(void *mcclock_addr, int clockmask, int (*tickpollfn)(void *mcclock_addr, int clockmask))
{
int s;
int iters = 0;
diff --git a/sys/arch/mipsco/isa/isa_machdep.c b/sys/arch/mipsco/isa/isa_machdep.c
index 0701489a3d9..2706f81613b 100644
--- a/sys/arch/mipsco/isa/isa_machdep.c
+++ b/sys/arch/mipsco/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.11 2009/03/14 21:04:12 dsl Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.12 2009/03/16 23:11:12 dsl Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.11 2009/03/14 21:04:12 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.12 2009/03/16 23:11:12 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -169,13 +169,9 @@ isa_intr_evcnt(isa_chipset_tag_t ic, int irq)
}
void *
-isa_intr_establish(ic, intr, type, level, ih_fun, ih_arg)
- isa_chipset_tag_t ic;
- int intr;
- int type; /* XXX not yet */
- int level; /* XXX not yet */
- int (*ih_fun)(void*);
- void *ih_arg;
+isa_intr_establish(isa_chipset_tag_t ic, int intr, int type, int level, int (*ih_fun)(void*), void *ih_arg)
+ /* type: XXX not yet */
+ /* level: XXX not yet */
{
struct mipsco_intrhand *ih;
diff --git a/sys/arch/mipsco/mipsco/disksubr.c b/sys/arch/mipsco/mipsco/disksubr.c
index 6b2f50f9206..fdaa0e33040 100644
--- a/sys/arch/mipsco/mipsco/disksubr.c
+++ b/sys/arch/mipsco/mipsco/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.26 2009/03/14 21:04:12 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.27 2009/03/16 23:11:12 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.26 2009/03/14 21:04:12 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.27 2009/03/16 23:11:12 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,11 +64,7 @@ static int mipsvh_cksum(struct mips_volheader *);
* Returns null on success and an error string on failure.
*/
const char *
-readdisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *bp);
- register struct disklabel *lp;
- struct cpu_disklabel *clp;
+readdisklabel(dev_t dev, void (*strat)(struct buf *bp), register struct disklabel *lp, struct cpu_disklabel *clp)
{
register struct buf *bp;
struct disklabel *dlp;
@@ -189,11 +185,7 @@ setdisklabel(register struct disklabel *olp, register struct disklabel *nlp, u_l
* Write disk label back to device after modification.
*/
int
-writedisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *bp);
- register struct disklabel *lp;
- struct cpu_disklabel *clp;
+writedisklabel(dev_t dev, void (*strat)(struct buf *bp), register struct disklabel *lp, struct cpu_disklabel *clp)
{
struct buf *bp;
int labelpart;
diff --git a/sys/arch/mipsco/mipsco/machdep.c b/sys/arch/mipsco/mipsco/machdep.c
index f3565037b84..fd2fee59510 100644
--- a/sys/arch/mipsco/mipsco/machdep.c
+++ b/sys/arch/mipsco/mipsco/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.65 2009/03/14 21:04:12 dsl Exp $ */
+/* $NetBSD: machdep.c,v 1.66 2009/03/16 23:11:12 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2009/03/14 21:04:12 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2009/03/16 23:11:12 dsl Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -559,10 +559,7 @@ unimpl_memsize(void *first)
}
void
-unimpl_intr_establish(level, func, arg)
- int level;
- int (*func)(void *);
- void *arg;
+unimpl_intr_establish(int level, int (*func)(void *), void *arg)
{
panic("sysconf.init didn't init intr_establish");
}
diff --git a/sys/arch/mipsco/obio/obio.c b/sys/arch/mipsco/obio/obio.c
index 59b314959f4..019f6674ccc 100644
--- a/sys/arch/mipsco/obio/obio.c
+++ b/sys/arch/mipsco/obio/obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.15 2009/03/14 15:36:10 dsl Exp $ */
+/* $NetBSD: obio.c,v 1.16 2009/03/16 23:11:13 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.15 2009/03/14 15:36:10 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.16 2009/03/16 23:11:13 dsl Exp $");
#include "locators.h"
@@ -123,13 +123,7 @@ obio_print(void *args, const char *name)
}
void
-obio_intr_establish(bst, level, pri, flags, func, arg)
- bus_space_tag_t bst;
- int level;
- int pri;
- int flags;
- int (*func)(void *);
- void *arg;
+obio_intr_establish(bus_space_tag_t bst, int level, int pri, int flags, int (*func)(void *), void *arg)
{
(*platform.intr_establish)(level, func, arg);
}
diff --git a/sys/arch/mmeye/dev/mmeyepcmcia.c b/sys/arch/mmeye/dev/mmeyepcmcia.c
index e77cadfee7d..c6b685b8f19 100644
--- a/sys/arch/mmeye/dev/mmeyepcmcia.c
+++ b/sys/arch/mmeye/dev/mmeyepcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mmeyepcmcia.c,v 1.14 2007/10/17 19:55:46 garbled Exp $ */
+/* $NetBSD: mmeyepcmcia.c,v 1.15 2009/03/16 23:11:13 dsl Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.14 2007/10/17 19:55:46 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.15 2009/03/16 23:11:13 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -302,12 +302,7 @@ mmeyepcmcia_attach(struct device *parent, struct device *self, void *aux)
}
void *
-mmeyepcmcia_chip_intr_establish(pch, pf, ipl, fct, arg)
- pcmcia_chipset_handle_t pch;
- struct pcmcia_function *pf;
- int ipl;
- int (*fct)(void *);
- void *arg;
+mmeyepcmcia_chip_intr_establish(pcmcia_chipset_handle_t pch, struct pcmcia_function *pf, int ipl, int (*fct)(void *), void *arg)
{
struct mmeyepcmcia_handle *h = (struct mmeyepcmcia_handle *) pch;
int irq = h->sc->card_irq;
diff --git a/sys/arch/mvme68k/dev/vme_pcc.c b/sys/arch/mvme68k/dev/vme_pcc.c
index c4aa1820bc2..0c3bf6a3bc6 100644
--- a/sys/arch/mvme68k/dev/vme_pcc.c
+++ b/sys/arch/mvme68k/dev/vme_pcc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_pcc.c,v 1.24 2009/03/14 21:04:13 dsl Exp $ */
+/* $NetBSD: vme_pcc.c,v 1.25 2009/03/16 23:11:13 dsl Exp $ */
/*-
* Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_pcc.c,v 1.24 2009/03/14 21:04:13 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_pcc.c,v 1.25 2009/03/16 23:11:13 dsl Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -241,12 +241,7 @@ vme_pcc_attach(struct device *parent, struct device *self, void *aux)
}
void
-vme_pcc_intr_establish(csc, prior, level, vector, first, func, arg, evcnt)
- void *csc;
- int prior, level, vector, first;
- int (*func)(void *);
- void *arg;
- struct evcnt *evcnt;
+vme_pcc_intr_establish(void *csc, int prior, int level, int vector, int first, int (*func)(void *), void *arg, struct evcnt *evcnt)
{
struct vme_pcc_softc *sc = csc;
diff --git a/sys/arch/netwinder/pci/pciide_machdep.c b/sys/arch/netwinder/pci/pciide_machdep.c
index befa0f01ecc..732efbda3a2 100644
--- a/sys/arch/netwinder/pci/pciide_machdep.c
+++ b/sys/arch/netwinder/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:46:03 dsl Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.6 2009/03/16 23:11:13 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:46:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.6 2009/03/16 23:11:13 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,12 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:46:03 dsl Exp $
#include "isa.h"
void *
-pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
- struct device *dev;
- struct pci_attach_args *pa;
- int chan;
- int (*func)(void *);
- void *arg;
+pciide_machdep_compat_intr_establish(struct device *dev, struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
#if NISA > 0
int irq;
diff --git a/sys/arch/next68k/next68k/disksubr.c b/sys/arch/next68k/next68k/disksubr.c
index 57a0fc47df5..25c1475b29f 100644
--- a/sys/arch/next68k/next68k/disksubr.c
+++ b/sys/arch/next68k/next68k/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.24 2009/03/14 21:04:13 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.25 2009/03/16 23:11:13 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.24 2009/03/14 21:04:13 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.25 2009/03/16 23:11:13 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -310,11 +310,7 @@ build_nextstep_label(struct next68k_disklabel *ondisk, struct disklabel *lp)
* string on failure.
*/
const char *
-readdisklabel(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct buf *bp;
struct disklabel *dlp;
@@ -442,11 +438,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru
* Write disk label back to device after modification.
*/
int
-writedisklabel(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct buf *bp;
#if 0
diff --git a/sys/arch/pmax/ibus/ibus.c b/sys/arch/pmax/ibus/ibus.c
index 50b0eb7f7e2..1db3c0618e4 100644
--- a/sys/arch/pmax/ibus/ibus.c
+++ b/sys/arch/pmax/ibus/ibus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus.c,v 1.17 2009/03/14 21:04:14 dsl Exp $ */
+/* $NetBSD: ibus.c,v 1.18 2009/03/16 23:11:13 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.17 2009/03/14 21:04:14 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.18 2009/03/16 23:11:13 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,12 +84,7 @@ ibusprint(void *aux, const char *pnp)
}
void
-ibus_intr_establish(dev, cookie, level, handler, arg)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *arg;
+ibus_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *arg)
{
(*platform.intr_establish)(dev, cookie, level, handler, arg);
}
diff --git a/sys/arch/pmax/pmax/dec_3100.c b/sys/arch/pmax/pmax/dec_3100.c
index 7c113fdd1e6..4cc19a6f828 100644
--- a/sys/arch/pmax/pmax/dec_3100.c
+++ b/sys/arch/pmax/pmax/dec_3100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3100.c,v 1.46 2009/03/14 15:36:11 dsl Exp $ */
+/* $NetBSD: dec_3100.c,v 1.47 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.46 2009/03/14 15:36:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.47 2009/03/16 23:11:14 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -258,12 +258,7 @@ dec_3100_intr(unsigned status, unsigned cause, unsigned pc, unsigned ipending)
static void
-dec_3100_intr_establish(dev, cookie, level, handler, arg)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *arg;
+dec_3100_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *arg)
{
intrtab[(int)cookie].ih_func = handler;
diff --git a/sys/arch/pmax/pmax/dec_3max.c b/sys/arch/pmax/pmax/dec_3max.c
index e7147e3f260..36c8729b1f4 100644
--- a/sys/arch/pmax/pmax/dec_3max.c
+++ b/sys/arch/pmax/pmax/dec_3max.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3max.c,v 1.47 2009/03/14 15:36:11 dsl Exp $ */
+/* $NetBSD: dec_3max.c,v 1.48 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.47 2009/03/14 15:36:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.48 2009/03/16 23:11:14 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -248,12 +248,7 @@ static const struct {
};
static void
-dec_3max_intr_establish(dev, cookie, level, handler, arg)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *arg;
+dec_3max_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *arg)
{
int i;
u_int32_t csr;
diff --git a/sys/arch/pmax/pmax/dec_3maxplus.c b/sys/arch/pmax/pmax/dec_3maxplus.c
index 18f66d02c90..4ee727a1c2f 100644
--- a/sys/arch/pmax/pmax/dec_3maxplus.c
+++ b/sys/arch/pmax/pmax/dec_3maxplus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3maxplus.c,v 1.60 2009/03/14 15:36:11 dsl Exp $ */
+/* $NetBSD: dec_3maxplus.c,v 1.61 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.60 2009/03/14 15:36:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.61 2009/03/16 23:11:14 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -263,12 +263,7 @@ dec_3maxplus_cons_init()
}
static void
-dec_3maxplus_intr_establish(dev, cookie, level, handler, arg)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *arg;
+dec_3maxplus_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *arg)
{
unsigned mask;
diff --git a/sys/arch/pmax/pmax/dec_3min.c b/sys/arch/pmax/pmax/dec_3min.c
index 0b235afb9c4..796c63eeca9 100644
--- a/sys/arch/pmax/pmax/dec_3min.c
+++ b/sys/arch/pmax/pmax/dec_3min.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.62 2009/03/14 15:36:11 dsl Exp $ */
+/* $NetBSD: dec_3min.c,v 1.63 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.62 2009/03/14 15:36:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.63 2009/03/16 23:11:14 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -264,12 +264,7 @@ dec_3min_cons_init()
}
static void
-dec_3min_intr_establish(dev, cookie, level, handler, arg)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *arg;
+dec_3min_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *arg)
{
unsigned mask;
diff --git a/sys/arch/pmax/pmax/dec_5100.c b/sys/arch/pmax/pmax/dec_5100.c
index 2a9c4e07377..bd30206a9b8 100644
--- a/sys/arch/pmax/pmax/dec_5100.c
+++ b/sys/arch/pmax/pmax/dec_5100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_5100.c,v 1.42 2009/03/14 15:36:11 dsl Exp $ */
+/* $NetBSD: dec_5100.c,v 1.43 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.42 2009/03/14 15:36:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.43 2009/03/16 23:11:14 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,12 +126,7 @@ dec_5100_cons_init()
}
static void
-dec_5100_intr_establish(dev, cookie, level, handler, arg)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *arg;
+dec_5100_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *arg)
{
intrtab[(int)cookie].ih_func = handler;
diff --git a/sys/arch/pmax/pmax/dec_maxine.c b/sys/arch/pmax/pmax/dec_maxine.c
index 7c381273a2d..d3b841b92c8 100644
--- a/sys/arch/pmax/pmax/dec_maxine.c
+++ b/sys/arch/pmax/pmax/dec_maxine.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_maxine.c,v 1.54 2009/03/14 15:36:11 dsl Exp $ */
+/* $NetBSD: dec_maxine.c,v 1.55 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.54 2009/03/14 15:36:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.55 2009/03/16 23:11:14 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -256,12 +256,7 @@ dec_maxine_cons_init()
}
static void
-dec_maxine_intr_establish(dev, cookie, level, handler, arg)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *arg;
+dec_maxine_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *arg)
{
unsigned mask;
diff --git a/sys/arch/pmax/pmax/disksubr.c b/sys/arch/pmax/pmax/disksubr.c
index aa31264fd2d..e746a4be31f 100644
--- a/sys/arch/pmax/pmax/disksubr.c
+++ b/sys/arch/pmax/pmax/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.51 2009/03/14 21:04:14 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.52 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.51 2009/03/14 21:04:14 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.52 2009/03/16 23:11:14 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,11 +56,7 @@ const char *compat_label(dev_t dev, void (*strat)(struct buf *bp),
* Returns null on success and an error string on failure.
*/
const char *
-readdisklabel(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *bp);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+readdisklabel(dev_t dev, void (*strat)(struct buf *bp), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct buf *bp;
struct disklabel *dlp;
@@ -119,11 +115,7 @@ readdisklabel(dev, strat, lp, osdep)
* putting the partition info into a native NetBSD label
*/
const char *
-compat_label(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *bp);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+compat_label(dev_t dev, void (*strat)(struct buf *bp), struct disklabel *lp, struct cpu_disklabel *osdep)
{
dec_disklabel *dlp;
struct buf *bp = NULL;
@@ -236,11 +228,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru
* Write disk label back to device after modification.
*/
int
-writedisklabel(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *bp);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+writedisklabel(dev_t dev, void (*strat)(struct buf *bp), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct buf *bp;
struct disklabel *dlp;
diff --git a/sys/arch/pmax/pmax/machdep.c b/sys/arch/pmax/pmax/machdep.c
index e338d131182..6c8ad7ba41e 100644
--- a/sys/arch/pmax/pmax/machdep.c
+++ b/sys/arch/pmax/pmax/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.230 2009/03/14 21:04:14 dsl Exp $ */
+/* $NetBSD: machdep.c,v 1.231 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.230 2009/03/14 21:04:14 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.231 2009/03/16 23:11:14 dsl Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -663,12 +663,7 @@ unimpl_iointr(u_int mask, u_int pc, u_int statusreg, u_int causereg)
}
static void
-unimpl_intr_establish(dev, cookie, level, handler, arg)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *arg;
+unimpl_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *arg)
{
panic("sysconf.init didn't set intr_establish");
}
diff --git a/sys/arch/pmax/tc/ioasic.c b/sys/arch/pmax/tc/ioasic.c
index 68dfd65cd61..963068704e1 100644
--- a/sys/arch/pmax/tc/ioasic.c
+++ b/sys/arch/pmax/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic.c,v 1.18 2009/03/14 21:04:14 dsl Exp $ */
+/* $NetBSD: ioasic.c,v 1.19 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.18 2009/03/14 21:04:14 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.19 2009/03/16 23:11:14 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -195,12 +195,7 @@ ioasic_intr_evcnt(struct device *dev, void *cookie)
}
void
-ioasic_intr_establish(dev, cookie, level, handler, val)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *val;
+ioasic_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *val)
{
(*platform.intr_establish)(dev, cookie, level, handler, val);
}
diff --git a/sys/arch/pmax/tc/tcbus.c b/sys/arch/pmax/tc/tcbus.c
index 1fb61c04468..35cb9b1813b 100644
--- a/sys/arch/pmax/tc/tcbus.c
+++ b/sys/arch/pmax/tc/tcbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcbus.c,v 1.24 2009/03/14 21:04:14 dsl Exp $ */
+/* $NetBSD: tcbus.c,v 1.25 2009/03/16 23:11:14 dsl Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.24 2009/03/14 21:04:14 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.25 2009/03/16 23:11:14 dsl Exp $");
/*
* Which system models were configured?
@@ -136,12 +136,7 @@ tc_ds_intr_evcnt(struct device *dev, void *cookie)
* Dispatch to model specific interrupt establishing routine
*/
static void
-tc_ds_intr_establish(dev, cookie, level, handler, val)
- struct device *dev;
- void *cookie;
- int level;
- int (*handler)(void *);
- void *val;
+tc_ds_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *val)
{
(*platform.intr_establish)(dev, cookie, level, handler, val);
diff --git a/sys/arch/sandpoint/pci/pciide_machdep.c b/sys/arch/sandpoint/pci/pciide_machdep.c
index 738f6b61ef3..f7a4f76d565 100644
--- a/sys/arch/sandpoint/pci/pciide_machdep.c
+++ b/sys/arch/sandpoint/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.2 2007/10/17 19:56:58 garbled Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.3 2009/03/16 23:11:14 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.2 2007/10/17 19:56:58 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.3 2009/03/16 23:11:14 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,12 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.2 2007/10/17 19:56:58 garbled E
#include "isa.h"
void *
-pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
- struct device *dev;
- struct pci_attach_args *pa;
- int chan;
- int (*func)(void *);
- void *arg;
+pciide_machdep_compat_intr_establish(struct device *dev, struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
#if NISA > 0
int irq;
diff --git a/sys/arch/sandpoint/stand/netboot/pci.c b/sys/arch/sandpoint/stand/netboot/pci.c
index 4495ac723bb..ab5666d1e3e 100644
--- a/sys/arch/sandpoint/stand/netboot/pci.c
+++ b/sys/arch/sandpoint/stand/netboot/pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.9 2009/03/14 21:04:15 dsl Exp $ */
+/* $NetBSD: pci.c,v 1.10 2009/03/16 23:11:14 dsl Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -166,10 +166,7 @@ cfgwrite(int b, int d, int f, int off, unsigned val)
}
static void
-_buswalk(bus, proc, data)
- int bus;
- int (*proc)(int, int, int, unsigned long);
- unsigned long data;
+_buswalk(int bus, int (*proc)(int, int, int, unsigned long), unsigned long data)
{
int device, function, nfunctions;
unsigned pciid, bhlcr;
@@ -347,12 +344,8 @@ clsmatch(int bus, int dev, int func, unsigned long data)
}
static int
-_pcilookup(bus, match, data, list, index, limit)
- int bus;
- int (*match)(int, int, int, unsigned long);
- unsigned long data;
- unsigned list[][2];
- int index, limit;
+_pcilookup(int bus, int (*match)(int, int, int, unsigned long), unsigned long data, list, int index, int limit)
+unsigned list[][2];
{
int device, function, nfuncs;
unsigned pciid, bhlcr, class;
diff --git a/sys/arch/sbmips/sbmips/disksubr.c b/sys/arch/sbmips/sbmips/disksubr.c
index 88e8099bdb1..3812cbfb9e9 100644
--- a/sys/arch/sbmips/sbmips/disksubr.c
+++ b/sys/arch/sbmips/sbmips/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.19 2009/03/14 21:04:15 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.20 2009/03/16 23:11:15 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.19 2009/03/14 21:04:15 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.20 2009/03/16 23:11:15 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,11 +93,7 @@ mbr_findslice(struct mbr_partition *dp, struct buf *bp)
* Returns null on success and an error string on failure.
*/
const char *
-readdisklabel(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct mbr_partition *dp;
struct partition *pp;
@@ -322,11 +318,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru
* Write disk label back to device after modification.
*/
int
-writedisklabel(dev, strat, lp, osdep)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *osdep;
+writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *osdep)
{
struct mbr_partition *dp;
struct buf *bp;
diff --git a/sys/arch/shark/isa/isa_irqhandler.c b/sys/arch/shark/isa/isa_irqhandler.c
index ddf2d28fbbb..c2f5794ae16 100644
--- a/sys/arch/shark/isa/isa_irqhandler.c
+++ b/sys/arch/shark/isa/isa_irqhandler.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_irqhandler.c,v 1.22 2009/03/14 15:36:13 dsl Exp $ */
+/* $NetBSD: isa_irqhandler.c,v 1.23 2009/03/16 23:11:15 dsl Exp $ */
/*
* Copyright 1997
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_irqhandler.c,v 1.22 2009/03/14 15:36:13 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_irqhandler.c,v 1.23 2009/03/16 23:11:15 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -308,13 +308,7 @@ irq_calculatemasks()
void *
-intr_claim(irq, level, ih_func, ih_arg, group, name)
- int irq;
- int level;
- int (*ih_func)(void *);
- void *ih_arg;
- const char *group;
- const char *name;
+intr_claim(int irq, int level, int (*ih_func)(void *), void *ih_arg, const char *group, const char *name)
{
irqhandler_t *ih;
diff --git a/sys/arch/shark/isa/isa_shark_machdep.c b/sys/arch/shark/isa/isa_shark_machdep.c
index 15b1d15f9bd..680590f7ad0 100644
--- a/sys/arch/shark/isa/isa_shark_machdep.c
+++ b/sys/arch/shark/isa/isa_shark_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_shark_machdep.c,v 1.11 2009/03/14 21:04:16 dsl Exp $ */
+/* $NetBSD: isa_shark_machdep.c,v 1.12 2009/03/16 23:11:15 dsl Exp $ */
/*
* Copyright 1997
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_shark_machdep.c,v 1.11 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_shark_machdep.c,v 1.12 2009/03/16 23:11:15 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,13 +163,7 @@ static const char * const isa_intr_names[16] = {
};
void *
-isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
- isa_chipset_tag_t ic;
- int irq;
- int type;
- int level;
- int (*ih_fun)(void *);
- void *ih_arg;
+isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg)
{
irqhandler_t *ih;
diff --git a/sys/arch/sparc64/sparc64/vm_machdep.c b/sys/arch/sparc64/sparc64/vm_machdep.c
index 81292958a1f..d796f6bee65 100644
--- a/sys/arch/sparc64/sparc64/vm_machdep.c
+++ b/sys/arch/sparc64/sparc64/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.86 2009/03/14 15:36:14 dsl Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.87 2009/03/16 23:11:15 dsl Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.86 2009/03/14 15:36:14 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.87 2009/03/16 23:11:15 dsl Exp $");
#include "opt_multiprocessor.h"
@@ -191,12 +191,7 @@ cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
* accordingly.
*/
void
-cpu_lwp_fork(l1, l2, stack, stacksize, func, arg)
- register struct lwp *l1, *l2;
- void *stack;
- size_t stacksize;
- void (*func)(void *);
- void *arg;
+cpu_lwp_fork(register struct lwp *l1, register struct lwp *l2, void *stack, size_t stacksize, void (*func)(void *), void *arg)
{
struct pcb *opcb = &l1->l_addr->u_pcb;
struct pcb *npcb = &l2->l_addr->u_pcb;
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index 43608e19c14..e2ef8cecc0f 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.16 2009/03/14 15:36:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.17 2009/03/16 23:11:15 dsl Exp $");
#endif
#include <sys/param.h>
@@ -683,10 +683,7 @@ ndis_shrink_thrqueue(int cnt)
}
int
-ndis_unsched(func, arg, t)
- void (*func)(void *);
- void *arg;
- int t;
+ndis_unsched(void (*func)(void *), void *arg, int t)
{
struct ndis_req *r;
struct ndisqhead *q;
@@ -734,10 +731,7 @@ struct ndis_req *ls_tq_req = NULL;
struct ndis_req *ls_swi_req = NULL;
int
-ndis_sched(func, arg, t)
- void (*func)(void *);
- void *arg;
- int t;
+ndis_sched(void (*func)(void *), void *arg, int t)
{
struct ndis_req *r;
struct ndisqhead *q;
@@ -857,10 +851,7 @@ ndis_sched(func, arg, t)
*/
/*
int
-ndis_sched(func, arg, t)
- void (*func)(void *);
- void *arg;
- int t;
+ndis_sched(void (*func)(void *), void *arg, int t)
{
if(func != NULL) {
(*func)(arg);
diff --git a/sys/dev/ic/hd44780_subr.c b/sys/dev/ic/hd44780_subr.c
index ea26e8934a6..bbd13baacf1 100644
--- a/sys/dev/ic/hd44780_subr.c
+++ b/sys/dev/ic/hd44780_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hd44780_subr.c,v 1.18 2009/03/14 21:04:20 dsl Exp $ */
+/* $NetBSD: hd44780_subr.c,v 1.19 2009/03/16 23:11:15 dsl Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.18 2009/03/14 21:04:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.19 2009/03/16 23:11:15 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -254,10 +254,7 @@ hlcd_free_screen(void *v, void *cookie)
}
static int
-hlcd_show_screen(v, cookie, waitok, cb, cbarg)
- void *v, *cookie, *cbarg;
- int waitok;
- void (*cb)(void *, int, int);
+hlcd_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), void *cbarg)
{
struct hlcd_screen *hdscr = v;
diff --git a/sys/dev/isa/ega.c b/sys/dev/isa/ega.c
index 2a5c2210723..c0ec79796ce 100644
--- a/sys/dev/isa/ega.c
+++ b/sys/dev/isa/ega.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ega.c,v 1.26 2009/03/14 21:04:20 dsl Exp $ */
+/* $NetBSD: ega.c,v 1.27 2009/03/16 23:11:15 dsl Exp $ */
/*
* Copyright (c) 1999
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.26 2009/03/14 21:04:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.27 2009/03/16 23:11:15 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -647,12 +647,7 @@ ega_setfont(struct ega_config *vc, struct egascreen *scr)
}
static int
-ega_show_screen(v, cookie, waitok, cb, cbarg)
- void *v;
- void *cookie;
- int waitok;
- void (*cb)(void *, int, int);
- void *cbarg;
+ega_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), void *cbarg)
{
struct egascreen *scr = cookie, *oldscr;
struct ega_config *vc = scr->cfg;
diff --git a/sys/dev/mvme/mvmebus.c b/sys/dev/mvme/mvmebus.c
index 023b9a6bf2e..9f13d681ea4 100644
--- a/sys/dev/mvme/mvmebus.c
+++ b/sys/dev/mvme/mvmebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mvmebus.c,v 1.16 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: mvmebus.c,v 1.17 2009/03/16 23:11:16 dsl Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.16 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.17 2009/03/16 23:11:16 dsl Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -307,14 +307,7 @@ mvmebus_unmap(void *vsc, vme_mapresc_t resc)
}
int
-mvmebus_probe(vsc, vmeaddr, len, am, datasize, callback, arg)
- void *vsc;
- vme_addr_t vmeaddr;
- vme_size_t len;
- vme_am_t am;
- vme_datasize_t datasize;
- int (*callback)(void *, bus_space_tag_t, bus_space_handle_t);
- void *arg;
+mvmebus_probe(void *vsc, vme_addr_t vmeaddr, vme_size_t len, vme_am_t am, vme_datasize_t datasize, int (*callback)(void *, bus_space_tag_t, bus_space_handle_t), void *arg)
{
bus_space_tag_t tag;
bus_space_handle_t handle;
@@ -378,12 +371,7 @@ mvmebus_intr_evcnt(void *vsc, vme_intr_handle_t handle)
}
void *
-mvmebus_intr_establish(vsc, handle, prior, func, arg)
- void *vsc;
- vme_intr_handle_t handle;
- int prior;
- int (*func)(void *);
- void *arg;
+mvmebus_intr_establish(void *vsc, vme_intr_handle_t handle, int prior, int (*func)(void *), void *arg)
{
struct mvmebus_softc *sc;
int level, vector, first;
diff --git a/sys/dev/mvme/vme_two_isr.c b/sys/dev/mvme/vme_two_isr.c
index ba60e0ae9e2..cf4d3a3a721 100644
--- a/sys/dev/mvme/vme_two_isr.c
+++ b/sys/dev/mvme/vme_two_isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_two_isr.c,v 1.14 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: vme_two_isr.c,v 1.15 2009/03/16 23:11:16 dsl Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.14 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.15 2009/03/16 23:11:16 dsl Exp $");
#include "vmetwo.h"
@@ -238,11 +238,7 @@ vmetwo_local_isr_trampoline(void *arg)
}
void
-vmetwo_local_intr_establish(pri, vec, hand, arg, evcnt)
- int pri, vec;
- int (*hand)(void *);
- void *arg;
- struct evcnt *evcnt;
+vmetwo_local_intr_establish(int pri, int vec, int (*hand)(void *), void *arg, struct evcnt *evcnt)
{
vmetwo_intr_establish(vmetwo_sc, pri, pri, vec, 1, hand, arg, evcnt);
@@ -250,12 +246,7 @@ vmetwo_local_intr_establish(pri, vec, hand, arg, evcnt)
/* ARGSUSED */
void
-vmetwo_intr_establish(csc, prior, lvl, vec, first, hand, arg, evcnt)
- void *csc;
- int prior, lvl, vec, first;
- int (*hand)(void *);
- void *arg;
- struct evcnt *evcnt;
+vmetwo_intr_establish(void *csc, int prior, int lvl, int vec, int first, int (*hand)(void *), void *arg, struct evcnt *evcnt)
{
struct vmetwo_softc *sc = csc;
u_int32_t reg;
diff --git a/sys/dev/pci/btvmei.c b/sys/dev/pci/btvmei.c
index 9be4523de0c..c240b192ee3 100644
--- a/sys/dev/pci/btvmei.c
+++ b/sys/dev/pci/btvmei.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmei.c,v 1.21 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: btvmei.c,v 1.22 2009/03/16 23:11:16 dsl Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.21 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.22 2009/03/16 23:11:16 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -476,14 +476,7 @@ b3_617_unmap_vme(void *vsc, vme_mapresc_t resc)
}
int
-b3_617_vme_probe(vsc, addr, len, am, datasize, callback, cbarg)
- void *vsc;
- vme_addr_t addr;
- vme_size_t len;
- vme_am_t am;
- vme_datasize_t datasize;
- int (*callback)(void *, bus_space_tag_t, bus_space_handle_t);
- void *cbarg;
+b3_617_vme_probe(void *vsc, vme_addr_t addr, vme_size_t len, vme_am_t am, vme_datasize_t datasize, int (*callback)(void *, bus_space_tag_t, bus_space_handle_t), void *cbarg)
{
bus_space_tag_t tag;
bus_space_handle_t handle;
@@ -555,12 +548,7 @@ b3_617_map_vmeint(void *vsc, int level, int vector, vme_intr_handle_t *handlep)
}
void *
-b3_617_establish_vmeint(vsc, handle, prior, func, arg)
- void *vsc;
- vme_intr_handle_t handle;
- int prior;
- int (*func)(void *);
- void *arg;
+b3_617_establish_vmeint(void *vsc, vme_intr_handle_t handle, int prior, int (*func)(void *), void *arg)
{
struct b3_617_vmeintrhand *ih;
long lv;
diff --git a/sys/dev/pci/btvmeii.c b/sys/dev/pci/btvmeii.c
index 516a72e33b7..2c6a6e0600b 100644
--- a/sys/dev/pci/btvmeii.c
+++ b/sys/dev/pci/btvmeii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmeii.c,v 1.16 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: btvmeii.c,v 1.17 2009/03/16 23:11:16 dsl Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.16 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.17 2009/03/16 23:11:16 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -367,14 +367,7 @@ b3_2706_unmap_vme(void *vsc, vme_mapresc_t resc)
}
int
-b3_2706_vme_probe(vsc, addr, len, am, datasize, callback, cbarg)
- void *vsc;
- vme_addr_t addr;
- vme_size_t len;
- vme_am_t am;
- vme_datasize_t datasize;
- int (*callback)(void *, bus_space_tag_t, bus_space_handle_t);
- void *cbarg;
+b3_2706_vme_probe(void *vsc, vme_addr_t addr, vme_size_t len, vme_am_t am, vme_datasize_t datasize, int (*callback)(void *, bus_space_tag_t, bus_space_handle_t), void *cbarg)
{
bus_space_tag_t tag;
bus_space_handle_t handle;
@@ -435,12 +428,7 @@ b3_2706_map_vmeint(void *vsc, int level, int vector, vme_intr_handle_t *handlep)
}
void *
-b3_2706_establish_vmeint(vsc, handle, prior, func, arg)
- void *vsc;
- vme_intr_handle_t handle;
- int prior;
- int (*func)(void *);
- void *arg;
+b3_2706_establish_vmeint(void *vsc, vme_intr_handle_t handle, int prior, int (*func)(void *), void *arg)
{
struct b3_2706_vmeintrhand *ih;
long lv;
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index 466d4f0f92c..6b7c5f54555 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.71 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: tga.c,v 1.72 2009/03/16 23:11:16 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.71 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.72 2009/03/16 23:11:16 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -593,9 +593,7 @@ tga_ioctl(void *v, void *vs, u_long cmd, void *data, int flag, struct lwp *l)
}
static int
-tga_sched_update(v, f)
- void *v;
- void (*f)(void *);
+tga_sched_update(void *v, void (*f)(void *))
{
struct tga_devconfig *dc = v;
@@ -694,12 +692,7 @@ tga_free_screen(void *v, void *cookie)
}
static int
-tga_show_screen(v, cookie, waitok, cb, cbarg)
- void *v;
- void *cookie;
- int waitok;
- void (*cb)(void *, int, int);
- void *cbarg;
+tga_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), void *cbarg)
{
return (0);
diff --git a/sys/dev/pci/universe_pci.c b/sys/dev/pci/universe_pci.c
index ed452b5f30b..052317d3f65 100644
--- a/sys/dev/pci/universe_pci.c
+++ b/sys/dev/pci/universe_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: universe_pci.c,v 1.9 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: universe_pci.c,v 1.10 2009/03/16 23:11:16 dsl Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.9 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.10 2009/03/16 23:11:16 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,12 +87,7 @@ static int vmeslvoffsets[8] = {
vmeslvoffsets[idx] + offsetof(struct universe_vmeslvimg, reg), val)
int
-univ_pci_attach(d, pa, name, inthdl, intcookie)
- struct univ_pci_data *d;
- struct pci_attach_args *pa;
- const char *name;
- void (*inthdl)(void *, int, int);
- void *intcookie;
+univ_pci_attach(struct univ_pci_data *d, struct pci_attach_args *pa, const char *name, void (*inthdl)(void *, int, int), void *intcookie)
{
pci_chipset_tag_t pc = pa->pa_pc;
pci_intr_handle_t ih;
diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c
index b641c0d22b5..db7925047ff 100644
--- a/sys/dev/sbus/stp4020.c
+++ b/sys/dev/sbus/stp4020.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stp4020.c,v 1.58 2009/03/14 21:04:23 dsl Exp $ */
+/* $NetBSD: stp4020.c,v 1.59 2009/03/16 23:11:16 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.58 2009/03/14 21:04:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.59 2009/03/16 23:11:16 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1035,12 +1035,7 @@ stp4020_chip_socket_disable(pcmcia_chipset_handle_t pch)
}
void *
-stp4020_chip_intr_establish(pch, pf, ipl, handler, arg)
- pcmcia_chipset_handle_t pch;
- struct pcmcia_function *pf;
- int ipl;
- int (*handler)(void *);
- void *arg;
+stp4020_chip_intr_establish(pcmcia_chipset_handle_t pch, struct pcmcia_function *pf, int ipl, int (*handler)(void *), void *arg)
{
struct stp4020_socket *h = (struct stp4020_socket *)pch;
diff --git a/sys/dev/sun/disksubr.c b/sys/dev/sun/disksubr.c
index a78ed5475bf..58515352e6f 100644
--- a/sys/dev/sun/disksubr.c
+++ b/sys/dev/sun/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.11 2009/03/14 21:04:23 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.12 2009/03/16 23:11:16 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.11 2009/03/14 21:04:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.12 2009/03/16 23:11:16 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,11 +88,7 @@ static int disklabel_bsd_to_sun(struct disklabel *, char *);
* Returns null on success and an error string on failure.
*/
const char *
-readdisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct buf *bp;
struct disklabel *dlp;
@@ -212,11 +208,7 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, stru
* Current label is already in clp->cd_block[]
*/
int
-writedisklabel(dev, strat, lp, clp)
- dev_t dev;
- void (*strat)(struct buf *);
- struct disklabel *lp;
- struct cpu_disklabel *clp;
+writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
struct buf *bp;
int error;