diff options
| author | Eric Jackson <ericj@cvs.openbsd.org> | 2002-01-20 23:21:55 +0000 |
|---|---|---|
| committer | Eric Jackson <ericj@cvs.openbsd.org> | 2002-01-20 23:21:55 +0000 |
| commit | 086156e37b278886d20cc12be1c34963b3ac9b99 (patch) | |
| tree | 0d562d4913fe9d76eaebf2fefc274911bb046279 | |
| parent | 80657539bceb3ff282139af1ed38495274a3f3a4 (diff) | |
move a few more arch specific drivers to use new allocm and round_buffersize.
| -rw-r--r-- | sys/arch/sparc/dev/cs4231.c | 18 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/ce4231.c | 18 |
2 files changed, 20 insertions, 16 deletions
diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c index be137fe8265..abb3de3c882 100644 --- a/sys/arch/sparc/dev/cs4231.c +++ b/sys/arch/sparc/dev/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.10 2002/01/18 14:29:35 jason Exp $ */ +/* $OpenBSD: cs4231.c,v 1.11 2002/01/20 23:21:54 ericj Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -135,9 +135,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 *)); @@ -1371,9 +1371,10 @@ cs4231_query_devinfo(addr, dip) } 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; { @@ -1416,10 +1417,11 @@ cs4231_free(addr, ptr, pool) printf("%s: attempt to free rogue pointer\n", sc->sc_dev.dv_xname); } -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); } diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c index 735b2e6fe7a..255c24bb35b 100644 --- a/sys/arch/sparc64/dev/ce4231.c +++ b/sys/arch/sparc64/dev/ce4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ce4231.c,v 1.3 2002/01/11 17:26:34 jason Exp $ */ +/* $OpenBSD: ce4231.c,v 1.4 2002/01/20 23:21:54 ericj Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -153,9 +153,9 @@ int ce4231_getdev __P((void *, struct audio_device *)); int ce4231_set_port __P((void *, mixer_ctrl_t *)); int ce4231_get_port __P((void *, mixer_ctrl_t *)); int ce4231_query_devinfo __P((void *addr, mixer_devinfo_t *)); -void * ce4231_alloc __P((void *, u_long, int, int)); +void * ce4231_alloc __P((void *, int, size_t, int, int)); void ce4231_free __P((void *, void *, int)); -u_long ce4231_round_buffersize __P((void *, u_long)); +size_t ce4231_round_buffersize __P((void *, int, size_t)); int ce4231_get_props __P((void *)); int ce4231_trigger_output __P((void *, void *, void *, int, void (*intr)__P((void *)), void *arg, struct audio_params *)); @@ -1280,10 +1280,11 @@ ce4231_query_devinfo(addr, dip) return (err); } -u_long -ce4231_round_buffersize(addr, size) +size_t +ce4231_round_buffersize(addr, direction, size) void *addr; - u_long size; + int direction; + size_t size; { return (size); } @@ -1359,9 +1360,10 @@ ce4231_pintr(v) } void * -ce4231_alloc(addr, size, pool, flags) +ce4231_alloc(addr, direction, size, pool, flags) void *addr; - u_long size; + int direction; + size_t size; int pool; int flags; { |