summaryrefslogtreecommitdiff
path: root/hw/gusemu.h
diff options
context:
space:
mode:
authormalc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-08 01:42:47 +0000
committermalc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-08 01:42:47 +0000
commit731ba0cec2ae7071da75902a8071ac718c86cb14 (patch)
tree017390d5d858f6b73c711ca6d86c7d5fe1cb3a9a /hw/gusemu.h
parente2eef1703b536d42b89f8046faf7adeaa0e42ba1 (diff)
Fix some signedness issues caught by gcc 4.3
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4696 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/gusemu.h')
-rw-r--r--hw/gusemu.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/gusemu.h b/hw/gusemu.h
index 2e9c1c0c77..a64300a09f 100644
--- a/hw/gusemu.h
+++ b/hw/gusemu.h
@@ -32,12 +32,14 @@
typedef unsigned short GUSword;
typedef unsigned int GUSdword;
typedef signed char GUSchar;
+ typedef signed short GUSsample;
#else
#include <stdint.h>
typedef int8_t GUSchar;
typedef uint8_t GUSbyte;
typedef uint16_t GUSword;
typedef uint32_t GUSdword;
+ typedef int16_t GUSsample;
#endif
typedef struct _GUSEmuState
@@ -91,7 +93,7 @@ void gus_dma_transferdata(GUSEmuState *state, char *dma_addr, unsigned int count
/* If the interrupts are asynchronous, it may be needed to use a separate thread mixing into a temporary */
/* audio buffer in order to avoid quality loss caused by large numsamples and elapsed_time values. */
-void gus_mixvoices(GUSEmuState *state, unsigned int playback_freq, unsigned int numsamples, short *bufferpos);
+void gus_mixvoices(GUSEmuState *state, unsigned int playback_freq, unsigned int numsamples, GUSsample *bufferpos);
/* recommended range: 10 < numsamples < 100 */
/* lower values may result in increased rounding error, higher values often cause audible timing delays */