Module Name: src
Committed By: dyoung
Date: Wed Aug 19 15:09:57 UTC 2009
Modified Files:
src/sys/arch/algor/include: isa_machdep.h
src/sys/arch/alpha/include: isa_machdep.h
src/sys/arch/arc/include: isa_machdep.h
src/sys/arch/atari/include: isa_machdep.h
src/sys/arch/hp700/include: isa_machdep.h
src/sys/arch/hpcmips/include: isa_machdep.h
src/sys/arch/mips/include: isa_machdep.h
src/sys/arch/mipsco/include: isa_machdep.h
src/sys/arch/mvmeppc/include: isa_machdep.h
Log Message:
(Re-)define isa_detach_hook(), and define isa_dmadestroy(). Update
some isa_chipset_tag_t->ic_detach_hook() definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/include/isa_machdep.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/alpha/include/isa_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/include/isa_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/atari/include/isa_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp700/include/isa_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcmips/include/isa_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/include/isa_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mipsco/include/isa_machdep.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvmeppc/include/isa_machdep.h
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/algor/include/isa_machdep.h
diff -u src/sys/arch/algor/include/isa_machdep.h:1.5 src/sys/arch/algor/include/isa_machdep.h:1.6
--- src/sys/arch/algor/include/isa_machdep.h:1.5 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/algor/include/isa_machdep.h Wed Aug 19 15:09:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.5 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.6 2009/08/19 15:09:56 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -75,6 +75,7 @@
int (*)(void *), void *);
void (*ic_intr_disestablish)(void *, void *);
int (*ic_intr_alloc)(void *, int, int, int *);
+ void (*ic_detach_hook)(isa_chipset_tag_t, device_t);
};
@@ -83,6 +84,8 @@
*/
#define isa_attach_hook(p, s, a) \
(*(a)->iba_ic->ic_attach_hook)((p), (s), (a))
+#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) \
@@ -94,6 +97,8 @@
#define isa_dmainit(ic, bst, dmat, d) \
_isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d))
+#define isa_dmadestroy(ic) \
+ _isa_dmadestroy(&(ic)->ic_dmastate)
#define isa_dmacascade(ic, c) \
_isa_dmacascade(&(ic)->ic_dmastate, (c))
#define isa_dmamaxsize(ic, c) \
Index: src/sys/arch/alpha/include/isa_machdep.h
diff -u src/sys/arch/alpha/include/isa_machdep.h:1.11 src/sys/arch/alpha/include/isa_machdep.h:1.12
--- src/sys/arch/alpha/include/isa_machdep.h:1.11 Wed Aug 19 15:00:23 2009
+++ src/sys/arch/alpha/include/isa_machdep.h Wed Aug 19 15:09:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.11 2009/08/19 15:00:23 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.12 2009/08/19 15:09:56 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -75,6 +75,7 @@
int (*)(void *), void *);
void (*ic_intr_disestablish)(void *, void *);
int (*ic_intr_alloc)(void *, int, int, int *);
+ void (*ic_detach_hook)(isa_chipset_tag_t, device_t);
};
Index: src/sys/arch/arc/include/isa_machdep.h
diff -u src/sys/arch/arc/include/isa_machdep.h:1.13 src/sys/arch/arc/include/isa_machdep.h:1.14
--- src/sys/arch/arc/include/isa_machdep.h:1.13 Mon Jun 12 15:39:01 2006
+++ src/sys/arch/arc/include/isa_machdep.h Wed Aug 19 15:09:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.13 2006/06/12 15:39:01 tsutsui Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.14 2009/08/19 15:09:56 dyoung Exp $ */
/* $OpenBSD: isa_machdep.h,v 1.5 1997/04/19 17:20:00 pefo Exp $ */
/*
@@ -57,6 +57,7 @@
void *(*ic_intr_establish)(isa_chipset_tag_t, int, int, int,
int (*)(void *), void *);
void (*ic_intr_disestablish)(isa_chipset_tag_t, void *);
+ void (*ic_detach_hook)(isa_chipset_tag_t, device_t);
};
@@ -65,6 +66,8 @@
*/
#define isa_attach_hook(p, s, a) /* \
(*(a)->iba_ic->ic_attach_hook)((p), (s), (a)) */
+#define isa_detach_hook(c, s) \
+ (*(c)->ic_detach_hook)((c), (s))
#define isa_intr_evcnt(c, i) \
(*(c)->ic_intr_evcnt)((c)->ic_data, (i))
#define isa_intr_establish(c, i, t, l, f, a) \
@@ -74,6 +77,8 @@
#define isa_dmainit(ic, bst, dmat, d) \
_isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d))
+#define isa_dmadestroy(ic) \
+ _isa_dmadestroy(&(ic)->ic_dmastate)
#define isa_dmacascade(ic, c) \
_isa_dmacascade(&(ic)->ic_dmastate, (c))
#define isa_dmamaxsize(ic, c) \
Index: src/sys/arch/atari/include/isa_machdep.h
diff -u src/sys/arch/atari/include/isa_machdep.h:1.13 src/sys/arch/atari/include/isa_machdep.h:1.14
--- src/sys/arch/atari/include/isa_machdep.h:1.13 Wed Jul 8 12:23:10 2009
+++ src/sys/arch/atari/include/isa_machdep.h Wed Aug 19 15:09:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.13 2009/07/08 12:23:10 tsutsui Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.14 2009/08/19 15:09:56 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,6 +85,7 @@
*/
void isa_attach_hook(struct device *, struct device *,
struct isabus_attach_args *);
+void isa_detach_hook(isa_chipset_tag_t, device_t);
int isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
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,
@@ -93,6 +94,8 @@
#define isa_dmainit(ic, bst, dmat, d) \
_isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d))
+#define isa_dmadestroy(ic) \
+ _isa_dmadestroy(&(ic)->ic_dmastate)
#define isa_dmacascade(ic, c) \
_isa_dmacascade(&(ic)->ic_dmastate, (c))
#define isa_dmamaxsize(ic, c) \
Index: src/sys/arch/hp700/include/isa_machdep.h
diff -u src/sys/arch/hp700/include/isa_machdep.h:1.3 src/sys/arch/hp700/include/isa_machdep.h:1.4
--- src/sys/arch/hp700/include/isa_machdep.h:1.3 Thu May 7 15:34:49 2009
+++ src/sys/arch/hp700/include/isa_machdep.h Wed Aug 19 15:09:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.3 2009/05/07 15:34:49 skrll Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.4 2009/08/19 15:09:56 dyoung Exp $ */
/* $OpenBSD: isa_machdep.h,v 1.2 1999/05/05 02:36:54 todd Exp $ */
@@ -48,6 +48,7 @@
int (*)(void *), void *);
void (*ic_intr_disestablish)(void *, void *);
int (*ic_intr_check)(void *, int, int);
+ void (*ic_detach_hook)(isa_chipset_tag_t, device_t);
};
/*
@@ -55,6 +56,8 @@
*/
#define isa_attach_hook(p, s, a) \
(*(a)->iba_ic->ic_attach_hook)((p), (s), (a))
+#define isa_detach_hook(c, s) \
+ (*(c)->ic_detach_hook)((c), (s))
#define isa_intr_establish(c, i, t, l, f, a) \
(*(c)->ic_intr_establish)((c)->ic_v, (i), (t), (l), (f), (a))
#define isa_intr_disestablish(c, h) \
Index: src/sys/arch/hpcmips/include/isa_machdep.h
diff -u src/sys/arch/hpcmips/include/isa_machdep.h:1.7 src/sys/arch/hpcmips/include/isa_machdep.h:1.8
--- src/sys/arch/hpcmips/include/isa_machdep.h:1.7 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpcmips/include/isa_machdep.h Wed Aug 19 15:09:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.7 2008/04/28 20:23:21 martin Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.8 2009/08/19 15:09:56 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -46,6 +46,7 @@
* Functions provided to machine-independent ISA code.
*/
void isa_attach_hook(struct device*, struct device*, struct isabus_attach_args*);
+void isa_detach_hook(isa_chipset_tag_t, device_t);
int isa_intr_alloc(isa_chipset_tag_t, int, int, int*);
const struct evcnt *isa_intr_evcnt(isa_chipset_tag_t ic, int irq);
void *isa_intr_establish(isa_chipset_tag_t, int, int, int, int (*)(void *), void*);
@@ -53,6 +54,8 @@
#define isa_dmainit(ic, bst, dmat, d) \
_isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d))
+#define isa_dmadestroy(ic) \
+ _isa_dmadestroy(&(ic)->ic_dmastate)
#define isa_dmacascade(ic, c) \
_isa_dmacascade(&(ic)->ic_dmastate, (c))
#define isa_dmamaxsize(ic, c) \
Index: src/sys/arch/mips/include/isa_machdep.h
diff -u src/sys/arch/mips/include/isa_machdep.h:1.3 src/sys/arch/mips/include/isa_machdep.h:1.4
--- src/sys/arch/mips/include/isa_machdep.h:1.3 Mon Apr 28 20:23:28 2008
+++ src/sys/arch/mips/include/isa_machdep.h Wed Aug 19 15:09:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.3 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.4 2009/08/19 15:09:56 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -77,6 +77,7 @@
int (*ic_intr_alloc)(void *, int, int, int *);
const char *(*ic_intr_string)(void *, int);
+ void (*ic_detach_hook)(isa_chipset_tag_t, device_t);
};
@@ -85,6 +86,8 @@
*/
#define isa_attach_hook(p, s, a) \
(*(a)->iba_ic->ic_attach_hook)((p), (s), (a))
+#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) \
@@ -96,6 +99,8 @@
#define isa_dmainit(ic, bst, dmat, d) \
_isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d))
+#define isa_dmadestroy(ic) \
+ _isa_dmadestroy(&(ic)->ic_dmastate)
#define isa_dmacascade(ic, c) \
_isa_dmacascade(&(ic)->ic_dmastate, (c))
#define isa_dmamaxsize(ic, c) \
Index: src/sys/arch/mipsco/include/isa_machdep.h
diff -u src/sys/arch/mipsco/include/isa_machdep.h:1.7 src/sys/arch/mipsco/include/isa_machdep.h:1.8
--- src/sys/arch/mipsco/include/isa_machdep.h:1.7 Mon Apr 28 20:23:28 2008
+++ src/sys/arch/mipsco/include/isa_machdep.h Wed Aug 19 15:09:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.7 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.8 2009/08/19 15:09:56 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -105,6 +105,7 @@
*/
void isa_attach_hook(struct device *, struct device *,
struct isabus_attach_args *);
+void isa_detach_hook(isa_chipset_tag_t, device_t);
int isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
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,
@@ -116,6 +117,8 @@
#define isa_dmainit(ic, bst, dmat, d) \
_isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d))
+#define isa_dmadestroy(ic) \
+ _isa_dmadestroy(&(ic)->ic_dmastate)
#define isa_dmacascade(ic, c) \
_isa_dmacascade(&(ic)->ic_dmastate, (c))
#define isa_dmamaxsize(ic, c) \
Index: src/sys/arch/mvmeppc/include/isa_machdep.h
diff -u src/sys/arch/mvmeppc/include/isa_machdep.h:1.6 src/sys/arch/mvmeppc/include/isa_machdep.h:1.7
--- src/sys/arch/mvmeppc/include/isa_machdep.h:1.6 Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mvmeppc/include/isa_machdep.h Wed Aug 19 15:09:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.6 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:09:57 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -44,6 +44,8 @@
/* function mappings */
#define isa_attach_hook(p, s, iaa) \
genppc_isa_attach_hook(p, s, iaa)
+#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) \
