isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t. trunk
authordyoung <dyoung@NetBSD.org>
Wed, 19 Aug 2009 15:00:23 +0000
branchtrunk
changeset 183096 f0f6ae36e860
parent 183095 195dbbb7ff63
child 183097 7186fe2e2bc4
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
sys/arch/alpha/include/isa_machdep.h
sys/arch/alpha/jensenio/jensenio.c
sys/arch/alpha/pci/sio.c
sys/arch/arm/footbridge/isa/isa_machdep.c
sys/arch/arm/include/isa_machdep.h
sys/arch/bebox/include/isa_machdep.h
sys/arch/ibmnws/include/isa_machdep.h
sys/arch/ofppc/include/isa_machdep.h
sys/arch/prep/include/isa_machdep.h
sys/arch/sandpoint/include/isa_machdep.h
--- a/sys/arch/alpha/include/isa_machdep.h	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/alpha/include/isa_machdep.h	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.10 2009/08/19 14:29:53 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.11 2009/08/19 15:00:23 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -83,8 +83,8 @@
  */
 #define	isa_attach_hook(p, s, a)					\
     (*(a)->iba_ic->ic_attach_hook)((p), (s), (a))
-#define	isa_detach_hook(s)						\
-    (*(a)->iba_ic->ic_detach_hook)((s))
+#define	isa_detach_hook(c, s)						\
+    (*(c)->ic_detach_hook)((c), (s))
 #define	isa_intr_evcnt(c, i)					\
     (*(c)->ic_intr_evcnt)((c)->ic_v, (i))
 #define	isa_intr_establish(c, i, t, l, f, a)				\
--- a/sys/arch/alpha/jensenio/jensenio.c	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/alpha/jensenio/jensenio.c	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio.c,v 1.18 2009/08/19 14:29:53 dyoung Exp $ */
+/* $NetBSD: jensenio.c,v 1.19 2009/08/19 15:00:24 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.18 2009/08/19 14:29:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.19 2009/08/19 15:00:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -97,7 +97,7 @@
 static void	jensenio_isa_attach_hook(device_t, device_t,
 	    struct isabus_attach_args *);
 
-static void	jensenio_isa_detach_hook(device_t);
+static void	jensenio_isa_detach_hook(isa_chipset_tag_t, device_t);
 
 /*
  * Set up the Jensen's function pointers.
@@ -259,7 +259,7 @@
 }
 
 static void
-jensenio_isa_detach_hook(device_t self)
+jensenio_isa_detach_hook(isa_chipset_tag_t ic, device_t self)
 {
 
 	/* Nothing to do. */
--- a/sys/arch/alpha/pci/sio.c	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/alpha/pci/sio.c	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.47 2009/08/19 14:29:54 dyoung Exp $ */
+/* $NetBSD: sio.c,v 1.48 2009/08/19 15:00:24 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.47 2009/08/19 14:29:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.48 2009/08/19 15:00:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -125,7 +125,7 @@
 
 void	sio_isa_attach_hook(struct device *, struct device *,
 	    struct isabus_attach_args *);
-void	sio_isa_detach_hook(device_t);
+void	sio_isa_detach_hook(isa_chipset_tag_t, device_t);
 #if NPCEB > 0
 void	sio_eisa_attach_hook(struct device *, struct device *,
 	    struct eisabus_attach_args *);
@@ -294,7 +294,7 @@
 }
 
 void
-sio_isa_detach_hook(device_t self)
+sio_isa_detach_hook(isa_chipset_tag_t ic, device_t self)
 {
 
 	/* Nothing to do. */
--- a/sys/arch/arm/footbridge/isa/isa_machdep.c	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/arm/footbridge/isa/isa_machdep.c	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.14 2009/08/18 17:02:00 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.15 2009/08/19 15:01:07 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.14 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.15 2009/08/19 15:01:07 dyoung Exp $");
 
 #include "opt_irqstats.h"
 
@@ -501,7 +501,7 @@
 }
 
 void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
 {
 #if NISADMA > 0
 	isa_dma_destroy();
--- a/sys/arch/arm/include/isa_machdep.h	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/arm/include/isa_machdep.h	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.6 2009/08/19 14:35:45 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:01:07 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 void	isa_attach_hook(struct device *, struct device *,
 	    struct isabus_attach_args *);
-void	isa_detach_hook(device_t);
+void	isa_detach_hook(isa_chipset_tag_t, device_t);
 const struct evcnt *isa_intr_evcnt(isa_chipset_tag_t ic, int irq);
 void	*isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
 	    int level, int (*ih_fun)(void *), void *ih_arg);
--- a/sys/arch/bebox/include/isa_machdep.h	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/bebox/include/isa_machdep.h	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.19 2009/08/19 14:32:26 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.20 2009/08/19 15:00:46 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -49,8 +49,8 @@
 /* function mappings */
 #define isa_attach_hook(p, s, iaa)					\
 	genppc_isa_attach_hook(p, s, iaa)
-#define isa_detach_hook(s)						\
-	genppc_isa_detach_hook(s)
+#define isa_detach_hook(c, s)						\
+	genppc_isa_detach_hook(c, s)
 #define isa_intr_evcnt(ic, irq)						\
 	genppc_isa_intr_evcnt(ic, irq)
 #define isa_intr_establish(ic, irq, type, level, fun, arg)		\
--- a/sys/arch/ibmnws/include/isa_machdep.h	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/ibmnws/include/isa_machdep.h	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.5 2009/08/19 14:37:24 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.6 2009/08/19 15:01:30 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -49,8 +49,8 @@
 /* function mappings */
 #define isa_attach_hook(p, s, iaa)					\
 	genppc_isa_attach_hook(p, s, iaa)
-#define isa_detach_hook(s)						\
-	genppc_isa_detach_hook(s)
+#define isa_detach_hook(c, s)						\
+	genppc_isa_detach_hook(c, s)
 #define isa_intr_evcnt(ic, irq)						\
 	genppc_isa_intr_evcnt(ic, irq)
 #define isa_intr_establish(ic, irq, type, level, fun, arg)		\
--- a/sys/arch/ofppc/include/isa_machdep.h	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/ofppc/include/isa_machdep.h	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.6 2009/08/19 14:40:36 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:01:46 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -46,8 +46,8 @@
 /* function mappings */
 #define isa_attach_hook(p, s, iaa)					\
 	genppc_isa_attach_hook(p, s, iaa)
-#define isa_detach_hook(s)						\
-	genppc_isa_detach_hook(s)
+#define isa_detach_hook(c, s)						\
+	genppc_isa_detach_hook(c, s)
 #define isa_intr_evcnt(ic, irq)						\
 	genppc_isa_intr_evcnt(ic, irq)
 #define isa_intr_establish(ic, irq, type, level, fun, arg)		\
--- a/sys/arch/prep/include/isa_machdep.h	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/prep/include/isa_machdep.h	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.12 2009/08/19 14:41:25 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.13 2009/08/19 15:02:05 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -49,8 +49,8 @@
 /* function mappings */
 #define isa_attach_hook(p, s, iaa)					\
 	genppc_isa_attach_hook(p, s, iaa)
-#define isa_detach_hook(s)						\
-	genppc_isa_detach_hook(s)
+#define isa_detach_hook(c, s)						\
+	genppc_isa_detach_hook(c, s)
 #define isa_intr_evcnt(ic, irq)						\
 	genppc_isa_intr_evcnt(ic, irq)
 #define isa_intr_establish(ic, irq, type, level, fun, arg)		\
--- a/sys/arch/sandpoint/include/isa_machdep.h	Wed Aug 19 14:58:48 2009 +0000
+++ b/sys/arch/sandpoint/include/isa_machdep.h	Wed Aug 19 15:00:23 2009 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.8 2009/08/19 14:41:57 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.9 2009/08/19 15:02:26 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -43,8 +43,8 @@
 /* function mappings */
 #define isa_attach_hook(p, s, iaa)					\
 	genppc_isa_attach_hook(p, s, iaa)
-#define isa_detach_hook(s)						\
-	genppc_isa_detach_hook(s)
+#define isa_detach_hook(c, s)						\
+	genppc_isa_detach_hook(c, s)
 #define isa_intr_evcnt(ic, irq)						\
 	genppc_isa_intr_evcnt(ic, irq)
 #define isa_intr_establish(ic, irq, type, level, fun, arg)		\