[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/27] palm: Rename omap_mpu_state_s variable
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 03/27] palm: Rename omap_mpu_state_s variable |
Date: |
Mon, 11 Jun 2012 02:00:35 +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/palm.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/palm.c b/hw/palm.c
index 6d81829..1375b19 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -196,7 +196,7 @@ static void palmte_init(ram_addr_t ram_size,
const char *initrd_filename, const char *cpu_model)
{
MemoryRegion *address_space_mem = get_system_memory();
- struct omap_mpu_state_s *cpu;
+ struct omap_mpu_state_s *mpu;
int flash_size = 0x00800000;
int sdram_size = palmte_binfo.ram_size;
static uint32_t cs0val = 0xffffffff;
@@ -208,7 +208,7 @@ static void palmte_init(ram_addr_t ram_size,
MemoryRegion *flash = g_new(MemoryRegion, 1);
MemoryRegion *cs = g_new(MemoryRegion, 4);
- cpu = omap310_mpu_init(address_space_mem, sdram_size, cpu_model);
+ mpu = omap310_mpu_init(address_space_mem, sdram_size, cpu_model);
/* External Flash (EMIFS) */
memory_region_init_ram(flash, "palmte.flash", flash_size);
@@ -230,11 +230,11 @@ static void palmte_init(ram_addr_t ram_size,
OMAP_CS3_SIZE);
memory_region_add_subregion(address_space_mem, OMAP_CS3_BASE, &cs[3]);
- palmte_microwire_setup(cpu);
+ palmte_microwire_setup(mpu);
- qemu_add_kbd_event_handler(palmte_button_event, cpu);
+ qemu_add_kbd_event_handler(palmte_button_event, mpu);
- palmte_gpio_setup(cpu);
+ palmte_gpio_setup(mpu);
/* Setup initial (reset) machine state */
if (nb_option_roms) {
@@ -265,7 +265,7 @@ static void palmte_init(ram_addr_t ram_size,
palmte_binfo.kernel_filename = kernel_filename;
palmte_binfo.kernel_cmdline = kernel_cmdline;
palmte_binfo.initrd_filename = initrd_filename;
- arm_load_kernel(&cpu->cpu->env, &palmte_binfo);
+ arm_load_kernel(&mpu->cpu->env, &palmte_binfo);
}
/* FIXME: We shouldn't really be doing this here. The LCD controller
--
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, 2012/06/10
- [Qemu-devel] [PATCH 03/27] palm: Rename omap_mpu_state_s variable,
Andreas Färber <=
- [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
- [Qemu-devel] [PATCH 12/27] arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot(), Andreas Färber, 2012/06/10