From patchwork Tue Mar 13 15:20:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 146427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B26D4B6EEA for ; Wed, 14 Mar 2012 02:21:44 +1100 (EST) Received: from localhost ([::1]:36347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7TXi-00014b-FW for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2012 11:21:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7TXR-0000Ue-Th for qemu-devel@nongnu.org; Tue, 13 Mar 2012 11:21:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7TXH-0003BU-Ka for qemu-devel@nongnu.org; Tue, 13 Mar 2012 11:21:25 -0400 Received: from mail-ey0-f173.google.com ([209.85.215.173]:37138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7TXH-00038q-CE for qemu-devel@nongnu.org; Tue, 13 Mar 2012 11:21:15 -0400 Received: by mail-ey0-f173.google.com with SMTP id f11so352200eaa.4 for ; Tue, 13 Mar 2012 08:21:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=55Eli4OEmdrBQEOMwq35MTL5qN/B12C+Kj1ETj/G9D8=; b=b5mYVCLDo0kNK/pY3I11Ef4eygbnUl35tzmhDQBgY+Ga+ju4eEqh7NYh8u6aUx7C+M xInbFyGUmEdBdwWg4ZEwTqyf/Zv+5YygR53jhB52x97m4D45eyKLiuQg2PLG2K3OymzB 7Z+XcQ1nHhKLoX0kpVrJYQHXEJ3hsrJRMXFy2TfjmMY8zTyWmdD8fabKA6B6O4uC8OFh J+xSvQTFyHqGyjzW0kxhL5QxhrO1f1ei5QEMV2bPdegZZO2a4gzJGKohip1brSSL8tDn fWliek1OmMAr9aSEwdWmRDj2sYSeuayLbdJQJ3LYJM+Znhz2+/0IXGR0tr5XOT+QzhkI rejw== Received: by 10.14.98.206 with SMTP id v54mr2483317eef.82.1331652074390; Tue, 13 Mar 2012 08:21:14 -0700 (PDT) Received: from localhost (254.pool85-58-48.dynamic.orange.es. [85.58.48.254]) by mx.google.com with ESMTPS id v15sm3004067eem.1.2012.03.13.08.21.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Mar 2012 08:21:13 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2012 16:20:51 +0100 Message-Id: <1331652059-10090-4-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1331652059-10090-1-git-send-email-marcandre.lureau@redhat.com> References: <1331652059-10090-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.215.173 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , dnb@redhat.com, dlaor@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH v4 03/11] hw/ac97: remove USE_MIXER code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org That code doesn't compile. The interesting bits for volume control are going to be rewritten in the following patch. Signed-off-by: Marc-André Lureau --- hw/ac97.c | 121 ------------------------------------------------------------- 1 files changed, 0 insertions(+), 121 deletions(-) diff --git a/hw/ac97.c b/hw/ac97.c index c0fd019..f2804e6 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -437,99 +437,6 @@ static void reset_voices (AC97LinkState *s, uint8_t active[LAST_INDEX]) AUD_set_active_in (s->voice_mc, active[MC_INDEX]); } -#ifdef USE_MIXER -static void set_volume (AC97LinkState *s, int index, - audmixerctl_t mt, uint32_t val) -{ - int mute = (val >> MUTE_SHIFT) & 1; - uint8_t rvol = VOL_MASK - (val & VOL_MASK); - uint8_t lvol = VOL_MASK - ((val >> 8) & VOL_MASK); - rvol = 255 * rvol / VOL_MASK; - lvol = 255 * lvol / VOL_MASK; - -#ifdef SOFT_VOLUME - if (index == AC97_Master_Volume_Mute) { - AUD_set_volume_out (s->voice_po, mute, lvol, rvol); - } - else { - AUD_set_volume (mt, &mute, &lvol, &rvol); - } -#else - AUD_set_volume (mt, &mute, &lvol, &rvol); -#endif - - rvol = VOL_MASK - ((VOL_MASK * rvol) / 255); - lvol = VOL_MASK - ((VOL_MASK * lvol) / 255); - mixer_store (s, index, val); -} - -static audrecsource_t ac97_to_aud_record_source (uint8_t i) -{ - switch (i) { - case REC_MIC: - return AUD_REC_MIC; - - case REC_CD: - return AUD_REC_CD; - - case REC_VIDEO: - return AUD_REC_VIDEO; - - case REC_AUX: - return AUD_REC_AUX; - - case REC_LINE_IN: - return AUD_REC_LINE_IN; - - case REC_PHONE: - return AUD_REC_PHONE; - - default: - dolog ("Unknown record source %d, using MIC\n", i); - return AUD_REC_MIC; - } -} - -static uint8_t aud_to_ac97_record_source (audrecsource_t rs) -{ - switch (rs) { - case AUD_REC_MIC: - return REC_MIC; - - case AUD_REC_CD: - return REC_CD; - - case AUD_REC_VIDEO: - return REC_VIDEO; - - case AUD_REC_AUX: - return REC_AUX; - - case AUD_REC_LINE_IN: - return REC_LINE_IN; - - case AUD_REC_PHONE: - return REC_PHONE; - - default: - dolog ("Unknown audio recording source %d using MIC\n", rs); - return REC_MIC; - } -} - -static void record_select (AC97LinkState *s, uint32_t val) -{ - uint8_t rs = val & REC_MASK; - uint8_t ls = (val >> 8) & REC_MASK; - audrecsource_t ars = ac97_to_aud_record_source (rs); - audrecsource_t als = ac97_to_aud_record_source (ls); - AUD_set_record_source (&als, &ars); - rs = aud_to_ac97_record_source (ars); - ls = aud_to_ac97_record_source (als); - mixer_store (s, AC97_Record_Select, rs | (ls << 8)); -} -#endif - static void mixer_reset (AC97LinkState *s) { uint8_t active[LAST_INDEX]; @@ -564,12 +471,6 @@ static void mixer_reset (AC97LinkState *s) mixer_store (s, AC97_PCM_LR_ADC_Rate , 0xbb80); mixer_store (s, AC97_MIC_ADC_Rate , 0xbb80); -#ifdef USE_MIXER - record_select (s, 0); - set_volume (s, AC97_Master_Volume_Mute, AUD_MIXER_VOLUME , 0x8000); - set_volume (s, AC97_PCM_Out_Volume_Mute, AUD_MIXER_PCM , 0x8808); - set_volume (s, AC97_Line_In_Volume_Mute, AUD_MIXER_LINE_IN, 0x8808); -#endif reset_voices (s, active); } @@ -628,20 +529,6 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val) val |= mixer_load (s, index) & 0xf; mixer_store (s, index, val); break; -#ifdef USE_MIXER - case AC97_Master_Volume_Mute: - set_volume (s, index, AUD_MIXER_VOLUME, val); - break; - case AC97_PCM_Out_Volume_Mute: - set_volume (s, index, AUD_MIXER_PCM, val); - break; - case AC97_Line_In_Volume_Mute: - set_volume (s, index, AUD_MIXER_LINE_IN, val); - break; - case AC97_Record_Select: - record_select (s, val); - break; -#endif case AC97_Vendor_ID1: case AC97_Vendor_ID2: dolog ("Attempt to write vendor ID to %#x\n", val); @@ -1194,14 +1081,6 @@ static int ac97_post_load (void *opaque, int version_id) uint8_t active[LAST_INDEX]; AC97LinkState *s = opaque; -#ifdef USE_MIXER - record_select (s, mixer_load (s, AC97_Record_Select)); -#define V_(a, b) set_volume (s, a, b, mixer_load (s, a)) - V_ (AC97_Master_Volume_Mute, AUD_MIXER_VOLUME); - V_ (AC97_PCM_Out_Volume_Mute, AUD_MIXER_PCM); - V_ (AC97_Line_In_Volume_Mute, AUD_MIXER_LINE_IN); -#undef V_ -#endif active[PI_INDEX] = !!(s->bm_regs[PI_INDEX].cr & CR_RPBM); active[PO_INDEX] = !!(s->bm_regs[PO_INDEX].cr & CR_RPBM); active[MC_INDEX] = !!(s->bm_regs[MC_INDEX].cr & CR_RPBM);