diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-17 15:43:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-17 15:43:15 +0100 |
| commit | 63dba7e6b18aa85392800f0cb7c897e3a05b097b (patch) | |
| tree | 45c1847e5c028be86947b38fe42c37dc3d8aa4d9 /hw/audio/fmopl.h | |
| parent | 1f244ebbba650b82828b6139377d6199fe648d6b (diff) | |
| parent | 639b49ef9a4dc9555ed6aaefa8dfda621e4165cf (diff) | |
| download | qemu-63dba7e6b18aa85392800f0cb7c897e3a05b097b.zip qemu-63dba7e6b18aa85392800f0cb7c897e3a05b097b.tar.gz qemu-63dba7e6b18aa85392800f0cb7c897e3a05b097b.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20170717-pull-request' into staging
audio: fixes for 2.10
# gpg: Signature made Mon 17 Jul 2017 10:29:08 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/audio-20170717-pull-request:
audio/adlib: remove limitation of one adlib card
audio/fmopl: modify timer callback to give opaque and channel parameters in two arguments
audio: st_rate_flow exist a infinite loop
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/audio/fmopl.h')
| -rw-r--r-- | hw/audio/fmopl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index fc9f16b..f4065f4 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -3,7 +3,7 @@ #include <stdint.h> -typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec); +typedef void (*OPL_TIMERHANDLER)(void *param, int channel, double interval_Sec); /* !!!!! here is private section , do not access there member direct !!!!! */ @@ -87,13 +87,14 @@ typedef struct fm_opl_f { uint8_t wavesel; /* external event callback handler */ OPL_TIMERHANDLER TimerHandler; /* TIMER handler */ - int TimerParam; /* TIMER 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 OPLSetTimerHandler(FM_OPL *OPL, OPL_TIMERHANDLER TimerHandler, + void *param); int OPLWrite(FM_OPL *OPL,int a,int v); unsigned char OPLRead(FM_OPL *OPL,int a); |