qxl: replace panic with guest bug in qxl_track_command

[qemu.git] / hw / mcf.h

diff --git a/hw/mcf.h b/hw/mcf.h
index edf25754b640bfd24eb270f94a95f4e99397d5c0..19a8b547785d5061182932341b33a8d038fa6fb7 100644 (file)
--- a/hw/mcf.h
+++ b/hw/mcf.h
@@ -2,20 +2,29 @@
 #define HW_MCF_H
 /* Motorola ColdFire device prototypes.  */
 
+struct MemoryRegion;
+
 /* 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);
+uint64_t mcf_uart_read(void *opaque, target_phys_addr_t addr,
+                       unsigned size);
+void mcf_uart_write(void *opaque, target_phys_addr_t addr,
+                    uint64_t val, unsigned size);
 void *mcf_uart_init(qemu_irq irq, CharDriverState *chr);
-void mcf_uart_mm_init(a_target_phys_addr base, qemu_irq irq,
-                      CharDriverState *chr);
+void mcf_uart_mm_init(struct MemoryRegion *sysmem,
+                      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(struct MemoryRegion *sysmem,
+                        target_phys_addr_t base,
+                        CPUM68KState *env);
 
 /* mcf_fec.c */
-void mcf_fec_init(NICInfo *nd, a_target_phys_addr base, qemu_irq *irq);
+void mcf_fec_init(struct MemoryRegion *sysmem, NICInfo *nd,
+                  target_phys_addr_t base, qemu_irq *irq);
 
 /* mcf5206.c */
-qemu_irq *mcf5206_init(uint32_t base, CPUState *env);
+qemu_irq *mcf5206_init(struct MemoryRegion *sysmem,
+                       uint32_t base, CPUM68KState *env);
 
 #endif