[src/trunk]: src/sys/arch/evbppc/walnut/dev in pbus_attach() make locs[] and ...

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

details:   https://anonhg.NetBSD.org/src/rev/3762dfb913ce
branches:  trunk
changeset: 766080:3762dfb913ce
user:      cliff <cliff%NetBSD.org@localhost>
date:      Wed Jun 15 05:21:38 2011 +0000

description:
in pbus_attach() make locs[] and pass to config_found_sm_loc()
to avoid triggering KASSERT in config_stdsubmatch().

diffstat:

 sys/arch/evbppc/walnut/dev/pbus.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 6688610f58c1 -r 3762dfb913ce sys/arch/evbppc/walnut/dev/pbus.c
--- a/sys/arch/evbppc/walnut/dev/pbus.c Wed Jun 15 04:52:52 2011 +0000
+++ b/sys/arch/evbppc/walnut/dev/pbus.c Wed Jun 15 05:21:38 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $   */
+/*     $NetBSD: pbus.c,v 1.12 2011/06/15 05:21:38 cliff Exp $  */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.12 2011/06/15 05:21:38 cliff Exp $");
 
 #include "locators.h"
 #include "pckbc.h"
@@ -152,7 +152,12 @@
                pba.pb_bt = &pbus_tag;
                pba.pb_dmat = paa->plb_dmat;
 
-               (void) config_found_sm_loc(self, "pbus", NULL, &pba, pbus_print,
+               const int locs[PBUSCF_NLOCS] = {
+                   [PBUSCF_ADDR] = pba.pb_addr,
+                   [PBUSCF_IRQ] = pba.pb_irq
+               };
+
+               (void) config_found_sm_loc(self, "pbus", locs, &pba, pbus_print,
                    config_stdsubmatch);
        }