[src/trunk]: src/sys/arch/x86 Implement pciide_machdep_compat_intr_disestabli...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f93b85b1c340
branches:  trunk
changeset: 758486:f93b85b1c340
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Nov 06 00:35:44 2010 +0000

description:
Implement pciide_machdep_compat_intr_disestablish() to help enable
detachment of compatibility-mapped pciide(4)-family controllers.

diffstat:

 sys/arch/x86/include/pci_machdep_common.h |   3 ++-
 sys/arch/x86/pci/pciide_machdep.c         |  11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r d6e80c2be464 -r f93b85b1c340 sys/arch/x86/include/pci_machdep_common.h
--- a/sys/arch/x86/include/pci_machdep_common.h Sat Nov 06 00:29:09 2010 +0000
+++ b/sys/arch/x86/include/pci_machdep_common.h Sat Nov 06 00:35:44 2010 +0000
@@ -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.
diff -r d6e80c2be464 -r f93b85b1c340 sys/arch/x86/pci/pciide_machdep.c
--- a/sys/arch/x86/pci/pciide_machdep.c Sat Nov 06 00:29:09 2010 +0000
+++ b/sys/arch/x86/pci/pciide_machdep.c Sat Nov 06 00:35:44 2010 +0000
@@ -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;
+}