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/arm_gic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'hw/arm_gic.c') diff --git a/hw/arm_gic.c b/hw/arm_gic.c index a466ba4bdf..12f5109924 100644 --- a/hw/arm_gic.c +++ b/hw/arm_gic.c @@ -238,7 +238,7 @@ static void gic_complete_irq(gic_state * s, int cpu, int irq) } } -static uint32_t gic_dist_readb(void *opaque, a_target_phys_addr offset) +static uint32_t gic_dist_readb(void *opaque, target_phys_addr_t offset) { gic_state *s = (gic_state *)opaque; uint32_t res; @@ -348,7 +348,7 @@ bad_reg: return 0; } -static uint32_t gic_dist_readw(void *opaque, a_target_phys_addr offset) +static uint32_t gic_dist_readw(void *opaque, target_phys_addr_t offset) { uint32_t val; val = gic_dist_readb(opaque, offset); @@ -356,7 +356,7 @@ static uint32_t gic_dist_readw(void *opaque, a_target_phys_addr offset) return val; } -static uint32_t gic_dist_readl(void *opaque, a_target_phys_addr offset) +static uint32_t gic_dist_readl(void *opaque, target_phys_addr_t offset) { uint32_t val; #ifdef NVIC @@ -371,7 +371,7 @@ static uint32_t gic_dist_readl(void *opaque, a_target_phys_addr offset) return val; } -static void gic_dist_writeb(void *opaque, a_target_phys_addr offset, +static void gic_dist_writeb(void *opaque, target_phys_addr_t offset, uint32_t value) { gic_state *s = (gic_state *)opaque; @@ -509,14 +509,14 @@ bad_reg: hw_error("gic_dist_writeb: Bad offset %x\n", (int)offset); } -static void gic_dist_writew(void *opaque, a_target_phys_addr offset, +static void gic_dist_writew(void *opaque, target_phys_addr_t offset, uint32_t value) { gic_dist_writeb(opaque, offset, value & 0xff); gic_dist_writeb(opaque, offset + 1, value >> 8); } -static void gic_dist_writel(void *opaque, a_target_phys_addr offset, +static void gic_dist_writel(void *opaque, target_phys_addr_t offset, uint32_t value) { gic_state *s = (gic_state *)opaque; -- cgit v1.2.3