[Qemu-devel] [PULL 15/30] audio: Unfold OPLSAMPLE

[Gerd Hoffmann]

From: Juan Quintela <address@hidden>

It was used only once, and now it was always int16_t.

Signed-off-by: Juan Quintela <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
 hw/audio/fmopl.h | 11 -----------
 hw/audio/fmopl.c |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h
index 1e74019586..c23628724c 100644
--- a/hw/audio/fmopl.h
+++ b/hw/audio/fmopl.h
@@ -3,17 +3,6 @@
 
 #include <stdint.h>
 
-/* --- system optimize --- */
-/* select bit size of output : 8 or 16 */
-#define OPL_OUTPUT_BIT 16
-
-#if (OPL_OUTPUT_BIT==16)
-typedef int16_t OPLSAMPLE;
-#endif
-#if (OPL_OUTPUT_BIT==8)
-typedef unsigned char  OPLSAMPLE;
-#endif
-
 typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec);
 typedef void (*OPL_IRQHANDLER)(int param,int irq);
 typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us);
diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
index 8f935f62b6..b1cb4b46d6 100644
--- a/hw/audio/fmopl.c
+++ b/hw/audio/fmopl.c
@@ -988,7 +988,7 @@ void YM3812UpdateOne(FM_OPL *OPL, int16_t *buffer, int 
length)
 {
     int i;
        int data;
-       OPLSAMPLE *buf = buffer;
+       int16_t *buf = buffer;
        uint32_t amsCnt  = OPL->amsCnt;
        uint32_t  vibCnt  = OPL->vibCnt;
        uint8_t rhythm = OPL->rhythm&0x20;
-- 
2.9.3