summaryrefslogtreecommitdiff
path: root/hw/mainstone.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-10-01 16:12:16 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-01 16:12:16 -0500
commit76f1a06508ba2ae3766b2e885a3acd4fc0f3377b (patch)
tree39e92c2f818e3e8144978740b914731613af0e40 /hw/mainstone.c
parent5be86926c66310373ee0f25efc9e151f2390201e (diff)
downloadqemu-76f1a06508ba2ae3766b2e885a3acd4fc0f3377b.tar.gz
qemu-76f1a06508ba2ae3766b2e885a3acd4fc0f3377b.tar.bz2
qemu-76f1a06508ba2ae3766b2e885a3acd4fc0f3377b.zip
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/mainstone.c')
-rw-r--r--hw/mainstone.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 74d81021d9..3e517f0704 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -68,13 +68,13 @@ static struct arm_boot_info mainstone_binfo = {
.ram_size = 0x04000000,
};
-static void mainstone_common_init(a_ram_addr ram_size,
+static void mainstone_common_init(ram_addr_t ram_size,
const char *kernel_filename,
const char *kernel_cmdline, const char *initrd_filename,
const char *cpu_model, enum mainstone_model_e model, int arm_id)
{
uint32_t sector_len = 256 * 1024;
- a_target_phys_addr mainstone_flash_base[] = { MST_FLASH_0, MST_FLASH_1 };
+ target_phys_addr_t mainstone_flash_base[] = { MST_FLASH_0, MST_FLASH_1 };
PXA2xxState *cpu;
qemu_irq *mst_irq;
DriveInfo *dinfo;
@@ -127,7 +127,7 @@ static void mainstone_common_init(a_ram_addr ram_size,
arm_load_kernel(cpu->env, &mainstone_binfo);
}
-static void mainstone_init(a_ram_addr ram_size,
+static void mainstone_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)