diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-04-16 21:57:24 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-04-16 21:57:24 +0000 |
commit | 8cfe6a4577283fbd292e70a1dfb76eff3191c45e (patch) | |
tree | 02a51378a8a42454c38fd64eac78db94f9c92ba3 | |
parent | 72f98a4d2b3f7334a19ec9b642d25c0d9777e2b5 (diff) |
do not provide round_buffer if not needed unless explained why in comments
-rw-r--r-- | sys/arch/sparc/dev/cs4231.c | 14 | ||||
-rw-r--r-- | sys/arch/sparc64/dev/ce4231.c | 14 | ||||
-rw-r--r-- | sys/dev/pci/autri.c | 14 | ||||
-rw-r--r-- | sys/dev/pci/auvia.c | 13 | ||||
-rw-r--r-- | sys/dev/pci/eap.c | 13 | ||||
-rw-r--r-- | sys/dev/pci/fms.c | 14 | ||||
-rw-r--r-- | sys/dev/pci/maestro.c | 14 | ||||
-rw-r--r-- | sys/dev/pci/sv.c | 14 | ||||
-rw-r--r-- | sys/dev/sbus/cs4231.c | 11 |
9 files changed, 19 insertions, 102 deletions
diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c index febf89afa67..a96bba8fe3a 100644 --- a/sys/arch/sparc/dev/cs4231.c +++ b/sys/arch/sparc/dev/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.22 2005/04/15 13:05:14 mickey Exp $ */ +/* $OpenBSD: cs4231.c,v 1.23 2005/04/16 21:57:22 mickey Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -137,7 +137,6 @@ int cs4231_get_port(void *, mixer_ctrl_t *); int cs4231_query_devinfo(void *addr, mixer_devinfo_t *); void * cs4231_alloc(void *, int, size_t, int, int); void cs4231_free(void *, void *, int); -size_t cs4231_round_buffersize(void *, int, size_t); int cs4231_get_props(void *); int cs4231_trigger_output(void *, void *, void *, int, void (*intr)(void *), void *arg, struct audio_params *); @@ -168,7 +167,7 @@ struct audio_hw_if cs4231_sa_hw_if = { cs4231_query_devinfo, cs4231_alloc, cs4231_free, - cs4231_round_buffersize, + 0, 0, cs4231_get_props, cs4231_trigger_output, @@ -1491,15 +1490,6 @@ cs4231_free(addr, ptr, pool) printf("%s: attempt to free rogue pointer\n", sc->sc_dev.dv_xname); } -size_t -cs4231_round_buffersize(addr, direction, size) - void *addr; - int direction; - size_t size; -{ - return (size); -} - int cs4231_get_props(addr) void *addr; diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c index 8e7fc4e32ad..30511b488ea 100644 --- a/sys/arch/sparc64/dev/ce4231.c +++ b/sys/arch/sparc64/dev/ce4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ce4231.c,v 1.18 2005/04/15 13:05:14 mickey Exp $ */ +/* $OpenBSD: ce4231.c,v 1.19 2005/04/16 21:57:23 mickey Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -155,7 +155,6 @@ int ce4231_get_port(void *, mixer_ctrl_t *); int ce4231_query_devinfo(void *addr, mixer_devinfo_t *); void * ce4231_alloc(void *, int, size_t, int, int); void ce4231_free(void *, void *, int); -size_t ce4231_round_buffersize(void *, int, size_t); int ce4231_get_props(void *); int ce4231_trigger_output(void *, void *, void *, int, void (*intr)(void *), void *arg, struct audio_params *); @@ -184,7 +183,7 @@ struct audio_hw_if ce4231_sa_hw_if = { ce4231_query_devinfo, ce4231_alloc, ce4231_free, - ce4231_round_buffersize, + 0, 0, ce4231_get_props, ce4231_trigger_output, @@ -1311,15 +1310,6 @@ ce4231_query_devinfo(addr, dip) return (err); } -size_t -ce4231_round_buffersize(addr, direction, size) - void *addr; - int direction; - size_t size; -{ - return (size); -} - int ce4231_get_props(addr) void *addr; diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 84606381a42..9de9e90305e 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autri.c,v 1.14 2005/04/14 12:42:16 mickey Exp $ */ +/* $OpenBSD: autri.c,v 1.15 2005/04/16 21:57:23 mickey Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -138,7 +138,6 @@ 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_free(void *, void *, int); -size_t autri_round_buffersize(void *, int, size_t); paddr_t autri_mappage(void *, void *, off_t, int); int autri_get_props(void *); int autri_query_devinfo(void *addr, mixer_devinfo_t *dip); @@ -167,7 +166,7 @@ struct audio_hw_if autri_hw_if = { autri_query_devinfo, autri_malloc, autri_free, - autri_round_buffersize, + NULL, autri_mappage, autri_get_props, autri_trigger_output, @@ -1217,15 +1216,6 @@ autri_find_dma(sc, addr) return p; } -size_t -autri_round_buffersize(addr, direction, size) - void *addr; - int direction; - size_t size; -{ - return size; -} - paddr_t autri_mappage(addr, mem, off, prot) void *addr; diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 1b3a2cfa51b..982e09807ea 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auvia.c,v 1.31 2005/04/14 12:42:16 mickey Exp $ */ +/* $OpenBSD: auvia.c,v 1.32 2005/04/16 21:57:23 mickey Exp $ */ /* $NetBSD: auvia.c,v 1.7 2000/11/15 21:06:33 jdolecek Exp $ */ /*- @@ -98,7 +98,6 @@ int auvia_get_port(void *, mixer_ctrl_t *); int auvia_query_devinfo(void *, mixer_devinfo_t *); void * auvia_malloc(void *, int, size_t, int, int); void auvia_free(void *, void *, int); -size_t auvia_round_buffersize(void *, int, size_t); paddr_t auvia_mappage(void *, void *, off_t, int); int auvia_get_props(void *); int auvia_build_dma_ops(struct auvia_softc *, struct auvia_softc_chan *, @@ -189,7 +188,7 @@ struct audio_hw_if auvia_hw_if = { auvia_query_devinfo, auvia_malloc, auvia_free, - auvia_round_buffersize, + NULL, /* auvia_round_buffersize */ auvia_mappage, auvia_get_props, auvia_trigger_output, @@ -778,14 +777,6 @@ auvia_free(void *addr, void *ptr, int pool) panic("auvia_free: trying to free unallocated memory"); } - -size_t -auvia_round_buffersize(void *addr, int direction, size_t size) -{ - return size; -} - - paddr_t auvia_mappage(void *addr, void *mem, off_t off, int prot) { diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index 5e73a993835..4eaa0baf567 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eap.c,v 1.24 2005/04/14 12:42:16 mickey Exp $ */ +/* $OpenBSD: eap.c,v 1.25 2005/04/16 21:57:23 mickey Exp $ */ /* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */ /* @@ -185,7 +185,6 @@ int eap1371_mixer_get_port(void *, mixer_ctrl_t *); int eap1370_query_devinfo(void *, mixer_devinfo_t *); void *eap_malloc(void *, int, size_t, int, int); void eap_free(void *, void *, int); -size_t eap_round_buffersize(void *, int, size_t); paddr_t eap_mappage(void *, void *, off_t, int); int eap_get_props(void *); void eap1370_set_mixer(struct eap_softc *sc, int a, int d); @@ -232,7 +231,7 @@ struct audio_hw_if eap1370_hw_if = { eap1370_query_devinfo, eap_malloc, eap_free, - eap_round_buffersize, + NULL, eap_mappage, eap_get_props, eap_trigger_output, @@ -261,7 +260,7 @@ struct audio_hw_if eap1371_hw_if = { eap1371_query_devinfo, eap_malloc, eap_free, - eap_round_buffersize, + NULL, eap_mappage, eap_get_props, eap_trigger_output, @@ -1649,12 +1648,6 @@ eap_free(void *addr, void *ptr, int pool) } } -size_t -eap_round_buffersize(void *addr, int direction, size_t size) -{ - return (size); -} - paddr_t eap_mappage(void *addr, void *mem, off_t off, int prot) { diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index bb5ed48c195..a317928a563 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fms.c,v 1.16 2005/04/14 12:42:16 mickey Exp $ */ +/* $OpenBSD: fms.c,v 1.17 2005/04/16 21:57:23 mickey Exp $ */ /* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */ /*- @@ -97,7 +97,6 @@ int fms_get_port(void *, mixer_ctrl_t *); int fms_query_devinfo(void *, mixer_devinfo_t *); void *fms_malloc(void *, int, size_t, int, int); 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(void *, void *, void *, int, void (*)(void *), @@ -142,7 +141,7 @@ struct audio_hw_if fms_hw_if = { fms_query_devinfo, fms_malloc, fms_free, - fms_round_buffersize, + NULL, fms_mappage, fms_get_props, fms_trigger_output, @@ -789,15 +788,6 @@ fms_free(addr, ptr, pool) panic("fms_free: trying to free unallocated memory"); } -size_t -fms_round_buffersize(addr, direction, size) - void *addr; - int direction; - size_t size; -{ - return size; -} - paddr_t fms_mappage(addr, mem, off, prot) void *addr; diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index 98d77d80729..3e4557c21ed 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.17 2005/04/14 12:42:16 mickey Exp $ */ +/* $OpenBSD: maestro.c,v 1.18 2005/04/16 21:57:23 mickey 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 @@ -179,7 +179,6 @@ int maestro_get_port(void *, mixer_ctrl_t *); int maestro_query_devinfo(void *, mixer_devinfo_t *); void *maestro_malloc(void *, int, size_t, int, int); 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(void *, void *, void *, int, void (*)(void *), @@ -254,7 +253,7 @@ struct audio_hw_if maestro_hw_if = { maestro_query_devinfo, maestro_malloc, maestro_free, - maestro_round_buffersize, + NULL, maestro_mappage, maestro_get_props, maestro_trigger_output, @@ -570,15 +569,6 @@ maestro_round_blocksize(self, blk) return ((blk + 0xf) & ~0xf); } -size_t -maestro_round_buffersize(self, direction, size) - void *self; - int direction; - size_t size; -{ - return (size); -} - void * maestro_malloc(arg, dir, size, pool, flags) void *arg; diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index 3d46f04181f..01cb12be0c6 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sv.c,v 1.17 2005/04/14 12:42:16 mickey Exp $ */ +/* $OpenBSD: sv.c,v 1.18 2005/04/16 21:57:23 mickey Exp $ */ /* * Copyright (c) 1998 Constantine Paul Sapuntzakis @@ -159,7 +159,6 @@ int sv_mixer_get_port(void *, mixer_ctrl_t *); int sv_query_devinfo(void *, mixer_devinfo_t *); void *sv_malloc(void *, int, size_t, int, int); void sv_free(void *, void *, int); -size_t sv_round(void *, int, size_t); paddr_t sv_mappage(void *, void *, off_t, int); int sv_get_props(void *); @@ -187,7 +186,7 @@ struct audio_hw_if sv_hw_if = { sv_query_devinfo, sv_malloc, sv_free, - sv_round, + NULL, sv_mappage, sv_get_props, NULL, @@ -1487,15 +1486,6 @@ sv_free(addr, ptr, pool) } } -size_t -sv_round(addr, direction, size) - void *addr; - int direction; - size_t size; -{ - return (size); -} - paddr_t sv_mappage(addr, mem, off, prot) void *addr; diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c index 70a8c50dea3..b2ed764ddf0 100644 --- a/sys/dev/sbus/cs4231.c +++ b/sys/dev/sbus/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.25 2005/04/15 13:05:14 mickey Exp $ */ +/* $OpenBSD: cs4231.c,v 1.26 2005/04/16 21:57:23 mickey Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -151,7 +151,6 @@ int cs4231_get_port(void *, mixer_ctrl_t *); int cs4231_query_devinfo(void *, mixer_devinfo_t *); void * cs4231_alloc(void *, int, size_t, int, int); void cs4231_free(void *, void *, int); -size_t cs4231_round_buffersize(void *, int, size_t); int cs4231_get_props(void *); int cs4231_trigger_output(void *, void *, void *, int, void (*)(void *), void *, struct audio_params *); @@ -180,7 +179,7 @@ struct audio_hw_if cs4231_sa_hw_if = { cs4231_query_devinfo, cs4231_alloc, cs4231_free, - cs4231_round_buffersize, + 0, 0, cs4231_get_props, cs4231_trigger_output, @@ -1307,12 +1306,6 @@ cs4231_query_devinfo(void *vsc, mixer_devinfo_t *dip) return (err); } -size_t -cs4231_round_buffersize(void *vsc, int direction, size_t size) -{ - return (size); -} - int cs4231_get_props(void *vsc) { |