From patchwork Mon Aug 22 08:15:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 110869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4E1EFB6F6F for ; Mon, 22 Aug 2011 18:17:18 +1000 (EST) Received: from localhost ([::1]:58345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvPh2-0001y1-Ml for incoming@patchwork.ozlabs.org; Mon, 22 Aug 2011 04:17:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvPgs-0001cX-NB for qemu-devel@nongnu.org; Mon, 22 Aug 2011 04:17:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QvPgq-000071-Ub for qemu-devel@nongnu.org; Mon, 22 Aug 2011 04:17:02 -0400 Received: from mail-yi0-f45.google.com ([209.85.218.45]:34398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvPgq-0008OX-PM for qemu-devel@nongnu.org; Mon, 22 Aug 2011 04:17:00 -0400 Received: by mail-yi0-f45.google.com with SMTP id 10so4059087yih.4 for ; Mon, 22 Aug 2011 01:17:00 -0700 (PDT) Received: by 10.236.78.202 with SMTP id g50mr12123032yhe.36.1314001020446; Mon, 22 Aug 2011 01:17:00 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id s62sm4732980yhn.33.2011.08.22.01.16.57 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Aug 2011 01:16:59 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, edgar.iglesias@petalogix.com Date: Mon, 22 Aug 2011 18:15:25 +1000 Message-Id: <1314000925-2255-2-git-send-email-peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1314000925-2255-1-git-send-email-peter.crosthwaite@petalogix.com> References: <1314000925-2255-1-git-send-email-peter.crosthwaite@petalogix.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.218.45 Cc: "Peter A. G. Crosthwaite" Subject: [Qemu-devel] [PATCH 2/2] xilinx: removed microbalze_pic_init from xilinx.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is a microblaze target specific function that belongs outside of xilinx.h (which is a collection of target independent device model instantiator functions) Signed-off-by: Peter A. G. Crosthwaite --- hw/microblaze_pic_cpu.c | 2 +- hw/microblaze_pic_cpu.h | 8 ++++++++ hw/petalogix_ml605_mmu.c | 1 + hw/petalogix_s3adsp1800_mmu.c | 2 ++ hw/xilinx.h | 3 --- 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 hw/microblaze_pic_cpu.h diff --git a/hw/microblaze_pic_cpu.c b/hw/microblaze_pic_cpu.c index 7c59382..9ad48b4 100644 --- a/hw/microblaze_pic_cpu.c +++ b/hw/microblaze_pic_cpu.c @@ -24,6 +24,7 @@ #include "hw.h" #include "pc.h" +#include "microblaze_pic_cpu.h" #define D(x) @@ -43,7 +44,6 @@ static void microblaze_pic_cpu_handler(void *opaque, int irq, int level) cpu_reset_interrupt(env, type); } -qemu_irq *microblaze_pic_init_cpu(CPUState *env); qemu_irq *microblaze_pic_init_cpu(CPUState *env) { return qemu_allocate_irqs(microblaze_pic_cpu_handler, env, 2); diff --git a/hw/microblaze_pic_cpu.h b/hw/microblaze_pic_cpu.h new file mode 100644 index 0000000..4c76275 --- /dev/null +++ b/hw/microblaze_pic_cpu.h @@ -0,0 +1,8 @@ +#ifndef MICROBLAZE_PIC_CPU_H +#define MICROBLAZE_PIC_CPU_H + +#include "qemu-common.h" + +qemu_irq *microblaze_pic_init_cpu(CPUState *env); + +#endif /* MICROBLAZE_PIC_CPU_H */ diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c index e3a66e5..e3ca310 100644 --- a/hw/petalogix_ml605_mmu.c +++ b/hw/petalogix_ml605_mmu.c @@ -39,6 +39,7 @@ #include "blockdev.h" #include "pc.h" +#include "microblaze_pic_cpu.h" #include "xilinx_axidma.h" #define LMB_BRAM_SIZE (128 * 1024) diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c index 589e8ca..a43fb4c 100644 --- a/hw/petalogix_s3adsp1800_mmu.c +++ b/hw/petalogix_s3adsp1800_mmu.c @@ -36,6 +36,8 @@ #include "elf.h" #include "blockdev.h" +#include "microblaze_pic_cpu.h" + #define LMB_BRAM_SIZE (128 * 1024) #define FLASH_SIZE (16 * 1024 * 1024) diff --git a/hw/xilinx.h b/hw/xilinx.h index 3a1f4c6..35f35bd 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -1,9 +1,6 @@ #include "qemu-common.h" #include "net.h" -/* OPB Interrupt Controller. */ -qemu_irq *microblaze_pic_init_cpu(CPUState *env); - static inline DeviceState * xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr) {