Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm26/conf Ensure that podulebus gets attached afte...



details:   https://anonhg.NetBSD.org/src/rev/af18c9f9a528
branches:  trunk
changeset: 519610:af18c9f9a528
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Fri Dec 21 22:41:18 2001 +0000

description:
Ensure that podulebus gets attached after unixbp, since it needs to know
whether the system has a unixbp to know what interrupt mask to use.
This could be cleaner.

diffstat:

 sys/arch/arm26/conf/files.arm26 |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 5f5efabcde65 -r af18c9f9a528 sys/arch/arm26/conf/files.arm26
--- a/sys/arch/arm26/conf/files.arm26   Fri Dec 21 22:33:28 2001 +0000
+++ b/sys/arch/arm26/conf/files.arm26   Fri Dec 21 22:41:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm26,v 1.43 2001/12/20 01:20:24 thorpej Exp $
+# $NetBSD: files.arm26,v 1.44 2001/12/21 22:41:18 bjh21 Exp $
 
 # Copyright (c) 1997, 1998, 2000 Ben Harris
 # All rights reserved.
@@ -102,7 +102,8 @@
 attach arcwskbd at arckbd
 device arcwsmouse: wsmousedev
 attach arcwsmouse at arckbd
-file   arch/arm26/ioc/arckbd.c                 arckbd          needs-flag
+file   arch/arm26/ioc/arckbd.c                 arckbd | arcwskbd | arcwsmouse
+                                                               needs-flag
 file   arch/arm26/ioc/arckbdmap.c              arckbd
 
 # On-board WD 1772 floppy controller (usually at bank 1 irq 12 fiq 0/1)
@@ -130,14 +131,16 @@
 attach arcpp at ioc
 file   arch/arm26/ioc/arcpp.c                  arcpp           needs-flag
 
-include "dev/podulebus/files.podulebus"
 
 # Podule interface (podules listed later) (usually at bank 4 irq 13 fiq 6)
 #  Unix backplanes also use bank 6
 #  MEMC podules also use the iobus directly
-# XXX How on Earth do we codify all that?
 device unixbp
 attach unixbp at ioc
+
+# NB: files.podulebus must come after unixbp is defined, to get the
+# attachments in the right order.
+include "dev/podulebus/files.podulebus"
 attach podulebus at ioc
 file   arch/arm26/podulebus/podulebus.c        podulebus
 file   arch/arm26/podulebus/podloader_asm.S    podloader       needs-flag



Home | Main Index | Thread Index | Old Index