From patchwork Tue Apr 25 22:37:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 755097 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wCJ8Z0Wttz9s0m for ; Wed, 26 Apr 2017 08:41:02 +1000 (AEST) Received: from localhost ([::1]:51703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d398l-000299-GC for incoming@patchwork.ozlabs.org; Tue, 25 Apr 2017 18:40:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d395n-0008Si-Lp for qemu-devel@nongnu.org; Tue, 25 Apr 2017 18:37:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d395m-0002M2-LU for qemu-devel@nongnu.org; Tue, 25 Apr 2017 18:37:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48968) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d395m-0002L5-Fp for qemu-devel@nongnu.org; Tue, 25 Apr 2017 18:37:54 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7124167EA6 for ; Tue, 25 Apr 2017 22:37:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7124167EA6 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7124167EA6 Received: from secure.mitica (unknown [10.36.118.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 175A55C472; Tue, 25 Apr 2017 22:37:51 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 26 Apr 2017 00:37:17 +0200 Message-Id: <20170425223739.6703-5-quintela@redhat.com> In-Reply-To: <20170425223739.6703-1-quintela@redhat.com> References: <20170425223739.6703-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 25 Apr 2017 22:37:53 +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] [PATCH 04/26] 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: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" So, remove the ifdefs. Signed-off-by: Juan Quintela --- hw/audio/fmopl.c | 4 ---- hw/audio/fmopl.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 1e05efc..282662a 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -30,8 +30,6 @@ * License along with this library; if not, see . */ -#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(); } -#if BUILD_YM3812 /*******************************************************************************/ /* YM3812 local section */ /*******************************************************************************/ @@ -1044,7 +1041,6 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) } #endif } -#endif /* BUILD_YM3812 */ /* ---------- reset one of chip ---------- */ void OPLResetChip(FM_OPL *OPL) diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index b254968..e476497 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -1,9 +1,6 @@ #ifndef FMOPL_H #define FMOPL_H -/* --- 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); -/* YM3626/YM3812 local section */ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length); #endif