diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-04-14 12:25:32 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-04-14 12:25:32 +0000 |
| commit | f8f4a56935e03780d4eea1f642f5ec17fb8e9178 (patch) | |
| tree | 11fb3f5acc1a9024ce3b2a3febb094d8c2cb680d /sys/dev | |
| parent | 50db09c195f9d9edf7aac8d32d567c45d9c6cb4e (diff) | |
do not reset tuner and audio settings on open/close; from jakemsr@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/bktr/bktr_core.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index f96fdc57235..5c4ba21818a 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_core.c,v 1.13 2004/06/29 12:24:57 mickey Exp $ */ +/* $OpenBSD: bktr_core.c,v 1.14 2005/04/14 12:25:31 mickey Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */ /* @@ -617,6 +617,15 @@ bktr_store_address(unit, BKTR_MEM_BUF, buf); /* Initialise any MSP34xx or TDA98xx audio chips */ init_audio_devices(bktr); + +#ifdef BKTR_NO_OPEN_RESET + /* enable drivers on the GPIO port that control the MUXes */ + OUTL(bktr, BKTR_GPIO_OUT_EN, INL(bktr, BKTR_GPIO_OUT_EN) | bktr->card.gpio_mux_bits); + + /* mute the audio stream */ + set_audio( bktr, AUDIO_MUTE ); +#endif + } @@ -1087,6 +1096,8 @@ tuner_open( bktr_ptr_t bktr ) return( 0 ); bktr->tflags |= TUNER_OPEN; + +#ifndef BKTR_NO_OPEN_RESET bktr->tuner.frequency = 0; bktr->tuner.channel = 0; bktr->tuner.chnlset = DEFAULT_CHNLSET; @@ -1101,6 +1112,7 @@ tuner_open( bktr_ptr_t bktr ) /* Initialise any audio chips, eg MSP34xx or TDA98xx */ init_audio_devices( bktr ); +#endif return( 0 ); } @@ -1143,11 +1155,13 @@ tuner_close( bktr_ptr_t bktr ) { bktr->tflags &= ~TUNER_OPEN; +#ifndef BKTR_NO_OPEN_RESET /* mute the audio by switching the mux */ set_audio( bktr, AUDIO_MUTE ); /* disable drivers on the GPIO port that control the MUXes */ OUTL(bktr, BKTR_GPIO_OUT_EN, INL(bktr, BKTR_GPIO_OUT_EN) & ~bktr->card.gpio_mux_bits); +#endif return( 0 ); } |