diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
| commit | c227f0995e1722a1abccc28cadf0664266bd8043 (patch) | |
| tree | 39e92c2f818e3e8144978740b914731613af0e40 /hw/mcf5208.c | |
| parent | 99a0949b720a0936da2052cb9a46db04ffc6db29 (diff) | |
| download | qemu-c227f0995e1722a1abccc28cadf0664266bd8043.tar.gz | |
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 <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mcf5208.c')
| -rw-r--r-- | hw/mcf5208.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/mcf5208.c b/hw/mcf5208.c index 46bcfe75a6..5598611462 100644 --- a/hw/mcf5208.c +++ b/hw/mcf5208.c @@ -42,7 +42,7 @@ static void m5208_timer_update(m5208_timer_state *s) qemu_irq_lower(s->irq); } -static void m5208_timer_write(void *opaque, a_target_phys_addr offset, +static void m5208_timer_write(void *opaque, target_phys_addr_t offset, uint32_t value) { m5208_timer_state *s = (m5208_timer_state *)opaque; @@ -104,7 +104,7 @@ static void m5208_timer_trigger(void *opaque) m5208_timer_update(s); } -static uint32_t m5208_timer_read(void *opaque, a_target_phys_addr addr) +static uint32_t m5208_timer_read(void *opaque, target_phys_addr_t addr) { m5208_timer_state *s = (m5208_timer_state *)opaque; switch (addr) { @@ -132,7 +132,7 @@ static CPUWriteMemoryFunc * const m5208_timer_writefn[] = { m5208_timer_write }; -static uint32_t m5208_sys_read(void *opaque, a_target_phys_addr addr) +static uint32_t m5208_sys_read(void *opaque, target_phys_addr_t addr) { switch (addr) { case 0x110: /* SDCS0 */ @@ -153,7 +153,7 @@ static uint32_t m5208_sys_read(void *opaque, a_target_phys_addr addr) } } -static void m5208_sys_write(void *opaque, a_target_phys_addr addr, +static void m5208_sys_write(void *opaque, target_phys_addr_t addr, uint32_t value) { hw_error("m5208_sys_write: Bad offset 0x%x\n", (int)addr); @@ -195,7 +195,7 @@ static void mcf5208_sys_init(qemu_irq *pic) } } -static void mcf5208evb_init(a_ram_addr ram_size, +static void mcf5208evb_init(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) @@ -203,7 +203,7 @@ static void mcf5208evb_init(a_ram_addr ram_size, CPUState *env; int kernel_size; uint64_t elf_entry; - a_target_phys_addr entry; + target_phys_addr_t entry; qemu_irq *pic; if (!cpu_model) |