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/mcf_intc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/mcf_intc.c') diff --git a/hw/mcf_intc.c b/hw/mcf_intc.c index 35a42dc9b0..f01bd320a4 100644 --- a/hw/mcf_intc.c +++ b/hw/mcf_intc.c @@ -41,7 +41,7 @@ static void mcf_intc_update(mcf_intc_state *s) m68k_set_irq_level(s->env, best_level, s->active_vector); } -static uint32_t mcf_intc_read(void *opaque, a_target_phys_addr addr) +static uint32_t mcf_intc_read(void *opaque, target_phys_addr_t addr) { int offset; mcf_intc_state *s = (mcf_intc_state *)opaque; @@ -73,7 +73,7 @@ static uint32_t mcf_intc_read(void *opaque, a_target_phys_addr addr) } } -static void mcf_intc_write(void *opaque, a_target_phys_addr addr, uint32_t val) +static void mcf_intc_write(void *opaque, target_phys_addr_t addr, uint32_t val) { int offset; mcf_intc_state *s = (mcf_intc_state *)opaque; @@ -139,7 +139,7 @@ static CPUWriteMemoryFunc * const mcf_intc_writefn[] = { mcf_intc_write }; -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_intc_state *s; int iomemtype; -- cgit 1.4.1