From nobody Mon Feb 9 11:30:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493883060927203.76665126442606; Thu, 4 May 2017 00:31:00 -0700 (PDT) Received: from localhost ([::1]:40097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6BE3-0004Om-Jq for importer@patchew.org; Thu, 04 May 2017 03:30:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6B1v-0001Uj-Uw for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6B1s-0004bY-Em for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57908) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6B1s-0004a6-8S for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:24 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C14DC059726 for ; Thu, 4 May 2017 07:18:23 +0000 (UTC) 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 CB52462923; Thu, 4 May 2017 07:18:20 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id CA2B580E62; Thu, 4 May 2017 09:18:15 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2C14DC059726 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2C14DC059726 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 4 May 2017 09:17:49 +0200 Message-Id: <20170504071811.3547-9-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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 04 May 2017 07:18:23 +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 08/30] audio: YM3812 was always defined 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Juan Quintela So, remove the ifdefs. Signed-off-by: Juan Quintela Message-id: 20170425223739.6703-5-quintela@redhat.com Signed-off-by: Gerd Hoffmann --- hw/audio/fmopl.h | 4 ---- hw/audio/fmopl.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index b254968b6a..e476497275 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -1,9 +1,6 @@ #ifndef FMOPL_H #define FMOPL_H =20 -/* --- select emulation chips --- */ -#define BUILD_YM3812 (HAS_YM3812) - /* --- system optimize --- */ /* select bit size of output : 8 or 16 */ #define OPL_OUTPUT_BIT 16 @@ -147,6 +144,5 @@ int OPLWrite(FM_OPL *OPL,int a,int v); unsigned char OPLRead(FM_OPL *OPL,int a); int OPLTimerOver(FM_OPL *OPL,int c); =20 -/* YM3626/YM3812 local section */ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length); #endif diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 1e05efca8a..282662a858 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -30,8 +30,6 @@ * License along with this library; if not, see . */ =20 -#define HAS_YM3812 1 - #include "qemu/osdep.h" #include //#include "driver.h" /* use M.A.M.E. */ @@ -981,7 +979,6 @@ static void OPL_UnLockTable(void) OPLCloseTable(); } =20 -#if BUILD_YM3812 /*************************************************************************= ******/ /* YM3812 local section = */ /*************************************************************************= ******/ @@ -1044,7 +1041,6 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int = length) } #endif } -#endif /* BUILD_YM3812 */ =20 /* ---------- reset one of chip ---------- */ void OPLResetChip(FM_OPL *OPL) --=20 2.9.3