From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8G-00058A-U6 for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STz8A-0000aM-I6 for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49588 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8A-0000ZK-9X for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:22 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 14 May 2012 19:31:50 +0200 Message-Id: <1337016729-12285-4-git-send-email-afaerber@suse.de> In-Reply-To: <1337016729-12285-1-git-send-email-afaerber@suse.de> References: <1337016729-12285-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next 03/22] palm: Rename omap_mpu_state_s variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Avoid cpu->cpu by using "mpu" as variable name. Signed-off-by: Andreas F=C3=A4rber --- 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 =3D get_system_memory(); - struct omap_mpu_state_s *cpu; + struct omap_mpu_state_s *mpu; int flash_size =3D 0x00800000; int sdram_size =3D palmte_binfo.ram_size; static uint32_t cs0val =3D 0xffffffff; @@ -208,7 +208,7 @@ static void palmte_init(ram_addr_t ram_size, MemoryRegion *flash =3D g_new(MemoryRegion, 1); MemoryRegion *cs =3D g_new(MemoryRegion, 4); =20 - cpu =3D omap310_mpu_init(address_space_mem, sdram_size, cpu_model); + mpu =3D omap310_mpu_init(address_space_mem, sdram_size, cpu_model); =20 /* 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]= ); =20 - palmte_microwire_setup(cpu); + palmte_microwire_setup(mpu); =20 - qemu_add_kbd_event_handler(palmte_button_event, cpu); + qemu_add_kbd_event_handler(palmte_button_event, mpu); =20 - palmte_gpio_setup(cpu); + palmte_gpio_setup(mpu); =20 /* 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 =3D kernel_filename; palmte_binfo.kernel_cmdline =3D kernel_cmdline; palmte_binfo.initrd_filename =3D initrd_filename; - arm_load_kernel(&cpu->cpu->env, &palmte_binfo); + arm_load_kernel(&mpu->cpu->env, &palmte_binfo); } =20 /* FIXME: We shouldn't really be doing this here. The LCD controlle= r --=20 1.7.7