From nobody Mon Apr 29 16:22:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593380734; cv=none; d=zohomail.com; s=zohoarc; b=eW0hoSbjScMs6VdfaUKaYM/k2WleddTqCuc3kflqj4P3sQuSxdeMDVRLGXU1QlSdntHy+305vkbo2PenKnVuTFJ/Dws/6AW4fuey5izIOCd95NS6HzEC8m8ml9MzKHA/QfkgAKQ1IMaU7VJGJ0y0wq58a1FzloPR57TcGZvHJQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593380734; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZROhVR26UPnFTLpmqo4CvX6OnKKdzzJIIB4TAfobIgs=; b=BvVTbbKP1bLfZiyu/ZHcRND4Wr1hygGtAbmiBOnEgl+sftyUeX355cpTJVfzUXLC732KgOXTLvFD54l0k110ad8GO2XlJIJ2Um8NK24ow1rP4W+hKoDPj8qRq10u1QeGmnpzYVvIGIWdgINi5kPL0yklP2FChh4QjyMO/SXTDS0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593380734519455.51076203714933; Sun, 28 Jun 2020 14:45:34 -0700 (PDT) Received: from localhost ([::1]:35936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpf7F-0002HJ-9n for importer@patchew.org; Sun, 28 Jun 2020 17:45:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpf4P-0008Dt-Vb for qemu-devel@nongnu.org; Sun, 28 Jun 2020 17:42:37 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39278) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpf4N-00072N-5S for qemu-devel@nongnu.org; Sun, 28 Jun 2020 17:42:37 -0400 Received: by mail-wr1-x442.google.com with SMTP id q5so14645662wru.6 for ; Sun, 28 Jun 2020 14:42:34 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t16sm26300948wru.9.2020.06.28.14.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 14:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZROhVR26UPnFTLpmqo4CvX6OnKKdzzJIIB4TAfobIgs=; b=OUbyaE+sOsJVjprwRa1S+qohK+L+6aFTScTiGv3MTn7vj2VJDgSuxCCk/8ExOhntxt N4ssIx7A3K43a9o8MR06M2E0086gYovNrFpjCayuug6U6B9Dsa21vqRfUCjRBtMEborz KU/JAsiriWz4y21r0MBRO7s6sKLCWurBRqCdgmJNgaHZl+ev/Mw5YBJb7KMPcIj2jFPU PUM0NzJ3MEKiNY0cB9y6+qzlzmox74uDu2x/vZPJhaIYm4oZ+axsAX1rhNxNku02dnVL uWAPIju+5NbbaElZl1UkxZw577pza1txEBZ10gn/8/2ts3+M1pzEtPn5nu25JOdLlRQw XKdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZROhVR26UPnFTLpmqo4CvX6OnKKdzzJIIB4TAfobIgs=; b=DDM2U/iaKL/5umbbeL8IN58xADjQnIaR4utaNSX3/uJeQQhJibzUB3Z5+hVc4i1aMr VC6jL/vW5e4O9NKrFYs46nQ+Xz95JgtHubMItlCYGNFM59eGlivLT8uto07bGS3a795O ++eeVLtrpZNN75ckQ0E4wtN83KQQtfzhdibyQNtuHGjZU0hpVsCxo3Vrqw4p74simk+t ODCYh7emqEvLhaLqhIIlTamY/ug2/Oha+cnGRUuctTVGMFRNVnWvNIXkeZp+VoayII7f uY7ZSOvL9roCK2s5vWJZsbHDnRj0Khyp64fLLG9FiwK75qcr0Cur0yic15wx9+tOjNgv m4oA== X-Gm-Message-State: AOAM530s4c44Ee1QBvA0rrdDAx6N8KlzYnQP0LrxCKu3dnVCbbwTmJyb JN7Zg80VYT/kBDsWX1feodAhUg== X-Google-Smtp-Source: ABdhPJx1ffhRmNmjbffKiwfCJboqcB/NY3S2IjoarIZv0H8XLtLY6/cvArLCULNNnzk7E1kN5+ZGrg== X-Received: by 2002:adf:f4c1:: with SMTP id h1mr13616969wrp.328.1593380553473; Sun, 28 Jun 2020 14:42:33 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/2] hw/arm/palm.c: Detabify Date: Sun, 28 Jun 2020 22:42:29 +0100 Message-Id: <20200628214230.2592-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200628214230.2592-1-peter.maydell@linaro.org> References: <20200628214230.2592-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Remove hard-tabs from palm.c. Signed-off-by: Peter Maydell Reviewed-by: Li Qiang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/palm.c | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 97ca105d297..569836178f6 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -61,21 +61,21 @@ static const MemoryRegionOps static_ops =3D { /* Palm Tunsgten|E support */ =20 /* Shared GPIOs */ -#define PALMTE_USBDETECT_GPIO 0 -#define PALMTE_USB_OR_DC_GPIO 1 -#define PALMTE_TSC_GPIO 4 -#define PALMTE_PINTDAV_GPIO 6 -#define PALMTE_MMC_WP_GPIO 8 -#define PALMTE_MMC_POWER_GPIO 9 -#define PALMTE_HDQ_GPIO 11 -#define PALMTE_HEADPHONES_GPIO 14 -#define PALMTE_SPEAKER_GPIO 15 +#define PALMTE_USBDETECT_GPIO 0 +#define PALMTE_USB_OR_DC_GPIO 1 +#define PALMTE_TSC_GPIO 4 +#define PALMTE_PINTDAV_GPIO 6 +#define PALMTE_MMC_WP_GPIO 8 +#define PALMTE_MMC_POWER_GPIO 9 +#define PALMTE_HDQ_GPIO 11 +#define PALMTE_HEADPHONES_GPIO 14 +#define PALMTE_SPEAKER_GPIO 15 /* MPU private GPIOs */ -#define PALMTE_DC_GPIO 2 -#define PALMTE_MMC_SWITCH_GPIO 4 -#define PALMTE_MMC1_GPIO 6 -#define PALMTE_MMC2_GPIO 7 -#define PALMTE_MMC3_GPIO 11 +#define PALMTE_DC_GPIO 2 +#define PALMTE_MMC_SWITCH_GPIO 4 +#define PALMTE_MMC1_GPIO 6 +#define PALMTE_MMC2_GPIO 7 +#define PALMTE_MMC3_GPIO 11 =20 static MouseTransformInfo palmte_pointercal =3D { .x =3D 320, @@ -100,17 +100,17 @@ static struct { int column; } palmte_keymap[0x80] =3D { [0 ... 0x7f] =3D { -1, -1 }, - [0x3b] =3D { 0, 0 }, /* F1 -> Calendar */ - [0x3c] =3D { 1, 0 }, /* F2 -> Contacts */ - [0x3d] =3D { 2, 0 }, /* F3 -> Tasks List */ - [0x3e] =3D { 3, 0 }, /* F4 -> Note Pad */ - [0x01] =3D { 4, 0 }, /* Esc -> Power */ - [0x4b] =3D { 0, 1 }, /* Left */ - [0x50] =3D { 1, 1 }, /* Down */ - [0x48] =3D { 2, 1 }, /* Up */ - [0x4d] =3D { 3, 1 }, /* Right */ - [0x4c] =3D { 4, 1 }, /* Centre */ - [0x39] =3D { 4, 1 }, /* Spc -> Centre */ + [0x3b] =3D { 0, 0 }, /* F1 -> Calendar */ + [0x3c] =3D { 1, 0 }, /* F2 -> Contacts */ + [0x3d] =3D { 2, 0 }, /* F3 -> Tasks List */ + [0x3e] =3D { 3, 0 }, /* F4 -> Note Pad */ + [0x01] =3D { 4, 0 }, /* Esc -> Power */ + [0x4b] =3D { 0, 1 }, /* Left */ + [0x50] =3D { 1, 1 }, /* Down */ + [0x48] =3D { 2, 1 }, /* Up */ + [0x4d] =3D { 3, 1 }, /* Right */ + [0x4c] =3D { 4, 1 }, /* Centre */ + [0x39] =3D { 4, 1 }, /* Spc -> Centre */ }; =20 static void palmte_button_event(void *opaque, int keycode) @@ -161,13 +161,13 @@ static void palmte_gpio_setup(struct omap_mpu_state_s= *cpu) [PALMTE_MMC_SWITCH_GPIO])); =20 misc_gpio =3D qemu_allocate_irqs(palmte_onoff_gpios, cpu, 7); - qdev_connect_gpio_out(cpu->gpio, PALMTE_MMC_POWER_GPIO, misc_gpio[0]); - qdev_connect_gpio_out(cpu->gpio, PALMTE_SPEAKER_GPIO, misc_gpio[1]); - qdev_connect_gpio_out(cpu->gpio, 11, misc_gpio[2]); - qdev_connect_gpio_out(cpu->gpio, 12, misc_gpio[3]); - qdev_connect_gpio_out(cpu->gpio, 13, misc_gpio[4]); - omap_mpuio_out_set(cpu->mpuio, 1, misc_gpio[5]); - omap_mpuio_out_set(cpu->mpuio, 3, misc_gpio[6]); + qdev_connect_gpio_out(cpu->gpio, PALMTE_MMC_POWER_GPIO, misc_gpio[= 0]); + qdev_connect_gpio_out(cpu->gpio, PALMTE_SPEAKER_GPIO, misc_gpio[= 1]); + qdev_connect_gpio_out(cpu->gpio, 11, misc_gpio[= 2]); + qdev_connect_gpio_out(cpu->gpio, 12, misc_gpio[= 3]); + qdev_connect_gpio_out(cpu->gpio, 13, misc_gpio[= 4]); + omap_mpuio_out_set(cpu->mpuio, 1, misc_gpio[= 5]); + omap_mpuio_out_set(cpu->mpuio, 3, misc_gpio[= 6]); =20 /* Reset some inputs to initial state. */ qemu_irq_lower(qdev_get_gpio_in(cpu->gpio, PALMTE_USBDETECT_GPIO)); --=20 2.20.1 From nobody Mon Apr 29 16:22:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593380633; cv=none; d=zohomail.com; s=zohoarc; b=lIHx+FxLUVxER0QH0oR52hb5DIr6skeIUCIPFt5mZaIxxqikEgDgbbL93/8zoO4VcELGw506gdZ8NDRTyM6gGSTJZcPgz4CQOUq2tcae6ONiUH7/UOmU6tugOOu5XVCmX7qHlkPnHvS+XIaxnLhGxs262+s+Jwd1G2YJRX22bXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593380633; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ueTMRGS8RlMtxcVmTh1y5s8U6X/zJuJaAqd5maYfOBU=; b=XfUM4srRlZuEcv4jv4PykGasV/XRpNcxpWz3st2YLV5khaSVjMi0Vl+VgYn60awxVsfR4cG8/FJkxoU19B/MYKLGnOtQv4ispYIlDqkYM2r/+fFkibpWleDwnM8hBZFDgiEQnH5ahxg2LdfPBgyZmf1/W9SDBq07ZYzfcrz+jpE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593380633950309.1081150011537; Sun, 28 Jun 2020 14:43:53 -0700 (PDT) Received: from localhost ([::1]:32920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpf5c-0000z4-Ff for importer@patchew.org; Sun, 28 Jun 2020 17:43:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpf4Q-0008F0-NH for qemu-devel@nongnu.org; Sun, 28 Jun 2020 17:42:38 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:43123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpf4O-00073J-0N for qemu-devel@nongnu.org; Sun, 28 Jun 2020 17:42:38 -0400 Received: by mail-wr1-x442.google.com with SMTP id j4so12196283wrp.10 for ; Sun, 28 Jun 2020 14:42:35 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t16sm26300948wru.9.2020.06.28.14.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 14:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ueTMRGS8RlMtxcVmTh1y5s8U6X/zJuJaAqd5maYfOBU=; b=klJLyuiK2tqR7Fjyk0UQ8fm3uaf+tk0YWm8kOvRmZlFj7+UPvRceuPeaM1tbzGcTcA 3cI+NseMKwUGCYInsLsIcyk9yMT/Klkc288MShVFw9xTHw+txKmoa57DmBxNHbxn0NmV JcgV1X/hrUDhNJXfsMbjeFZQBYfql3UiUGe2FNso2D/xN+RVC2O97sRSh0C+Sz5S8/hJ G78DR7Xr+r9ziN6zonuLYRLwyXnYj6CbWsvVFCHASJdo69caxrIx3O4J8lk3kqvmRscs gLUTbk+cNrxJp4gDg4HbVH7W5oR7n+DL70Ex4U3rrOd12alVQc2t0JXKkIaWWLmHzjE1 2wZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ueTMRGS8RlMtxcVmTh1y5s8U6X/zJuJaAqd5maYfOBU=; b=pDUJ4GdTyEVaeM6tCtoEd6E5RDBZCGt9gDVYCiKj7BBsk9xEK3jsaZxHqzt8FkJQWT Jlbm6zGf7KxihmN82QN1p5G/5OGfUVmtu0BR3yDjm+lq0L9347cLRPPLX/W64B6oM7UR 8Ej8FjGlIjiSXnMRY9SErtj+TIvIU5A8n88KdqxUiqDhuqrefiwcFxSMpL+nLr7J98SE OjR08Ubes/CImlPVm0DsCQD9VGtoIiJsaUeizjtFsJsjxosnMBHsB91RS8cpK3w7Pkl+ HR48kieGAfFKvfAlByNB8cKc0lNL+GxNpx7qpq7lC1ATGdwRlKM0vEBemGTFSPnn986F xVDw== X-Gm-Message-State: AOAM530HR61mR5uOVF2DJtxpUlDCcGwb05kQMP6YbMv+YJVX8gPRTC3Y cp6LwExi/Ge2Bkm8M3aLQFpRww== X-Google-Smtp-Source: ABdhPJycH/yPFmJdCzHapmTMTGyn1tN0KUoTtNvljE7CqI1SeZpql+S46p6f044XNqgy1LO/yPD3ZA== X-Received: by 2002:a5d:610a:: with SMTP id v10mr14159235wrt.108.1593380554713; Sun, 28 Jun 2020 14:42:34 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/2] hw/arm/palm.c: Encapsulate misc GPIO handling in a device Date: Sun, 28 Jun 2020 22:42:30 +0100 Message-Id: <20200628214230.2592-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200628214230.2592-1-peter.maydell@linaro.org> References: <20200628214230.2592-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Replace the free-floating set of IRQs and palmte_onoff_gpios() function with a simple QOM device that encapsulates this behaviour. This fixes Coverity issue CID 1421944, which points out that the memory returned by qemu_allocate_irqs() is leaked. Signed-off-by: Peter Maydell Reviewed-by: Li Qiang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/palm.c | 61 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 9 deletions(-) diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 569836178f6..e7bc9ea4c6a 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -124,6 +124,21 @@ static void palmte_button_event(void *opaque, int keyc= ode) !(keycode & 0x80)); } =20 +/* + * Encapsulation of some GPIO line behaviour for the Palm board + * + * QEMU interface: + * + unnamed GPIO inputs 0..6: for the various miscellaneous input lines + */ + +#define TYPE_PALM_MISC_GPIO "palm-misc-gpio" +#define PALM_MISC_GPIO(obj) \ + OBJECT_CHECK(PalmMiscGPIOState, (obj), TYPE_PALM_MISC_GPIO) + +typedef struct PalmMiscGPIOState { + SysBusDevice parent_obj; +} PalmMiscGPIOState; + static void palmte_onoff_gpios(void *opaque, int line, int level) { switch (line) { @@ -151,23 +166,44 @@ static void palmte_onoff_gpios(void *opaque, int line= , int level) } } =20 +static void palm_misc_gpio_init(Object *obj) +{ + DeviceState *dev =3D DEVICE(obj); + + qdev_init_gpio_in(dev, palmte_onoff_gpios, 7); +} + +static const TypeInfo palm_misc_gpio_info =3D { + .name =3D TYPE_PALM_MISC_GPIO, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(PalmMiscGPIOState), + .instance_init =3D palm_misc_gpio_init, + /* + * No class init required: device has no internal state so does not + * need to set up reset or vmstate, and has no realize method. + */ +}; + static void palmte_gpio_setup(struct omap_mpu_state_s *cpu) { - qemu_irq *misc_gpio; + DeviceState *misc_gpio; + + misc_gpio =3D sysbus_create_simple(TYPE_PALM_MISC_GPIO, -1, NULL); =20 omap_mmc_handlers(cpu->mmc, qdev_get_gpio_in(cpu->gpio, PALMTE_MMC_WP_GPIO), qemu_irq_invert(omap_mpuio_in_get(cpu->mpuio) [PALMTE_MMC_SWITCH_GPIO])); =20 - misc_gpio =3D qemu_allocate_irqs(palmte_onoff_gpios, cpu, 7); - qdev_connect_gpio_out(cpu->gpio, PALMTE_MMC_POWER_GPIO, misc_gpio[= 0]); - qdev_connect_gpio_out(cpu->gpio, PALMTE_SPEAKER_GPIO, misc_gpio[= 1]); - qdev_connect_gpio_out(cpu->gpio, 11, misc_gpio[= 2]); - qdev_connect_gpio_out(cpu->gpio, 12, misc_gpio[= 3]); - qdev_connect_gpio_out(cpu->gpio, 13, misc_gpio[= 4]); - omap_mpuio_out_set(cpu->mpuio, 1, misc_gpio[= 5]); - omap_mpuio_out_set(cpu->mpuio, 3, misc_gpio[= 6]); + qdev_connect_gpio_out(cpu->gpio, PALMTE_MMC_POWER_GPIO, + qdev_get_gpio_in(misc_gpio, 0)); + qdev_connect_gpio_out(cpu->gpio, PALMTE_SPEAKER_GPIO, + qdev_get_gpio_in(misc_gpio, 1)); + qdev_connect_gpio_out(cpu->gpio, 11, qdev_get_gpio_in(misc_gpio, 2)); + qdev_connect_gpio_out(cpu->gpio, 12, qdev_get_gpio_in(misc_gpio, 3)); + qdev_connect_gpio_out(cpu->gpio, 13, qdev_get_gpio_in(misc_gpio, 4)); + omap_mpuio_out_set(cpu->mpuio, 1, qdev_get_gpio_in(misc_gpio, 5)); + omap_mpuio_out_set(cpu->mpuio, 3, qdev_get_gpio_in(misc_gpio, 6)); =20 /* Reset some inputs to initial state. */ qemu_irq_lower(qdev_get_gpio_in(cpu->gpio, PALMTE_USBDETECT_GPIO)); @@ -276,3 +312,10 @@ static void palmte_machine_init(MachineClass *mc) } =20 DEFINE_MACHINE("cheetah", palmte_machine_init) + +static void palm_register_types(void) +{ + type_register_static(&palm_misc_gpio_info); +} + +type_init(palm_register_types) --=20 2.20.1