diff options
author | Nathan Binkert <nate@cvs.openbsd.org> | 2000-08-19 14:25:16 +0000 |
---|---|---|
committer | Nathan Binkert <nate@cvs.openbsd.org> | 2000-08-19 14:25:16 +0000 |
commit | fb46c299c80fd5bc82fb368e0adaa1964395c3c9 (patch) | |
tree | cae861d6a9b33b6a1a32bbc0e02264852a20050a /sys/dev/isa/gus.c | |
parent | 0b6f33c21cc38ed9d26eac726b28b09a50b144dc (diff) |
MALLOC/FREE -> malloc/free ok art@
Diffstat (limited to 'sys/dev/isa/gus.c')
-rw-r--r-- | sys/dev/isa/gus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c index f2353592f77..5d12a896143 100644 --- a/sys/dev/isa/gus.c +++ b/sys/dev/isa/gus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gus.c,v 1.21 1999/07/05 20:08:37 deraadt Exp $ */ +/* $OpenBSD: gus.c,v 1.22 2000/08/19 14:25:15 nate Exp $ */ /* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */ /*- @@ -637,7 +637,7 @@ gusclose(addr) sc->sc_flags &= ~(GUS_OPEN|GUS_LOCKED|GUS_DMAOUT_ACTIVE|GUS_DMAIN_ACTIVE); if (sc->sc_deintr_buf) { - FREE(sc->sc_deintr_buf, M_DEVBUF); + free(sc->sc_deintr_buf, M_DEVBUF); sc->sc_deintr_buf = NULL; } /* turn off speaker, etc. */ @@ -1625,10 +1625,10 @@ gus_round_blocksize(addr, blocksize) /* set up temporary buffer to hold the deinterleave, if necessary for stereo output */ if (sc->sc_deintr_buf) { - FREE(sc->sc_deintr_buf, M_DEVBUF); + free(sc->sc_deintr_buf, M_DEVBUF); sc->sc_deintr_buf = NULL; } - MALLOC(sc->sc_deintr_buf, void *, blocksize>>1, M_DEVBUF, M_WAITOK); + sc->sc_deintr_buf = malloc(blocksize/2, M_DEVBUF, M_WAITOK); sc->sc_blocksize = blocksize; /* multi-buffering not quite working yet. */ |