[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/30] audio: GUSword is uint16_t
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 22/30] audio: GUSword is uint16_t |
Date: |
Thu, 4 May 2017 09:18:03 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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"
#define GUSregb(position) (* (gusptr+(position)))
-#define GUSregw(position) (*(GUSword *) (gusptr+(position)))
+#define GUSregw(position) (*(uint16_t *) (gusptr+(position)))
#define GUSregd(position) (*(GUSdword *)(gusptr+(position)))
/* size given in bytes */
@@ -173,7 +173,7 @@ unsigned int gus_read(GUSEmuState * state, int port, int
size)
value_read = value_read >> 8;
value_read &= 0xff;
}
- return (GUSword) value_read;
+ return (uint16_t) value_read;
/* case 0x306: */ /* Mixer/Version info */
/* 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 size,
unsigned int data)
case 0x304:
case 0x305:
{
- GUSword writedata = (GUSword) data;
- GUSword readmask = 0x0000;
+ uint16_t writedata = (uint16_t) data;
+ uint16_t readmask = 0x0000;
if (size == 1)
{
readmask = 0xff00;
writedata &= 0xff;
if ((port & 0xff0f) == 0x305)
{
- writedata = (GUSword) (writedata << 8);
+ writedata = (uint16_t) (writedata << 8);
readmask = 0x00ff;
}
}
@@ -353,7 +353,7 @@ void gus_write(GUSEmuState * state, int port, int size,
unsigned int data)
break; /* reset flag active? */
offset = 2 * (GUSregb(FunkSelReg3x3) & 0x0f);
offset += (GUSregb(VoiceSelReg3x2) & 0x1f) << 5; /* =
Voice*32 + Funktion*2 */
- GUSregw(offset) = (GUSword) ((GUSregw(offset) & readmask)
| writedata);
+ GUSregw(offset) = (uint16_t) ((GUSregw(offset) & readmask)
| writedata);
}
break;
/* voice unspecific functions */
@@ -521,7 +521,7 @@ void gus_dma_transferdata(GUSEmuState * state, char
*dma_addr, unsigned int coun
destaddr = (char *) state->himemaddr + offset; /* wavetable RAM
address */
}
- GUSregw(GUS42DMAStart) += (GUSword) (count >> 4);
/* ToDo: add 16bit GUS page limit? */
+ GUSregw(GUS42DMAStart) += (uint16_t) (count >> 4);
/* ToDo: add 16bit GUS page limit? */
GUSregb(GUS50DMAHigh) = (uint8_t) ((count + GUSregb(GUS50DMAHigh)) &
0xf); /* ToDo: add 16bit GUS page limit? */
if (GUSregb(GUS41DMACtrl) & 0x02) /* direction, 0 := sysram->gusram */
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"
#define GUSregb(position) (* (gusptr+(position)))
-#define GUSregw(position) (*(GUSword *) (gusptr+(position)))
+#define GUSregw(position) (*(uint16_t *) (gusptr+(position)))
#define GUSregd(position) (*(GUSdword *)(gusptr+(position)))
-#define GUSvoice(position) (*(GUSword *)(voiceptr+(position)))
+#define GUSvoice(position) (*(uint16_t *)(voiceptr+(position)))
/* samples are always 16bit stereo (4 bytes each, first right then left
interleaved) */
void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsigned
int numsamples,
@@ -39,14 +39,14 @@ void gus_mixvoices(GUSEmuState * state, unsigned int
playback_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;
unsigned int count;
for (count = 0; count < numsamples * 2; count++)
*(bufferpos + count) = 0; /* clear */
gusptr = state->gusdatapos;
- voiceptr = (GUSword *) gusptr;
+ voiceptr = (uint16_t *) gusptr;
if (!(GUSregb(GUS4cReset) & 0x01)) /* reset flag active? */
return;
--
2.9.3
- [Qemu-devel] [PULL 02/30] hw/audio: convert exit callback in HDACodecDeviceClass to void, (continued)
- [Qemu-devel] [PULL 02/30] hw/audio: convert exit callback in HDACodecDeviceClass to void, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 18/30] audio: Remove unused fields, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 15/30] audio: Unfold OPLSAMPLE, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 21/30] audio: GUSword is uint16_t, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 13/30] audio: remove INT16, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 10/30] audio: remove UINT16, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 24/30] audio: OPLSetIRQHandler is not used anywhere, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 16/30] audio: Remove Unused OPL_TYPE_*, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 26/30] audio: IRQHandler is not used anymore, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 23/30] audio: GUSsample is int16_t, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 22/30] audio: GUSword is uint16_t,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 05/30] adlib: Remove support for YMF262, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 29/30] audio: un-export OPLResetChip, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 19/30] audio: GUSbyte is uint8_t, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 25/30] audio: OPLSetUpdateHandler is not used anywhere, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 30/30] audio: Use ARRAY_SIZE from qemu/osdep.h, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 20/30] audio: remove GUSchar, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 06/30] audio: remove Y8950 configuration, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 08/30] audio: YM3812 was always defined, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 14/30] audio: Remove INT32, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 28/30] audio: Remove unused typedefs, Gerd Hoffmann, 2017/05/04