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

backout the parts of the previous change (7 months ago) that were *not* part 

of the sys/vm removal, but some (fortunately disabled) work-in-progress.
This commit is contained in:
mrg 2001-02-12 09:14:53 +00:00
parent 433553dc94
commit 6ee70851f1
2 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/pci/pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci.c,v 1.49 2000/06/28 16:08:48 mrg Exp $ */
/* $NetBSD: pci.c,v 1.50 2001/02/12 09:14:53 mrg Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@ -63,20 +63,13 @@ struct pci_softc {
u_int sc_intrswiz;
pcitag_t sc_intrtag;
int sc_flags;
#ifdef __PCI_OFW_BINDING
int sc_node;
#endif
};
struct cfattach pci_ca = {
sizeof(struct pci_softc), pcimatch, pciattach
};
#ifdef __PCI_OFW_BINDING
void pci_ofw_probe_bus __P((struct device *));
#else
void pci_probe_bus __P((struct device *));
#endif
int pciprint __P((void *, const char *));
int pcisubmatch __P((struct device *, struct cfdata *, void *));
@ -133,19 +126,6 @@ pcimatch(parent, cf, aux)
return 1;
}
#ifdef __PCI_OFW_BINDING
void
pci_ofw_probe_bus(self)
struct device *self;
{
struct pci_softc *sc = (struct pci_softc *)self;
int node;
for (node = OF_child(sc->sc_node); node; node = OF_peer(node)) {
}
}
#else
void
pci_probe_bus(self)
struct device *self;
@ -248,7 +228,6 @@ pci_probe_bus(self)
}
}
}
#endif
void
pciattach(parent, self, aux)
@ -307,13 +286,7 @@ pciattach(parent, self, aux)
sc->sc_intrswiz = pba->pba_intrswiz;
sc->sc_intrtag = pba->pba_intrtag;
sc->sc_flags = pba->pba_flags;
#ifdef __PCI_OFW_BINDING
sc->sc_node = pba->pba_node;
pci_ofw_probe_bus(self);
#else
pci_probe_bus(self);
#endif
}
int

10
sys/dev/pci/pcivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcivar.h,v 1.43 2000/06/28 16:08:50 mrg Exp $ */
/* $NetBSD: pcivar.h,v 1.44 2001/02/12 09:14:53 mrg Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -68,10 +68,6 @@ struct pcibus_attach_args {
int pba_bus; /* PCI bus number */
#ifdef __PCI_OFW_BINDING
int pba_node; /* OFW node */
#endif
/*
* Interrupt swizzling information. These fields
* are only used by secondary busses.
@ -95,10 +91,6 @@ struct pci_attach_args {
pcitag_t pa_tag;
pcireg_t pa_id, pa_class;
#ifdef __PCI_OFW_BINDING
int pa_node; /* OFW node */
#endif
/*
* Interrupt information.
*