[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/30] audio: remove GUSchar
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 20/30] audio: remove GUSchar |
Date: |
Thu, 4 May 2017 09:18:01 +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.h | 2 --
hw/audio/gusemu_mixer.c | 8 ++++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/audio/gusemu.h b/hw/audio/gusemu.h
index 3a69222281..1c1a63cc0f 100644
--- a/hw/audio/gusemu.h
+++ b/hw/audio/gusemu.h
@@ -30,10 +30,8 @@
#if defined _WIN32 && defined _MSC_VER /* doesn't support other win32
compilers yet, do it yourself... */
typedef unsigned short GUSword;
typedef unsigned int GUSdword;
- typedef signed char GUSchar;
typedef signed short GUSsample;
#else
- typedef int8_t GUSchar;
typedef uint16_t GUSword;
typedef uint32_t GUSdword;
typedef int16_t GUSsample;
diff --git a/hw/audio/gusemu_mixer.c b/hw/audio/gusemu_mixer.c
index d255ac821d..b189db990c 100644
--- a/hw/audio/gusemu_mixer.c
+++ b/hw/audio/gusemu_mixer.c
@@ -85,16 +85,16 @@ void gus_mixvoices(GUSEmuState * state, unsigned int
playback_freq, unsigned int
if (GUSvoice(wVSRControl) & 0x400) /* 16bit */
{
int offset = ((CurrPos >> 9) & 0xc0000) + (((CurrPos >> 9)
& 0x1ffff) << 1);
- GUSchar *adr;
- adr = (GUSchar *) state->himemaddr + offset;
+ int8_t *adr;
+ adr = (int8_t *) state->himemaddr + offset;
sample1 = (*adr & 0xff) + (*(adr + 1) * 256);
sample2 = (*(adr + 2) & 0xff) + (*(adr + 2 + 1) * 256);
}
else /* 8bit */
{
int offset = (CurrPos >> 9) & 0xfffff;
- GUSchar *adr;
- adr = (GUSchar *) state->himemaddr + offset;
+ int8_t *adr;
+ adr = (int8_t *) state->himemaddr + offset;
sample1 = (*adr) * 256;
sample2 = (*(adr + 1)) * 256;
}
--
2.9.3
- [Qemu-devel] [PULL 24/30] audio: OPLSetIRQHandler is not used anywhere, (continued)
- [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, 2017/05/04
- [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 <=
- [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
- [Qemu-devel] [PULL 09/30] audio: Remove UINT8, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 11/30] audio: remove UINT32, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 17/30] audio: Remove type field, Gerd Hoffmann, 2017/05/04
- Re: [Qemu-devel] [PULL 00/30] audio patch queue, no-reply, 2017/05/04
- Re: [Qemu-devel] [PULL 00/30] audio patch queue, Stefan Hajnoczi, 2017/05/05