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

Attach the pnpbus prior to attaching the pci bus on the prep. This 

should allow us to probe for both pnp-attached devices and isa-attached
devices while preferring the pnpbus attachment point.
This commit is contained in:
garbled 2006-06-21 20:08:11 +00:00
parent c6b709de73
commit 4c0cfa49ad
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/prep/pci/pcib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcib.c,v 1.16 2006/03/17 06:11:58 garbled Exp $ */ /* $NetBSD: pcib.c,v 1.17 2006/06/21 20:08:11 garbled Exp $ */
/*- /*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.16 2006/03/17 06:11:58 garbled Exp $"); __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.17 2006/06/21 20:08:11 garbled Exp $");
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -137,10 +137,6 @@ pcibattach(struct device *parent, struct device *self, void *aux)
printf("\n"); printf("\n");
} }
} }
#if NISA > 0
/* Initialize interrupt controller */
init_icu(lvlmask);
#endif
config_defer(self, pcib_callback); config_defer(self, pcib_callback);
} }

30
sys/arch/prep/prep/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.22 2006/06/09 01:19:11 garbled Exp $ */ /* $NetBSD: mainbus.c,v 1.23 2006/06/21 20:08:11 garbled Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22 2006/06/09 01:19:11 garbled Exp $"); __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.23 2006/06/21 20:08:11 garbled Exp $");
#include "opt_pci.h" #include "opt_pci.h"
#include "opt_residual.h" #include "opt_residual.h"
@ -150,8 +150,23 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
extent_destroy(ioext); extent_destroy(ioext);
extent_destroy(memext); extent_destroy(memext);
#endif #endif /* PCI_NETBSD_CONFIGURE */
#endif /* NPCI */
/* scan pnpbus first */
#if NISA > 0
/* Initialize interrupt controller */
init_icu(lvlmask);
#endif
#if NPNPBUS > 0
mba.mba_paa.paa_iot = &prep_isa_io_space_tag;
mba.mba_paa.paa_memt = &prep_isa_mem_space_tag;
mba.mba_paa.paa_ic = &prep_isa_chipset;
config_found_ia(self, "mainbus", &mba.mba_pba, mainbus_print);
#endif /* NPNPBUS */
#if NPCI > 0
bzero(&mba, sizeof(mba));
mba.mba_pba.pba_iot = &prep_io_space_tag; mba.mba_pba.pba_iot = &prep_io_space_tag;
mba.mba_pba.pba_memt = &prep_mem_space_tag; mba.mba_pba.pba_memt = &prep_mem_space_tag;
mba.mba_pba.pba_dmat = &pci_bus_dma_tag; mba.mba_pba.pba_dmat = &pci_bus_dma_tag;
@ -161,15 +176,8 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
mba.mba_pba.pba_bridgetag = NULL; mba.mba_pba.pba_bridgetag = NULL;
mba.mba_pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED; mba.mba_pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED;
config_found_ia(self, "pcibus", &mba.mba_pba, pcibusprint); config_found_ia(self, "pcibus", &mba.mba_pba, pcibusprint);
#endif #endif /* NPCI */
#if NPNPBUS > 0
bzero(&mba, sizeof(mba));
mba.mba_paa.paa_iot = &prep_isa_io_space_tag;
mba.mba_paa.paa_memt = &prep_isa_mem_space_tag;
mba.mba_paa.paa_ic = &prep_isa_chipset;
config_found_ia(self, "mainbus", &mba.mba_pba, mainbus_print);
#endif
} }
int int