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/armv7m.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'hw/armv7m.c') diff --git a/hw/armv7m.c b/hw/armv7m.c index 0f40b406c..a96288d0d 100644 --- a/hw/armv7m.c +++ b/hw/armv7m.c @@ -26,14 +26,14 @@ static inline uint32_t bitband_addr(void * opaque, uint32_t addr) } -static uint32_t bitband_readb(void *opaque, a_target_phys_addr offset) +static uint32_t bitband_readb(void *opaque, target_phys_addr_t offset) { uint8_t v; cpu_physical_memory_read(bitband_addr(opaque, offset), &v, 1); return (v & (1 << ((offset >> 2) & 7))) != 0; } -static void bitband_writeb(void *opaque, a_target_phys_addr offset, +static void bitband_writeb(void *opaque, target_phys_addr_t offset, uint32_t value) { uint32_t addr; @@ -49,7 +49,7 @@ static void bitband_writeb(void *opaque, a_target_phys_addr offset, cpu_physical_memory_write(addr, &v, 1); } -static uint32_t bitband_readw(void *opaque, a_target_phys_addr offset) +static uint32_t bitband_readw(void *opaque, target_phys_addr_t offset) { uint32_t addr; uint16_t mask; @@ -61,7 +61,7 @@ static uint32_t bitband_readw(void *opaque, a_target_phys_addr offset) return (v & mask) != 0; } -static void bitband_writew(void *opaque, a_target_phys_addr offset, +static void bitband_writew(void *opaque, target_phys_addr_t offset, uint32_t value) { uint32_t addr; @@ -78,7 +78,7 @@ static void bitband_writew(void *opaque, a_target_phys_addr offset, cpu_physical_memory_write(addr, (uint8_t *)&v, 2); } -static uint32_t bitband_readl(void *opaque, a_target_phys_addr offset) +static uint32_t bitband_readl(void *opaque, target_phys_addr_t offset) { uint32_t addr; uint32_t mask; @@ -90,7 +90,7 @@ static uint32_t bitband_readl(void *opaque, a_target_phys_addr offset) return (v & mask) != 0; } -static void bitband_writel(void *opaque, a_target_phys_addr offset, +static void bitband_writel(void *opaque, target_phys_addr_t offset, uint32_t value) { uint32_t addr; -- cgit v1.2.3