diff options
author | Paul Brook <paul@codesourcery.com> | 2009-05-12 12:33:04 +0100 |
---|---|---|
committer | Paul Brook <paul@codesourcery.com> | 2009-05-12 12:33:04 +0100 |
commit | 22d83b140e7b2dda555b7e3035050454f8764b7f (patch) | |
tree | b80cd7f2cbae7951323871218db3772dd8b3b8c7 /hw/adlib.c | |
parent | 0d9acba8fddbf970c7353083e6a60b47017ce3e4 (diff) |
Push AUD_init down to devices
Now we can safely call AUD_init multiple times we can push it down to
individual audio devices, rather than having to pass it from the board
init.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/adlib.c')
-rw-r--r-- | hw/adlib.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/adlib.c b/hw/adlib.c index 9f8f6f277e..076c1a0b1f 100644 --- a/hw/adlib.c +++ b/hw/adlib.c @@ -277,16 +277,12 @@ static void Adlib_fini (AdlibState *s) AUD_remove_card (&s->card); } -int Adlib_init (AudioState *audio, qemu_irq *pic) +int Adlib_init (qemu_irq *pic) { + AudioState *audio = AUD_init(); AdlibState *s = &glob_adlib; struct audsettings as; - if (!audio) { - dolog ("No audio state\n"); - return -1; - } - #ifdef HAS_YMF262 if (YMF262Init (1, 14318180, conf.freq)) { dolog ("YMF262Init %d failed\n", conf.freq); |