Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move ym_mixer_set_port() (if used) during attach AFTER initialization of 

power ctl stuff, or it makes unwanted changes to the CODEC settings.
This commit is contained in:
itohy 2000-09-04 00:57:17 +00:00
parent 0778dad08f
commit 572e9e2f80
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/dev/isa/ym.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ym.c,v 1.15 2000/07/04 10:02:45 augustss Exp $ */
/* $NetBSD: ym.c,v 1.16 2000/09/04 00:57:17 itohy Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -124,8 +124,15 @@
#define YM_VOL_OPL3 184
#endif
#ifndef YM_VOL_EQUAL
#define YM_VOL_EQUAL 128
/*
* The equalizer is ``flat'' if the 3D Enhance is turned off,
* but you can set other default values.
*/
#ifndef YM_ENHANCE_TREBLE
#define YM_ENHANCE_TREBLE 0
#endif
#ifndef YM_ENHANCE_BASS
#define YM_ENHANCE_BASS 0
#endif
#ifdef __i386__ /* XXX */
@ -206,7 +213,9 @@ ym_attach(sc)
static struct ad1848_volume vol_master = {YM_VOL_MASTER, YM_VOL_MASTER};
static struct ad1848_volume vol_dac = {YM_VOL_DAC, YM_VOL_DAC};
static struct ad1848_volume vol_opl3 = {YM_VOL_OPL3, YM_VOL_OPL3};
#if YM_ENHANCE_TREBLE || YM_ENHANCE_BASS
mixer_ctrl_t mctl;
#endif
struct audio_attach_args arg;
callout_init(&sc->sc_powerdown_ch);
@ -239,14 +248,6 @@ ym_attach(sc)
ad1848_set_channel_gain(ac, AD1848_DAC_CHANNEL, &vol_dac);
ad1848_set_channel_gain(ac, AD1848_AUX2_CHANNEL, &vol_opl3);
/* Set tone control to middle position. */
mctl.un.value.num_channels = 1;
mctl.un.value.level[AUDIO_MIXER_LEVEL_MONO] = YM_VOL_EQUAL;
mctl.dev = YM_MASTER_BASS;
ym_mixer_set_port(sc, &mctl);
mctl.dev = YM_MASTER_TREBLE;
ym_mixer_set_port(sc, &mctl);
/*
* Mute all external sources. If you change this, you must
* also change the initial value of sc->sc_external_sources
@ -313,6 +314,21 @@ ym_attach(sc)
ym_mute(sc, SA3_VOL_L, sc->master_mute);
ym_mute(sc, SA3_VOL_R, sc->master_mute);
}
#if YM_ENHANCE_TREBLE || YM_ENHANCE_BASS
/* Set tone control to the default position. */
mctl.un.value.num_channels = 1;
#if YM_ENHANCE_TREBLE
mctl.un.value.level[AUDIO_MIXER_LEVEL_MONO] = YM_ENHANCE_TREBLE;
mctl.dev = YM_MASTER_TREBLE;
ym_mixer_set_port(sc, &mctl);
#endif
#if YM_ENHANCE_BASS
mctl.un.value.level[AUDIO_MIXER_LEVEL_MONO] = YM_ENHANCE_BASS;
mctl.dev = YM_MASTER_BASS;
ym_mixer_set_port(sc, &mctl);
#endif
#endif
}
static __inline int