ESP: Add it_shift parameter (Hervé Poussineau)

[qemu.git] / hw / sun4m.h

diff --git a/hw/sun4m.h b/hw/sun4m.h
index 4b27d864726541ca0d56f4316b06efabe22b60f9..212e30d0f8eb2f2c08b1907540f0433296e8869c 100644 (file)
--- a/hw/sun4m.h
+++ b/hw/sun4m.h
@@ -54,15 +54,11 @@ 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, qemu_irq **fdc_tc);
 void slavio_set_power_fail(void *opaque, int power_failing);
 
-/* esp.c */
-#define ESP_MAX_DEVS 7
-void esp_scsi_attach(void *opaque, BlockDriverState *bd, int id);
-void *esp_init(target_phys_addr_t espaddr,
-               void *dma_opaque, qemu_irq irq, qemu_irq *reset);
-
 /* cs4231.c */
 void cs_init(target_phys_addr_t base, int irq, void *intctl);
 
@@ -81,6 +77,6 @@ void lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque,
                 qemu_irq irq, qemu_irq *reset);
 
 /* eccmemctl.c */
-void *ecc_init(target_phys_addr_t base, uint32_t version);
+void *ecc_init(target_phys_addr_t base, qemu_irq irq, uint32_t version);
 
 #endif