From 22d83b140e7b2dda555b7e3035050454f8764b7f Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Tue, 12 May 2009 12:33:04 +0100 Subject: 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 --- hw/musicpal.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'hw/musicpal.c') diff --git a/hw/musicpal.c b/hw/musicpal.c index 0c47e5d..b1cece4 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -422,13 +422,10 @@ static CPUWriteMemoryFunc *musicpal_audio_writefn[] = { static i2c_interface *musicpal_audio_init(qemu_irq irq) { - AudioState *audio; musicpal_audio_state *s; i2c_interface *i2c; int iomemtype; - audio = AUD_init(); - s = qemu_mallocz(sizeof(musicpal_audio_state)); s->irq = irq; @@ -436,7 +433,7 @@ static i2c_interface *musicpal_audio_init(qemu_irq irq) i2c->bus = i2c_init_bus(); i2c->current_addr = -1; - s->wm = wm8750_init(i2c->bus, audio); + s->wm = wm8750_init(i2c->bus); if (!s->wm) return NULL; i2c_set_slave_address(s->wm, MP_WM_ADDR); -- cgit v1.1