diff options
| author | miko <miko@cvs.openbsd.org> | 2018-10-31 02:25:27 +0000 |
|---|---|---|
| committer | miko <miko@cvs.openbsd.org> | 2018-10-31 02:25:27 +0000 |
| commit | 975fc703a2e5ea28e48ba3491d905e31c0a15ede (patch) | |
| tree | f8db08d9dc30e9748a5a47be83a95b82a55e487a /sys/dev | |
| parent | 6f068d2a0ca4f0b59ca5fe780b137027b0acc4e0 (diff) | |
sc argument of start_output, start_input, trigger_output and trigger_input
is void* so no need to cast; ok ratchov@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/audio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 840764a2e88..024d07a480c 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audio.c,v 1.172 2018/06/24 23:54:22 ratchov Exp $ */ +/* $OpenBSD: audio.c,v 1.173 2018/10/31 02:25:26 miko Exp $ */ /* * Copyright (c) 2015 Alexandre Ratchov <alex@caoua.org> * @@ -415,7 +415,7 @@ audio_pintr(void *addr) if (!sc->ops->trigger_output) { ptr = audio_buf_rgetblk(&sc->play, &count); error = sc->ops->start_output(sc->arg, - ptr, sc->play.blksz, audio_pintr, (void *)sc); + ptr, sc->play.blksz, audio_pintr, sc); if (error) { printf("%s: play restart failed: %d\n", DEVNAME(sc), error); @@ -496,7 +496,7 @@ audio_rintr(void *addr) if (!sc->ops->trigger_input) { ptr = audio_buf_wgetblk(&sc->rec, &count); error = sc->ops->start_input(sc->arg, - ptr, sc->rec.blksz, audio_rintr, (void *)sc); + ptr, sc->rec.blksz, audio_rintr, sc); if (error) { printf("%s: rec restart failed: %d\n", DEVNAME(sc), error); @@ -538,12 +538,12 @@ audio_start_do(struct audio_softc *sc) sc->play.data, sc->play.data + sc->play.len, sc->play.blksz, - audio_pintr, (void *)sc, &p); + audio_pintr, sc, &p); } else { mtx_enter(&audio_lock); ptr = audio_buf_rgetblk(&sc->play, &count); error = sc->ops->start_output(sc->arg, - ptr, sc->play.blksz, audio_pintr, (void *)sc); + ptr, sc->play.blksz, audio_pintr, sc); mtx_leave(&audio_lock); } if (error) @@ -561,12 +561,12 @@ audio_start_do(struct audio_softc *sc) sc->rec.data, sc->rec.data + sc->rec.len, sc->rec.blksz, - audio_rintr, (void *)sc, &p); + audio_rintr, sc, &p); } else { mtx_enter(&audio_lock); ptr = audio_buf_wgetblk(&sc->rec, &count); error = sc->ops->start_input(sc->arg, - ptr, sc->rec.blksz, audio_rintr, (void *)sc); + ptr, sc->rec.blksz, audio_rintr, sc); mtx_leave(&audio_lock); } if (error) |