QError: Add QERR_KVM_MISSING_CAP

[qemu.git] / hw / adlib.c

diff --git a/hw/adlib.c b/hw/adlib.c
index 9f8f6f277e4bf91a30d63a14772837158ee939b2..1d8092baca729615debf6c44510e19e084cceec5 100644 (file)
--- a/hw/adlib.c
+++ b/hw/adlib.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 
-#include <assert.h>
 #include "hw.h"
 #include "audiodev.h"
 #include "audio/audio.h"
@@ -116,7 +115,7 @@ static void adlib_kill_timers (AdlibState *s)
     }
 }
 
-static IO_WRITE_PROTO(adlib_write)
+static IO_WRITE_PROTO (adlib_write)
 {
     AdlibState *s = opaque;
     int a = nport & 3;
@@ -134,7 +133,7 @@ static IO_WRITE_PROTO(adlib_write)
 #endif
 }
 
-static IO_READ_PROTO(adlib_read)
+static IO_READ_PROTO (adlib_read)
 {
     AdlibState *s = opaque;
     uint8_t data;
@@ -166,7 +165,7 @@ static void timer_handler (int c, double interval_Sec)
 
     s->ticking[n] = 1;
 #ifdef DEBUG
-    interval = ticks_per_sec * interval_Sec;
+    interval = get_ticks_per_sec() * interval_Sec;
     exp = qemu_get_clock (vm_clock) + interval;
     s->exp[n] = exp;
 #endif
@@ -277,16 +276,11 @@ 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)
 {
     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);
@@ -313,7 +307,7 @@ int Adlib_init (AudioState *audio, 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,