From patchwork Wed Feb 12 23:22:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 319837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A17262C0089 for ; Thu, 13 Feb 2014 10:24:31 +1100 (EST) Received: from localhost ([::1]:42018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDjAL-0002Vf-Dk for incoming@patchwork.ozlabs.org; Wed, 12 Feb 2014 18:24:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDj93-000167-Gl for qemu-devel@nongnu.org; Wed, 12 Feb 2014 18:23:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDj8x-000148-Bh for qemu-devel@nongnu.org; Wed, 12 Feb 2014 18:23:09 -0500 Received: from mail-qc0-f172.google.com ([209.85.216.172]:37102) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDj8x-000144-8Z for qemu-devel@nongnu.org; Wed, 12 Feb 2014 18:23:03 -0500 Received: by mail-qc0-f172.google.com with SMTP id c9so16833032qcz.31 for ; Wed, 12 Feb 2014 15:23:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=9Fnyr33r2mzRq0vGrJNgRdkoiJ6GdGG8Q59lAl5JU0U=; b=PR3ZJ5sLLEP4hKRm4qaRee0r62fxDmLVlrheNlNaGBchWkY1bgp3zPdzJpqqW2Odvl tkWYNi7Kin7zbcXF+9ArcEe+QLlE4ZuSMoTwK4RJJZRSrVCZEaD9epy9XBhoipCdMkiR V3SCpmL6BnSGDvpWYo91h4cmYLkM7oxEmUQJdIWNpnt/7GLPuHAHcPtgSvn543rM86Qu VY9DcSUvapNGSFhT4BDEE6JduJVv/1zaGlsXBsrxhiymBQluN8Z69QQxDdPUKMGV9QC/ KtKPC6o1nGWTnOugyBm2lHIVJsi2bMFDhwH2Bg84Bbs2wegCsmOeztYrImu9L0jY7L0x G08g== X-Gm-Message-State: ALoCoQkxbL26AS+NaRArCmwoJ9jN7tDYI8eKdRrBSEXbP+v1grdlUjWU19AVMzjjruPE7SdZncag X-Received: by 10.140.87.172 with SMTP id r41mr54299152qgd.101.1392247382917; Wed, 12 Feb 2014 15:23:02 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id z1sm67466593qaz.18.2014.02.12.15.23.01 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 12 Feb 2014 15:23:02 -0800 (PST) From: Peter Crosthwaite To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Date: Wed, 12 Feb 2014 15:22:30 -0800 Message-Id: X-Mailer: git-send-email 1.8.5.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.216.172 Cc: agraf@suse.de Subject: [Qemu-devel] [PATCH microblaze/ppc v2 1/8] microblaze/s3adsp_1800: Define macros for irq map 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 Define macros for the interrupt map for the sake of self documentation. Signed-off-by: Peter Crosthwaite --- I haven't converted the xilinx_foo_create usages because they will be deleted in following patches hw/microblaze/petalogix_s3adsp1800_mmu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index f500215..a4877a6 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -48,6 +48,10 @@ #define UARTLITE_BASEADDR 0x84000000 #define ETHLITE_BASEADDR 0x81000000 +#define TIMER_IRQ 0 +#define ETHLITE_IRQ 1 +#define UARTLITE_IRQ 3 + static void machine_cpu_reset(MicroBlazeCPU *cpu) { CPUMBState *env = &cpu->env; @@ -99,7 +103,8 @@ petalogix_s3adsp1800_init(QEMUMachineInitArgs *args) irq[i] = qdev_get_gpio_in(dev, i); } - sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR, irq[3]); + sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR, + irq[UARTLITE_IRQ]); /* 2 timers at irq 2 @ 62 Mhz. */ xilinx_timer_create(TIMER_BASEADDR, irq[0], 0, 62 * 1000000); xilinx_ethlite_create(&nd_table[0], ETHLITE_BASEADDR, irq[1], 0, 0);