Rearrange slavio_misc code to prepare for different addresses

Pass first env instead of using cpu_single_env directly
Add Aux1 to Sun4c


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

1 files changed, 3 insertions, 1 deletions

diff --git a/hw/sun4m.h b/hw/sun4m.h
index daf104b6b..484e3e860 100644
--- a/hw/sun4m.h
+++ b/hw/sun4m.h
@@ -54,7 +54,9 @@ void slavio_serial_ms_kbd_init(target_phys_addr_t base, qemu_irq irq,
 
 /* slavio_misc.c */
 void *slavio_misc_init(target_phys_addr_t base, target_phys_addr_t power_base,
-                       qemu_irq irq);
+                       target_phys_addr_t aux1_base,
+                       target_phys_addr_t aux2_base, qemu_irq irq,
+                       CPUState *env);
 void slavio_set_power_fail(void *opaque, int power_failing);
 
 /* esp.c */