From patchwork Thu Aug 8 16:04:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18890 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f71.google.com (mail-vb0-f71.google.com [209.85.212.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5ABFC25D87 for ; Thu, 8 Aug 2013 16:04:25 +0000 (UTC) Received: by mail-vb0-f71.google.com with SMTP id g17sf647990vbg.10 for ; Thu, 08 Aug 2013 09:04:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=kIwijYNuJp688d3l76/GSbvolfES7gCzio5jCfBd10c=; b=hV8CkKrJTO7srN8tYEHJ3qIRUb3UUxUDmJbqitg+q5JlE10n6RodFNuxXMqoLO/+t0 jQjPuztpGWyAnkBR/jaCjARykUf+jBIoutCR2NQ+JfRz8Oy3MIxtKCLtt6bjVUUUJUtI grkf0M3r3e2ip7WJ/23I9wgJB25Cs6LMpQvoySybugv8lVzHO7DDL1x7FMcRQSgTcks+ HJBN3tSRf9JQYC/ZxTXHMF9UMjZgATRQQvzbnfIte72hSynWnlKK3qN5qS5s1lq/MsST orr4m41U8xXyd+e7Po4cm6FrLeNoy64LfthbHbCS1eNpIm8w9io7MKLpcQhw5Pg1kaLz HGow== X-Received: by 10.236.112.33 with SMTP id x21mr3551947yhg.57.1375977864945; Thu, 08 Aug 2013 09:04:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.117.166 with SMTP id kf6ls986229qeb.30.gmail; Thu, 08 Aug 2013 09:04:24 -0700 (PDT) X-Received: by 10.221.36.4 with SMTP id sy4mr4497527vcb.11.1375977864826; Thu, 08 Aug 2013 09:04:24 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id bq2si3278728vcb.115.2013.08.08.09.04.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:24 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id d10so3235935vea.33 for ; Thu, 08 Aug 2013 09:04:24 -0700 (PDT) X-Gm-Message-State: ALoCoQnXZMgomqhQ2vDfX4xqlUYMczXQq2auQQ8QVlb6FHH/uC1K5/kSvKMqKmg5y9wGQW5n85V/ X-Received: by 10.52.117.208 with SMTP id kg16mr3055226vdb.48.1375977864729; Thu, 08 Aug 2013 09:04:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp23542vcz; Thu, 8 Aug 2013 09:04:24 -0700 (PDT) X-Received: by 10.14.221.198 with SMTP id r46mr9005707eep.18.1375977860801; Thu, 08 Aug 2013 09:04:20 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id 7si11454797eeu.248.2013.08.08.09.04.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:20 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1V7ShH-0006Xw-DT; Thu, 08 Aug 2013 17:04:19 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 14/14] hw/arm/pic_cpu: Remove the now-unneeded arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:16 +0100 Message-Id: <1375977856-25046-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1375977856-25046-1-git-send-email-peter.maydell@linaro.org> References: <1375977856-25046-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Now all the boards have been converted arm_pic_init_cpu() is unused and can just be deleted. Signed-off-by: Peter Maydell --- hw/arm/Makefile.objs | 2 +- hw/arm/pic_cpu.c | 25 ------------------------- include/hw/arm/arm.h | 5 ----- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 hw/arm/pic_cpu.c diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 9e3a06f..3671b42 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,6 +1,6 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o -obj-y += omap_sx1.o palm.o pic_cpu.o realview.o spitz.o stellaris.o +obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o diff --git a/hw/arm/pic_cpu.c b/hw/arm/pic_cpu.c deleted file mode 100644 index 9c36273..0000000 --- a/hw/arm/pic_cpu.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Generic ARM Programmable Interrupt Controller support. - * - * Copyright (c) 2006 CodeSourcery. - * Written by Paul Brook - * - * This code is licensed under the LGPL - */ - -#include "hw/hw.h" -#include "hw/arm/arm.h" - -/* Backwards compatibility shim; this can disappear when all - * board models have been updated to get IRQ and FIQ lines directly - * from the ARMCPU object rather than by calling this function. - */ -qemu_irq *arm_pic_init_cpu(ARMCPU *cpu) -{ - DeviceState *dev = DEVICE(cpu); - qemu_irq *irqs = g_new(qemu_irq, 2); - - irqs[0] = qdev_get_gpio_in(dev, ARM_CPU_IRQ); - irqs[1] = qdev_get_gpio_in(dev, ARM_CPU_FIQ); - return irqs; -} diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index bae87c6..ecbbba8 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -14,11 +14,6 @@ #include "exec/memory.h" #include "hw/irq.h" -/* The CPU is also modelled as an interrupt controller. */ -#define ARM_PIC_CPU_IRQ 0 -#define ARM_PIC_CPU_FIQ 1 -qemu_irq *arm_pic_init_cpu(ARMCPU *cpu); - /* armv7m.c */ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, int flash_size, int sram_size,