Module Name: src
Committed By: jakllsch
Date: Sat Nov 6 00:35:44 UTC 2010
Modified Files:
src/sys/arch/x86/include: pci_machdep_common.h
src/sys/arch/x86/pci: pciide_machdep.c
Log Message:
Implement pciide_machdep_compat_intr_disestablish() to help enable
detachment of compatibility-mapped pciide(4)-family controllers.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/include/pci_machdep_common.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/pci/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/include/pci_machdep_common.h
diff -u src/sys/arch/x86/include/pci_machdep_common.h:1.3 src/sys/arch/x86/include/pci_machdep_common.h:1.4
--- src/sys/arch/x86/include/pci_machdep_common.h:1.3 Wed Apr 28 21:27:14 2010
+++ src/sys/arch/x86/include/pci_machdep_common.h Sat Nov 6 00:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_common.h,v 1.3 2010/04/28 21:27:14 dyoung Exp $ */
+/* $NetBSD: pci_machdep_common.h,v 1.4 2010/11/06 00:35:44 jakllsch Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -37,6 +37,7 @@
* Machine-specific definitions for PCI autoconfiguration.
*/
#define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
+#define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH
/*
* i386-specific PCI structure and type definitions.
Index: src/sys/arch/x86/pci/pciide_machdep.c
diff -u src/sys/arch/x86/pci/pciide_machdep.c:1.9 src/sys/arch/x86/pci/pciide_machdep.c:1.10
--- src/sys/arch/x86/pci/pciide_machdep.c:1.9 Fri May 1 09:26:34 2009
+++ src/sys/arch/x86/pci/pciide_machdep.c Sat Nov 6 00:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.9 2009/05/01 09:26:34 cegger Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.10 2010/11/06 00:35:44 jakllsch 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.9 2009/05/01 09:26:34 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.10 2010/11/06 00:35:44 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,3 +90,10 @@
PCIIDE_CHANNEL_NAME(chan), irq);
return cookie;
}
+
+void
+pciide_machdep_compat_intr_disestablish(device_t dev, pci_chipset_tag_t pc, int chan, void *cookie)
+{
+ isa_intr_disestablish(NULL, cookie);
+ return;
+}
