From patchwork Thu Oct 13 12:26:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 119466 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D4931B6F86 for ; Thu, 13 Oct 2011 23:27:07 +1100 (EST) Received: from localhost ([::1]:36445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REKNK-0003Nw-Dx for incoming@patchwork.ozlabs.org; Thu, 13 Oct 2011 08:27:02 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REKNA-0003Ne-Eo for qemu-devel@nongnu.org; Thu, 13 Oct 2011 08:26:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1REKN6-0006gl-6Z for qemu-devel@nongnu.org; Thu, 13 Oct 2011 08:26:52 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:58236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REKN5-0006fn-Tx for qemu-devel@nongnu.org; Thu, 13 Oct 2011 08:26:48 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so1438678wwg.10 for ; Thu, 13 Oct 2011 05:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=q+PUyVCbtGd6eveGnj2qkpr6rjO2mH3xDMTdsMgEzgU=; b=YgSEtZkBdjdR1fry7l/CiI0tqU03dobFSpT0e2Kfv1utfzhIjzvnwPqc4CXjGM7nzZ mZO99jPOGh76acb3iljZFeWvxBYjIO3Sb0v5sRfzYJvckHs+MPYIKqiQWijSPMHytQNG /baY1tJudPXe9KZTzky8aZs1B9IWCL/9phD18= Received: by 10.227.200.134 with SMTP id ew6mr1195754wbb.45.1318508807501; Thu, 13 Oct 2011 05:26:47 -0700 (PDT) Received: from localhost (75.Red-83-60-208.dynamicIP.rima-tde.net. [83.60.208.75]) by mx.google.com with ESMTPS id l9sm5705944wba.5.2011.10.13.05.26.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Oct 2011 05:26:45 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Thu, 13 Oct 2011 14:26:17 +0200 Message-Id: <1318508784-8172-4-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.6.2 In-Reply-To: <1318508784-8172-1-git-send-email-marcandre.lureau@redhat.com> References: <1316621468-32171-1-git-send-email-marcandre.lureau@redhat.com> <1318508784-8172-1-git-send-email-marcandre.lureau@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com Subject: [Qemu-devel] [PATCH 04/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 It doesn't compile. The interesting bits for volume control are going to be rewritten. --- hw/ac97.c | 121 ------------------------------------------------------------- 1 files changed, 0 insertions(+), 121 deletions(-) diff --git a/hw/ac97.c b/hw/ac97.c index 541d9a4..4d4a658 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -432,99 +432,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]; @@ -559,12 +466,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); } @@ -623,20 +524,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); @@ -1189,14 +1076,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);