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

Make pmppc use stock <powerpc/pci_machdep.h>

Browse Source 
Move some private declartions to <pmppc/dev/mainbus.h>
This commit is contained in:
matt 2011-06-22 05:08:56 +00:00
parent 2715676450
commit 546208c586
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/evbppc/conf/std.pmppc
View File

@ -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 BOARDTYPE="pmppc"
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"

6
sys/arch/evbppc/include/pmppc_intr.h
View File

@ -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 @@ struct pic_ops *setup_cpc700(void);
#define LEGAL_HWIRQ_P(x) ((u_int)(x) < ICU_LEN && (ICU_MASK & (0x80000000 >> (x))))
#endif /* !_LOCORE */
#endif /* !_LOCORE && !_MODULE */
#endif /* !_PMPPC_INTR_H_ */

15
sys/arch/evbppc/pmppc/dev/mainbus.h
View File

@ -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 @@ struct mainbus_attach_args {
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_ */