From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jxiik-000509-U8 for qemu-devel@nongnu.org; Sun, 18 May 2008 09:14:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jxiik-0004yz-5M for qemu-devel@nongnu.org; Sun, 18 May 2008 09:14:38 -0400 Received: from [199.232.76.173] (port=38310 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jxiik-0004yh-06 for qemu-devel@nongnu.org; Sun, 18 May 2008 09:14:38 -0400 Received: from savannah.gnu.org ([199.232.41.3]:36884 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Jxiij-0005Hi-NK for qemu-devel@nongnu.org; Sun, 18 May 2008 09:14:37 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1Jxiic-0003U5-8M for qemu-devel@nongnu.org; Sun, 18 May 2008 13:14:30 +0000 Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1Jxiib-0003Tu-Ve for qemu-devel@nongnu.org; Sun, 18 May 2008 13:14:30 +0000 MIME-Version: 1.0 Errors-To: balrog Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Andrzej Zaborowski Message-Id: Date: Sun, 18 May 2008 13:14:29 +0000 Subject: [Qemu-devel] [4491] N810 keyboard slide open by default, add more comments. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4491 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4491 Author: balrog Date: 2008-05-18 13:14:29 +0000 (Sun, 18 May 2008) Log Message: ----------- N810 keyboard slide open by default, add more comments. Modified Paths: -------------- trunk/hw/nseries.c trunk/hw/tsc2005.c Modified: trunk/hw/nseries.c =================================================================== --- trunk/hw/nseries.c 2008-05-18 13:01:40 UTC (rev 4490) +++ trunk/hw/nseries.c 2008-05-18 13:14:29 UTC (rev 4491) @@ -56,11 +56,13 @@ #define N8X0_TUSB_ENABLE_GPIO 0 #define N800_MMC2_WP_GPIO 8 #define N800_UNKNOWN_GPIO0 9 /* out */ +#define N810_MMC2_VIOSD_GPIO 9 #define N800_UNKNOWN_GPIO1 10 /* out */ #define N800_CAM_TURN_GPIO 12 #define N810_GPS_RESET_GPIO 12 #define N800_BLIZZARD_POWERDOWN_GPIO 15 #define N800_MMC1_WP_GPIO 23 +#define N810_MMC2_VSD_GPIO 23 #define N8X0_ONENAND_GPIO 26 #define N810_BLIZZARD_RESET_GPIO 30 #define N800_UNKNOWN_GPIO2 53 /* out */ @@ -799,6 +801,10 @@ /* CPU setup */ s->cpu->env->regs[15] = s->cpu->env->boot_info->loader_start; s->cpu->env->GE = 0x5; + + /* If the machine has a slided keyboard, open it */ + if (s->kbd) + qemu_irq_raise(omap2_gpio_in_get(s->cpu->gpif, N810_SLIDE_GPIO)[0]); } #define OMAP_TAG_NOKIA_BT 0x4e01 @@ -1057,6 +1063,25 @@ s->cpu = omap2420_mpu_init(sdram_size, NULL, cpu_model); + /* Setup peripherals + * + * Believed external peripherals layout in the N810: + * (spi bus 1) + * tsc2005 + * lcd_mipid + * (spi bus 2) + * Conexant cx3110x (WLAN) + * optional: pc2400m (WiMAX) + * (i2c bus 0) + * TLV320AIC33 (audio codec) + * TCM825x (camera by Toshiba) + * lp5521 (clever LEDs) + * tsl2563 (light sensor, hwmon, model 7, rev. 0) + * lm8323 (keypad, manf 00, rev 04) + * (i2c bus 1) + * tmp105 (temperature sensor, hwmon) + * menelaus (pm) + */ n8x0_gpio_setup(s); n8x0_nand_setup(s); n8x0_i2c_setup(s); Modified: trunk/hw/tsc2005.c =================================================================== --- trunk/hw/tsc2005.c 2008-05-18 13:01:40 UTC (rev 4490) +++ trunk/hw/tsc2005.c 2008-05-18 13:14:29 UTC (rev 4491) @@ -197,10 +197,14 @@ case 0xc: /* CFR0 */ s->host_mode = data >> 15; - s->enabled = !(data & 0x4000); - if (s->busy && !s->enabled) - qemu_del_timer(s->timer); - s->busy &= s->enabled; + if (s->enabled != !(data & 0x4000)) { + s->enabled = !(data & 0x4000); + fprintf(stderr, "%s: touchscreen sense %sabled\n", + __FUNCTION__, s->enabled ? "en" : "dis"); + if (s->busy && !s->enabled) + qemu_del_timer(s->timer); + s->busy &= s->enabled; + } s->nextprecision = (data >> 13) & 1; s->timing[0] = data & 0x1fff; if ((s->timing[0] >> 11) == 3)