ansify

3 files changed, 61 insertions, 177 deletions

diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c
index 93d78cd4588..97aca416c78 100644
--- a/sys/dev/sbus/cgsix.c
+++ b/sys/dev/sbus/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.43 2003/06/24 21:54:38 henric Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.44 2003/07/03 21:02:13 jason Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -117,9 +117,7 @@ struct cfdriver cgsix_cd = {
 };
 
 int
-cgsixmatch(parent, vcf, aux)
-	struct device *parent;
-	void *vcf, *aux;
+cgsixmatch(struct device *parent, void *vcf, void *aux)
 {
 	struct cfdata *cf = vcf;
 	struct sbus_attach_args *sa = aux;
@@ -128,9 +126,7 @@ cgsixmatch(parent, vcf, aux)
 }
 
 void    
-cgsixattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+cgsixattach(struct device *parent, struct device *self, void *aux)
 {
 	struct cgsix_softc *sc = (struct cgsix_softc *)self;
 	struct sbus_attach_args *sa = aux;
@@ -287,12 +283,7 @@ fail:
 }
 
 int
-cgsix_ioctl(v, cmd, data, flags, p)
-	void *v;
-	u_long cmd;
-	caddr_t data;
-	int flags;
-	struct proc *p;
+cgsix_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	struct cgsix_softc *sc = v;
 	struct wsdisplay_cmap *cm;
@@ -536,12 +527,8 @@ cgsix_updatecursor(struct cgsix_softc *sc, u_int which)
 }
 
 int
-cgsix_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
-	void *v;
-	const struct wsscreen_descr *type;
-	void **cookiep;
-	int *curxp, *curyp;
-	long *attrp;
+cgsix_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
+    int *curxp, int *curyp, long *attrp)
 {
 	struct cgsix_softc *sc = v;
 
@@ -558,9 +545,7 @@ cgsix_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
 }
 
 void
-cgsix_free_screen(v, cookie)
-	void *v;
-	void *cookie;
+cgsix_free_screen(void *v, void *cookie)
 {
 	struct cgsix_softc *sc = v;
 
@@ -568,12 +553,8 @@ cgsix_free_screen(v, cookie)
 }
 
 int
-cgsix_show_screen(v, cookie, waitok, cb, cbarg)
-	void *v;
-	void *cookie;
-	int waitok;
-	void (*cb)(void *, int, int);
-	void *cbarg;
+cgsix_show_screen(void *v, void *cookie, int waitok,
+    void (*cb)(void *, int, int), void *cbarg)
 {
 	return (0);
 }
@@ -585,10 +566,7 @@ struct mmo {
 };
 
 paddr_t
-cgsix_mmap(v, off, prot)
-	void *v;
-	off_t off;
-	int prot;
+cgsix_mmap(void *v, off_t off, int prot)
 {
 	struct cgsix_softc *sc = v;
 	struct mmo *mo;
@@ -640,8 +618,7 @@ cgsix_mmap(v, off, prot)
 }
 
 int
-cgsix_is_console(node)
-	int node;
+cgsix_is_console(int node)
 {
 	extern int fbnode;
 
@@ -649,9 +626,7 @@ cgsix_is_console(node)
 }
 
 int
-cg6_bt_getcmap(bcm, rcm)
-	union bt_cmap *bcm;
-	struct wsdisplay_cmap *rcm;
+cg6_bt_getcmap(union bt_cmap *bcm, struct wsdisplay_cmap *rcm)
 {
 	u_int index = rcm->index, count = rcm->count, i;
 	int error;
@@ -673,9 +648,7 @@ cg6_bt_getcmap(bcm, rcm)
 }
 
 int
-cg6_bt_putcmap(bcm, rcm)
-	union bt_cmap *bcm;
-	struct wsdisplay_cmap *rcm;
+cg6_bt_putcmap(union bt_cmap *bcm, struct wsdisplay_cmap *rcm)
 {
 	u_int index = rcm->index, count = rcm->count, i;
 	int error;
@@ -697,9 +670,7 @@ cg6_bt_putcmap(bcm, rcm)
 }
 
 void
-cgsix_loadcmap_deferred(sc, start, ncolors)
-	struct cgsix_softc *sc;
-	u_int start, ncolors;
+cgsix_loadcmap_deferred(struct cgsix_softc *sc, u_int start, u_int ncolors)
 {
 	u_int32_t thcm;
 
@@ -710,9 +681,7 @@ cgsix_loadcmap_deferred(sc, start, ncolors)
 }
 
 void
-cgsix_loadcmap_immediate(sc, start, ncolors)
-	struct cgsix_softc *sc;
-	u_int start, ncolors;
+cgsix_loadcmap_immediate(struct cgsix_softc *sc, u_int start, u_int ncolors)
 {
 	u_int cstart;
 	u_int32_t v;
@@ -744,9 +713,7 @@ cgsix_setcolor(void *v, u_int index, u_int8_t r, u_int8_t g, u_int8_t b)
 }
 
 void
-cgsix_reset(sc, fhcrev)
-	struct cgsix_softc *sc;
-	u_int32_t fhcrev;
+cgsix_reset(struct cgsix_softc *sc, u_int32_t fhcrev)
 {
 	u_int32_t fhc;
 
@@ -779,8 +746,7 @@ cgsix_reset(sc, fhcrev)
 }
 
 void
-cgsix_hardreset(sc)
-	struct cgsix_softc *sc;
+cgsix_hardreset(struct cgsix_softc *sc)
 {
 	u_int32_t fhc, rev;
 
@@ -841,9 +807,7 @@ cgsix_hardreset(sc)
 }
 
 void
-cgsix_burner(vsc, on, flags)
-	void *vsc;
-	u_int on, flags;
+cgsix_burner(void *vsc, u_int on, u_int flags)
 {
 	struct cgsix_softc *sc = vsc;
 	int s;
@@ -863,8 +827,7 @@ cgsix_burner(vsc, on, flags)
 }
 
 int
-cgsix_intr(vsc)
-	void *vsc;
+cgsix_intr(void *vsc)
 {
 	struct cgsix_softc *sc = vsc;
 	u_int32_t thcm;
@@ -885,8 +848,7 @@ cgsix_intr(vsc)
 }
 
 void
-cgsix_ras_init(sc)
-	struct cgsix_softc *sc;
+cgsix_ras_init(struct cgsix_softc *sc)
 {
 	u_int32_t m;
 
@@ -898,9 +860,7 @@ cgsix_ras_init(sc)
 }
 
 void
-cgsix_ras_copyrows(cookie, src, dst, n)
-	void *cookie;
-	int src, dst, n;
+cgsix_ras_copyrows(void *cookie, int src, int dst, int n)
 {
 	struct rasops_info *ri = cookie;
 	struct cgsix_softc *sc = ri->ri_hw;
@@ -947,9 +907,7 @@ cgsix_ras_copyrows(cookie, src, dst, n)
 }
 
 void
-cgsix_ras_copycols(cookie, row, src, dst, n)
-	void *cookie;
-	int row, src, dst, n;
+cgsix_ras_copycols(void *cookie, int row, int src, int dst, int n)
 {
 	struct rasops_info *ri = cookie;
 	struct cgsix_softc *sc = ri->ri_hw;
@@ -1001,10 +959,7 @@ cgsix_ras_copycols(cookie, row, src, dst, n)
 }
 
 void
-cgsix_ras_erasecols(cookie, row, col, n, attr)
-	void *cookie;
-	int row, col, n;
-	long int attr;
+cgsix_ras_erasecols(void *cookie, int row, int col, int n, long int attr)
 {
 	struct rasops_info *ri = cookie;
 	struct cgsix_softc *sc = ri->ri_hw;
@@ -1043,10 +998,7 @@ cgsix_ras_erasecols(cookie, row, col, n, attr)
 }
 
 void
-cgsix_ras_eraserows(cookie, row, n, attr)
-	void *cookie;
-	int row, n;
-	long int attr;
+cgsix_ras_eraserows(void *cookie, int row, int n, long int attr)
 {
 	struct rasops_info *ri = cookie;
 	struct cgsix_softc *sc = ri->ri_hw;
@@ -1089,8 +1041,7 @@ cgsix_ras_eraserows(cookie, row, n, attr)
 }
 
 void
-cgsix_ras_do_cursor(ri)
-	struct rasops_info *ri;
+cgsix_ras_do_cursor(struct rasops_info *ri)
 {
 	struct cgsix_softc *sc = ri->ri_hw;
 	int row, col;
@@ -1117,8 +1068,7 @@ cgsix_ras_do_cursor(ri)
 }
 
 void
-cgsix_ras_updatecursor(ri)
-	struct rasops_info *ri;
+cgsix_ras_updatecursor(struct rasops_info *ri)
 {
 	struct cgsix_softc *sc = ri->ri_hw;
 
diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c
index 0a02d44b3a8..c2c03089b88 100644
--- a/sys/dev/sbus/cgthree.c
+++ b/sys/dev/sbus/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.33 2003/06/27 01:36:53 jason Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.34 2003/07/03 21:02:13 jason Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -211,9 +211,7 @@ struct cg3_videoctrl {
 };
 
 int
-cgthreematch(parent, vcf, aux)
-	struct device *parent;
-	void *vcf, *aux;
+cgthreematch(struct device *parent, void *vcf, void *aux)
 {
 	struct cfdata *cf = vcf;
 	struct sbus_attach_args *sa = aux;
@@ -222,9 +220,7 @@ cgthreematch(parent, vcf, aux)
 }
 
 void    
-cgthreeattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+cgthreeattach(struct device *parent, struct device *self, void *aux)
 {
 	struct cgthree_softc *sc = (struct cgthree_softc *)self;
 	struct sbus_attach_args *sa = aux;
@@ -307,12 +303,7 @@ fail:
 }
 
 int
-cgthree_ioctl(v, cmd, data, flags, p)
-	void *v;
-	u_long cmd;
-	caddr_t data;
-	int flags;
-	struct proc *p;
+cgthree_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	struct cgthree_softc *sc = v;
 	struct wsdisplay_fbinfo *wdf;
@@ -367,12 +358,8 @@ cgthree_ioctl(v, cmd, data, flags, p)
 }
 
 int
-cgthree_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
-	void *v;
-	const struct wsscreen_descr *type;
-	void **cookiep;
-	int *curxp, *curyp;
-	long *attrp;
+cgthree_alloc_screen(void *v, const struct wsscreen_descr *type,
+    void **cookiep, int *curxp, int *curyp, long *attrp)
 {
 	struct cgthree_softc *sc = v;
 
@@ -389,9 +376,7 @@ cgthree_alloc_screen(v, type, cookiep, curxp, curyp, attrp)
 }
 
 void
-cgthree_free_screen(v, cookie)
-	void *v;
-	void *cookie;
+cgthree_free_screen(void *v, void *cookie)
 {
 	struct cgthree_softc *sc = v;
 
@@ -399,12 +384,8 @@ cgthree_free_screen(v, cookie)
 }
 
 int
-cgthree_show_screen(v, cookie, waitok, cb, cbarg)
-	void *v;
-	void *cookie;
-	int waitok;
-	void (*cb)(void *, int, int);
-	void *cbarg;
+cgthree_show_screen(void *v, void *cookie, int waitok,
+    void (*cb)(void *, int, int), void *cbarg)
 {
 	return (0);
 }
@@ -413,10 +394,7 @@ cgthree_show_screen(v, cookie, waitok, cb, cbarg)
 #define	NOOVERLAY	(0x04000000)
 
 paddr_t
-cgthree_mmap(v, offset, prot)
-	void *v;
-	off_t offset;
-	int prot;
+cgthree_mmap(void *v, off_t offset, int prot)
 {
 	struct cgthree_softc *sc = v;
 
@@ -446,8 +424,7 @@ cgthree_mmap(v, offset, prot)
 }
 
 int
-cgthree_is_console(node)
-	int node;
+cgthree_is_console(int node)
 {
 	extern int fbnode;
 
@@ -467,9 +444,7 @@ cgthree_setcolor(void *v, u_int index, u_int8_t r, u_int8_t g, u_int8_t b)
 }
 
 void
-cgthree_loadcmap(sc, start, ncolors)
-	struct cgthree_softc *sc;
-	u_int start, ncolors;
+cgthree_loadcmap(struct cgthree_softc *sc, u_int start, u_int ncolors)
 {
 	u_int cstart;
 	int count;
@@ -484,9 +459,7 @@ cgthree_loadcmap(sc, start, ncolors)
 }
 
 int
-cg3_bt_getcmap(bcm, rcm)
-	union bt_cmap *bcm;
-	struct wsdisplay_cmap *rcm;
+cg3_bt_getcmap(union bt_cmap *bcm, struct wsdisplay_cmap *rcm)
 {
 	u_int index = rcm->index, count = rcm->count, i;
 	int error;
@@ -508,9 +481,7 @@ cg3_bt_getcmap(bcm, rcm)
 }
 
 int
-cg3_bt_putcmap(bcm, rcm)
-	union bt_cmap *bcm;
-	struct wsdisplay_cmap *rcm;
+cg3_bt_putcmap(union bt_cmap *bcm, struct wsdisplay_cmap *rcm)
 {
 	u_int index = rcm->index, count = rcm->count, i;
 	int error;
@@ -532,8 +503,7 @@ cg3_bt_putcmap(bcm, rcm)
 }
 
 void
-cgthree_reset(sc)
-	struct cgthree_softc *sc;
+cgthree_reset(struct cgthree_softc *sc)
 {
 	int i, j;
 	u_int8_t sts, ctrl;
@@ -591,9 +561,7 @@ cgthree_reset(sc)
 }
 
 void
-cgthree_burner(vsc, on, flags)
-	void *vsc;
-	u_int on, flags;
+cgthree_burner(void *vsc, u_int on, u_int flags)
 {
 	struct cgthree_softc *sc = vsc;
 	int s;
@@ -613,8 +581,7 @@ cgthree_burner(vsc, on, flags)
 }
 
 void
-cgthree_updatecursor(ri)
-	struct rasops_info *ri;
+cgthree_updatecursor(struct rasops_info *ri)
 {
 	struct cgthree_softc *sc = ri->ri_hw;
 
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
index 768316411a1..545954329e4 100644
--- a/sys/dev/sbus/esp_sbus.c
+++ b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esp_sbus.c,v 1.14 2003/06/27 01:36:53 jason Exp $	*/
+/*	$OpenBSD: esp_sbus.c,v 1.15 2003/07/03 21:02:13 jason Exp $	*/
 /*	$NetBSD: esp_sbus.c,v 1.14 2001/04/25 17:53:37 bouyer Exp $	*/
 
 /*-
@@ -150,10 +150,7 @@ static struct ncr53c9x_glue esp_sbus_glue1 = {
 static void	espattach(struct esp_softc *, struct ncr53c9x_glue *);
 
 int
-espmatch_sbus(parent, vcf, aux)
-	struct device *parent;
-	void *vcf;
-	void *aux;
+espmatch_sbus(struct device *parent, void *vcf, void *aux)
 {
 	struct cfdata *cf = vcf;
 	int rv;
@@ -168,9 +165,7 @@ espmatch_sbus(parent, vcf, aux)
 }
 
 void
-espattach_sbus(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+espattach_sbus(struct device *parent, struct device *self, void *aux)
 {
 	struct esp_softc *esc = (void *)self;
 	struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x;
@@ -366,9 +361,7 @@ espattach_sbus(parent, self, aux)
 }
 
 void
-espattach_dma(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
+espattach_dma(struct device *parent, struct device *self, void *aux)
 {
 	struct esp_softc *esc = (void *)self;
 	struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x;
@@ -431,9 +424,7 @@ espattach_dma(parent, self, aux)
  * Attach this instance, and then all the sub-devices
  */
 void
-espattach(esc, gluep)
-	struct esp_softc *esc;
-	struct ncr53c9x_glue *gluep;
+espattach(struct esp_softc *esc, struct ncr53c9x_glue *gluep)
 {
 	struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x;
 	void *icookie;
@@ -603,9 +594,7 @@ static struct {
 #endif
 
 u_char
-esp_read_reg(sc, reg)
-	struct ncr53c9x_softc *sc;
-	int reg;
+esp_read_reg(struct ncr53c9x_softc *sc, int reg)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 	u_char v;
@@ -620,10 +609,7 @@ esp_read_reg(sc, reg)
 }
 
 void
-esp_write_reg(sc, reg, v)
-	struct ncr53c9x_softc *sc;
-	int reg;
-	u_char v;
+esp_write_reg(struct ncr53c9x_softc *sc, int reg, u_char v)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -636,9 +622,7 @@ esp_write_reg(sc, reg, v)
 }
 
 u_char
-esp_rdreg1(sc, reg)
-	struct ncr53c9x_softc *sc;
-	int reg;
+esp_rdreg1(struct ncr53c9x_softc *sc, int reg)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -646,10 +630,7 @@ esp_rdreg1(sc, reg)
 }
 
 void
-esp_wrreg1(sc, reg, v)
-	struct ncr53c9x_softc *sc;
-	int reg;
-	u_char v;
+esp_wrreg1(struct ncr53c9x_softc *sc, int reg, u_char v)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -657,8 +638,7 @@ esp_wrreg1(sc, reg, v)
 }
 
 int
-esp_dma_isintr(sc)
-	struct ncr53c9x_softc *sc;
+esp_dma_isintr(struct ncr53c9x_softc *sc)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -666,8 +646,7 @@ esp_dma_isintr(sc)
 }
 
 void
-esp_dma_reset(sc)
-	struct ncr53c9x_softc *sc;
+esp_dma_reset(struct ncr53c9x_softc *sc)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -675,8 +654,7 @@ esp_dma_reset(sc)
 }
 
 int
-esp_dma_intr(sc)
-	struct ncr53c9x_softc *sc;
+esp_dma_intr(struct ncr53c9x_softc *sc)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -684,12 +662,8 @@ esp_dma_intr(sc)
 }
 
 int
-esp_dma_setup(sc, addr, len, datain, dmasize)
-	struct ncr53c9x_softc *sc;
-	caddr_t *addr;
-	size_t *len;
-	int datain;
-	size_t *dmasize;
+esp_dma_setup(struct ncr53c9x_softc *sc, caddr_t *addr, size_t *len,
+    int datain, size_t *dmasize)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -697,8 +671,7 @@ esp_dma_setup(sc, addr, len, datain, dmasize)
 }
 
 void
-esp_dma_go(sc)
-	struct ncr53c9x_softc *sc;
+esp_dma_go(struct ncr53c9x_softc *sc)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -706,8 +679,7 @@ esp_dma_go(sc)
 }
 
 void
-esp_dma_stop(sc)
-	struct ncr53c9x_softc *sc;
+esp_dma_stop(struct ncr53c9x_softc *sc)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 	u_int32_t csr;
@@ -718,8 +690,7 @@ esp_dma_stop(sc)
 }
 
 int
-esp_dma_isactive(sc)
-	struct ncr53c9x_softc *sc;
+esp_dma_isactive(struct ncr53c9x_softc *sc)
 {
 	struct esp_softc *esc = (struct esp_softc *)sc;
 
@@ -733,11 +704,7 @@ esp_dma_isactive(sc)
 void db_esp(db_expr_t, int, db_expr_t, char *);
 
 void
-db_esp(addr, have_addr, count, modif)
-	db_expr_t addr;
-	int have_addr;
-	db_expr_t count;
-	char *modif;
+db_esp(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
 {
 	struct ncr53c9x_softc *sc;
 	struct ncr53c9x_ecb *ecb;