Final __P removal plus some cosmetic fixups

28 files changed, 181 insertions, 192 deletions

diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 6751b8cb754..f3c183d663c 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auich.c,v 1.23 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: auich.c,v 1.24 2002/03/14 03:16:06 millert Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Michael Shalayeff
@@ -226,10 +226,10 @@ void auich_freem(void *, void *, int);
 size_t auich_round_buffersize(void *, int, size_t);
 paddr_t auich_mappage(void *, void *, off_t, int);
 int auich_get_props(void *);
-int auich_trigger_output __P((void *, void *, void *, int, void (*)(void *),
-    void *, struct audio_params *));
-int auich_trigger_input __P((void *, void *, void *, int, void (*)(void *),
-    void *, struct audio_params *));
+int auich_trigger_output(void *, void *, void *, int, void (*)(void *),
+    void *, struct audio_params *);
+int auich_trigger_input(void *, void *, void *, int, void (*)(void *),
+    void *, struct audio_params *);
 
 void auich_powerhook(int, void *);
 
@@ -347,7 +347,7 @@ auich_attach(parent, self, aux)
 	printf(": %s %s\n", intrstr, sc->sc_audev.name);
 
 	/* allocate dma lists */
-#define	a(a)	(void*)(((u_long)(a) + sizeof(*(a)) - 1) & ~(sizeof(*(a))-1))
+#define	a(a)	(void *)(((u_long)(a) + sizeof(*(a)) - 1) & ~(sizeof(*(a))-1))
 	sc->dmalist_pcmo = sc->dmap_pcmo = a(sc->dmasto_pcmo);
 	sc->dmalist_pcmi = sc->dmap_pcmi = a(sc->dmasto_pcmi);
 	sc->dmalist_mici = sc->dmap_mici = a(sc->dmasto_mici);
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index 24b33ed4d9b..7d2d8007ab3 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autri.c,v 1.6 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: autri.c,v 1.7 2002/03/14 03:16:06 millert Exp $	*/
 
 /*
  * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -123,20 +123,19 @@ struct cfattach autri_ca = {
 int	autri_open(void *, int);
 void	autri_close(void *);
 int	autri_query_encoding(void *, struct audio_encoding *);
-int	autri_set_params(void *, int, int, struct audio_params *, struct audio_params *);
+int	autri_set_params(void *, int, int, struct audio_params *,
+	    struct audio_params *);
 int	autri_round_blocksize(void *, int);
-int	autri_trigger_output
-    __P((void *, void *, void *, int, void (*)(void *), void *,
-    struct audio_params *));
-int	autri_trigger_input
-    __P((void *, void *, void *, int, void (*)(void *), void *,
-    struct audio_params *));
+int	autri_trigger_output(void *, void *, void *, int, void (*)(void *),
+	    void *, struct audio_params *);
+int	autri_trigger_input(void *, void *, void *, int, void (*)(void *),
+	    void *, struct audio_params *);
 int	autri_halt_output(void *);
 int	autri_halt_input(void *);
 int	autri_getdev(void *, struct audio_device *);
 int	autri_mixer_set_port(void *, mixer_ctrl_t *);
 int	autri_mixer_get_port(void *, mixer_ctrl_t *);
-void*	autri_malloc(void *, int, size_t, int, int);
+void   *autri_malloc(void *, int, size_t, int, int);
 void	autri_free(void *, void *, int);
 size_t	autri_round_buffersize(void *, int, size_t);
 paddr_t	autri_mappage(void *, void *, off_t, int);
diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c
index 39c16c36d4f..60e91b06ebe 100644
--- a/sys/dev/pci/bktr/bktr_card.c
+++ b/sys/dev/pci/bktr/bktr_card.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_card.c,v 1.2 2001/09/20 17:02:31 mpech Exp $	*/
+/*	$OpenBSD: bktr_card.c,v 1.3 2002/03/14 03:16:06 millert Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp $ */
 
 /*
@@ -413,7 +413,7 @@ readEEProm( bktr_ptr_t bktr, int offset, int count, u_char *data )
  * XXX FIXME: use offset & count args
  */
 int
-signCard( bktr_ptr_t bktr, int offset, int count, u_char* sig )
+signCard( bktr_ptr_t bktr, int offset, int count, u_char *sig )
 {
 	int	x;
 
diff --git a/sys/dev/pci/bktr/bktr_card.h b/sys/dev/pci/bktr/bktr_card.h
index 5d948440c7d..5de5fd54161 100644
--- a/sys/dev/pci/bktr/bktr_card.h
+++ b/sys/dev/pci/bktr/bktr_card.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_card.h,v 1.1 2001/03/28 03:27:09 fgsch Exp $	*/
+/*	$OpenBSD: bktr_card.h,v 1.2 2002/03/14 03:16:06 millert Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.4 2000/06/26 09:41:31 roger Exp $ */
 
 /*
@@ -80,7 +80,7 @@
 #define Bt848_MAX_CARD		17
 
 
-int	signCard( bktr_ptr_t bktr, int offset, int count, u_char* sig );
+int	signCard( bktr_ptr_t bktr, int offset, int count, u_char *sig );
 void	probeCard( bktr_ptr_t bktr, int verbose, int unit);
 
 int	writeEEProm( bktr_ptr_t bktr, int offset, int count, u_char *data );
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index 5bf2a2e1a09..b88e10792d5 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_core.c,v 1.3 2001/11/06 19:53:19 miod Exp $	*/
+/*	$OpenBSD: bktr_core.c,v 1.4 2002/03/14 03:16:06 millert Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */
 
 /*
@@ -640,7 +640,7 @@ static void vbidecode(bktr_ptr_t bktr) {
 	/* Copy the VBI data into the next free slot in the buffer. */
 	/* 'dest' is the point in vbibuffer where we want to insert new data */
         dest = (unsigned char *)bktr->vbibuffer + bktr->vbiinsert;
-        memcpy(dest, (unsigned char*)bktr->vbidata, VBI_DATA_SIZE);
+        memcpy(dest, (unsigned char *)bktr->vbidata, VBI_DATA_SIZE);
 
 	/* Write the VBI sequence number to the end of the vbi data */
 	/* This is used by the AleVT teletext program */
@@ -1366,7 +1366,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 		break;
 
 	case BT848SFMT:		/* set input format */
-		temp = *(unsigned long*)arg & BT848_IFORM_FORMAT;
+		temp = *(unsigned long *)arg & BT848_IFORM_FORMAT;
 		temp_iform = INB(bktr, BKTR_IFORM);
 		temp_iform &= ~BT848_IFORM_FORMAT;
 		temp_iform &= ~BT848_IFORM_XTSEL;
@@ -1995,17 +1995,17 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 		return tuner_getchnlset((struct bktr_chnlset *)arg);
 
 	case BT848_SAUDIO:	/* set audio channel */
-		if ( set_audio( bktr, *(int*)arg ) < 0 )
+		if ( set_audio( bktr, *(int *)arg ) < 0 )
 			return( EIO );
 		break;
 
 	/* hue is a 2's compliment number, -90' to +89.3' in 0.7' steps */
 	case BT848_SHUE:	/* set hue */
-		OUTB(bktr, BKTR_HUE, (u_char)(*(int*)arg & 0xff));
+		OUTB(bktr, BKTR_HUE, (u_char)(*(int *)arg & 0xff));
 		break;
 
 	case BT848_GHUE:	/* get hue */
-		*(int*)arg = (signed char)(INB(bktr, BKTR_HUE) & 0xff);
+		*(int *)arg = (signed char)(INB(bktr, BKTR_HUE) & 0xff);
 		break;
 
 	/* brightness is a 2's compliment #, -50 to +%49.6% in 0.39% steps */
@@ -2019,7 +2019,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 
 	/*  */
 	case BT848_SCSAT:	/* set chroma saturation */
-		tmp_int = *(int*)arg;
+		tmp_int = *(int *)arg;
 
 		temp = INB(bktr, BKTR_E_CONTROL);
 		temp1 = INB(bktr, BKTR_O_CONTROL);
@@ -2046,12 +2046,12 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 		tmp_int = (int)(INB(bktr, BKTR_SAT_V_LO) & 0xff);
 		if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_SAT_V_MSB )
 			tmp_int |= BIT_EIGHT_HIGH;
-		*(int*)arg = tmp_int;
+		*(int *)arg = tmp_int;
 		break;
 
 	/*  */
 	case BT848_SVSAT:	/* set chroma V saturation */
-		tmp_int = *(int*)arg;
+		tmp_int = *(int *)arg;
 
 		temp = INB(bktr, BKTR_E_CONTROL);
 		temp1 = INB(bktr, BKTR_O_CONTROL);
@@ -2073,12 +2073,12 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 		tmp_int = (int)INB(bktr, BKTR_SAT_V_LO) & 0xff;
 		if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_SAT_V_MSB )
 			tmp_int |= BIT_EIGHT_HIGH;
-		*(int*)arg = tmp_int;
+		*(int *)arg = tmp_int;
 		break;
 
 	/*  */
 	case BT848_SUSAT:	/* set chroma U saturation */
-		tmp_int = *(int*)arg;
+		tmp_int = *(int *)arg;
 
 		temp = INB(bktr, BKTR_E_CONTROL);
 		temp1 = INB(bktr, BKTR_O_CONTROL);
@@ -2100,7 +2100,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 		tmp_int = (int)INB(bktr, BKTR_SAT_U_LO) & 0xff;
 		if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_SAT_U_MSB )
 			tmp_int |= BIT_EIGHT_HIGH;
-		*(int*)arg = tmp_int;
+		*(int *)arg = tmp_int;
 		break;
 
 /* lr 970528 luma notch etc - 3 high bits of e_control/o_control */
@@ -2120,7 +2120,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 
 	/*  */
 	case BT848_SCONT:	/* set contrast */
-		tmp_int = *(int*)arg;
+		tmp_int = *(int *)arg;
 
 		temp = INB(bktr, BKTR_E_CONTROL);
 		temp1 = INB(bktr, BKTR_O_CONTROL);
@@ -2142,7 +2142,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 		tmp_int = (int)INB(bktr, BKTR_CONTRAST_LO) & 0xff;
 		if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_CON_MSB )
 			tmp_int |= BIT_EIGHT_HIGH;
-		*(int*)arg = tmp_int;
+		*(int *)arg = tmp_int;
 		break;
 
 		/*  FIXME:  SCBARS and CCBARS require a valid int *        */
@@ -2161,11 +2161,11 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
 		temp = bktr->audio_mux_select;
 		if ( bktr->audio_mute_state == TRUE )
 			temp |= AUDIO_MUTE;
-		*(int*)arg = temp;
+		*(int *)arg = temp;
 		break;
 
 	case BT848_SBTSC:	/* set audio channel */
-		if ( set_BTSC( bktr, *(int*)arg ) < 0 )
+		if ( set_BTSC( bktr, *(int *)arg ) < 0 )
 			return( EIO );
 		break;
 
@@ -2196,19 +2196,19 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
         /* Ioctl's for direct gpio access */
 #ifdef BKTR_GPIO_ACCESS
         case BT848_GPIO_GET_EN:
-                *(int*)arg = INL(bktr, BKTR_GPIO_OUT_EN);
+                *(int *)arg = INL(bktr, BKTR_GPIO_OUT_EN);
                 break;
 
         case BT848_GPIO_SET_EN:
-                OUTL(bktr, BKTR_GPIO_OUT_EN, *(int*)arg);
+                OUTL(bktr, BKTR_GPIO_OUT_EN, *(int *)arg);
                 break;
 
         case BT848_GPIO_GET_DATA:
-                *(int*)arg = INL(bktr, BKTR_GPIO_DATA);
+                *(int *)arg = INL(bktr, BKTR_GPIO_DATA);
                 break;
 
         case BT848_GPIO_SET_DATA:
-                OUTL(bktr, BKTR_GPIO_DATA, *(int*)arg);
+                OUTL(bktr, BKTR_GPIO_DATA, *(int *)arg);
                 break;
 #endif /* BKTR_GPIO_ACCESS */
 
@@ -2456,7 +2456,7 @@ common_ioctl( bktr_ptr_t bktr, ioctl_cmd_t cmd, caddr_t arg )
 		temp = status_sum;
 		status_sum = 0;
 		ENABLE_INTR(s);
-		*(u_int*)arg = temp;
+		*(u_int *)arg = temp;
 		break;
 		}
 #endif /* STATUS_SUM */
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index 9526baaec89..5903b62fa17 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_os.c,v 1.9 2002/03/14 01:27:00 millert Exp $	*/
+/*	$OpenBSD: bktr_os.c,v 1.10 2002/03/14 03:16:07 millert Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */
 
 /*
@@ -821,7 +821,7 @@ int bktr_poll( dev_t dev, int events, struct proc *p)
 
 static bktr_reg_t brooktree[ NBKTR ];
 
-static const char*	bktr_probe( pcici_t tag, pcidi_t type );
+static const char      *bktr_probe( pcici_t tag, pcidi_t type );
 static void		bktr_attach( pcici_t tag, int unit );
 static void		bktr_intr(void *arg) { common_bktr_intr(arg); }
 
@@ -872,7 +872,7 @@ SYSINIT(bktrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bktr_drvinit,NULL)
 /*
  * the boot time probe routine.
  */
-static const char*
+static const char *
 bktr_probe( pcici_t tag, pcidi_t type )
 {
         unsigned int rev = pci_conf_read( tag, PCIR_REVID) & 0x000000ff;
@@ -960,7 +960,7 @@ bktr_attach( pcici_t tag, int unit )
 	/*
 	 * setup the interrupt handling routine
 	 */
-	pci_map_int(tag, bktr_intr, (void*) bktr, &tty_imask);
+	pci_map_int(tag, bktr_intr, (void *) bktr, &tty_imask);
 
 
 	/* Update the Device Control Register */
diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h
index 645952dbf01..bc1ad4dd476 100644
--- a/sys/dev/pci/bktr/bktr_reg.h
+++ b/sys/dev/pci/bktr/bktr_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_reg.h,v 1.4 2001/05/16 07:15:42 fgsch Exp $	*/
+/*	$OpenBSD: bktr_reg.h,v 1.5 2002/03/14 03:16:07 millert Exp $	*/
 /*
  * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp $
  *
@@ -414,7 +414,7 @@ struct TVTUNER {
 
 /* description of the PHYSICAL tuner */
 struct TUNER {
-	char*		name;
+	char	       *name;
 	u_char		type;
 	u_char		pllControl[4];
 	u_char		bandLimits[ 2 ];
@@ -429,7 +429,7 @@ struct TUNER {
 #define EEPROMBLOCKSIZE		32
 struct CARDTYPE {
 	unsigned int		card_id;	/* card id (from #define's) */
-	char*			name;
+	char		       *name;
 	const struct TUNER*	tuner;		/* Tuner details */
 	u_char			tuner_pllAddr;	/* Tuner i2c address */
 	u_char			dbx;		/* Has DBX chip? */
@@ -483,12 +483,12 @@ struct bktr_i2c_softc {
 #define OUTW(bktr,offset,value) bus_space_write_2((bktr)->memt,(bktr)->memh,(offset),(value))
 #define OUTL(bktr,offset,value) bus_space_write_4((bktr)->memt,(bktr)->memh,(offset),(value))
 #else
-#define INB(bktr,offset)	*(volatile unsigned char*) ((int)((bktr)->memh)+(offset))
-#define INW(bktr,offset)	*(volatile unsigned short*)((int)((bktr)->memh)+(offset))
-#define INL(bktr,offset)	*(volatile unsigned int*)  ((int)((bktr)->memh)+(offset))
-#define OUTB(bktr,offset,value)	*(volatile unsigned char*) ((int)((bktr)->memh)+(offset)) = (value)
-#define OUTW(bktr,offset,value)	*(volatile unsigned short*)((int)((bktr)->memh)+(offset)) = (value)
-#define OUTL(bktr,offset,value)	*(volatile unsigned int*)  ((int)((bktr)->memh)+(offset)) = (value)
+#define INB(bktr,offset)	*(volatile unsigned char *)((int)((bktr)->memh)+(offset))
+#define INW(bktr,offset)	*(volatile unsigned short *)((int)((bktr)->memh)+(offset))
+#define INL(bktr,offset)	*(volatile unsigned int *)((int)((bktr)->memh)+(offset))
+#define OUTB(bktr,offset,value)	*(volatile unsigned char *)((int)((bktr)->memh)+(offset)) = (value)
+#define OUTW(bktr,offset,value)	*(volatile unsigned short *)((int)((bktr)->memh)+(offset)) = (value)
+#define OUTL(bktr,offset,value)	*(volatile unsigned int *)((int)((bktr)->memh)+(offset)) = (value)
 #endif
 
 
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index 8e9626bfef0..2c99279b111 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmpci.c,v 1.7 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: cmpci.c,v 1.8 2002/03/14 03:16:06 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Takuya SHIOZAKI
@@ -142,12 +142,12 @@ void cmpci_free(void *, void *, int);
 size_t cmpci_round_buffersize(void *, int, size_t);
 paddr_t cmpci_mappage(void *, void *, off_t, int);
 int cmpci_get_props(void *);
-int cmpci_trigger_output __P((void *, void *, void *, int,
-                              void (*)(void *), void *,
-                              struct audio_params *));
-int cmpci_trigger_input __P((void *, void *, void *, int,
-                             void (*)(void *), void *,
-                             struct audio_params *));
+int cmpci_trigger_output(void *, void *, void *, int,
+                         void (*)(void *), void *,
+                         struct audio_params *);
+int cmpci_trigger_input(void *, void *, void *, int,
+                        void (*)(void *), void *,
+                        struct audio_params *);
 
 struct audio_hw_if cmpci_hw_if = {
 	cmpci_open,			/* open */
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index 821f6e669c2..1f1cd7da894 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4280.c,v 1.14 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: cs4280.c,v 1.15 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $	*/
 
 /*
@@ -216,10 +216,10 @@ void	cs4280_free(void *, void *, int);
 size_t	cs4280_round_buffersize(void *, int, size_t);
 paddr_t	cs4280_mappage(void *, void *, off_t, int);
 int	cs4280_get_props(void *);
-int	cs4280_trigger_output __P((void *, void *, void *, int, void (*)(void *),
-	    void *, struct audio_params *));
-int	cs4280_trigger_input __P((void *, void *, void *, int, void (*)(void *),
-	    void *, struct audio_params *));
+int	cs4280_trigger_output(void *, void *, void *, int, void (*)(void *),
+	    void *, struct audio_params *);
+int	cs4280_trigger_input(void *, void *, void *, int, void (*)(void *),
+	    void *, struct audio_params *);
 
 
 void	cs4280_set_dac_rate(struct cs4280_softc *, int );
@@ -237,10 +237,10 @@ void	cs4280_power(int, void *);
 void	cs4280_clear_fifos(struct cs4280_softc *);
 
 #if NMIDI > 0
-void	cs4280_midi_close(void*);
+void	cs4280_midi_close(void *);
 void	cs4280_midi_getinfo(void *, struct midi_info *);
-int	cs4280_midi_open __P((void *, int, void (*)(void *, int),
-			      void (*)(void *), void *));
+int	cs4280_midi_open(void *, int, void (*)(void *, int),
+	    void (*)(void *), void *);
 int	cs4280_midi_output(void *, int);
 #endif
 
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index 1ba179a80f8..ef4626f7188 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4281.c,v 1.11 2002/03/14 01:26:58 millert Exp $ */
+/*	$OpenBSD: cs4281.c,v 1.12 2002/03/14 03:16:06 millert Exp $ */
 /*	$Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $	*/
 
 /*
@@ -167,13 +167,10 @@ int cs4281_set_params(void *, int, int, struct audio_params *,
 int cs4281_halt_output(void *);
 int cs4281_halt_input(void *);
 int cs4281_getdev(void *, struct audio_device *);
-int cs4281_trigger_output	__P((void *, void *, void *, int,
-				     void (*)(void *), void *,
-				     struct audio_params *));
-int cs4281_trigger_input	__P((void *, void *, void *, int,
-				     void (*)(void *), void *,
-				     struct audio_params *));
-
+int cs4281_trigger_output(void *, void *, void *, int, void (*)(void *),
+			  void *, struct audio_params *);
+int cs4281_trigger_input(void *, void *, void *, int, void (*)(void *),
+			 void *, struct audio_params *);
 u_int8_t cs4281_sr2regval(int);
 void cs4281_set_dac_rate(struct cs4281_softc *, int);
 void cs4281_set_adc_rate(struct cs4281_softc *, int);
@@ -246,8 +243,8 @@ struct audio_hw_if cs4281_hw_if = {
 /* Midi Interface */
 void cs4281_midi_close(void *);
 void cs4281_midi_getinfo(void *, struct midi_info *);
-int cs4281_midi_open		__P((void *, int, void (*)(void *, int),
-				     void (*)(void *), void *));
+int cs4281_midi_open(void *, int, void (*)(void *, int),
+		     void (*)(void *), void *);
 int cs4281_midi_output(void *, int);
 
 struct midi_hw_if cs4281_midi_hw_if = {
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index e50518e5f8d..9d2318e6509 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emuxki.c,v 1.9 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: emuxki.c,v 1.10 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $	*/
 
 /*-
@@ -124,8 +124,7 @@ void emuxki_voice_recsrc_release(struct emuxki_softc *sc, emuxki_recsrc_t source
 u_int32_t emuxki_voice_curaddr(struct emuxki_voice *);
 int emuxki_set_vparms(struct emuxki_voice *voice, struct audio_params *p);
 int emuxki_voice_set_srate(struct emuxki_voice *voice, u_int32_t srate);
-void emuxki_voice_start
-	__P((struct emuxki_voice *, void (*) (void *), void *));
+void emuxki_voice_start(struct emuxki_voice *, void (*) (void *), void *);
 void emuxki_voice_halt(struct emuxki_voice *);
 int emuxki_voice_channel_create(struct emuxki_voice *voice);
 void emuxki_voice_channel_destroy(struct emuxki_voice *voice);
@@ -173,12 +172,10 @@ int	emuxki_set_params(void *, int, int,
 
 size_t	emuxki_round_buffersize(void *, int, size_t);
 
-int	emuxki_trigger_output   __P((void *, void *, void *, int,
-				      void (*)(void *), void *,
-				      struct audio_params *));
-int	emuxki_trigger_input    __P((void *, void *, void *, int,
-				      void (*) (void *), void *,
-				      struct audio_params *));
+int	emuxki_trigger_output(void *, void *, void *, int, void (*)(void *),
+	    void *, struct audio_params *);
+int	emuxki_trigger_input(void *, void *, void *, int, void (*) (void *),
+	    void *, struct audio_params *);
 int	emuxki_halt_output(void *);
 int	emuxki_halt_input(void *);
 
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 4bc778c2390..ba4c0ba275d 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eso.c,v 1.16 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: eso.c,v 1.17 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: eso.c,v 1.3 1999/08/02 17:37:43 augustss Exp $	*/
 
 /*
@@ -136,10 +136,10 @@ HIDE void	eso_freem(void *, void *, int);
 HIDE size_t	eso_round_buffersize(void *, int, size_t);
 HIDE paddr_t	eso_mappage(void *, void *, off_t, int);
 HIDE int	eso_get_props(void *);
-HIDE int	eso_trigger_output __P((void *, void *, void *, int,
-		    void (*)(void *), void *, struct audio_params *));
-HIDE int	eso_trigger_input __P((void *, void *, void *, int,
-		    void (*)(void *), void *, struct audio_params *));
+HIDE int	eso_trigger_output(void *, void *, void *, int,
+		    void (*)(void *), void *, struct audio_params *);
+HIDE int	eso_trigger_input(void *, void *, void *, int,
+		    void (*)(void *), void *, struct audio_params *);
 
 HIDE struct audio_hw_if eso_hw_if = {
 	eso_open,
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index ede1b5da81e..ee56e5227da 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fms.c,v 1.7 2002/03/14 01:26:58 millert Exp $ */
+/*	$OpenBSD: fms.c,v 1.8 2002/03/14 03:16:06 millert Exp $ */
 /*	$NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $	*/
 
 /*-
@@ -97,10 +97,10 @@ void	fms_free(void *, void *, int);
 size_t	fms_round_buffersize(void *, int, size_t);
 paddr_t	fms_mappage(void *, void *, off_t, int);
 int	fms_get_props(void *);
-int	fms_trigger_output __P((void *, void *, void *, int, void (*)(void *),
-				void *, struct audio_params *));
-int	fms_trigger_input __P((void *, void *, void *, int, void (*)(void *),
-			       void *, struct audio_params *));
+int	fms_trigger_output(void *, void *, void *, int, void (*)(void *),
+			   void *, struct audio_params *);
+int	fms_trigger_input(void *, void *, void *, int, void (*)(void *),
+			  void *, struct audio_params *);
 
 struct  cfdriver fms_cd = {
 	NULL, "fms", DV_DULL
diff --git a/sys/dev/pci/i82365_pcivar.h b/sys/dev/pci/i82365_pcivar.h
index 0052b3f2a53..b02fafc660b 100644
--- a/sys/dev/pci/i82365_pcivar.h
+++ b/sys/dev/pci/i82365_pcivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_pcivar.h,v 1.4 2002/03/14 01:26:58 millert Exp $ */
+/*	$OpenBSD: i82365_pcivar.h,v 1.5 2002/03/14 03:16:06 millert Exp $ */
 /*	$NetBSD: i82365_pcivar.h,v 1.2 2000/02/22 16:04:47 thorpej Exp $	*/
 
 /*
@@ -45,12 +45,11 @@ struct pcic_pci_softc {
 
 void *pcic_pci_machdep_intr_est(pci_chipset_tag_t);
 
-void *pcic_pci_machdep_pcic_intr_establish __P((struct pcic_softc *,
-						int (*)(void *)));
+void *pcic_pci_machdep_pcic_intr_establish(struct pcic_softc *,
+					   int (*)(void *));
 
-void *pcic_pci_machdep_chip_intr_establish __P((pcmcia_chipset_handle_t,
-						struct pcmcia_function *,
-						int, int (*)(void *),
-						void *, char *));
-void pcic_pci_machdep_chip_intr_disestablish(pcmcia_chipset_handle_t,
-						  void *);
+void *pcic_pci_machdep_chip_intr_establish(pcmcia_chipset_handle_t,
+					   struct pcmcia_function *,
+					   int, int (*)(void *),
+					   void *, char *);
+void pcic_pci_machdep_chip_intr_disestablish(pcmcia_chipset_handle_t, void *);
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index b7d8c9a1b7c..b3f6649fa21 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.52 2001/11/06 19:53:19 miod Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.53 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $	*/
 
 /*-
@@ -5025,7 +5025,7 @@ tulip_pci_shutdown(
 }
 #endif
 
-static char*
+static char *
 tulip_pci_probe(
     pcici_t config_id,
     pcidi_t device_id)
@@ -5561,7 +5561,7 @@ tulip_pci_attach(
 #endif
 #if defined(__FreeBSD__)
 	if ((sc->tulip_features & TULIP_HAVE_SLAVEDINTR) == 0) {
-	    if (!pci_map_int (config_id, intr_rtn, (void*) sc, &net_imask)) {
+	    if (!pci_map_int (config_id, intr_rtn, (void *) sc, &net_imask)) {
 		printf(TULIP_PRINTF_FMT ": couldn't map interrupt\n",
 		       TULIP_PRINTF_ARGS);
 		return;
diff --git a/sys/dev/pci/if_txvar.h b/sys/dev/pci/if_txvar.h
index 040569b54f1..500f62fe633 100644
--- a/sys/dev/pci/if_txvar.h
+++ b/sys/dev/pci/if_txvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_txvar.h,v 1.11 2001/11/19 19:22:43 deraadt Exp $	*/
+/*	$OpenBSD: if_txvar.h,v 1.12 2002/03/14 03:16:06 millert Exp $	*/
 /* $FreeBSD: src/sys/pci/if_txvar.h,v 1.8 2001/02/07 20:11:02 semenu Exp $ */
 
 /*-
@@ -373,7 +373,7 @@ struct epic_type {
 #if defined(__OpenBSD__)
 
 #define epic_dev(sc)		(*sc)
-#define epic_dev_ptr(sc)	(void*)(sc)
+#define epic_dev_ptr(sc)	(void *)(sc)
 
 #define epic_mii(sc)		(sc->miibus)
 #define epic_mii_ptr(sc)	(&sc->miibus)	
diff --git a/sys/dev/pci/ises.c b/sys/dev/pci/ises.c
index f57772514b3..23eb3a3022b 100644
--- a/sys/dev/pci/ises.c
+++ b/sys/dev/pci/ises.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ises.c,v 1.19 2002/03/14 01:26:59 millert Exp $	*/
+/*	$OpenBSD: ises.c,v 1.20 2002/03/14 03:16:06 millert Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Håkan Olsson (ho@crt.se)
@@ -68,9 +68,8 @@ void	ises_initstate(void *);
 void	ises_hrng_init(struct ises_softc *);
 void	ises_hrng(void *);
 void	ises_process_oqueue(struct ises_softc *);
-int	ises_queue_cmd __P((struct ises_softc *, u_int32_t, u_int32_t *, 
-			    u_int32_t (*)(struct ises_softc *, 
-					  struct ises_cmd *)));
+int	ises_queue_cmd(struct ises_softc *, u_int32_t, u_int32_t *, 
+		       u_int32_t (*)(struct ises_softc *, struct ises_cmd *));
 u_int32_t ises_get_fwversion(struct ises_softc *);
 int	ises_assert_cmd_mode(struct ises_softc *);
 
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index 21b6eba422a..ab9f122690e 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: maestro.c,v 1.14 2002/03/14 01:26:59 millert Exp $	*/
+/*	$OpenBSD: maestro.c,v 1.15 2002/03/14 03:16:06 millert Exp $	*/
 /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
 /*
  * FreeBSD's ESS Agogo/Maestro driver 
@@ -182,10 +182,10 @@ void	maestro_free(void *, void *, int);
 size_t	maestro_round_buffersize(void *, int, size_t);
 paddr_t	maestro_mappage(void *, void *, off_t, int);
 int	maestro_get_props(void *);
-int	maestro_trigger_output __P((void *, void *, void *, int, void (*)(void *),
-				void *, struct audio_params *));
-int	maestro_trigger_input __P((void *, void *, void *, int, void (*)(void *),
-			       void *, struct audio_params *));
+int	maestro_trigger_output(void *, void *, void *, int, void (*)(void *),
+				void *, struct audio_params *);
+int	maestro_trigger_input(void *, void *, void *, int, void (*)(void *),
+			       void *, struct audio_params *);
 
 int	maestro_attach_codec(void *, struct ac97_codec_if *);
 int	maestro_read_codec(void *, u_int8_t, u_int16_t *);
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 2aa38f908f3..8cd4bbd8d42 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr.c,v 1.62 2001/11/06 19:53:19 miod Exp $	*/
+/*	$OpenBSD: ncr.c,v 1.63 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $	*/
 
 /**************************************************************************
@@ -1416,7 +1416,7 @@ static	void	ncr_int_ma	(ncb_p np, u_char dstat);
 static	void	ncr_int_sir	(ncb_p np);
 static  void    ncr_int_sto     (ncb_p np);
 #ifdef __OpenBSD__
-static	u_long	ncr_lookup	(char* id);
+static	u_long	ncr_lookup	(char *id);
 #endif
 static	void	ncr_min_phys	(struct buf *bp);
 static	void	ncr_negotiate	(struct ncb* np, struct tcb* tp);
@@ -1448,7 +1448,7 @@ static	int	ncr_probe	(struct device *, struct cfdata *, void *);
 #endif
 static	void	ncr_attach	(struct device *, struct device *, void *);
 #else /* !__OpenBSD__ */
-static  char*	ncr_probe       (pcici_t tag, pcidi_t type);
+static  char   *ncr_probe       (pcici_t tag, pcidi_t type);
 static	void	ncr_attach	(pcici_t tag, int unit);
 #endif /* __OpenBSD__ */
 
@@ -1466,7 +1466,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if 0
 static char ident[] =
-	"\n$OpenBSD: ncr.c,v 1.62 2001/11/06 19:53:19 miod Exp $\n";
+	"\n$OpenBSD: ncr.c,v 1.63 2002/03/14 03:16:06 millert Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -3559,7 +3559,7 @@ ncr_probe(parent, match, aux)
 #else /* !__OpenBSD__ */
 
 
-static	char* ncr_probe (pcici_t tag, pcidi_t type)
+static	char *ncr_probe (pcici_t tag, pcidi_t type)
 {
 	u_char rev = PCI_REVISION(pa->pa_class);
 	int i;
@@ -4491,7 +4491,7 @@ static int32_t ncr_start (struct scsi_xfer * xp)
 
 	if (tp->quirks & QUIRK_UPDATE) {
 #ifdef __OpenBSD__
-		tp->quirks = ncr_lookup ((char*) &tp->inqdata[0]);
+		tp->quirks = ncr_lookup ((char *) &tp->inqdata[0]);
 #else
 		int q = xp->sc_link->quirks;
 		tp->quirks = QUIRK_NOMSG;
@@ -5069,7 +5069,7 @@ void ncr_complete (ncb_p np, ccb_p cp)
 		xp->error = XS_SENSE;
 
 		if (DEBUG_FLAGS & (DEBUG_RESULT|DEBUG_TINY)) {
-			u_char * p = (u_char*) & xp->sense;
+			u_char * p = (u_char *) & xp->sense;
 			int i;
 			printf ("\n%s: sense data:", ncr_name (np));
 			for (i=0; i<14; i++) printf (" %x", *p++);
@@ -5122,7 +5122,7 @@ void ncr_complete (ncb_p np, ccb_p cp)
 		int i;
 		PRINT_ADDR(xp);
 		printf (" CMD:");
-		p = (u_char*) &xp->cmd->opcode;
+		p = (u_char *) &xp->cmd->opcode;
 		for (i=0; i<xp->cmdlen; i++) printf (" %x", *p++);
 
 		if (cp->host_status==HS_COMPLETE) {
@@ -5132,7 +5132,7 @@ void ncr_complete (ncb_p np, ccb_p cp)
 				break;
 			case S_CHECK_COND:
 				printf ("  SENSE:");
-				p = (u_char*) &xp->sense;
+				p = (u_char *) &xp->sense;
 				for (i=0; i<xp->req_sense_length; i++)
 					printf (" %x", *p++);
 				break;
@@ -6099,7 +6099,7 @@ void ncr_exception (ncb_p np)
 		gettime(&np->regtime);
 #endif
 		for (i=0; i<sizeof(np->regdump); i++)
-			((char*)&np->regdump)[i] = INB_OFF(i);
+			((char *)&np->regdump)[i] = INB_OFF(i);
 		np->regdump.nc_dstat = dstat;
 		np->regdump.nc_sist  = sist;
 	};
@@ -6442,7 +6442,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 	oadr = READSCRIPT_OFF(vdsp_base, vdsp_off + 1*4);
 
 	if (cmd & 0x10) {	/* Table indirect */
-		tblp = (u_int32_t *) ((char*) &cp->phys + oadr);
+		tblp = (u_int32_t *) ((char *) &cp->phys + oadr);
 		olen = SCR_BO(tblp[0]);
 		oadr = SCR_BO(tblp[1]);
 	} else {
diff --git a/sys/dev/pci/ncrstat.c b/sys/dev/pci/ncrstat.c
index 7f1d7c7a8a7..ac64d5132ae 100644
--- a/sys/dev/pci/ncrstat.c
+++ b/sys/dev/pci/ncrstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncrstat.c,v 1.3 1997/02/23 06:06:25 millert Exp $	*/
+/*	$OpenBSD: ncrstat.c,v 1.4 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: ncrstat.c,v 1.7 1996/03/17 00:55:36 thorpej Exp $	*/
 
 /**************************************************************************
@@ -66,14 +66,12 @@
 #if defined(__NetBSD__) || defined(__OpenBSD__) || (__FreeBSD__ >= 2)
 kvm_t	*kvm;
 #define	KVM_NLIST(n)		(kvm_nlist(kvm, (n)) >= 0)
-#define	KVM_READ(o, p, l)	(kvm_read(kvm, (o), (void*)(p), (l)) == (l))
+#define	KVM_READ(o, p, l)	(kvm_read(kvm, (o), (void *)(p), (l)) == (l))
 #else
 #define	KVM_NLIST(n)		(kvm_nlist((n)) >= 0)
-#define	KVM_READ(o, p, l)	(kvm_read((void*)(o), (p), (l)) == (l))
+#define	KVM_READ(o, p, l)	(kvm_read((void *)(o), (p), (l)) == (l))
 #endif
 
-extern void  exit();
-extern char* strerror (int num);
 
 /*===========================================================
 **
@@ -314,7 +312,7 @@ void set_lun_mask(struct tcb * tp)
 		if (tp->lp[l]) lun_mask |= (1<<l);
 }
 
-void printc (u_char*p, int l)
+void printc (u_char *p, int l)
 {
 	for (;l>0;l--) {
 		char c=*p++;
@@ -421,7 +419,7 @@ do_info(void)
 		if (verbose<1) continue;
 
 		for (i=0; i<8; i++) {
-			char* (class[10])={
+			char *(class[10])={
 			"disk","tape","printer","processor",
 			"worm", "cdrom", "scanner", "optical disk",
 			"media changer", "communication device"};
@@ -625,7 +623,7 @@ do_profile(void)
 */
 
 static	int kernelwritefile;
-static	char* kernelwritefilename = _PATH_KMEM;
+static	char *kernelwritefilename = _PATH_KMEM;
 
 void openkernelwritefile(void)
 {
@@ -743,7 +741,7 @@ void do_set (char * arg)
 	};
 
 	if (!strncmp(arg, "wide=", 5)) {
-		u_char t = strtoul (arg+5, (char**)0, 0);
+		u_char t = strtoul (arg+5, (char **)0, 0);
 		if (t<=1) {
 			user.data = t;
 			user.cmd  = UC_SETWIDE;
@@ -751,7 +749,7 @@ void do_set (char * arg)
 	};
 
 	if (!strncmp(arg, "tags=", 5)) {
-		u_char t = strtoul (arg+5, (char**)0, 0);
+		u_char t = strtoul (arg+5, (char **)0, 0);
 		if (t<=SCSI_NCR_MAX_TAGS) {
 			user.data = t;
 			user.cmd  = UC_SETTAGS;
@@ -759,7 +757,7 @@ void do_set (char * arg)
 	};
 
 	if (!strncmp(arg, "flags=", 6)) {
-		u_char t = strtoul (arg+6, (char**)0, 0);
+		u_char t = strtoul (arg+6, (char **)0, 0);
 		if (t<=0xff) {
 			user.data = t;
 			user.cmd  = UC_SETFLAG;
@@ -767,7 +765,7 @@ void do_set (char * arg)
 	};
 
 	if (!strncmp(arg, "debug=", 6)) {
-		user.data = strtoul (arg+6, (char**)0, 0);
+		user.data = strtoul (arg+6, (char **)0, 0);
 		user.cmd  = UC_SETDEBUG;
 	};
 
@@ -979,7 +977,7 @@ void dump_table (const char * str, struct scr_tblmove * p, int l)
 	};
 }
 
-void dump_link (const char* name, struct link * link)
+void dump_link (const char *name, struct link * link)
 {
 	printf ("%s: cmd=%08x pa=%08x %s\n",
 	name, link->l_cmd, link->l_paddr, sn(link->l_paddr));
@@ -994,7 +992,7 @@ void dump_link (const char* name, struct link * link)
 **================================================================
 */
 
-void dump_tstamp (const char* name, struct tstamp * p)
+void dump_tstamp (const char *name, struct tstamp * p)
 #define P(id,fld)\
 	if (p->fld.tv_sec) \
 		printf ("%s: "id" at %s.%06d",\
@@ -1014,7 +1012,7 @@ void dump_tstamp (const char* name, struct tstamp * p)
 
 
 
-void dump_profile (const char* name, struct profile * p)
+void dump_profile (const char *name, struct profile * p)
 {
 	printf ("%s: %10d transfers.\n"        ,name,p->num_trans);
 	printf ("%s: %10d bytes transferred.\n",name,p->num_bytes);
@@ -1040,11 +1038,11 @@ void dump_profile (const char* name, struct profile * p)
 
 static void dump_reg(struct ncr_reg * rp)
 {
-	u_char *reg = (u_char*) rp;
+	u_char *reg = (u_char *) rp;
 #define l(i)  (reg[i]+(reg[i+1]<<8ul)+(reg[i+2]<<16ul)+(reg[i+3]<<24ul))
 	int ad;
 
-	char*(phasename[8])={"DATA-OUT","DATA-IN","COMMAND","STATUS",
+	char *(phasename[8])={"DATA-OUT","DATA-IN","COMMAND","STATUS",
 				"ILG-OUT","ILG-IN","MESSAGE-OUT","MESSAGE-IN"};
 	for (ad=0x00;ad<0x80;ad++) {
 		switch (ad % 16) {
diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c
index 7028678630a..91eb3d5064a 100644
--- a/sys/dev/pci/neo.c
+++ b/sys/dev/pci/neo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: neo.c,v 1.11 2002/03/14 01:26:59 millert Exp $       */
+/*      $OpenBSD: neo.c,v 1.12 2002/03/14 03:16:06 millert Exp $       */
 
 /*
  * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
@@ -183,10 +183,10 @@ void	neo_close(void *);
 int	neo_query_encoding(void *, struct audio_encoding *);
 int	neo_set_params(void *, int, int, struct audio_params *, struct audio_params *);
 int	neo_round_blocksize(void *, int);
-int	neo_trigger_output __P((void *, void *, void *, int, void (*)(void *),
-	    void *, struct audio_params *));
-int	neo_trigger_input __P((void *, void *, void *, int, void (*)(void *),
-	    void *, struct audio_params *));
+int	neo_trigger_output(void *, void *, void *, int, void (*)(void *),
+	    void *, struct audio_params *);
+int	neo_trigger_input(void *, void *, void *, int, void (*)(void *),
+	    void *, struct audio_params *);
 int	neo_halt_output(void *);
 int	neo_halt_input(void *);
 int	neo_getdev(void *, struct audio_device *);
@@ -922,7 +922,7 @@ neo_trigger_output(addr, start, end, blksize, intr, arg, param)
 	if (param->channels == 2)
 		ssz <<= 1;
 
-	sc->pbufsize = ((char*)end - (char *)start);
+	sc->pbufsize = ((char *)end - (char *)start);
 	sc->pblksize = blksize;
 	sc->pwmark = blksize;
 
@@ -958,7 +958,7 @@ neo_trigger_input(addr, start, end, blksize, intr, arg, param)
 	if (param->channels == 2)
 		ssz <<= 1;
 
-	sc->rbufsize = ((char*)end - (char *)start);
+	sc->rbufsize = ((char *)end - (char *)start);
 	sc->rblksize = blksize;
 	sc->rwmark = blksize;
 
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index b00de73180b..c49199c58ab 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccbb.c,v 1.29 2002/03/14 01:26:59 millert Exp $ */
+/*	$OpenBSD: pccbb.c,v 1.30 2002/03/14 03:16:06 millert Exp $ */
 /*	$NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $	*/
 
 /*
@@ -122,12 +122,12 @@ int	pccbb_io_close(cardbus_chipset_tag_t, int);
 int	pccbb_mem_open(cardbus_chipset_tag_t, int, u_int32_t, u_int32_t);
 int	pccbb_mem_close(cardbus_chipset_tag_t, int);
 #endif /* !rbus */
-void   *pccbb_intr_establish __P((struct pccbb_softc *, int irq, int level,
-    int (*ih) (void *), void *sc));
+void   *pccbb_intr_establish(struct pccbb_softc *, int irq, int level,
+    int (*ih) (void *), void *sc);
 void	pccbb_intr_disestablish(struct pccbb_softc *, void *ih);
 
-void   *pccbb_cb_intr_establish __P((cardbus_chipset_tag_t, int irq, int level,
-    int (*ih) (void *), void *sc));
+void   *pccbb_cb_intr_establish(cardbus_chipset_tag_t, int irq, int level,
+    int (*ih) (void *), void *sc);
 void	pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct, void *ih);
 
 cardbustag_t pccbb_make_tag(cardbus_chipset_tag_t, int, int, int);
@@ -151,8 +151,8 @@ void	pccbb_pcmcia_io_free(pcmcia_chipset_handle_t,
 int	pccbb_pcmcia_io_map(pcmcia_chipset_handle_t, int, bus_addr_t,
     bus_size_t, struct pcmcia_io_handle *, int *);
 void	pccbb_pcmcia_io_unmap(pcmcia_chipset_handle_t, int);
-void   *pccbb_pcmcia_intr_establish __P((pcmcia_chipset_handle_t,
-    struct pcmcia_function *, int, int (*)(void *), void *, char *));
+void   *pccbb_pcmcia_intr_establish(pcmcia_chipset_handle_t,
+    struct pcmcia_function *, int, int (*)(void *), void *, char *);
 void	pccbb_pcmcia_intr_disestablish(pcmcia_chipset_handle_t,
     void *);
 void	pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t);
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 74ef9444af7..44992997aee 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.80 2002/03/14 01:26:59 millert Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.81 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -244,9 +244,9 @@ int  acard_pci_intr(void *);
  
 void pciide_channel_dma_setup(struct pciide_channel *);
 int  pciide_dma_table_setup(struct pciide_softc*, int, int);
-int  pciide_dma_init(void*, int, int, void *, size_t, int);
-void pciide_dma_start(void*, int, int);
-int  pciide_dma_finish(void*, int, int);
+int  pciide_dma_init(void *, int, int, void *, size_t, int);
+void pciide_dma_start(void *, int, int);
+int  pciide_dma_finish(void *, int, int);
 void pciide_irqack(struct channel_softc *);
 void pciide_print_modes(struct pciide_channel *);
 void pciide_print_channels(int, pcireg_t);;
@@ -501,15 +501,15 @@ struct        cfdriver pciide_cd = {
 int	pciide_chipen(struct pciide_softc *, struct pci_attach_args *);
 int	pciide_mapregs_compat( struct pci_attach_args *,
 	    struct pciide_channel *, int, bus_size_t *, bus_size_t*);
-int	pciide_mapregs_native __P((struct pci_attach_args *, 
+int	pciide_mapregs_native(struct pci_attach_args *, 
 	    struct pciide_channel *, bus_size_t *, bus_size_t *,
-	    int (*pci_intr)(void *)));
+	    int (*pci_intr)(void *));
 void	pciide_mapreg_dma(struct pciide_softc *,
 	    struct pci_attach_args *);
 int	pciide_chansetup(struct pciide_softc *, int, pcireg_t);
-void	pciide_mapchan __P((struct pci_attach_args *,
+void	pciide_mapchan(struct pci_attach_args *,
 	    struct pciide_channel *, pcireg_t, bus_size_t *, bus_size_t *,
-	    int (*pci_intr)(void *)));
+	    int (*pci_intr)(void *));
 int	pciide_chan_candisable(struct pciide_channel *);
 void	pciide_map_compat_intr( struct pci_attach_args *,
 	    struct pciide_channel *, int, int);
diff --git a/sys/dev/pci/pciidevar.h b/sys/dev/pci/pciidevar.h
index 4afc1188cae..4c1bdd225aa 100644
--- a/sys/dev/pci/pciidevar.h
+++ b/sys/dev/pci/pciidevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciidevar.h,v 1.5 2002/03/14 01:26:59 millert Exp $	*/
+/*	$OpenBSD: pciidevar.h,v 1.6 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: pciidevar.h,v 1.6 2001/01/12 16:04:00 bouyer Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ struct device;
  */
 
 /* Attach compat interrupt handler, returning handle or NULL if failed. */
-void	*pciide_machdep_compat_intr_establish __P((struct device *,
-	    struct pci_attach_args *, int, int (*)(void *), void *));
+void	*pciide_machdep_compat_intr_establish(struct device *,
+	    struct pci_attach_args *, int, int (*)(void *), void *);
 void	pciide_machdep_compat_intr_disestablish(pci_chipset_tag_t pc,
 	    void *);
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 3759041e5dc..c9419191ede 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcivar.h,v 1.23 2002/03/14 01:26:59 millert Exp $	*/
+/*	$OpenBSD: pcivar.h,v 1.24 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $	*/
 
 /*
@@ -186,9 +186,9 @@ int pci_get_capability(pci_chipset_tag_t, pcitag_t, int,
  * Helper functions for autoconfiguration.
  */
 void	pci_devinfo(pcireg_t, pcireg_t, int, char *);
-void	set_pci_isa_bridge_callback __P((void (*)(void *), void *));
-const struct pci_quirkdata *
-	pci_lookup_quirkdata(pci_vendor_id_t, pci_product_id_t);
+void	set_pci_isa_bridge_callback(void (*)(void *), void *);
+const struct pci_quirkdata *pci_lookup_quirkdata(pci_vendor_id_t,
+	    pci_product_id_t);
 
 /*
  * Misc.
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index 94be98d11a6..2931916fba7 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sv.c,v 1.12 2002/03/14 01:27:00 millert Exp $ */
+/*      $OpenBSD: sv.c,v 1.13 2002/03/14 03:16:06 millert Exp $ */
 
 /*
  * Copyright (c) 1998 Constantine Paul Sapuntzakis
@@ -149,8 +149,8 @@ int	sv_set_params(void *, int, int, struct audio_params *, struct audio_params *
 int	sv_round_blocksize(void *, int);
 int	sv_dma_init_output(void *, void *, int);
 int	sv_dma_init_input(void *, void *, int);
-int	sv_dma_output __P((void *, void *, int, void (*)(void *), void*));
-int	sv_dma_input __P((void *, void *, int, void (*)(void *), void*));
+int	sv_dma_output(void *, void *, int, void (*)(void *), void *);
+int	sv_dma_input(void *, void *, int, void (*)(void *), void *);
 int	sv_halt_in_dma(void *);
 int	sv_halt_out_dma(void *);
 int	sv_getdev(void *, struct audio_device *);
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index 977aa824287..d47937eb5b7 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tga.c,v 1.11 2002/03/14 01:27:00 millert Exp $ */
+/* $OpenBSD: tga.c,v 1.12 2002/03/14 03:16:06 millert Exp $ */
 /* $NetBSD: tga.c,v 1.31 2001/02/11 19:34:58 nathanw Exp $ */
 
 /*
@@ -90,8 +90,8 @@ static void tga_copycols(void *, int, int, int, int);
 static int tga_alloc_screen(void *, const struct wsscreen_descr *,
 				      void **, int *, int *, long *);
 static void tga_free_screen(void *, void *);
-static int tga_show_screen __P((void *, void *, int,
-				void (*) (void *, int, int), void *));
+static int tga_show_screen(void *, void *, int,
+			   void (*) (void *, int, int), void *);
 static int tga_rop(struct rasops_info *, int, int, int, int, int,
 	struct rasops_info *, int, int);
 static int tga_rop_vtov(struct rasops_info *, int, int, int, int,
@@ -105,7 +105,7 @@ void tga2_init(struct tga_devconfig *, int);
 void tga_config_interrupts(struct device *);
 
 /* RAMDAC interface functions */
-int		tga_sched_update __P((void *, void (*)(void *)));
+int		tga_sched_update(void *, void (*)(void *));
 void		tga_ramdac_wr(void *, u_int, u_int8_t);
 u_int8_t	tga_ramdac_rd(void *, u_int);
 void		tga_bt463_wr(void *, u_int, u_int8_t);
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 973bd7b461c..9506cf1b772 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yds.c,v 1.14 2002/03/14 01:27:00 millert Exp $	*/
+/*	$OpenBSD: yds.c,v 1.15 2002/03/14 03:16:06 millert Exp $	*/
 /*	$NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $	*/
 
 /*
@@ -162,10 +162,10 @@ int	yds_query_encoding(void *, struct audio_encoding *);
 int	yds_set_params(void *, int, int,
 	    struct audio_params *, struct audio_params *);
 int	yds_round_blocksize(void *, int);
-int	yds_trigger_output __P((void *, void *, void *, int, void (*)(void *),
-	    void *, struct audio_params *));
-int	yds_trigger_input __P((void *, void *, void *, int, void (*)(void *),
-	    void *, struct audio_params *));
+int	yds_trigger_output(void *, void *, void *, int, void (*)(void *),
+	    void *, struct audio_params *);
+int	yds_trigger_input(void *, void *, void *, int, void (*)(void *),
+	    void *, struct audio_params *);
 int	yds_halt_output(void *);
 int	yds_halt_input(void *);
 int	yds_getdev(void *, struct audio_device *);
@@ -301,10 +301,10 @@ yds_dump_play_slot(sc, bank)
 
 		p = (u_int32_t *)sc->pbankp[i];
 
-		dma = yds_find_dma(sc,(void*)p);
+		dma = yds_find_dma(sc,(void *)p);
 
 		printf("  pbankp[%d] : %p(%p)\n",
-		       i, p, (void*)vtophys((vaddr_t)p));
+		       i, p, (void *)vtophys((vaddr_t)p));
 		for (j = 0; j < sizeof(struct play_slot_ctrl_bank) /
 		    sizeof(u_int32_t); j++) {
 			printf("    0x%02x: 0x%08x\n",
@@ -449,7 +449,7 @@ yds_allocate_slots(sc)
 	da = DMAADDR(p);
 
 	DPRINTF(("mp:%p, DMA addr:%p\n",
-		 mp, (void*) sc->sc_ctrldata.map->dm_segs[0].ds_addr));
+		 mp, (void *) sc->sc_ctrldata.map->dm_segs[0].ds_addr));
 
 	bzero(mp, memsize);