From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8J-0005Ax-1o for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STz8B-0000bZ-Nr for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49622 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8B-0000aH-CO 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:54 +0200 Message-Id: <1337016729-12285-8-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 07/22] z2: 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/z2.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/z2.c b/hw/z2.c index 9dd83ff..db25cdc 100644 --- a/hw/z2.c +++ b/hw/z2.c @@ -301,7 +301,7 @@ static void z2_init(ram_addr_t ram_size, { MemoryRegion *address_space_mem =3D get_system_memory(); uint32_t sector_len =3D 0x10000; - PXA2xxState *cpu; + PXA2xxState *mpu; DriveInfo *dinfo; int be; void *z2_lcd; @@ -313,7 +313,7 @@ static void z2_init(ram_addr_t ram_size, } =20 /* Setup CPU & memory */ - cpu =3D pxa270_init(address_space_mem, z2_binfo.ram_size, cpu_model)= ; + mpu =3D pxa270_init(address_space_mem, z2_binfo.ram_size, cpu_model)= ; =20 #ifdef TARGET_WORDS_BIGENDIAN be =3D 1; @@ -337,25 +337,25 @@ static void z2_init(ram_addr_t ram_size, } =20 /* setup keypad */ - pxa27x_register_keypad(cpu->kp, map, 0x100); + pxa27x_register_keypad(mpu->kp, map, 0x100); =20 /* MMC/SD host */ - pxa2xx_mmci_handlers(cpu->mmc, + pxa2xx_mmci_handlers(mpu->mmc, NULL, - qdev_get_gpio_in(cpu->gpio, Z2_GPIO_SD_DETECT)); + qdev_get_gpio_in(mpu->gpio, Z2_GPIO_SD_DETECT)); =20 type_register_static(&zipit_lcd_info); type_register_static(&aer915_info); - z2_lcd =3D ssi_create_slave(cpu->ssp[1], "zipit-lcd"); - bus =3D pxa2xx_i2c_bus(cpu->i2c[0]); + z2_lcd =3D ssi_create_slave(mpu->ssp[1], "zipit-lcd"); + bus =3D pxa2xx_i2c_bus(mpu->i2c[0]); i2c_create_slave(bus, "aer915", 0x55); wm =3D i2c_create_slave(bus, "wm8750", 0x1b); - cpu->i2s->opaque =3D wm; - cpu->i2s->codec_out =3D wm8750_dac_dat; - cpu->i2s->codec_in =3D wm8750_adc_dat; - wm8750_data_req_set(wm, cpu->i2s->data_req, cpu->i2s); + mpu->i2s->opaque =3D wm; + mpu->i2s->codec_out =3D wm8750_dac_dat; + mpu->i2s->codec_in =3D wm8750_adc_dat; + wm8750_data_req_set(wm, mpu->i2s->data_req, mpu->i2s); =20 - qdev_connect_gpio_out(cpu->gpio, Z2_GPIO_LCD_CS, + qdev_connect_gpio_out(mpu->gpio, Z2_GPIO_LCD_CS, qemu_allocate_irqs(z2_lcd_cs, z2_lcd, 1)[0]); =20 if (kernel_filename) { @@ -363,7 +363,7 @@ static void z2_init(ram_addr_t ram_size, z2_binfo.kernel_cmdline =3D kernel_cmdline; z2_binfo.initrd_filename =3D initrd_filename; z2_binfo.board_id =3D 0x6dd; - arm_load_kernel(&cpu->cpu->env, &z2_binfo); + arm_load_kernel(&mpu->cpu->env, &z2_binfo); } } =20 --=20 1.7.7