Module Name: src
Committed By: cherry
Date: Sat Nov 4 15:24:42 UTC 2017
Modified Files:
src/sys/arch/x86/pci: pciide_machdep.c
src/sys/arch/xen/conf: files.xen
Removed Files:
src/sys/arch/xen/xen: pci_intr_machdep.c pciide_machdep.c
Log Message:
Remove bitrotted xen specific versions of pci, pciide machdep related code.
Use the common x86/ code instead.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/pci/pciide_machdep.c
cvs rdiff -u -r1.161 -r1.162 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.21 -r0 src/sys/arch/xen/xen/pci_intr_machdep.c
cvs rdiff -u -r1.20 -r0 src/sys/arch/xen/xen/pciide_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/x86/pci/pciide_machdep.c
diff -u src/sys/arch/x86/pci/pciide_machdep.c:1.16 src/sys/arch/x86/pci/pciide_machdep.c:1.17
--- src/sys/arch/x86/pci/pciide_machdep.c:1.16 Sat Oct 15 16:46:14 2016
+++ src/sys/arch/x86/pci/pciide_machdep.c Sat Nov 4 15:24:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.16 2016/10/15 16:46:14 jdolecek Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.17 2017/11/04 15:24:42 cherry Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.16 2016/10/15 16:46:14 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.17 2017/11/04 15:24:42 cherry Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,6 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciide_machd
#include <machine/mpbiosvar.h>
#endif
+#ifdef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
void *
pciide_machdep_compat_intr_establish(device_t dev,
const struct pci_attach_args *pa, int chan, int (*func)(void *),
@@ -96,7 +97,9 @@ pciide_machdep_compat_intr_establish(dev
PCIIDE_CHANNEL_NAME(chan), irq);
return cookie;
}
+#endif /* __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH */
+#ifdef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH
void
pciide_machdep_compat_intr_disestablish(device_t dev, pci_chipset_tag_t pc,
int chan, void *cookie)
@@ -104,3 +107,4 @@ pciide_machdep_compat_intr_disestablish(
isa_intr_disestablish(NULL, cookie);
return;
}
+#endif /* __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH */
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.161 src/sys/arch/xen/conf/files.xen:1.162
--- src/sys/arch/xen/conf/files.xen:1.161 Sat Nov 4 14:56:48 2017
+++ src/sys/arch/xen/conf/files.xen Sat Nov 4 15:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.161 2017/11/04 14:56:48 cherry Exp $
+# $NetBSD: files.xen,v 1.162 2017/11/04 15:24:42 cherry Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
@@ -232,7 +232,7 @@ include "dev/pckbport/files.pckbport"
include "dev/i2o/files.i2o"
include "dev/pci/files.pci"
include "dev/pci/files.agp"
-file arch/xen/xen/pciide_machdep.c pciide_common
+file arch/x86/pci/pciide_machdep.c pciide_common
device pciback {unit = -1}
attach pciback at pci
@@ -382,7 +382,9 @@ defflag opt_xen.h DOM0OPS
file arch/xen/xen/privcmd.c dom0ops
file arch/xen/x86/xen_shm_machdep.c dom0ops
file arch/x86/pci/pci_machdep.c hypervisor & pci & dom0ops
-file arch/xen/xen/pci_intr_machdep.c hypervisor & pci
+file arch/x86/pci/pci_intr_machdep.c hypervisor & pci
+file arch/x86/pci/pci_msi_machdep.c hypervisor & pci
+file arch/x86/pci/msipic.c hypervisor & pci
file arch/x86/isa/isa_machdep.c hypervisor & dom0ops
file arch/xen/xen/xenevt.c xenevt & dom0ops
file arch/xen/xen/xennetback_xenbus.c xvif
