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/sh_timer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'hw/sh_timer.c') diff --git a/hw/sh_timer.c b/hw/sh_timer.c index 057a5076ce..fd2146a0c9 100644 --- a/hw/sh_timer.c +++ b/hw/sh_timer.c @@ -57,7 +57,7 @@ static void sh_timer_update(sh_timer_state *s) s->int_level = new_level; } -static uint32_t sh_timer_read(void *opaque, a_target_phys_addr offset) +static uint32_t sh_timer_read(void *opaque, target_phys_addr_t offset) { sh_timer_state *s = (sh_timer_state *)opaque; @@ -77,7 +77,7 @@ static uint32_t sh_timer_read(void *opaque, a_target_phys_addr offset) } } -static void sh_timer_write(void *opaque, a_target_phys_addr offset, +static void sh_timer_write(void *opaque, target_phys_addr_t offset, uint32_t value) { sh_timer_state *s = (sh_timer_state *)opaque; @@ -217,7 +217,7 @@ typedef struct { int feat; } tmu012_state; -static uint32_t tmu012_read(void *opaque, a_target_phys_addr offset) +static uint32_t tmu012_read(void *opaque, target_phys_addr_t offset) { tmu012_state *s = (tmu012_state *)opaque; @@ -247,7 +247,7 @@ static uint32_t tmu012_read(void *opaque, a_target_phys_addr offset) return 0; } -static void tmu012_write(void *opaque, a_target_phys_addr offset, +static void tmu012_write(void *opaque, target_phys_addr_t offset, uint32_t value) { tmu012_state *s = (tmu012_state *)opaque; @@ -303,7 +303,7 @@ static CPUWriteMemoryFunc * const tmu012_writefn[] = { tmu012_write }; -void tmu012_init(a_target_phys_addr base, int feat, uint32_t freq, +void tmu012_init(target_phys_addr_t base, int feat, uint32_t freq, qemu_irq ch0_irq, qemu_irq ch1_irq, qemu_irq ch2_irq0, qemu_irq ch2_irq1) { -- cgit v1.2.3-55-g7522