make all audio drivers use the new allocm and round_buffersize decl's.

will ease porting, and generally cleans up a bit

5 files changed, 32 insertions, 26 deletions

diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c
index a849f1d3455..e0bbc384ed8 100644
--- a/sys/dev/isa/ad1848.c
+++ b/sys/dev/isa/ad1848.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ad1848.c,v 1.23 2001/11/06 19:53:19 miod Exp $	*/
+/*	$OpenBSD: ad1848.c,v 1.24 2002/01/20 19:56:53 ericj Exp $	*/
 /*	$NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $	*/
 
 /*
@@ -1640,9 +1640,10 @@ ad1848_intr(arg)
 }
 
 void *
-ad1848_malloc(addr, size, pool, flags)
+ad1848_malloc(addr, direction, size, pool, flags)
 	void *addr;
-	unsigned long size;
+	int direction;
+	size_t size;
 	int pool;
 	int flags;
 {
@@ -1660,10 +1661,11 @@ ad1848_free(addr, ptr, pool)
 	isa_free(ptr, pool);
 }
 
-unsigned long
-ad1848_round(addr, size)
+size_t
+ad1848_round(addr, direction, size)
 	void *addr;
-	unsigned long size;
+	int direction;
+	size_t size;
 {
 	if (size > MAX_ISADMA)
 		size = MAX_ISADMA;
diff --git a/sys/dev/isa/ad1848var.h b/sys/dev/isa/ad1848var.h
index a866a2637a1..0a776ce2df4 100644
--- a/sys/dev/isa/ad1848var.h
+++ b/sys/dev/isa/ad1848var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ad1848var.h,v 1.9 2001/10/31 11:00:24 art Exp $	*/
+/*	$OpenBSD: ad1848var.h,v 1.10 2002/01/20 19:56:53 ericj Exp $	*/
 /*	$NetBSD: ad1848var.h,v 1.22 1998/01/19 22:18:26 augustss Exp $	*/
 
 /*
@@ -218,9 +218,9 @@ int	ad1848_set_mic_gain __P((struct ad1848_softc *, struct ad1848_volume *));
 int	ad1848_get_mic_gain __P((struct ad1848_softc *, struct ad1848_volume *));
 void     ad1848_mute_channel __P((struct ad1848_softc *, int device, int mute));
 
-void   *ad1848_malloc __P((void *, unsigned long, int, int));
+void   *ad1848_malloc __P((void *, int, size_t, int, int));
 void	ad1848_free __P((void *, void *, int));
-unsigned long ad1848_round __P((void *, unsigned long));
+size_t	ad1848_round __P((void *, int, size_t));
 paddr_t	ad1848_mappage __P((void *, void *, off_t, int));
 
 int	ad1848_get_props __P((void *));
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index 4e2ad288181..8f096e7afcc 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ess.c,v 1.5 2001/10/31 11:00:24 art Exp $	*/
+/*	$OpenBSD: ess.c,v 1.6 2002/01/20 19:56:53 ericj Exp $	*/
 /*	$NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $	*/
 
 /*
@@ -148,9 +148,9 @@ int	ess_getdev __P((void *, struct audio_device *));
 int	ess_set_port __P((void *, mixer_ctrl_t *));
 int	ess_get_port __P((void *, mixer_ctrl_t *));
 
-void   *ess_malloc __P((void *, unsigned long, int, int));
+void   *ess_malloc __P((void *, int, size_t, int, int));
 void	ess_free __P((void *, void *, int));
-unsigned long ess_round_buffersize __P((void *, unsigned long));
+size_t	ess_round_buffersize __P((void *, int, size_t));
 paddr_t	ess_mappage __P((void *, void *, off_t, int));
 
 
@@ -2157,9 +2157,10 @@ ess_query_devinfo(addr, dip)
 }
 
 void *
-ess_malloc(addr, size, pool, flags)
+ess_malloc(addr, direction, size, pool, flags)
 	void *addr;
-	unsigned long size;
+	int direction;
+	size_t size;
 	int pool, flags;
 {
 	struct ess_softc *sc = addr;
@@ -2181,10 +2182,11 @@ ess_free(addr, ptr, pool)
 	isa_free(ptr, pool);
 }
 
-unsigned long
-ess_round_buffersize(addr, size)
+size_t
+ess_round_buffersize(addr, direction, size)
 	void *addr;
-	unsigned long size;
+	int direction;
+	size_t size;
 {
 	if (size > MAX_ISADMA)
 		size = MAX_ISADMA;
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index a716fa24fb6..d0aadc94253 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbdsp.c,v 1.18 2001/11/06 19:53:19 miod Exp $	*/
+/*	$OpenBSD: sbdsp.c,v 1.19 2002/01/20 19:56:53 ericj Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -2189,9 +2189,10 @@ sbdsp_mixer_query_devinfo(addr, dip)
 }
 
 void *
-sb_malloc(addr, size, pool, flags)
+sb_malloc(addr, direction, size, pool, flags)
 	void *addr;
-	unsigned long size;
+	int direction;
+	size_t size;
 	int pool;
 	int flags;
 {
@@ -2216,10 +2217,11 @@ sb_free(addr, ptr, pool)
 	isa_free(ptr, pool);
 }
 
-unsigned long
-sb_round(addr, size)
+size_t
+sb_round(addr, direction, size)
 	void *addr;
-	unsigned long size;
+	int direction;
+	size_t size;
 {
 	if (size > MAX_ISADMA)
 		size = MAX_ISADMA;
diff --git a/sys/dev/isa/sbdspvar.h b/sys/dev/isa/sbdspvar.h
index ce8ad78b04d..8efd819f077 100644
--- a/sys/dev/isa/sbdspvar.h
+++ b/sys/dev/isa/sbdspvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbdspvar.h,v 1.13 2001/10/31 11:00:24 art Exp $	*/
+/*	$OpenBSD: sbdspvar.h,v 1.14 2002/01/20 19:56:53 ericj Exp $	*/
 /*	$NetBSD: sbdspvar.h,v 1.37 1998/08/10 00:20:39 mycroft Exp $	*/
 
 /*
@@ -240,9 +240,9 @@ int	sbdsp_mixer_set_port __P((void *, mixer_ctrl_t *));
 int	sbdsp_mixer_get_port __P((void *, mixer_ctrl_t *));
 int	sbdsp_mixer_query_devinfo __P((void *, mixer_devinfo_t *));
 
-void	*sb_malloc __P((void *, unsigned long, int, int));
+void	*sb_malloc __P((void *, int, size_t, int, int));
 void	sb_free __P((void *, void *, int));
-unsigned long sb_round __P((void *, unsigned long));
+size_t sb_round __P((void *, int, size_t));
 paddr_t	sb_mappage __P((void *, void *, off_t, int));
 
 int	sbdsp_get_props __P((void *));