[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/27] spitz: Rename PXA2xxState variable
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 05/27] spitz: Rename PXA2xxState variable |
Date: |
Mon, 11 Jun 2012 02:00:37 +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/spitz.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/hw/spitz.c b/hw/spitz.c
index 9042d44..d320633 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -884,7 +884,7 @@ static void spitz_common_init(ram_addr_t ram_size,
const char *kernel_cmdline, const char *initrd_filename,
const char *cpu_model, enum spitz_model_e model, int arm_id)
{
- PXA2xxState *cpu;
+ PXA2xxState *mpu;
DeviceState *scp0, *scp1 = NULL;
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *rom = g_new(MemoryRegion, 1);
@@ -893,9 +893,9 @@ static void spitz_common_init(ram_addr_t ram_size,
cpu_model = (model == terrier) ? "pxa270-c5" : "pxa270-c0";
/* Setup CPU & memory */
- cpu = pxa270_init(address_space_mem, spitz_binfo.ram_size, cpu_model);
+ mpu = pxa270_init(address_space_mem, spitz_binfo.ram_size, cpu_model);
- sl_flash_register(cpu, (model == spitz) ? FLASH_128M : FLASH_1024M);
+ sl_flash_register(mpu, (model == spitz) ? FLASH_128M : FLASH_1024M);
memory_region_init_ram(rom, "spitz.rom", SPITZ_ROM);
vmstate_register_ram_global(rom);
@@ -903,36 +903,36 @@ static void spitz_common_init(ram_addr_t ram_size,
memory_region_add_subregion(address_space_mem, 0, rom);
/* Setup peripherals */
- spitz_keyboard_register(cpu);
+ spitz_keyboard_register(mpu);
- spitz_ssp_attach(cpu);
+ spitz_ssp_attach(mpu);
scp0 = sysbus_create_simple("scoop", 0x10800000, NULL);
if (model != akita) {
scp1 = sysbus_create_simple("scoop", 0x08800040, NULL);
}
- spitz_scoop_gpio_setup(cpu, scp0, scp1);
+ spitz_scoop_gpio_setup(mpu, scp0, scp1);
- spitz_gpio_setup(cpu, (model == akita) ? 1 : 2);
+ spitz_gpio_setup(mpu, (model == akita) ? 1 : 2);
- spitz_i2c_setup(cpu);
+ spitz_i2c_setup(mpu);
if (model == akita)
- spitz_akita_i2c_setup(cpu);
+ spitz_akita_i2c_setup(mpu);
if (model == terrier)
/* A 6.0 GB microdrive is permanently sitting in CF slot 1. */
- spitz_microdrive_attach(cpu, 1);
+ spitz_microdrive_attach(mpu, 1);
else if (model != akita)
/* A 4.0 GB microdrive is permanently sitting in CF slot 0. */
- spitz_microdrive_attach(cpu, 0);
+ spitz_microdrive_attach(mpu, 0);
spitz_binfo.kernel_filename = kernel_filename;
spitz_binfo.kernel_cmdline = kernel_cmdline;
spitz_binfo.initrd_filename = initrd_filename;
spitz_binfo.board_id = arm_id;
- arm_load_kernel(&cpu->cpu->env, &spitz_binfo);
+ arm_load_kernel(&mpu->cpu->env, &spitz_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 <=
- [Qemu-devel] [PATCH 06/27] tosa: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [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