Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/ia64 Remove empty pci_enumerate_bus() stub specific...



details:   https://anonhg.NetBSD.org/src/rev/59ec1eb97827
branches:  trunk
changeset: 830235:59ec1eb97827
user:      scole <scole%NetBSD.org@localhost>
date:      Thu Mar 01 23:01:19 2018 +0000

description:
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.

diffstat:

 sys/arch/ia64/include/pci_machdep.h |  11 +----------
 sys/arch/ia64/pci/pci_machdep.c     |  14 ++------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diffs (55 lines):

diff -r dedf49b9c80a -r 59ec1eb97827 sys/arch/ia64/include/pci_machdep.h
--- a/sys/arch/ia64/include/pci_machdep.h       Thu Mar 01 19:09:33 2018 +0000
+++ b/sys/arch/ia64/include/pci_machdep.h       Thu Mar 01 23:01:19 2018 +0000
@@ -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 @@
 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
diff -r dedf49b9c80a -r 59ec1eb97827 sys/arch/ia64/pci/pci_machdep.c
--- a/sys/arch/ia64/pci/pci_machdep.c   Thu Mar 01 19:09:33 2018 +0000
+++ b/sys/arch/ia64/pci/pci_machdep.c   Thu Mar 01 23:01:19 2018 +0000
@@ -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 @@
        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;
-}



Home | Main Index | Thread Index | Old Index