Remove any pretense that there can be more than one AudioState

10 files changed, 11 insertions, 22 deletions

diff --git a/hw/ac97.c b/hw/ac97.c
index f2ae4b3..0ff2941 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -1310,7 +1310,6 @@ static void ac97_on_reset (void *opaque)
 
 int ac97_init (PCIBus *bus)
 {
-    AudioState *audio = AUD_init();
     PCIAC97LinkState *d;
     AC97LinkState *s;
     uint8_t *c;
@@ -1371,7 +1370,7 @@ int ac97_init (PCIBus *bus)
     pci_register_io_region (&d->dev, 1, 64 * 4, PCI_ADDRESS_SPACE_IO, ac97_map);
     register_savevm ("ac97", 0, 2, ac97_save, ac97_load, s);
     qemu_register_reset (ac97_on_reset, s);
-    AUD_register_card (audio, "ac97", &s->card);
+    AUD_register_card ("ac97", &s->card);
     ac97_on_reset (s);
     return 0;
 }
diff --git a/hw/adlib.c b/hw/adlib.c
index 8c23319..ea46931 100644
--- a/hw/adlib.c
+++ b/hw/adlib.c
@@ -278,7 +278,6 @@ static void Adlib_fini (AdlibState *s)
 
 int Adlib_init (qemu_irq *pic)
 {
-    AudioState *audio = AUD_init();
     AdlibState *s = &glob_adlib;
     struct audsettings as;
 
@@ -308,7 +307,7 @@ int Adlib_init (qemu_irq *pic)
     as.fmt = AUD_FMT_S16;
     as.endianness = AUDIO_HOST_ENDIANNESS;
 
-    AUD_register_card (audio, "adlib", &s->card);
+    AUD_register_card ("adlib", &s->card);
 
     s->voice = AUD_open_out (
         &s->card,
diff --git a/hw/cs4231a.c b/hw/cs4231a.c
index 4212ed1..33c9460 100644
--- a/hw/cs4231a.c
+++ b/hw/cs4231a.c
@@ -638,7 +638,6 @@ static int cs_load(QEMUFile *f, void *opaque, int version_id)
 
 int cs4231a_init (qemu_irq *pic)
 {
-    AudioState *audio = AUD_init();
     int i;
     CSState *s;
 
@@ -660,6 +659,6 @@ int cs4231a_init (qemu_irq *pic)
     qemu_register_reset (cs_reset, s);
     cs_reset (s);
 
-    AUD_register_card (audio,"cs4231a", &s->card);
+    AUD_register_card ("cs4231a", &s->card);
     return 0;
 }
diff --git a/hw/es1370.c b/hw/es1370.c
index 99ee208..6589547 100644
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -1007,7 +1007,6 @@ static void es1370_on_reset (void *opaque)
 
 int es1370_init (PCIBus *bus)
 {
-    AudioState *audio = AUD_init();
     PCIES1370State *d;
     ES1370State *s;
     uint8_t *c;
@@ -1058,7 +1057,7 @@ int es1370_init (PCIBus *bus)
     register_savevm ("es1370", 0, 2, es1370_save, es1370_load, s);
     qemu_register_reset (es1370_on_reset, s);
 
-    AUD_register_card (audio, "es1370", &s->card);
+    AUD_register_card ("es1370", &s->card);
     es1370_reset (s);
     return 0;
 }
diff --git a/hw/gus.c b/hw/gus.c
index 44f3e25..8915d43 100644
--- a/hw/gus.c
+++ b/hw/gus.c
@@ -252,13 +252,12 @@ static int GUS_load (QEMUFile *f, void *opaque, int version_id)
 
 int GUS_init (qemu_irq *pic)
 {
-    AudioState *audio = AUD_init();
     GUSState *s;
     struct audsettings as;
 
     s = qemu_mallocz (sizeof (*s));
 
-    AUD_register_card (audio, "gus", &s->card);
+    AUD_register_card ("gus", &s->card);
 
     as.freq = conf.freq;
     as.nchannels = 2;
diff --git a/hw/omap2.c b/hw/omap2.c
index 82ea618..8aaa9c9 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -1973,7 +1973,7 @@ struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta,
     omap_eac_reset(s);
 
 #ifdef HAS_AUDIO
-    AUD_register_card(AUD_init(), "OMAP EAC", &s->codec.card);
+    AUD_register_card("OMAP EAC", &s->codec.card);
 
     iomemtype = cpu_register_io_memory(0, omap_eac_readfn,
                     omap_eac_writefn, s);
diff --git a/hw/pcspk.c b/hw/pcspk.c
index 0dad161..26a0ecb 100644
--- a/hw/pcspk.c
+++ b/hw/pcspk.c
@@ -98,11 +98,10 @@ static void pcspk_callback(void *opaque, int free)
 
 int pcspk_audio_init(qemu_irq *pic)
 {
-    AudioState *audio = AUD_init();
     PCSpkState *s = &pcspk_state;
     struct audsettings as = {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0};
 
-    AUD_register_card(audio, s_spk, &s->card);
+    AUD_register_card(s_spk, &s->card);
 
     s->voice = AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback, &as);
     if (!s->voice) {
diff --git a/hw/sb16.c b/hw/sb16.c
index 32e6a28..218c0ba 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -1400,7 +1400,6 @@ static int SB_load (QEMUFile *f, void *opaque, int version_id)
 
 int SB16_init (qemu_irq *pic)
 {
-    AudioState *audio = AUD_init();
     SB16State *s;
     int i;
     static const uint8_t dsp_write_ports[] = {0x6, 0xc};
@@ -1447,6 +1446,6 @@ int SB16_init (qemu_irq *pic)
     s->can_write = 1;
 
     register_savevm ("sb16", 0, 1, SB_save, SB_load, s);
-    AUD_register_card (audio, "sb16", &s->card);
+    AUD_register_card ("sb16", &s->card);
     return 0;
 }
diff --git a/hw/tsc210x.c b/hw/tsc210x.c
index 316156d..16874e0 100644
--- a/hw/tsc210x.c
+++ b/hw/tsc210x.c
@@ -82,7 +82,6 @@ typedef struct {
     SWVoiceOut *dac_voice[1];
     int i2s_rx_rate;
     int i2s_tx_rate;
-    AudioState *audio;
 
     int tr[8];
 
@@ -1117,7 +1116,6 @@ uWireSlave *tsc2102_init(qemu_irq pint)
     s->pint = pint;
     s->model = 0x2102;
     s->name = "tsc2102";
-    s->audio = AUD_init();;
 
     s->tr[0] = 0;
     s->tr[1] = 1;
@@ -1143,7 +1141,7 @@ uWireSlave *tsc2102_init(qemu_irq pint)
     qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1,
                     "QEMU TSC2102-driven Touchscreen");
 
-    AUD_register_card(s->audio, s->name, &s->card);
+    AUD_register_card(s->name, &s->card);
 
     qemu_register_reset((void *) tsc210x_reset, s);
     register_savevm(s->name, -1, 0,
@@ -1169,7 +1167,6 @@ uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq kbirq, qemu_irq dav)
     s->davint = dav;
     s->model = 0x2301;
     s->name = "tsc2301";
-    s->audio = AUD_init();
 
     s->tr[0] = 0;
     s->tr[1] = 1;
@@ -1195,7 +1192,7 @@ uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq kbirq, qemu_irq dav)
     qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1,
                     "QEMU TSC2301-driven Touchscreen");
 
-    AUD_register_card(s->audio, s->name, &s->card);
+    AUD_register_card(s->name, &s->card);
 
     qemu_register_reset((void *) tsc210x_reset, s);
     register_savevm(s->name, -1, 0, tsc210x_save, tsc210x_load, s);
diff --git a/hw/wm8750.c b/hw/wm8750.c
index 3a428c6..bb5106d 100644
--- a/hw/wm8750.c
+++ b/hw/wm8750.c
@@ -647,14 +647,13 @@ static int wm8750_load(QEMUFile *f, void *opaque, int version_id)
 
 i2c_slave *wm8750_init(i2c_bus *bus)
 {
-    AudioState *audio = AUD_init();
     WM8750State *s = (WM8750State *)
             i2c_slave_init(bus, 0, sizeof(WM8750State));
     s->i2c.event = wm8750_event;
     s->i2c.recv = wm8750_rx;
     s->i2c.send = wm8750_tx;
 
-    AUD_register_card(audio, CODEC, &s->card);
+    AUD_register_card(CODEC, &s->card);
     wm8750_reset(&s->i2c);
 
     register_savevm(CODEC, -1, 0, wm8750_save, wm8750_load, s);