Support marking a device as non-migratable

[qemu.git] / hw / adlib.c

diff --git a/hw/adlib.c b/hw/adlib.c
index 8c2331955bf403f3aae84ed937825a9a70171b79..1d8092baca729615debf6c44510e19e084cceec5 100644 (file)
--- a/hw/adlib.c
+++ b/hw/adlib.c
@@ -115,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;
@@ -133,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;
@@ -165,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
@@ -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,