summaryrefslogtreecommitdiff
path: root/sys/dev/sbus
diff options
context:
space:
mode:
authorNathan Binkert <nate@cvs.openbsd.org>2002-01-21 02:41:01 +0000
committerNathan Binkert <nate@cvs.openbsd.org>2002-01-21 02:41:01 +0000
commit10568ea07c5b8663d090932e335e3ec5b233cccd (patch)
treebffbd9ef0ff023571492f5ba202c2b086ac9fe0c /sys/dev/sbus
parent797789a7793cb3b75c0314b30b5be42084bb6e39 (diff)
finish ericj's work.
make all audio drivers use the new allocm and round_buffersize decl's. will ease porting, and generally cleans up a bit
Diffstat (limited to 'sys/dev/sbus')
-rw-r--r--sys/dev/sbus/cs4231.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c
index 95d56cd6a7e..5c7bfe1f3b2 100644
--- a/sys/dev/sbus/cs4231.c
+++ b/sys/dev/sbus/cs4231.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4231.c,v 1.8 2002/01/11 17:11:32 jason Exp $ */
+/* $OpenBSD: cs4231.c,v 1.9 2002/01/21 02:41:00 nate Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -142,9 +142,9 @@ int cs4231_getdev __P((void *, struct audio_device *));
int cs4231_set_port __P((void *, mixer_ctrl_t *));
int cs4231_get_port __P((void *, mixer_ctrl_t *));
int cs4231_query_devinfo __P((void *addr, mixer_devinfo_t *));
-void * cs4231_alloc __P((void *, u_long, int, int));
+void * cs4231_alloc __P((void *, int, size_t, int, int));
void cs4231_free __P((void *, void *, int));
-u_long cs4231_round_buffersize __P((void *, u_long));
+size_t cs4231_round_buffersize __P((void *, int, size_t));
int cs4231_get_props __P((void *));
int cs4231_trigger_output __P((void *, void *, void *, int,
void (*intr)__P((void *)), void *arg, struct audio_params *));
@@ -1254,10 +1254,11 @@ cs4231_query_devinfo(addr, dip)
return (err);
}
-u_long
-cs4231_round_buffersize(addr, size)
+size_t
+cs4231_round_buffersize(addr, direction, size)
void *addr;
- u_long size;
+ int direction;
+ size_t size;
{
return (size);
}
@@ -1349,9 +1350,10 @@ cs4231_intr(v)
}
void *
-cs4231_alloc(addr, size, pool, flags)
+cs4231_alloc(addr, direction, size, pool, flags)
void *addr;
- u_long size;
+ int direction;
+ size_t size;
int pool;
int flags;
{