From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KxHbF-0001fj-HE for qemu-devel@nongnu.org; Tue, 04 Nov 2008 03:49:21 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KxHbE-0001f9-CV for qemu-devel@nongnu.org; Tue, 04 Nov 2008 03:49:21 -0500 Received: from [199.232.76.173] (port=50725 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KxHbE-0001f6-5U for qemu-devel@nongnu.org; Tue, 04 Nov 2008 03:49:20 -0500 Received: from savannah.gnu.org ([199.232.41.3]:46133 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 1KxHbD-00074d-Rq for qemu-devel@nongnu.org; Tue, 04 Nov 2008 03:49:20 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KxHbC-0006oq-Nx for qemu-devel@nongnu.org; Tue, 04 Nov 2008 08:49:18 +0000 Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KxHbC-0006ok-Dc for qemu-devel@nongnu.org; Tue, 04 Nov 2008 08:49:18 +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: Tue, 04 Nov 2008 08:49:18 +0000 Subject: [Qemu-devel] [5615] scoop: GPRR reports the state of GPIO lines (Dmitry Baryshkov). 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: 5615 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5615 Author: balrog Date: 2008-11-04 08:49:17 +0000 (Tue, 04 Nov 2008) Log Message: ----------- scoop: GPRR reports the state of GPIO lines (Dmitry Baryshkov). Signed-off-by: Dmitry Baryshkov Signed-off-by: Andrzej Zaborowski Modified Paths: -------------- trunk/hw/zaurus.c Modified: trunk/hw/zaurus.c =================================================================== --- trunk/hw/zaurus.c 2008-11-04 08:47:06 UTC (rev 5614) +++ trunk/hw/zaurus.c 2008-11-04 08:49:17 UTC (rev 5615) @@ -46,7 +46,6 @@ uint16_t irr; uint16_t imr; uint16_t isr; - uint16_t gprr; }; #define SCOOP_MCR 0x00 @@ -99,9 +98,8 @@ case SCOOP_GPCR: return s->gpio_dir; case SCOOP_GPWR: - return s->gpio_level; case SCOOP_GPRR: - return s->gprr; + return s->gpio_level; default: zaurus_printf("Bad register offset " REG_FMT "\n", addr); } @@ -144,12 +142,10 @@ scoop_gpio_handler_update(s); break; case SCOOP_GPWR: + case SCOOP_GPRR: /* GPRR is probably R/O in real HW */ s->gpio_level = value & s->gpio_dir; scoop_gpio_handler_update(s); break; - case SCOOP_GPRR: - s->gprr = value; - break; default: zaurus_printf("Bad register offset " REG_FMT "\n", addr); } @@ -205,11 +201,11 @@ qemu_put_be16s(f, &s->irr); qemu_put_be16s(f, &s->imr); qemu_put_be16s(f, &s->isr); - qemu_put_be16s(f, &s->gprr); } static int scoop_load(QEMUFile *f, void *opaque, int version_id) { + uint16_t dummy; struct scoop_info_s *s = (struct scoop_info_s *) opaque; qemu_get_be16s(f, &s->status); qemu_get_be16s(f, &s->power); @@ -222,7 +218,8 @@ qemu_get_be16s(f, &s->irr); qemu_get_be16s(f, &s->imr); qemu_get_be16s(f, &s->isr); - qemu_get_be16s(f, &s->gprr); + if (version_id < 1) + qemu_get_be16s(f, &dummy); return 0; } @@ -243,7 +240,7 @@ iomemtype = cpu_register_io_memory(0, scoop_readfn, scoop_writefn, s); cpu_register_physical_memory(s->target_base, 0x1000, iomemtype); - register_savevm("scoop", instance, 0, scoop_save, scoop_load, s); + register_savevm("scoop", instance, 1, scoop_save, scoop_load, s); return s; }