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/axis_dev88.c | |
| parent | 99a0949b720a0936da2052cb9a46db04ffc6db29 (diff) | |
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/axis_dev88.c')
| -rw-r--r-- | hw/axis_dev88.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index 5ceb653920..81a41c9446 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -44,7 +44,7 @@ struct nand_state_t }; static struct nand_state_t nand_state; -static uint32_t nand_readl (void *opaque, a_target_phys_addr addr) +static uint32_t nand_readl (void *opaque, target_phys_addr_t addr) { struct nand_state_t *s = opaque; uint32_t r; @@ -59,7 +59,7 @@ static uint32_t nand_readl (void *opaque, a_target_phys_addr addr) } static void -nand_writel (void *opaque, a_target_phys_addr addr, uint32_t value) +nand_writel (void *opaque, target_phys_addr_t addr, uint32_t value) { struct nand_state_t *s = opaque; int rdy; @@ -168,7 +168,7 @@ static struct gpio_state_t uint32_t regs[0x5c / 4]; } gpio_state; -static uint32_t gpio_readl (void *opaque, a_target_phys_addr addr) +static uint32_t gpio_readl (void *opaque, target_phys_addr_t addr) { struct gpio_state_t *s = opaque; uint32_t r = 0; @@ -197,7 +197,7 @@ static uint32_t gpio_readl (void *opaque, a_target_phys_addr addr) D(printf("%s %x=%x\n", __func__, addr, r)); } -static void gpio_writel (void *opaque, a_target_phys_addr addr, uint32_t value) +static void gpio_writel (void *opaque, target_phys_addr_t addr, uint32_t value) { struct gpio_state_t *s = opaque; D(printf("%s %x=%x\n", __func__, addr, value)); @@ -250,7 +250,7 @@ static void main_cpu_reset(void *opaque) } static -void axisdev88_init (a_ram_addr ram_size, +void axisdev88_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) @@ -265,8 +265,8 @@ void axisdev88_init (a_ram_addr ram_size, int i; int nand_regs; int gpio_regs; - a_ram_addr phys_ram; - a_ram_addr phys_intmem; + ram_addr_t phys_ram; + ram_addr_t phys_intmem; /* init CPUs */ if (cpu_model == NULL) { |