[src/trunk]: src/sys/arch/arm Add intrbase locator to mainbus.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/29a78aa88e0e
branches:  trunk
changeset: 780176:29a78aa88e0e
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jul 14 07:57:26 2012 +0000

description:
Add intrbase locator to mainbus.

diffstat:

 sys/arch/arm/conf/files.arm    |  4 ++--
 sys/arch/arm/mainbus/mainbus.c |  5 +++--
 sys/arch/arm/mainbus/mainbus.h |  3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r d1d8bdf8089b -r 29a78aa88e0e sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm       Sat Jul 14 07:55:28 2012 +0000
+++ b/sys/arch/arm/conf/files.arm       Sat Jul 14 07:57:26 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.arm,v 1.104 2012/07/13 05:23:29 matt Exp $
+#      $NetBSD: files.arm,v 1.105 2012/07/14 07:57:26 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag                                ARM32
@@ -78,7 +78,7 @@
 file   arch/arm/arm/fiq_subr.S
 
 # mainbus files
-device mainbus { [base = -1], [size = 0], [dack = -1], [irq = -1] }
+device mainbus { [base = -1], [size = 0], [dack = -1], [irq = -1], [intrbase = -1] }
 attach mainbus at root
 file   arch/arm/mainbus/mainbus.c              mainbus & arm32
 file   arch/arm/mainbus/mainbus_io.c           mainbus & arm32
diff -r d1d8bdf8089b -r 29a78aa88e0e sys/arch/arm/mainbus/mainbus.c
--- a/sys/arch/arm/mainbus/mainbus.c    Sat Jul 14 07:55:28 2012 +0000
+++ b/sys/arch/arm/mainbus/mainbus.c    Sat Jul 14 07:57:26 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $ */
+/* $NetBSD: mainbus.c,v 1.19 2012/07/14 07:57:26 matt Exp $ */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.19 2012/07/14 07:57:26 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -142,6 +142,7 @@
                        mb.mb_drq = cf->cf_loc[MAINBUSCF_DACK];
                        mb.mb_irq = cf->cf_loc[MAINBUSCF_IRQ];
                }
+               mb.mb_intrbase = cf->cf_loc[MAINBUSCF_INTRBASE];
                mb.mb_iot = &mainbus_bs_tag;
 
                tryagain = 0;
diff -r d1d8bdf8089b -r 29a78aa88e0e sys/arch/arm/mainbus/mainbus.h
--- a/sys/arch/arm/mainbus/mainbus.h    Sat Jul 14 07:55:28 2012 +0000
+++ b/sys/arch/arm/mainbus/mainbus.h    Sat Jul 14 07:57:26 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.h,v 1.2 2011/07/01 20:31:39 dyoung Exp $ */
+/* $NetBSD: mainbus.h,v 1.3 2012/07/14 07:57:26 matt Exp $ */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -52,6 +52,7 @@
        int             mb_iosize;      /* span of ports used */
        int             mb_irq;         /* interrupt request */
        int             mb_drq;         /* DMA request */
+       int             mb_intrbase;    /* interrupt numbering base */
        void            *mb_aux;        /* driver specific */
        bus_space_tag_t mb_iot;         /* bus space tag */
 };