Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180202-pull-request' into...

[qemu.git] / hw / audio / fmopl.h

diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h
index 375f971b4db56f0e17f7800efad7f00a72413a79..e7e578a48eb8a99a4d4e0f85df01c57627da34d1 100644 (file)
--- a/hw/audio/fmopl.h
+++ b/hw/audio/fmopl.h
@@ -1,13 +1,8 @@
 #ifndef FMOPL_H
 #define FMOPL_H
 
-#include <stdint.h>
 
-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);
-typedef void (*OPL_PORTHANDLER_W)(int param,unsigned char data);
-typedef unsigned char (*OPL_PORTHANDLER_R)(int param);
+typedef void (*OPL_TIMERHANDLER)(void *param, int channel, double interval_Sec);
 
 /* !!!!! here is private section , do not access there member direct !!!!! */
 
@@ -91,20 +86,15 @@ typedef struct fm_opl_f {
        uint8_t wavesel;
        /* external event callback handler */
        OPL_TIMERHANDLER  TimerHandler;         /* TIMER handler   */
-       int TimerParam;                                         /* TIMER parameter */
-       OPL_IRQHANDLER    IRQHandler;           /* IRQ handler    */
-       int IRQParam;                                           /* IRQ parameter  */
-       OPL_UPDATEHANDLER UpdateHandler;        /* stream update handler   */
-       int UpdateParam;                                        /* stream update parameter */
+    void *TimerParam; /* TIMER parameter */
 } FM_OPL;
 
 /* ---------- Generic interface section ---------- */
 FM_OPL *OPLCreate(int clock, int rate);
 void OPLDestroy(FM_OPL *OPL);
-void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset);
-void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param);
+void OPLSetTimerHandler(FM_OPL *OPL, OPL_TIMERHANDLER TimerHandler,
+                        void *param);
 
-void OPLResetChip(FM_OPL *OPL);
 int OPLWrite(FM_OPL *OPL,int a,int v);
 unsigned char OPLRead(FM_OPL *OPL,int a);
 int OPLTimerOver(FM_OPL *OPL,int c);