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/pckbd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'hw/pckbd.c') diff --git a/hw/pckbd.c b/hw/pckbd.c index 57f6668bbc..c049047aea 100644 --- a/hw/pckbd.c +++ b/hw/pckbd.c @@ -123,7 +123,7 @@ typedef struct KBDState { qemu_irq irq_kbd; qemu_irq irq_mouse; - a_target_phys_addr mask; + target_phys_addr_t mask; } KBDState; static KBDState kbd_state; @@ -354,7 +354,7 @@ static const VMStateDescription vmstate_kbd = { }; /* Memory mapped interface */ -static uint32_t kbd_mm_readb (void *opaque, a_target_phys_addr addr) +static uint32_t kbd_mm_readb (void *opaque, target_phys_addr_t addr) { KBDState *s = opaque; @@ -364,7 +364,7 @@ static uint32_t kbd_mm_readb (void *opaque, a_target_phys_addr addr) return kbd_read_data(s, 0) & 0xff; } -static void kbd_mm_writeb (void *opaque, a_target_phys_addr addr, uint32_t value) +static void kbd_mm_writeb (void *opaque, target_phys_addr_t addr, uint32_t value) { KBDState *s = opaque; @@ -387,8 +387,8 @@ static CPUWriteMemoryFunc * const kbd_mm_write[] = { }; void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, - a_target_phys_addr base, a_ram_addr size, - a_target_phys_addr mask) + target_phys_addr_t base, ram_addr_t size, + target_phys_addr_t mask) { KBDState *s = &kbd_state; int s_io_memory; -- cgit v1.2.1