From a52956e8c3517f4b63cda75baa47f93baf4ce1d1 Mon Sep 17 00:00:00 2001 From: James Courtier-Dutton Date: Fri, 11 Nov 2005 23:39:05 +0100 Subject: [PATCH] --- yaml --- r: 15919 b: refs/heads/master c: e2b15f8f7dfc7a60ab89162502732120792a644f h: refs/heads/master i: 15917: f863c5952fe4a0ef63ad4c436e39f889fb3ab610 15915: ff48480928bc6e4d0f3df68f741f56517fdd2aac 15911: 24732b3acf0afd38e394d0425401993a2aed2ed3 15903: f91178caa2ffe0b2fed305c59dec0c09919a10a6 v: v3 --- [refs] | 2 +- trunk/sound/pci/emu10k1/emu10k1_main.c | 2 ++ trunk/sound/pci/emu10k1/tina2.h | 36 ++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 trunk/sound/pci/emu10k1/tina2.h diff --git a/[refs] b/[refs] index ce9b326c9744..6da56a8b5690 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 755e137138007200c3e2549fbd8390a4e7708ed9 +refs/heads/master: e2b15f8f7dfc7a60ab89162502732120792a644f diff --git a/trunk/sound/pci/emu10k1/emu10k1_main.c b/trunk/sound/pci/emu10k1/emu10k1_main.c index 541aad6c7126..2d1ebe8c6b41 100644 --- a/trunk/sound/pci/emu10k1/emu10k1_main.c +++ b/trunk/sound/pci/emu10k1/emu10k1_main.c @@ -40,6 +40,7 @@ #include #include #include "p16v.h" +#include "tina2.h" #if 0 MODULE_AUTHOR("Jaroslav Kysela , Creative Labs, Inc."); @@ -600,6 +601,7 @@ static int __devinit snd_emu10k1_cardbus_init(emu10k1_t * emu) outl(0x0090007f, special_port); value = inl(special_port); + snd_emu10k1_ptr20_write(emu, TINA2_VOLUME, 0, 0xfefefefe); /* Defaults to 0x30303030 */ return 0; } diff --git a/trunk/sound/pci/emu10k1/tina2.h b/trunk/sound/pci/emu10k1/tina2.h new file mode 100644 index 000000000000..5c43abf03e89 --- /dev/null +++ b/trunk/sound/pci/emu10k1/tina2.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) by James Courtier-Dutton + * Driver p16v chips + * Version: 0.21 + * + * + * This code was initally based on code from ALSA's emu10k1x.c which is: + * Copyright (c) by Francisco Moraes + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/********************************************************************************************************/ +/* Audigy2 Tina2 (notebook) pointer-offset register set, accessed through the PTR2 and DATA2 registers */ +/********************************************************************************************************/ + +#define TINA2_VOLUME 0x71 /* Attenuate playback volume to prevent distortion. */ + /* The windows driver does not use this register, + * so it must use some other attenuation method. + * Without this, the output is 12dB too loud, + * resulting in distortion. + */ +