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/slavio_misc.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'hw/slavio_misc.c') diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index fdcdc24911..ca95b10581 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -109,7 +109,7 @@ static void slavio_set_power_fail(void *opaque, int irq, int power_failing) slavio_misc_update_irq(s); } -static void slavio_cfg_mem_writeb(void *opaque, a_target_phys_addr addr, +static void slavio_cfg_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { MiscState *s = opaque; @@ -119,7 +119,7 @@ static void slavio_cfg_mem_writeb(void *opaque, a_target_phys_addr addr, slavio_misc_update_irq(s); } -static uint32_t slavio_cfg_mem_readb(void *opaque, a_target_phys_addr addr) +static uint32_t slavio_cfg_mem_readb(void *opaque, target_phys_addr_t addr) { MiscState *s = opaque; uint32_t ret = 0; @@ -141,7 +141,7 @@ static CPUWriteMemoryFunc * const slavio_cfg_mem_write[3] = { NULL, }; -static void slavio_diag_mem_writeb(void *opaque, a_target_phys_addr addr, +static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { MiscState *s = opaque; @@ -150,7 +150,7 @@ static void slavio_diag_mem_writeb(void *opaque, a_target_phys_addr addr, s->diag = val & 0xff; } -static uint32_t slavio_diag_mem_readb(void *opaque, a_target_phys_addr addr) +static uint32_t slavio_diag_mem_readb(void *opaque, target_phys_addr_t addr) { MiscState *s = opaque; uint32_t ret = 0; @@ -172,7 +172,7 @@ static CPUWriteMemoryFunc * const slavio_diag_mem_write[3] = { NULL, }; -static void slavio_mdm_mem_writeb(void *opaque, a_target_phys_addr addr, +static void slavio_mdm_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { MiscState *s = opaque; @@ -181,7 +181,7 @@ static void slavio_mdm_mem_writeb(void *opaque, a_target_phys_addr addr, s->mctrl = val & 0xff; } -static uint32_t slavio_mdm_mem_readb(void *opaque, a_target_phys_addr addr) +static uint32_t slavio_mdm_mem_readb(void *opaque, target_phys_addr_t addr) { MiscState *s = opaque; uint32_t ret = 0; @@ -203,7 +203,7 @@ static CPUWriteMemoryFunc * const slavio_mdm_mem_write[3] = { NULL, }; -static void slavio_aux1_mem_writeb(void *opaque, a_target_phys_addr addr, +static void slavio_aux1_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { MiscState *s = opaque; @@ -220,7 +220,7 @@ static void slavio_aux1_mem_writeb(void *opaque, a_target_phys_addr addr, s->aux1 = val & 0xff; } -static uint32_t slavio_aux1_mem_readb(void *opaque, a_target_phys_addr addr) +static uint32_t slavio_aux1_mem_readb(void *opaque, target_phys_addr_t addr) { MiscState *s = opaque; uint32_t ret = 0; @@ -243,7 +243,7 @@ static CPUWriteMemoryFunc * const slavio_aux1_mem_write[3] = { NULL, }; -static void slavio_aux2_mem_writeb(void *opaque, a_target_phys_addr addr, +static void slavio_aux2_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { MiscState *s = opaque; @@ -259,7 +259,7 @@ static void slavio_aux2_mem_writeb(void *opaque, a_target_phys_addr addr, slavio_misc_update_irq(s); } -static uint32_t slavio_aux2_mem_readb(void *opaque, a_target_phys_addr addr) +static uint32_t slavio_aux2_mem_readb(void *opaque, target_phys_addr_t addr) { MiscState *s = opaque; uint32_t ret = 0; @@ -282,7 +282,7 @@ static CPUWriteMemoryFunc * const slavio_aux2_mem_write[3] = { NULL, }; -static void apc_mem_writeb(void *opaque, a_target_phys_addr addr, uint32_t val) +static void apc_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { APCState *s = opaque; @@ -290,7 +290,7 @@ static void apc_mem_writeb(void *opaque, a_target_phys_addr addr, uint32_t val) qemu_irq_raise(s->cpu_halt); } -static uint32_t apc_mem_readb(void *opaque, a_target_phys_addr addr) +static uint32_t apc_mem_readb(void *opaque, target_phys_addr_t addr) { uint32_t ret = 0; @@ -310,7 +310,7 @@ static CPUWriteMemoryFunc * const apc_mem_write[3] = { NULL, }; -static uint32_t slavio_sysctrl_mem_readl(void *opaque, a_target_phys_addr addr) +static uint32_t slavio_sysctrl_mem_readl(void *opaque, target_phys_addr_t addr) { MiscState *s = opaque; uint32_t ret = 0; @@ -326,7 +326,7 @@ static uint32_t slavio_sysctrl_mem_readl(void *opaque, a_target_phys_addr addr) return ret; } -static void slavio_sysctrl_mem_writel(void *opaque, a_target_phys_addr addr, +static void slavio_sysctrl_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val) { MiscState *s = opaque; @@ -356,7 +356,7 @@ static CPUWriteMemoryFunc * const slavio_sysctrl_mem_write[3] = { slavio_sysctrl_mem_writel, }; -static uint32_t slavio_led_mem_readw(void *opaque, a_target_phys_addr addr) +static uint32_t slavio_led_mem_readw(void *opaque, target_phys_addr_t addr) { MiscState *s = opaque; uint32_t ret = 0; @@ -372,7 +372,7 @@ static uint32_t slavio_led_mem_readw(void *opaque, a_target_phys_addr addr) return ret; } -static void slavio_led_mem_writew(void *opaque, a_target_phys_addr addr, +static void slavio_led_mem_writew(void *opaque, target_phys_addr_t addr, uint32_t val) { MiscState *s = opaque; -- cgit v1.2.1