aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-04-26 00:37:29 +0200
committerGerd Hoffmann <kraxel@redhat.com>2017-05-04 09:16:04 +0200
commit222e0356fa383175ca3c60f7b76cc9dcbb15113f (patch)
treed0da587cfde11e166c796add05f8c118ed1024bc /hw
parent0af81c56bf687b419ecf2f8e73cd6079a9323e4c (diff)
audio: remove GUSchar
Signed-off-by: Juan Quintela <quintela@redhat.com> Message-id: 20170425223739.6703-17-quintela@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/audio/gusemu.h2
-rw-r--r--hw/audio/gusemu_mixer.c8
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;
}