From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6B1u-0001UR-IO 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-0004Zl-4M for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57888) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6B1q-0004Yp-VO 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 0655DC059735 for ; Thu, 4 May 2017 07:18:22 +0000 (UTC) From: Gerd Hoffmann Date: Thu, 4 May 2017 09:17:56 +0200 Message-Id: <20170504071811.3547-16-kraxel@redhat.com> In-Reply-To: <20170504071811.3547-1-kraxel@redhat.com> References: <20170504071811.3547-1-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 15/30] audio: Unfold OPLSAMPLE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Juan Quintela , Gerd Hoffmann From: Juan Quintela It was used only once, and now it was always int16_t. Signed-off-by: Juan Quintela Message-id: 20170425223739.6703-12-quintela@redhat.com Signed-off-by: Gerd Hoffmann --- hw/audio/fmopl.h | 11 ----------- hw/audio/fmopl.c | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index 1e74019586..c23628724c 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -3,17 +3,6 @@ #include -/* --- system optimize --- */ -/* select bit size of output : 8 or 16 */ -#define OPL_OUTPUT_BIT 16 - -#if (OPL_OUTPUT_BIT==16) -typedef int16_t OPLSAMPLE; -#endif -#if (OPL_OUTPUT_BIT==8) -typedef unsigned char OPLSAMPLE; -#endif - typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec); typedef void (*OPL_IRQHANDLER)(int param,int irq); typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us); diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 8f935f62b6..b1cb4b46d6 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -988,7 +988,7 @@ void YM3812UpdateOne(FM_OPL *OPL, int16_t *buffer, int length) { int i; int data; - OPLSAMPLE *buf = buffer; + int16_t *buf = buffer; uint32_t amsCnt = OPL->amsCnt; uint32_t vibCnt = OPL->vibCnt; uint8_t rhythm = OPL->rhythm&0x20; -- 2.9.3