Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add intrbase locator to mainbus.

Browse Source
This commit is contained in:
matt 2012-07-14 07:57:26 +00:00
parent e07e1443a1
commit a08758835a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/arm/conf/files.arm
View File

@ -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.c
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

5
sys/arch/arm/mainbus/mainbus.c
View File

@ -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 @@ mainbussearch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
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;

3
sys/arch/arm/mainbus/mainbus.h
View File

@ -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 @@ struct mainbus_attach_args {
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 */
};