From c227f0995e1722a1abccc28cadf0664266bd8043 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Thu, 1 Oct 2009 16:12:16 -0500 Subject: Revert "Get rid of _t suffix" In the very least, a change like this requires discussion on the list. The naming convention is goofy and it causes a massive merge problem. Something like this _must_ be presented on the list first so people can provide input and cope with it. This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29. Signed-off-by: Anthony Liguori --- hw/xilinx.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/xilinx.h') diff --git a/hw/xilinx.h b/hw/xilinx.h index a128f9cd9..070679c24 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -3,7 +3,7 @@ qemu_irq *microblaze_pic_init_cpu(CPUState *env); static inline DeviceState * -xilinx_intc_create(a_target_phys_addr base, qemu_irq irq, int kind_of_intr) +xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr) { DeviceState *dev; @@ -17,7 +17,7 @@ xilinx_intc_create(a_target_phys_addr base, qemu_irq irq, int kind_of_intr) /* OPB Timer/Counter. */ static inline DeviceState * -xilinx_timer_create(a_target_phys_addr base, qemu_irq irq, int nr, int freq) +xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int nr, int freq) { DeviceState *dev; @@ -32,7 +32,7 @@ xilinx_timer_create(a_target_phys_addr base, qemu_irq irq, int nr, int freq) /* XPS Ethernet Lite MAC. */ static inline DeviceState * -xilinx_ethlite_create(NICInfo *nd, a_target_phys_addr base, qemu_irq irq, +xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq, int txpingpong, int rxpingpong) { DeviceState *dev; -- cgit v1.2.3