Module Name: src
Committed By: scole
Date: Thu Mar 1 23:01:19 UTC 2018
Modified Files:
src/sys/arch/ia64/include: pci_machdep.h
src/sys/arch/ia64/pci: pci_machdep.c
Log Message:
Remove empty pci_enumerate_bus() stub specific for ia64. I think it was
originally added to allow acpi compilation with pci, which appears to no longer
be an issue.
PCI will need to be revisited for ia64 at some point.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/pci_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/pci/pci_machdep.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/ia64/include/pci_machdep.h
diff -u src/sys/arch/ia64/include/pci_machdep.h:1.3 src/sys/arch/ia64/include/pci_machdep.h:1.4
--- src/sys/arch/ia64/include/pci_machdep.h:1.3 Fri Aug 5 17:01:56 2016
+++ src/sys/arch/ia64/include/pci_machdep.h Thu Mar 1 23:01:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.3 2016/08/05 17:01:56 scole Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.4 2018/03/01 23:01:19 scole Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -42,13 +42,4 @@ void pci_decompose_tag(pci_chipset_tag_t
pcireg_t pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
void pci_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
-/*
- * XXX should ia64_pci_enumerate_bus and
- * #define PCI_MACHDEP_ENUMERATE_BUS ia64_pci_enumerate_bus
- * be used? acpi_pci appears to require pci_enumerate_bus though.
- */
-int pci_enumerate_bus(struct pci_softc *, const int *,
- int (*)(const struct pci_attach_args *),
- struct pci_attach_args *);
-
#endif
Index: src/sys/arch/ia64/pci/pci_machdep.c
diff -u src/sys/arch/ia64/pci/pci_machdep.c:1.5 src/sys/arch/ia64/pci/pci_machdep.c:1.6
--- src/sys/arch/ia64/pci/pci_machdep.c:1.5 Fri Aug 5 17:04:52 2016
+++ src/sys/arch/ia64/pci/pci_machdep.c Thu Mar 1 23:01:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.5 2016/08/05 17:04:52 scole Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.6 2018/03/01 23:01:19 scole Exp $ */
/*
* Copyright (c) 2009, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.5 2016/08/05 17:04:52 scole Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.6 2018/03/01 23:01:19 scole Exp $");
#include <machine/bus.h>
#include <machine/sal.h>
@@ -102,13 +102,3 @@ pci_conf_write(pci_chipset_tag_t pc, pci
if (res.sal_status < 0)
printf("pci configuration write failed\n");
}
-
-int
-pci_enumerate_bus(struct pci_softc *sc, const int *locators,
- int (*match)(const struct pci_attach_args *), struct pci_attach_args *pap)
-{
- /* XXX implement */
- panic("ia64 pci_enumerate_bus not implemented");
-
- return -1;
-}
