From patchwork Fri Mar 4 00:41:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 85354 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CB805B70AF for ; Fri, 4 Mar 2011 11:43:17 +1100 (EST) Received: from localhost ([127.0.0.1]:57899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvJ6x-0005Zr-65 for incoming@patchwork.ozlabs.org; Thu, 03 Mar 2011 19:43:15 -0500 Received: from [140.186.70.92] (port=39996 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvJ4y-0004mq-Fh for qemu-devel@nongnu.org; Thu, 03 Mar 2011 19:41:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PvJ4w-0000rD-Ad for qemu-devel@nongnu.org; Thu, 03 Mar 2011 19:41:12 -0500 Received: from mail-fx0-f45.google.com ([209.85.161.45]:60662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvJ4w-0000qU-4M for qemu-devel@nongnu.org; Thu, 03 Mar 2011 19:41:10 -0500 Received: by mail-fx0-f45.google.com with SMTP id 11so1829251fxm.4 for ; Thu, 03 Mar 2011 16:41:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=EbIilXj+PEmyhjQPVv/jEj3h5KQ+Yhl3eoPuDmQsNX8=; b=T9L8jldQwPY3Ueg9AfJsovNMHrTfPSYKP+E4r5xIw8Sc/Dce/uYFfEUN+Onlyw0bHh 9LV1ZtlLTCYgY91z0A9UPlNum0GXXfKjozxPIJU51BFDtNUIUB6lBXrYWJcI8vI4woS5 t7x/e9a6ucUGtuL3HdAP3OAp6wvIAa2owjozY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=Kll/OMPwq75B0LvtB+lV0uUzpZMNrVIZhBphWysqwFB8u5LzE4KAEiSo4+evPzlXNm bOQqiMR6U0tYxvNejvjA8JYAmXkCH5S6cqH4gGzk/4XW9aggNYPPPHT26hqGJ5en3M6o V8X7Ks2rqLbCA2zqxorCpJS7WacfmzTGOAYts= Received: by 10.223.72.202 with SMTP id n10mr2235323faj.139.1299199268331; Thu, 03 Mar 2011 16:41:08 -0800 (PST) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id b7sm910190faa.18.2011.03.03.16.41.06 (version=SSLv3 cipher=OTHER); Thu, 03 Mar 2011 16:41:07 -0800 (PST) From: Dmitry Eremin-Solenikov To: qemu-devel@nongnu.org Date: Fri, 4 Mar 2011 03:41:00 +0300 Message-Id: <1299199260-20840-2-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1299199260-20840-1-git-send-email-dbaryshkov@gmail.com> References: <1299199260-20840-1-git-send-email-dbaryshkov@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.45 Subject: [Qemu-devel] [PATCH 2/2] pxa2xx_pic: fixup initialisation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently pxa2xx_pic init fails with error at sysbus_mmio_map(), as there is no correspondent sysbus_init_mmio. Also move most of init to pxa2xx_pic_initfn. Signed-off-by: Dmitry Eremin-Solenikov --- hw/pxa2xx_pic.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/hw/pxa2xx_pic.c b/hw/pxa2xx_pic.c index 86c0ee6..65edfd6 100644 --- a/hw/pxa2xx_pic.c +++ b/hw/pxa2xx_pic.c @@ -251,12 +251,25 @@ static int pxa2xx_pic_post_load(void *opaque, int version_id) DeviceState *pxa2xx_pic_init(target_phys_addr_t base, CPUState *env) { - DeviceState *dev = qdev_create(NULL, "pxa2xx_pic"); - int iomemtype; - PXA2xxPICState *s = FROM_SYSBUS(PXA2xxPICState, sysbus_from_qdev(dev)); + DeviceState *dev; + PXA2xxPICState *s; + + dev = sysbus_create_varargs("pxa2xx_pic", base, NULL); + s = FROM_SYSBUS(PXA2xxPICState, sysbus_from_qdev(dev)); s->cpu_env = env; + /* Enable IC coprocessor access. */ + cpu_arm_set_cp_io(env, 6, pxa2xx_pic_cp_read, pxa2xx_pic_cp_write, s); + + return dev; +} + +static int pxa2xx_pic_initfn(SysBusDevice *dev) +{ + PXA2xxPICState *s = FROM_SYSBUS(PXA2xxPICState, dev); + int iomemtype; + s->int_pending[0] = 0; s->int_pending[1] = 0; s->int_enabled[0] = 0; @@ -264,21 +277,14 @@ DeviceState *pxa2xx_pic_init(target_phys_addr_t base, CPUState *env) s->is_fiq[0] = 0; s->is_fiq[1] = 0; - qdev_init_nofail(dev); - - qdev_init_gpio_in(dev, pxa2xx_pic_set_irq, PXA2XX_PIC_SRCS); - - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + qdev_init_gpio_in(&dev->qdev, pxa2xx_pic_set_irq, PXA2XX_PIC_SRCS); /* Enable IC memory-mapped registers access. */ iomemtype = cpu_register_io_memory(pxa2xx_pic_readfn, pxa2xx_pic_writefn, s, DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(sysbus_from_qdev(dev), 0x00100000, iomemtype); - - /* Enable IC coprocessor access. */ - cpu_arm_set_cp_io(env, 6, pxa2xx_pic_cp_read, pxa2xx_pic_cp_write, s); + sysbus_init_mmio(dev, 0x00100000, iomemtype); - return dev; + return 0; } static VMStateDescription vmstate_pxa2xx_pic_regs = { @@ -297,11 +303,6 @@ static VMStateDescription vmstate_pxa2xx_pic_regs = { }, }; -static int pxa2xx_pic_initfn(SysBusDevice *dev) -{ - return 0; -} - static SysBusDeviceInfo pxa2xx_pic_info = { .init = pxa2xx_pic_initfn, .qdev.name = "pxa2xx_pic",