Merge remote-tracking branch 'spice/spice.v39' into staging

[qemu.git] / hw / mcf.h

diff --git a/hw/mcf.h b/hw/mcf.h
index edf25754b640bfd24eb270f94a95f4e99397d5c0..91f2821f1f2eb158dc811cb0b625be205fcfa359 100644 (file)
--- a/hw/mcf.h
+++ b/hw/mcf.h
@@ -3,17 +3,17 @@
 /* Motorola ColdFire device prototypes.  */
 
 /* mcf_uart.c */
-uint32_t mcf_uart_read(void *opaque, a_target_phys_addr addr);
-void mcf_uart_write(void *opaque, a_target_phys_addr addr, uint32_t val);
+uint32_t mcf_uart_read(void *opaque, target_phys_addr_t addr);
+void mcf_uart_write(void *opaque, target_phys_addr_t addr, uint32_t val);
 void *mcf_uart_init(qemu_irq irq, CharDriverState *chr);
-void mcf_uart_mm_init(a_target_phys_addr base, qemu_irq irq,
+void mcf_uart_mm_init(target_phys_addr_t base, qemu_irq irq,
                       CharDriverState *chr);
 
 /* mcf_intc.c */
-qemu_irq *mcf_intc_init(a_target_phys_addr base, CPUState *env);
+qemu_irq *mcf_intc_init(target_phys_addr_t base, CPUState *env);
 
 /* mcf_fec.c */
-void mcf_fec_init(NICInfo *nd, a_target_phys_addr base, qemu_irq *irq);
+void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq);
 
 /* mcf5206.c */
 qemu_irq *mcf5206_init(uint32_t base, CPUState *env);