Make audio violate POSIX less

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5864 c046a42c-6fe2-441c-8c8c-71466251a162

10 files changed, 15 insertions, 15 deletions

diff --git a/hw/ac97.c b/hw/ac97.c
index 55c65df4fc..c30e894074 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -354,7 +354,7 @@ static uint16_t mixer_load (AC97LinkState *s, uint32_t i)
 
 static void open_voice (AC97LinkState *s, int index, int freq)
 {
-    audsettings_t as;
+    struct audsettings as;
 
     as.freq = freq;
     as.nchannels = 2;
diff --git a/hw/adlib.c b/hw/adlib.c
index 7a9c2e7f5c..3c1436032d 100644
--- a/hw/adlib.c
+++ b/hw/adlib.c
@@ -280,7 +280,7 @@ static void Adlib_fini (AdlibState *s)
 int Adlib_init (AudioState *audio, qemu_irq *pic)
 {
     AdlibState *s = &glob_adlib;
-    audsettings_t as;
+    struct audsettings as;
 
     if (!audio) {
         dolog ("No audio state\n");
diff --git a/hw/cs4231a.c b/hw/cs4231a.c
index 75529089f6..6d04d367b1 100644
--- a/hw/cs4231a.c
+++ b/hw/cs4231a.c
@@ -268,7 +268,7 @@ static void cs_audio_callback (void *opaque, int free)
 static void cs_reset_voices (CSState *s, uint32_t val)
 {
     int xtal;
-    audsettings_t as;
+    struct audsettings as;
 
 #ifdef DEBUG_XLAW
     if (val == 0 || val == 32)
diff --git a/hw/es1370.c b/hw/es1370.c
index a2a017bd5f..bad237d21f 100644
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -421,7 +421,7 @@ static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl)
                     (new_fmt & 2) ? AUD_FMT_S16 : AUD_FMT_U8,
                     d->shift);
             if (new_freq) {
-                audsettings_t as;
+                struct audsettings as;
 
                 as.freq = new_freq;
                 as.nchannels = 1 << (new_fmt & 1);
diff --git a/hw/gus.c b/hw/gus.c
index 0ab55a63b5..fb129cd49d 100644
--- a/hw/gus.c
+++ b/hw/gus.c
@@ -253,7 +253,7 @@ static int GUS_load (QEMUFile *f, void *opaque, int version_id)
 int GUS_init (AudioState *audio, qemu_irq *pic)
 {
     GUSState *s;
-    audsettings_t as;
+    struct audsettings as;
 
     if (!audio) {
         dolog ("No audio state\n");
diff --git a/hw/omap2.c b/hw/omap2.c
index aee26a0296..58debaf552 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -1610,7 +1610,7 @@ static void omap_eac_volume_update(struct omap_eac_s *s)
 
 static void omap_eac_format_update(struct omap_eac_s *s)
 {
-    audsettings_t fmt;
+    struct audsettings fmt;
 
     /* The hardware buffers at most one sample */
     if (s->codec.rxlen)
diff --git a/hw/pcspk.c b/hw/pcspk.c
index 9bb248b807..ec1d0c687c 100644
--- a/hw/pcspk.c
+++ b/hw/pcspk.c
@@ -99,7 +99,7 @@ static void pcspk_callback(void *opaque, int free)
 int pcspk_audio_init(AudioState *audio, qemu_irq *pic)
 {
     PCSpkState *s = &pcspk_state;
-    audsettings_t as = {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0};
+    struct audsettings as = {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0};
 
     if (!audio) {
         AUD_log(s_spk, "No audio state\n");
diff --git a/hw/sb16.c b/hw/sb16.c
index c22de7a715..8a0fafe63f 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -201,7 +201,7 @@ static void aux_timer (void *opaque)
 static void continue_dma8 (SB16State *s)
 {
     if (s->freq > 0) {
-        audsettings_t as;
+        struct audsettings as;
 
         s->audio_free = 0;
 
@@ -346,7 +346,7 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t d0, int dma_len)
     }
 
     if (s->freq) {
-        audsettings_t as;
+        struct audsettings as;
 
         s->audio_free = 0;
 
@@ -833,7 +833,7 @@ static void complete (SB16State *s)
 
 static void legacy_reset (SB16State *s)
 {
-    audsettings_t as;
+    struct audsettings as;
 
     s->freq = 11025;
     s->fmt_signed = 0;
@@ -1375,7 +1375,7 @@ static int SB_load (QEMUFile *f, void *opaque, int version_id)
 
     if (s->dma_running) {
         if (s->freq) {
-            audsettings_t as;
+            struct audsettings as;
 
             s->audio_free = 0;
 
diff --git a/hw/tsc210x.c b/hw/tsc210x.c
index 0ae48f73b0..2d31c65398 100644
--- a/hw/tsc210x.c
+++ b/hw/tsc210x.c
@@ -327,7 +327,7 @@ static void tsc2102_audio_rate_update(struct tsc210x_state_s *s)
 static void tsc2102_audio_output_update(struct tsc210x_state_s *s)
 {
     int enable;
-    audsettings_t fmt;
+    struct audsettings fmt;
 
     if (s->dac_voice[0]) {
         tsc210x_out_flush(s, s->codec.out.len);
diff --git a/hw/wm8750.c b/hw/wm8750.c
index e35492408c..93fa6d7ff6 100644
--- a/hw/wm8750.c
+++ b/hw/wm8750.c
@@ -170,9 +170,9 @@ static void wm8750_vol_update(struct wm8750_s *s)
 static void wm8750_set_format(struct wm8750_s *s)
 {
     int i;
-    audsettings_t in_fmt;
-    audsettings_t out_fmt;
-    audsettings_t monoout_fmt;
+    struct audsettings in_fmt;
+    struct audsettings out_fmt;
+    struct audsettings monoout_fmt;
 
     wm8750_out_flush(s);