Module Name: src
Committed By: dyoung
Date: Wed Aug 19 15:00:24 UTC 2009
Modified Files:
src/sys/arch/alpha/include: isa_machdep.h
src/sys/arch/alpha/jensenio: jensenio.c
src/sys/arch/alpha/pci: sio.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/include/isa_machdep.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/jensenio/jensenio.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/alpha/pci/sio.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/alpha/include/isa_machdep.h
diff -u src/sys/arch/alpha/include/isa_machdep.h:1.10 src/sys/arch/alpha/include/isa_machdep.h:1.11
--- src/sys/arch/alpha/include/isa_machdep.h:1.10 Wed Aug 19 14:29:53 2009
+++ src/sys/arch/alpha/include/isa_machdep.h Wed Aug 19 15:00:23 2009
@@ -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) \
Index: src/sys/arch/alpha/jensenio/jensenio.c
diff -u src/sys/arch/alpha/jensenio/jensenio.c:1.18 src/sys/arch/alpha/jensenio/jensenio.c:1.19
--- src/sys/arch/alpha/jensenio/jensenio.c:1.18 Wed Aug 19 14:29:53 2009
+++ src/sys/arch/alpha/jensenio/jensenio.c Wed Aug 19 15:00:24 2009
@@ -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. */
Index: src/sys/arch/alpha/pci/sio.c
diff -u src/sys/arch/alpha/pci/sio.c:1.47 src/sys/arch/alpha/pci/sio.c:1.48
--- src/sys/arch/alpha/pci/sio.c:1.47 Wed Aug 19 14:29:54 2009
+++ src/sys/arch/alpha/pci/sio.c Wed Aug 19 15:00:24 2009
@@ -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. */
