Commit 222e0356 authored by Juan Quintela's avatar Juan Quintela Committed by Gerd Hoffmann
Browse files

audio: remove GUSchar 



Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Message-id: 20170425223739.6703-17-quintela@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 0af81c56

hw/audio/gusemu.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

hw/audio/gusemu_mixer.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

                }