[src/trunk]: src/sys/arch/evbppc Make pmppc use stock <powerpc/pci_machdep.h>

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

details:   https://anonhg.NetBSD.org/src/rev/64e0e792d630
branches:  trunk
changeset: 766421:64e0e792d630
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jun 22 05:08:56 2011 +0000

description:
Make pmppc use stock <powerpc/pci_machdep.h>
Move some private declartions to <pmppc/dev/mainbus.h>

diffstat:

 sys/arch/evbppc/conf/std.pmppc       |   4 ++--
 sys/arch/evbppc/include/pmppc_intr.h |   6 +++---
 sys/arch/evbppc/pmppc/dev/mainbus.h  |  15 ++++++++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diffs (76 lines):

diff -r 674dfa5cce2e -r 64e0e792d630 sys/arch/evbppc/conf/std.pmppc
--- a/sys/arch/evbppc/conf/std.pmppc    Wed Jun 22 04:57:28 2011 +0000
+++ b/sys/arch/evbppc/conf/std.pmppc    Wed Jun 22 05:08:56 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: std.pmppc,v 1.3 2008/01/08 13:47:49 joerg Exp $
+#      $NetBSD: std.pmppc,v 1.4 2011/06/22 05:08:56 matt Exp $
 #
 # standard, required NetBSD/pmppc 'options'
 
@@ -20,6 +20,6 @@
 makeoptions    NEED_BINARY=1
 
 options                PPC_INTR_IMPL="<machine/pmppc_intr.h>"
-options                PPC_PCI_MACHDEP_IMPL="<machine/pmppc_pci_machdep.h>"
+options                PPC_PCI_MACHDEP_IMPL="<powerpc/pci_machdep.h>"
 
 include                "arch/evbppc/conf/files.pmppc"
diff -r 674dfa5cce2e -r 64e0e792d630 sys/arch/evbppc/include/pmppc_intr.h
--- a/sys/arch/evbppc/include/pmppc_intr.h      Wed Jun 22 04:57:28 2011 +0000
+++ b/sys/arch/evbppc/include/pmppc_intr.h      Wed Jun 22 05:08:56 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmppc_intr.h,v 1.4 2011/06/17 23:36:17 matt Exp $      */
+/*     $NetBSD: pmppc_intr.h,v 1.5 2011/06/22 05:08:56 matt Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <powerpc/intr.h>
 
-#ifndef _LOCORE
+#if !defined(_LOCORE) && !defined(_MODULE)
 
 struct pic_ops *setup_cpc700(void);
 
@@ -46,6 +46,6 @@
 
 #define        LEGAL_HWIRQ_P(x) ((u_int)(x) < ICU_LEN && (ICU_MASK & (0x80000000 >> (x))))
 
-#endif /* !_LOCORE */
+#endif /* !_LOCORE && !_MODULE */
 
 #endif /* !_PMPPC_INTR_H_ */
diff -r 674dfa5cce2e -r 64e0e792d630 sys/arch/evbppc/pmppc/dev/mainbus.h
--- a/sys/arch/evbppc/pmppc/dev/mainbus.h       Wed Jun 22 04:57:28 2011 +0000
+++ b/sys/arch/evbppc/pmppc/dev/mainbus.h       Wed Jun 22 05:08:56 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.h,v 1.3 2008/04/28 20:23:17 martin Exp $       */
+/*     $NetBSD: mainbus.h,v 1.4 2011/06/22 05:08:56 matt Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -29,6 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _PMPPC_DEV_MAINBUS_H_
+#define _PMPPC_DEV_MAINBUS_H_
+
+#include <dev/pci/pcivar.h>
+#include <machine/pci_machdep.h>
+
 struct mainbus_attach_args {
        const char *mb_name;
        u_long mb_addr;
@@ -46,3 +52,10 @@
 
 extern struct powerpc_bus_space pmppc_mem_tag;
 extern struct powerpc_bus_space pmppc_pci_io_tag;
+extern struct powerpc_bus_dma_tag pci_bus_dma_tag;
+
+int pmppc_pci_intr_map(const struct pci_attach_args *, pci_intr_handle_t *);
+void pmppc_pci_conf_interrupt(pci_chipset_tag_t, int, int, int, int, int *);
+void pmppc_pci_get_chipset_tag(pci_chipset_tag_t);
+
+#endif /* _PMPPC_DEV_MAINBUS_H_ */