From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8O-0005SY-5s for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STz8B-0000bO-NW for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:35 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49623 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8B-0000aI-CP for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 14 May 2012 19:31:52 +0200 Message-Id: <1337016729-12285-6-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 05/22] spitz: Rename PXA2xxState 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/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 =3D NULL; MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *rom =3D g_new(MemoryRegion, 1); @@ -893,9 +893,9 @@ static void spitz_common_init(ram_addr_t ram_size, cpu_model =3D (model =3D=3D terrier) ? "pxa270-c5" : "pxa270-c0"= ; =20 /* Setup CPU & memory */ - cpu =3D pxa270_init(address_space_mem, spitz_binfo.ram_size, cpu_mod= el); + mpu =3D pxa270_init(address_space_mem, spitz_binfo.ram_size, cpu_mod= el); =20 - sl_flash_register(cpu, (model =3D=3D spitz) ? FLASH_128M : FLASH_102= 4M); + sl_flash_register(mpu, (model =3D=3D spitz) ? FLASH_128M : FLASH_102= 4M); =20 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); =20 /* Setup peripherals */ - spitz_keyboard_register(cpu); + spitz_keyboard_register(mpu); =20 - spitz_ssp_attach(cpu); + spitz_ssp_attach(mpu); =20 scp0 =3D sysbus_create_simple("scoop", 0x10800000, NULL); if (model !=3D akita) { scp1 =3D sysbus_create_simple("scoop", 0x08800040, NULL); } =20 - spitz_scoop_gpio_setup(cpu, scp0, scp1); + spitz_scoop_gpio_setup(mpu, scp0, scp1); =20 - spitz_gpio_setup(cpu, (model =3D=3D akita) ? 1 : 2); + spitz_gpio_setup(mpu, (model =3D=3D akita) ? 1 : 2); =20 - spitz_i2c_setup(cpu); + spitz_i2c_setup(mpu); =20 if (model =3D=3D akita) - spitz_akita_i2c_setup(cpu); + spitz_akita_i2c_setup(mpu); =20 if (model =3D=3D 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 !=3D akita) /* A 4.0 GB microdrive is permanently sitting in CF slot 0. */ - spitz_microdrive_attach(cpu, 0); + spitz_microdrive_attach(mpu, 0); =20 spitz_binfo.kernel_filename =3D kernel_filename; spitz_binfo.kernel_cmdline =3D kernel_cmdline; spitz_binfo.initrd_filename =3D initrd_filename; spitz_binfo.board_id =3D 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); } =20 --=20 1.7.7