From nobody Mon Feb 9 16:19:00 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 1493883877577502.9137483535519; Thu, 4 May 2017 00:44:37 -0700 (PDT) Received: from localhost ([::1]:40203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6BRE-0006yE-8j for importer@patchew.org; Thu, 04 May 2017 03:44:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6B1w-0001Ur-Dl for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6B1t-0004cy-6d for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40268) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6B1s-0004bE-Ty for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:25 -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 E928F80C1B 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 EE63018376; Thu, 4 May 2017 07:18:22 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id D725781609; Thu, 4 May 2017 09:18:16 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E928F80C1B Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E928F80C1B From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 4 May 2017 09:18:03 +0200 Message-Id: <20170504071811.3547-23-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.26]); Thu, 04 May 2017 07:18:24 +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 22/30] audio: GUSword is uint16_t 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 Signed-off-by: Juan Quintela Message-id: 20170425223739.6703-19-quintela@redhat.com Signed-off-by: Gerd Hoffmann --- hw/audio/gusemu_hal.c | 14 +++++++------- hw/audio/gusemu_mixer.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/audio/gusemu_hal.c b/hw/audio/gusemu_hal.c index 444a2bbb22..3dd7239a4b 100644 --- a/hw/audio/gusemu_hal.c +++ b/hw/audio/gusemu_hal.c @@ -31,7 +31,7 @@ #include "gusemu.h" =20 #define GUSregb(position) (* (gusptr+(position))) -#define GUSregw(position) (*(GUSword *) (gusptr+(position))) +#define GUSregw(position) (*(uint16_t *) (gusptr+(position))) #define GUSregd(position) (*(GUSdword *)(gusptr+(position))) =20 /* size given in bytes */ @@ -173,7 +173,7 @@ unsigned int gus_read(GUSEmuState * state, int port, in= t size) value_read =3D value_read >> 8; value_read &=3D 0xff; } - return (GUSword) value_read; + return (uint16_t) value_read; /* case 0x306: */ /* Mixer/Version in= fo */ /* return 0xff; */ /* Pre 3.6 boards, ICS mixer NOT present */ case 0x307: /* DRAMaccess */ @@ -318,15 +318,15 @@ void gus_write(GUSEmuState * state, int port, int siz= e, unsigned int data) case 0x304: case 0x305: { - GUSword writedata =3D (GUSword) data; - GUSword readmask =3D 0x0000; + uint16_t writedata =3D (uint16_t) data; + uint16_t readmask =3D 0x0000; if (size =3D=3D 1) { readmask =3D 0xff00; writedata &=3D 0xff; if ((port & 0xff0f) =3D=3D 0x305) { - writedata =3D (GUSword) (writedata << 8); + writedata =3D (uint16_t) (writedata << 8); readmask =3D 0x00ff; } } @@ -353,7 +353,7 @@ void gus_write(GUSEmuState * state, int port, int size,= unsigned int data) break; /* reset flag active? */ offset =3D 2 * (GUSregb(FunkSelReg3x3) & 0x0f); offset +=3D (GUSregb(VoiceSelReg3x2) & 0x1f) << 5; /* = =3D Voice*32 + Funktion*2 */ - GUSregw(offset) =3D (GUSword) ((GUSregw(offset) & read= mask) | writedata); + GUSregw(offset) =3D (uint16_t) ((GUSregw(offset) & rea= dmask) | writedata); } break; /* voice unspecific functions */ @@ -521,7 +521,7 @@ void gus_dma_transferdata(GUSEmuState * state, char *dm= a_addr, unsigned int coun destaddr =3D (char *) state->himemaddr + offset; /* wavetable RAM = address */ } =20 - GUSregw(GUS42DMAStart) +=3D (GUSword) (count >> 4); = /* ToDo: add 16bit GUS page limit? */ + GUSregw(GUS42DMAStart) +=3D (uint16_t) (count >> 4); = /* ToDo: add 16bit GUS page limit? */ GUSregb(GUS50DMAHigh) =3D (uint8_t) ((count + GUSregb(GUS50DMAHigh))= & 0xf); /* ToDo: add 16bit GUS page limit? */ =20 if (GUSregb(GUS41DMACtrl) & 0x02) /* direction, 0 :=3D sysram->gusra= m */ diff --git a/hw/audio/gusemu_mixer.c b/hw/audio/gusemu_mixer.c index b189db990c..981a9ae0d4 100644 --- a/hw/audio/gusemu_mixer.c +++ b/hw/audio/gusemu_mixer.c @@ -27,10 +27,10 @@ #include "gustate.h" =20 #define GUSregb(position) (* (gusptr+(position))) -#define GUSregw(position) (*(GUSword *) (gusptr+(position))) +#define GUSregw(position) (*(uint16_t *) (gusptr+(position))) #define GUSregd(position) (*(GUSdword *)(gusptr+(position))) =20 -#define GUSvoice(position) (*(GUSword *)(voiceptr+(position))) +#define GUSvoice(position) (*(uint16_t *)(voiceptr+(position))) =20 /* samples are always 16bit stereo (4 bytes each, first right then left in= terleaved) */ void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsign= ed int numsamples, @@ -39,14 +39,14 @@ void gus_mixvoices(GUSEmuState * state, unsigned int pl= ayback_freq, unsigned int /* note that byte registers are stored in the upper half of each voice= register! */ uint8_t *gusptr; int Voice; - GUSword *voiceptr; + uint16_t *voiceptr; =20 unsigned int count; for (count =3D 0; count < numsamples * 2; count++) *(bufferpos + count) =3D 0; /* clear */ =20 gusptr =3D state->gusdatapos; - voiceptr =3D (GUSword *) gusptr; + voiceptr =3D (uint16_t *) gusptr; if (!(GUSregb(GUS4cReset) & 0x01)) /* reset flag active? */ return; =20 --=20 2.9.3