From patchwork Thu May 4 07:17:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9710863 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 6012B60235 for ; Thu, 4 May 2017 07:19:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5277D28662 for ; Thu, 4 May 2017 07:19:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4761C28673; Thu, 4 May 2017 07:19:53 +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 22B9E28677 for ; Thu, 4 May 2017 07:19:52 +0000 (UTC) Received: from localhost ([::1]:40040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6B3H-0001ZX-Ag for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 May 2017 03:19:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6B1u-0001UF-1W for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6B1r-0004Ze-2z for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56042) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6B1q-0004Ya-TF for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:23 -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 EB2F661BA5 for ; Thu, 4 May 2017 07:18:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EB2F661BA5 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com EB2F661BA5 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 94B64183E3; Thu, 4 May 2017 07:18:21 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 3384880E25; Thu, 4 May 2017 09:18:16 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 4 May 2017 09:17:54 +0200 Message-Id: <20170504071811.3547-14-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.39]); Thu, 04 May 2017 07:18:22 +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 13/30] audio: remove INT16 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 Signed-off-by: Juan Quintela Message-id: 20170425223739.6703-10-quintela@redhat.com Signed-off-by: Gerd Hoffmann --- hw/audio/fmopl.h | 5 ++--- hw/audio/fmopl.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index bede6717ae..0bc3415cd3 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -10,12 +10,11 @@ /* compiler dependence */ #ifndef OSD_CPU_H #define OSD_CPU_H -typedef signed short INT16; /* signed 16bit */ typedef signed int INT32; /* signed 32bit */ #endif #if (OPL_OUTPUT_BIT==16) -typedef INT16 OPLSAMPLE; +typedef int16_t OPLSAMPLE; #endif #if (OPL_OUTPUT_BIT==8) typedef unsigned char OPLSAMPLE; @@ -142,5 +141,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); -void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length); +void YM3812UpdateOne(FM_OPL *OPL, int16_t *buffer, int length); #endif diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 47754e86b2..ebd3dbbf80 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -984,7 +984,7 @@ static void OPL_UnLockTable(void) /*******************************************************************************/ /* ---------- update one of chip ----------- */ -void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) +void YM3812UpdateOne(FM_OPL *OPL, int16_t *buffer, int length) { int i; int data;