aboutsummaryrefslogtreecommitdiff
path: root/hw/audio/adlib.c
diff options
context:
space:
mode:
authorHervé Poussineau <hpoussin@reactos.org>2017-06-21 06:34:01 +0200
committerGerd Hoffmann <kraxel@redhat.com>2017-07-17 11:09:02 +0200
commit639b49ef9a4dc9555ed6aaefa8dfda621e4165cf (patch)
treef5694f5ae192c92e28d48597f25b6ca47f5d8a69 /hw/audio/adlib.c
parentc57fbf50e7b5f94efc697b1d8ef387a5b2b4a5ee (diff)
downloadqemu-639b49ef9a4dc9555ed6aaefa8dfda621e4165cf.zip
qemu-639b49ef9a4dc9555ed6aaefa8dfda621e4165cf.tar.gz
qemu-639b49ef9a4dc9555ed6aaefa8dfda621e4165cf.tar.bz2
audio/adlib: remove limitation of one adlib card
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20170621043401.19842-3-hpoussin@reactos.org Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/audio/adlib.c')
-rw-r--r--hw/audio/adlib.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index be42034..97b876c 100644
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -74,8 +74,6 @@ typedef struct {
PortioList port_list;
} AdlibState;
-static AdlibState *glob_adlib;
-
static void adlib_stop_opl_timer (AdlibState *s, size_t n)
{
OPLTimerOver (s->opl, n);
@@ -132,7 +130,7 @@ static uint32_t adlib_read(void *opaque, uint32_t nport)
static void timer_handler (void *opaque, int c, double interval_Sec)
{
- AdlibState *s = glob_adlib;
+ AdlibState *s = opaque;
unsigned n = c & 1;
#ifdef DEBUG
double interval;
@@ -259,19 +257,13 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
AdlibState *s = ADLIB(dev);
struct audsettings as;
- if (glob_adlib) {
- error_setg (errp, "Cannot create more than 1 adlib device");
- return;
- }
- glob_adlib = s;
-
s->opl = OPLCreate (3579545, s->freq);
if (!s->opl) {
error_setg (errp, "OPLCreate %d failed", s->freq);
return;
}
else {
- OPLSetTimerHandler (s->opl, timer_handler, 0);
+ OPLSetTimerHandler(s->opl, timer_handler, s);
s->enabled = 1;
}