ansify

1 files changed, 18 insertions, 51 deletions

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;