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/serial.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'hw/serial.c') diff --git a/hw/serial.c b/hw/serial.c index 3a84219..6e8c6e1 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -749,14 +749,14 @@ SerialState *serial_init(int base, qemu_irq irq, int baudbase, } /* Memory mapped interface */ -static uint32_t serial_mm_readb(void *opaque, a_target_phys_addr addr) +static uint32_t serial_mm_readb(void *opaque, target_phys_addr_t addr) { SerialState *s = opaque; return serial_ioport_read(s, addr >> s->it_shift) & 0xFF; } -static void serial_mm_writeb(void *opaque, a_target_phys_addr addr, +static void serial_mm_writeb(void *opaque, target_phys_addr_t addr, uint32_t value) { SerialState *s = opaque; @@ -764,7 +764,7 @@ static void serial_mm_writeb(void *opaque, a_target_phys_addr addr, serial_ioport_write(s, addr >> s->it_shift, value & 0xFF); } -static uint32_t serial_mm_readw(void *opaque, a_target_phys_addr addr) +static uint32_t serial_mm_readw(void *opaque, target_phys_addr_t addr) { SerialState *s = opaque; uint32_t val; @@ -776,7 +776,7 @@ static uint32_t serial_mm_readw(void *opaque, a_target_phys_addr addr) return val; } -static void serial_mm_writew(void *opaque, a_target_phys_addr addr, +static void serial_mm_writew(void *opaque, target_phys_addr_t addr, uint32_t value) { SerialState *s = opaque; @@ -786,7 +786,7 @@ static void serial_mm_writew(void *opaque, a_target_phys_addr addr, serial_ioport_write(s, addr >> s->it_shift, value & 0xFFFF); } -static uint32_t serial_mm_readl(void *opaque, a_target_phys_addr addr) +static uint32_t serial_mm_readl(void *opaque, target_phys_addr_t addr) { SerialState *s = opaque; uint32_t val; @@ -798,7 +798,7 @@ static uint32_t serial_mm_readl(void *opaque, a_target_phys_addr addr) return val; } -static void serial_mm_writel(void *opaque, a_target_phys_addr addr, +static void serial_mm_writel(void *opaque, target_phys_addr_t addr, uint32_t value) { SerialState *s = opaque; @@ -820,7 +820,7 @@ static CPUWriteMemoryFunc * const serial_mm_write[] = { &serial_mm_writel, }; -SerialState *serial_mm_init (a_target_phys_addr base, int it_shift, +SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, qemu_irq irq, int baudbase, CharDriverState *chr, int ioregister) { -- cgit v1.1