Module Name: src
Committed By: skrll
Date: Fri Aug 26 13:58:27 UTC 2016
Modified Files:
src/sys/arch/evbmips/loongson: mainbus.c
Log Message:
Make PCI_NETBSD_CONFIGURE compile
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/loongson/mainbus.c
diff -u src/sys/arch/evbmips/loongson/mainbus.c:1.1 src/sys/arch/evbmips/loongson/mainbus.c:1.2
--- src/sys/arch/evbmips/loongson/mainbus.c:1.1 Sat Aug 27 13:42:45 2011
+++ src/sys/arch/evbmips/loongson/mainbus.c Fri Aug 26 13:58:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.1 2011/08/27 13:42:45 bouyer Exp $ */
+/* $NetBSD: mainbus.c,v 1.2 2016/08/26 13:58:27 skrll Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.1 2011/08/27 13:42:45 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2016/08/26 13:58:27 skrll Exp $");
#include "opt_pci.h"
@@ -59,6 +59,9 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <mips/bonito/bonitoreg.h>
#include <evbmips/loongson/autoconf.h>
+#if defined(PCI_NETBSD_CONFIGURE)
+#include <evbmips/loongson/loongson_bus_defs.h>
+#endif
#include "locators.h"
#include "pci.h"
@@ -100,19 +103,16 @@ mainbus_attach(device_t parent, device_t
aprint_normal("\n");
#if defined(PCI_NETBSD_CONFIGURE)
- {
- struct extent *ioext, *memext;
-
- ioext = extent_create("pciio", 0x00001000, 0x00003fff,
- M_DEVBUF, NULL, 0, EX_NOWAIT);
- memext = extent_create("pcimem", 0, BONITO_PCILO_SIZE,
- M_DEVBUF, NULL, 0, EX_NOWAIT);
-
- pci_configure_bus(&gdium_configuration.gc_pc, ioext, memext,
- NULL, 0, mips_dcache_align);
- extent_destroy(ioext);
- extent_destroy(memext);
- }
+ struct extent *ioext = extent_create("pciio", 0x00001000, 0x00003fff,
+ NULL, 0, EX_NOWAIT);
+ struct extent *memext = extent_create("pcimem", 0, BONITO_PCILO_SIZE,
+ NULL, 0, EX_NOWAIT);
+ struct mips_cache_info * const mci = &mips_cache_info;
+
+ pci_configure_bus(&bonito_pc, ioext, memext,
+ NULL, 0, mci->mci_dcache_align);
+ extent_destroy(ioext);
+ extent_destroy(memext);
#endif /* PCI_NETBSD_CONFIGURE */
for (i = 0; i < __arraycount(mainbusdevs); i++) {
