From patchwork Thu May 4 07:17:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9710873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D6B260235 for ; Thu, 4 May 2017 07:24:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1721B28682 for ; Thu, 4 May 2017 07:24:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BC9E28685; Thu, 4 May 2017 07:24:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B195428682 for ; Thu, 4 May 2017 07:24:31 +0000 (UTC) Received: from localhost ([::1]:40062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6B7m-0006C3-Tv for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 May 2017 03:24:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6B1t-0001U8-VD for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6B1q-0004Yf-9t for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45852) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6B1q-0004Y2-2y for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:22 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 28840C04B950 for ; Thu, 4 May 2017 07:18:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 28840C04B950 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 28840C04B950 Received: from nilsson.home.kraxel.org (ovpn-116-101.ams2.redhat.com [10.36.116.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9B49183E5; Thu, 4 May 2017 07:18:20 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id B868F80E55; Thu, 4 May 2017 09:18:15 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 4 May 2017 09:17:48 +0200 Message-Id: <20170504071811.3547-8-kraxel@redhat.com> In-Reply-To: <20170504071811.3547-1-kraxel@redhat.com> References: <20170504071811.3547-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 04 May 2017 07:18:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 07/30] audio: Remove YM3526 support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Juan Quintela Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Juan Quintela It was never compiled in. Signed-off-by: Juan Quintela Message-id: 20170425223739.6703-4-quintela@redhat.com Signed-off-by: Gerd Hoffmann --- hw/audio/fmopl.h | 2 -- hw/audio/fmopl.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index 96d958ac72..b254968b6a 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -3,7 +3,6 @@ /* --- select emulation chips --- */ #define BUILD_YM3812 (HAS_YM3812) -//#define BUILD_YM3526 (HAS_YM3526) /* --- system optimize --- */ /* select bit size of output : 8 or 16 */ @@ -135,7 +134,6 @@ typedef struct fm_opl_f { } FM_OPL; /* ---------- Generic interface section ---------- */ -#define OPL_TYPE_YM3526 (0) #define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL) FM_OPL *OPLCreate(int type, int clock, int rate); diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 29f6d3c5a4..1e05efca8a 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -981,7 +981,7 @@ static void OPL_UnLockTable(void) OPLCloseTable(); } -#if (BUILD_YM3812 || BUILD_YM3526) +#if BUILD_YM3812 /*******************************************************************************/ /* YM3812 local section */ /*******************************************************************************/ @@ -1044,7 +1044,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) } #endif } -#endif /* (BUILD_YM3812 || BUILD_YM3526) */ +#endif /* BUILD_YM3812 */ /* ---------- reset one of chip ---------- */ void OPLResetChip(FM_OPL *OPL)