Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys add isa_intr_establish_xname() to MD isa headers so that...
details: https://anonhg.NetBSD.org/src/rev/181b041c15f3
branches: trunk
changeset: 348442:181b041c15f3
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Tue Oct 18 22:04:33 2016 +0000
description:
add isa_intr_establish_xname() to MD isa headers so that it can be used
by MI drivers
diffstat:
sys/arch/alpha/include/isa_machdep.h | 4 +++-
sys/arch/arc/include/isa_machdep.h | 4 +++-
sys/arch/arm/include/isa_machdep.h | 4 +++-
sys/arch/atari/include/isa_machdep.h | 4 +++-
sys/arch/bebox/include/isa_machdep.h | 4 +++-
sys/arch/hpcmips/include/isa_machdep.h | 3 ++-
sys/arch/hppa/include/isa_machdep.h | 4 +++-
sys/arch/ia64/include/isa_machdep.h | 5 ++++-
sys/arch/ibmnws/include/isa_machdep.h | 4 +++-
sys/arch/mips/include/isa_machdep.h | 4 +++-
sys/arch/mipsco/include/isa_machdep.h | 4 +++-
sys/arch/mvmeppc/include/isa_machdep.h | 4 +++-
sys/arch/ofppc/include/isa_machdep.h | 4 +++-
sys/arch/prep/include/isa_machdep.h | 6 +++++-
sys/arch/sandpoint/include/isa_machdep.h | 4 +++-
sys/dev/isa/isa_stub.c | 9 ++++-----
16 files changed, 51 insertions(+), 20 deletions(-)
diffs (truncated from 307 to 300 lines):
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/alpha/include/isa_machdep.h
--- a/sys/arch/alpha/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/alpha/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.14 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.15 2016/10/18 22:04:33 jdolecek Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -90,6 +90,8 @@
(*(c)->ic_intr_evcnt)((c)->ic_v, (i))
#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_establish_xname(c, i, t, l, f, a, x) \
+ (*(c)->ic_intr_establish)((c)->ic_v, (i), (t), (l), (f), (a))
#define isa_intr_disestablish(c, h) \
(*(c)->ic_intr_disestablish)((c)->ic_v, (h))
#define isa_intr_alloc(c, m, t, i) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/arc/include/isa_machdep.h
--- a/sys/arch/arc/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/arc/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.16 2012/10/27 17:17:35 chs Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.17 2016/10/18 22:04:33 jdolecek Exp $ */
/* $OpenBSD: isa_machdep.h,v 1.5 1997/04/19 17:20:00 pefo Exp $ */
/*
@@ -72,6 +72,8 @@
(*(c)->ic_intr_evcnt)((c)->ic_data, (i))
#define isa_intr_establish(c, i, t, l, f, a) \
(*(c)->ic_intr_establish)((c)->ic_data, (i), (t), (l), (f), (a))
+#define isa_intr_establish_xname(c, i, t, l, f, a, x) \
+ (*(c)->ic_intr_establish)((c)->ic_data, (i), (t), (l), (f), (a))
#define isa_intr_disestablish(c, h) \
(*(c)->ic_intr_disestablish)((c)->ic_data, (h))
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/arm/include/isa_machdep.h
--- a/sys/arch/arm/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/arm/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.11 2014/01/29 00:42:15 matt Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.12 2016/10/18 22:04:33 jdolecek Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -56,6 +56,8 @@
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);
+void *isa_intr_establish_xname(isa_chipset_tag_t ic, int irq, int type,
+ int level, int (*ih_fun)(void *), void *ih_arg, const char *xname);
void isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
#define isa_dmainit(ic, bst, dmat, d) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/atari/include/isa_machdep.h
--- a/sys/arch/atari/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/atari/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.17 2012/10/27 17:17:43 chs Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.18 2016/10/18 22:04:33 jdolecek Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,6 +85,8 @@
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 (*)(void *), void *ih_arg);
+void *isa_intr_establish_xname(isa_chipset_tag_t ic, int irq, int type,
+ int level, int (*ih_fun)(void *), void *ih_arg, const char *xname);
void isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
#define isa_dmainit(ic, bst, dmat, d) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/bebox/include/isa_machdep.h
--- a/sys/arch/bebox/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/bebox/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.21 2011/08/07 15:22:19 kiyohara Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.22 2016/10/18 22:04:33 jdolecek Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -54,6 +54,8 @@
genppc_isa_intr_evcnt(ic, irq)
#define isa_intr_establish(ic, irq, type, level, fun, arg) \
genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
+#define isa_intr_establish_xname(ic, irq, type, level, fun, arg, xname) \
+ genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
#define isa_intr_disestablish(ic, arg) \
genppc_isa_intr_disestablish(ic, arg)
#define isa_intr_alloc(ic, mask, type, irqp) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/hpcmips/include/isa_machdep.h
--- a/sys/arch/hpcmips/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/hpcmips/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.9 2012/10/27 17:17:54 chs Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.10 2016/10/18 22:04:33 jdolecek Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -50,6 +50,7 @@
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 *);
+void *isa_intr_establish_xname(isa_chipset_tag_t, int, int, int, int (*)(void *), void *, const char *);
void isa_intr_disestablish(isa_chipset_tag_t, void *);
#define isa_dmainit(ic, bst, dmat, d) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/hppa/include/isa_machdep.h
--- a/sys/arch/hppa/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/hppa/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.2 2016/10/18 22:04:34 jdolecek Exp $ */
/* $OpenBSD: isa_machdep.h,v 1.2 1999/05/05 02:36:54 todd Exp $ */
@@ -56,6 +56,8 @@
(*(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_establish_xname(c, i, t, l, f, a, x) \
+ (*(c)->ic_intr_establish)((c)->ic_v, (i), (t), (l), (f), (a))
#define isa_intr_disestablish(c, h) \
(*(c)->ic_intr_disestablish)((c)->ic_v, (h))
#define isa_intr_check(c, i, t) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/ia64/include/isa_machdep.h
--- a/sys/arch/ia64/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/ia64/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.1 2009/07/20 04:41:37 kiyohara Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.2 2016/10/18 22:04:34 jdolecek Exp $ */
/*
* Copyright (c) 2009 KIYOHARA Takashi
* All rights reserved.
@@ -37,4 +37,7 @@
return intr_establish(irq, type, level, ih_func, ih_arg);
}
+void *isa_intr_establish_xname(isa_chipset_tag_t, int, int, int,
+ int (*)(void *), void *, const char *);
+
#endif /* _ISA_MACHDEP_H_ */
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/ibmnws/include/isa_machdep.h
--- a/sys/arch/ibmnws/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/ibmnws/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.6 2009/08/19 15:01:30 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.7 2016/10/18 22:04:34 jdolecek Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -55,6 +55,8 @@
genppc_isa_intr_evcnt(ic, irq)
#define isa_intr_establish(ic, irq, type, level, fun, arg) \
genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
+#define isa_intr_establish_xname(ic, irq, type, level, fun, arg, xname) \
+ genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
#define isa_intr_disestablish(ic, arg) \
genppc_isa_intr_disestablish(ic, arg)
#define isa_intr_alloc(ic, mask, type, irqp) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/mips/include/isa_machdep.h
--- a/sys/arch/mips/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/mips/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.7 2014/03/30 20:06:50 macallan Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.8 2016/10/18 22:04:34 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -92,6 +92,8 @@
(*(c)->ic_intr_evcnt)((c)->ic_v, (i))
#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_establish_xname(c, i, t, l, f, a, x) \
+ (*(c)->ic_intr_establish)((c)->ic_v, (i), (t), (l), (f), (a))
#define isa_intr_disestablish(c, h) \
(*(c)->ic_intr_disestablish)((c)->ic_v, (h))
#define isa_intr_alloc(c, m, t, i) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/mipsco/include/isa_machdep.h
--- a/sys/arch/mipsco/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/mipsco/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.9 2012/10/27 17:18:03 chs Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.10 2016/10/18 22:04:34 jdolecek Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -108,6 +108,8 @@
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);
+void *isa_intr_establish_xname(isa_chipset_tag_t ic, int irq, int type,
+ int level, int (*ih_fun)(void *), void *ih_arg, const char *xname);
void isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
int isa_mem_alloc(bus_space_tag_t, bus_size_t, bus_size_t,
bus_addr_t, int, bus_addr_t *, bus_space_handle_t *);
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/mvmeppc/include/isa_machdep.h
--- a/sys/arch/mvmeppc/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/mvmeppc/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:09:57 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.8 2016/10/18 22:04:34 jdolecek Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -50,6 +50,8 @@
genppc_isa_intr_evcnt(ic, irq)
#define isa_intr_establish(ic, irq, type, level, fun, arg) \
genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
+#define isa_intr_establish_xname(ic, irq, type, level, fun, arg, xname) \
+ genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
#define isa_intr_disestablish(ic, arg) \
genppc_isa_intr_disestablish(ic, arg)
#define isa_intr_alloc(ic, mask, type, irqp) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/ofppc/include/isa_machdep.h
--- a/sys/arch/ofppc/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/ofppc/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:01:46 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.8 2016/10/18 22:04:34 jdolecek Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -52,6 +52,8 @@
genppc_isa_intr_evcnt(ic, irq)
#define isa_intr_establish(ic, irq, type, level, fun, arg) \
genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
+#define isa_intr_establish_xname(ic, irq, type, level, fun, arg, xname) \
+ genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
#define isa_intr_disestablish(ic, arg) \
genppc_isa_intr_disestablish(ic, arg)
#define isa_intr_alloc(ic, mask, type, irqp) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/prep/include/isa_machdep.h
--- a/sys/arch/prep/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/prep/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.13 2009/08/19 15:02:05 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.14 2016/10/18 22:04:34 jdolecek Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -55,6 +55,10 @@
genppc_isa_intr_evcnt(ic, irq)
#define isa_intr_establish(ic, irq, type, level, fun, arg) \
genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
+#define isa_intr_establish(ic, irq, type, level, fun, arg) \
+ genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
+#define isa_intr_establish_xname(ic, irq, type, level, fun, arg, xname) \
+ genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
#define isa_intr_disestablish(ic, arg) \
genppc_isa_intr_disestablish(ic, arg)
#define isa_intr_alloc(ic, mask, type, irqp) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/arch/sandpoint/include/isa_machdep.h
--- a/sys/arch/sandpoint/include/isa_machdep.h Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/arch/sandpoint/include/isa_machdep.h Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.9 2009/08/19 15:02:26 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.10 2016/10/18 22:04:34 jdolecek Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -49,6 +49,8 @@
genppc_isa_intr_evcnt(ic, irq)
#define isa_intr_establish(ic, irq, type, level, fun, arg) \
genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
+#define isa_intr_establish_xname(ic, irq, type, level, fun, arg, xname) \
+ genppc_isa_intr_establish(ic, irq, type, level, fun, arg)
#define isa_intr_disestablish(ic, arg) \
genppc_isa_intr_disestablish(ic, arg)
#define isa_intr_alloc(ic, mask, type, irqp) \
diff -r 66d96a55aa11 -r 181b041c15f3 sys/dev/isa/isa_stub.c
--- a/sys/dev/isa/isa_stub.c Tue Oct 18 20:44:59 2016 +0000
+++ b/sys/dev/isa/isa_stub.c Tue Oct 18 22:04:33 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_stub.c,v 1.2 2016/10/18 03:38:50 martin Exp $ */
+/* $NetBSD: isa_stub.c,v 1.3 2016/10/18 22:04:34 jdolecek Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_stub.c,v 1.2 2016/10/18 03:38:50 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_stub.c,v 1.3 2016/10/18 22:04:34 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,12 +44,10 @@
#include <dev/isa/isavar.h>
#include <dev/isa/isadmareg.h>
+#if !defined(isa_intr_establish_xname)
void *default_isa_intr_establish_xname(isa_chipset_tag_t ic, int irq,
int type,
int level, int (*ih_fun)(void *), void *ih_arg, const char *xname);
-void *isa_intr_establish_xname(isa_chipset_tag_t ic, int irq,
- int type,
- int level, int (*ih_fun)(void *), void *ih_arg, const char *xname);
__strict_weak_alias(isa_intr_establish_xname, default_isa_intr_establish_xname);
Home |
Main Index |
Thread Index |
Old Index