[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/27] tosa: Rename PXA2xxState variable
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 06/27] tosa: Rename PXA2xxState variable |
Date: |
Mon, 11 Jun 2012 02:00:38 +0200 |
Avoid cpu->cpu by using "mpu" as variable name.
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Peter Maydell <address@hidden>
---
hw/tosa.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/tosa.c b/hw/tosa.c
index d1ede8d..8bae80d 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -212,14 +212,14 @@ static void tosa_init(ram_addr_t ram_size,
{
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *rom = g_new(MemoryRegion, 1);
- PXA2xxState *cpu;
+ PXA2xxState *mpu;
TC6393xbState *tmio;
DeviceState *scp0, *scp1;
if (!cpu_model)
cpu_model = "pxa255";
- cpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
+ mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
memory_region_init_ram(rom, "tosa.rom", TOSA_ROM);
vmstate_register_ram_global(rom);
@@ -227,22 +227,22 @@ static void tosa_init(ram_addr_t ram_size,
memory_region_add_subregion(address_space_mem, 0, rom);
tmio = tc6393xb_init(address_space_mem, 0x10000000,
- qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_TC6393XB_INT));
+ qdev_get_gpio_in(mpu->gpio, TOSA_GPIO_TC6393XB_INT));
scp0 = sysbus_create_simple("scoop", 0x08800000, NULL);
scp1 = sysbus_create_simple("scoop", 0x14800040, NULL);
- tosa_gpio_setup(cpu, scp0, scp1, tmio);
+ tosa_gpio_setup(mpu, scp0, scp1, tmio);
- tosa_microdrive_attach(cpu);
+ tosa_microdrive_attach(mpu);
- tosa_tg_init(cpu);
+ tosa_tg_init(mpu);
tosa_binfo.kernel_filename = kernel_filename;
tosa_binfo.kernel_cmdline = kernel_cmdline;
tosa_binfo.initrd_filename = initrd_filename;
tosa_binfo.board_id = 0x208;
- arm_load_kernel(&cpu->cpu->env, &tosa_binfo);
+ arm_load_kernel(&mpu->cpu->env, &tosa_binfo);
sl_bootparam_write(SL_PXA_PARAM_BASE);
}
--
1.7.7
- [Qemu-devel] [PULL] QOM CPUState, part 3a: cleanups & preparations, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 01/27] nseries: Rename n800_s::cpu to mpu, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 02/27] omap_sx1: Rename omap_mpu_state_s variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 04/27] mainstone: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 05/27] spitz: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 06/27] tosa: Rename PXA2xxState variable,
Andreas Färber <=
- [Qemu-devel] [PATCH 03/27] palm: Rename omap_mpu_state_s variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 07/27] z2: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 09/27] integratorcp: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 15/27] vexpress: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 14/27] realview: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 11/27] versatilepb: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 10/27] musicpal: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 08/27] strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 21/27] arm_boot: Pass ARMCPU to arm_load_kernel(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 16/27] exynos4210: Use cpu_arm_init() to store ARMCPU, Andreas Färber, 2012/06/10