diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2006-01-15 20:38:42 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2006-01-15 20:38:42 +0000 |
| commit | 4a811a0a3208ceef42d10eec3b9531b216023ffb (patch) | |
| tree | 47fc0e582cd17132206f92e8021e10a385ed8db3 /sys/dev/pci/bktr | |
| parent | 5a0c9c32cd7fcb06f7d79476328d886eb8ef1ef0 (diff) | |
as of rev 1.16 of bktr_core.c, bktr(4) enables the audio muxes at
attach, and doesn't disable them ever.
this removes the enabling/disabling of the audio muxes in the radio(4)
interface for bktr(4) as well.
OK robert@, mickey@
Diffstat (limited to 'sys/dev/pci/bktr')
| -rw-r--r-- | sys/dev/pci/bktr/bktr_os.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index c575e275625..0db3a38dc1c 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_os.c,v 1.22 2005/12/05 15:16:26 robert Exp $ */ +/* $OpenBSD: bktr_os.c,v 1.23 2006/01/15 20:38:41 jakemsr Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */ /* @@ -1266,15 +1266,7 @@ bktr_set_info(void *v, struct radio_info *ri) if (ri->mute) { /* mute the audio stream by switching the mux */ set_audio(sc, AUDIO_MUTE); - - /* disable drivers on the GPIO port that controls the MUXes */ - OUTL(sc, BKTR_GPIO_OUT_EN, INL(sc, BKTR_GPIO_OUT_EN) & - ~sc->card.gpio_mux_bits); } else { - /* enable drivers on the GPIO port that controls the MUXes */ - OUTL(sc, BKTR_GPIO_OUT_EN, INL(sc, BKTR_GPIO_OUT_EN) | - sc->card.gpio_mux_bits); - /* unmute the audio stream */ set_audio(sc, AUDIO_UNMUTE); init_audio_devices(sc); |