Merge remote branch 'kwolf/for-anthony' into staging

[qemu.git] / hw / mips.h

diff --git a/hw/mips.h b/hw/mips.h
index e75fea7228fb882f730266603003d71056203c76..617ea103c0888793408f16ba9e7ed2938d95c01e 100644 (file)
--- a/hw/mips.h
+++ b/hw/mips.h
@@ -5,30 +5,27 @@
 /* gt64xxx.c */
 PCIBus *pci_gt64120_init(qemu_irq *pic);
 
+/* bonito.c */
+PCIBus *bonito_init(qemu_irq *pic);
+
 /* ds1225y.c */
-void *ds1225y_init(a_target_phys_addr mem_base, const char *filename);
+void *ds1225y_init(target_phys_addr_t mem_base, const char *filename);
 void ds1225y_set_protection(void *opaque, int protection);
 
 /* g364fb.c */
-int g364fb_mm_init(a_target_phys_addr vram_base,
-                   a_target_phys_addr ctrl_base, int it_shift,
+int g364fb_mm_init(target_phys_addr_t vram_base,
+                   target_phys_addr_t ctrl_base, int it_shift,
                    qemu_irq irq);
 
 /* mipsnet.c */
 void mipsnet_init(int base, qemu_irq irq, NICInfo *nd);
 
 /* jazz_led.c */
-extern void jazz_led_init(a_target_phys_addr base);
-
-/* mips_int.c */
-extern void cpu_mips_irq_init_cpu(CPUState *env);
-
-/* mips_timer.c */
-extern void cpu_mips_clock_init(CPUState *);
+extern void jazz_led_init(target_phys_addr_t base);
 
 /* rc4030.c */
 typedef struct rc4030DMAState *rc4030_dma;
-void rc4030_dma_memory_rw(void *opaque, a_target_phys_addr addr, uint8_t *buf, int len, int is_write);
+void rc4030_dma_memory_rw(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write);
 void rc4030_dma_read(void *dma, uint8_t *buf, int len);
 void rc4030_dma_write(void *dma, uint8_t *buf, int len);
 
@@ -36,8 +33,8 @@ void *rc4030_init(qemu_irq timer, qemu_irq jazz_bus,
                   qemu_irq **irqs, rc4030_dma **dmas);
 
 /* dp8393x.c */
-void dp83932_init(NICInfo *nd, a_target_phys_addr base, int it_shift,
+void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
                   qemu_irq irq, void* mem_opaque,
-                  void (*memory_rw)(void *opaque, a_target_phys_addr addr, uint8_t *buf, int len, int is_write));
+                  void (*memory_rw)(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write));
 
 #endif