Module Name:    src
Committed By:   jdolecek
Date:           Tue Oct 18 22:04:34 UTC 2016

Modified Files:
        src/sys/arch/alpha/include: isa_machdep.h
        src/sys/arch/arc/include: isa_machdep.h
        src/sys/arch/arm/include: isa_machdep.h
        src/sys/arch/atari/include: isa_machdep.h
        src/sys/arch/bebox/include: isa_machdep.h
        src/sys/arch/hpcmips/include: isa_machdep.h
        src/sys/arch/hppa/include: isa_machdep.h
        src/sys/arch/ia64/include: isa_machdep.h
        src/sys/arch/ibmnws/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
        src/sys/arch/ofppc/include: isa_machdep.h
        src/sys/arch/prep/include: isa_machdep.h
        src/sys/arch/sandpoint/include: isa_machdep.h
        src/sys/dev/isa: isa_stub.c

Log Message:
add isa_intr_establish_xname() to MD isa headers so that it can be used
by MI drivers


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/include/isa_machdep.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arc/include/isa_machdep.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/isa_machdep.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/atari/include/isa_machdep.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/bebox/include/isa_machdep.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpcmips/include/isa_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/include/isa_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/isa_machdep.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ibmnws/include/isa_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/include/isa_machdep.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mipsco/include/isa_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mvmeppc/include/isa_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ofppc/include/isa_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/prep/include/isa_machdep.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sandpoint/include/isa_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/isa_stub.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.14 src/sys/arch/alpha/include/isa_machdep.h:1.15
--- src/sys/arch/alpha/include/isa_machdep.h:1.14	Mon Feb  6 02:14:13 2012
+++ src/sys/arch/alpha/include/isa_machdep.h	Tue Oct 18 22:04:33 2016
@@ -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 @@ struct alpha_isa_chipset {
     (*(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)					\

Index: src/sys/arch/arc/include/isa_machdep.h
diff -u src/sys/arch/arc/include/isa_machdep.h:1.16 src/sys/arch/arc/include/isa_machdep.h:1.17
--- src/sys/arch/arc/include/isa_machdep.h:1.16	Sat Oct 27 17:17:35 2012
+++ src/sys/arch/arc/include/isa_machdep.h	Tue Oct 18 22:04:33 2016
@@ -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 @@ struct arc_isa_bus {
     (*(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))
 

Index: src/sys/arch/arm/include/isa_machdep.h
diff -u src/sys/arch/arm/include/isa_machdep.h:1.11 src/sys/arch/arm/include/isa_machdep.h:1.12
--- src/sys/arch/arm/include/isa_machdep.h:1.11	Wed Jan 29 00:42:15 2014
+++ src/sys/arch/arm/include/isa_machdep.h	Tue Oct 18 22:04:33 2016
@@ -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 @@ void	isa_detach_hook(isa_chipset_tag_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);
+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)					\

Index: src/sys/arch/atari/include/isa_machdep.h
diff -u src/sys/arch/atari/include/isa_machdep.h:1.17 src/sys/arch/atari/include/isa_machdep.h:1.18
--- src/sys/arch/atari/include/isa_machdep.h:1.17	Sat Oct 27 17:17:43 2012
+++ src/sys/arch/atari/include/isa_machdep.h	Tue Oct 18 22:04:33 2016
@@ -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 @@ int	isa_intr_alloc(isa_chipset_tag_t, in
 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)					\

Index: src/sys/arch/bebox/include/isa_machdep.h
diff -u src/sys/arch/bebox/include/isa_machdep.h:1.21 src/sys/arch/bebox/include/isa_machdep.h:1.22
--- src/sys/arch/bebox/include/isa_machdep.h:1.21	Sun Aug  7 15:22:19 2011
+++ src/sys/arch/bebox/include/isa_machdep.h	Tue Oct 18 22:04:33 2016
@@ -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 @@ extern struct pic_ops *isa_pic;
 	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)				\

Index: src/sys/arch/hpcmips/include/isa_machdep.h
diff -u src/sys/arch/hpcmips/include/isa_machdep.h:1.9 src/sys/arch/hpcmips/include/isa_machdep.h:1.10
--- src/sys/arch/hpcmips/include/isa_machdep.h:1.9	Sat Oct 27 17:17:54 2012
+++ src/sys/arch/hpcmips/include/isa_machdep.h	Tue Oct 18 22:04:33 2016
@@ -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 @@ void	isa_detach_hook(isa_chipset_tag_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 *);
+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)					\

Index: src/sys/arch/hppa/include/isa_machdep.h
diff -u src/sys/arch/hppa/include/isa_machdep.h:1.1 src/sys/arch/hppa/include/isa_machdep.h:1.2
--- src/sys/arch/hppa/include/isa_machdep.h:1.1	Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/include/isa_machdep.h	Tue Oct 18 22:04:34 2016
@@ -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 @@ struct hppa_isa_chipset {
     (*(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)						\

Index: src/sys/arch/ia64/include/isa_machdep.h
diff -u src/sys/arch/ia64/include/isa_machdep.h:1.1 src/sys/arch/ia64/include/isa_machdep.h:1.2
--- src/sys/arch/ia64/include/isa_machdep.h:1.1	Mon Jul 20 04:41:37 2009
+++ src/sys/arch/ia64/include/isa_machdep.h	Tue Oct 18 22:04:34 2016
@@ -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 @@ isa_intr_establish(isa_chipset_tag_t ic,
 	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_ */

Index: src/sys/arch/ibmnws/include/isa_machdep.h
diff -u src/sys/arch/ibmnws/include/isa_machdep.h:1.6 src/sys/arch/ibmnws/include/isa_machdep.h:1.7
--- src/sys/arch/ibmnws/include/isa_machdep.h:1.6	Wed Aug 19 15:01:30 2009
+++ src/sys/arch/ibmnws/include/isa_machdep.h	Tue Oct 18 22:04:34 2016
@@ -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 @@ extern struct pic_ops *isa_pic;
 	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)				\

Index: src/sys/arch/mips/include/isa_machdep.h
diff -u src/sys/arch/mips/include/isa_machdep.h:1.7 src/sys/arch/mips/include/isa_machdep.h:1.8
--- src/sys/arch/mips/include/isa_machdep.h:1.7	Sun Mar 30 20:06:50 2014
+++ src/sys/arch/mips/include/isa_machdep.h	Tue Oct 18 22:04:34 2016
@@ -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 @@ struct mips_isa_chipset {
     (*(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)					\

Index: src/sys/arch/mipsco/include/isa_machdep.h
diff -u src/sys/arch/mipsco/include/isa_machdep.h:1.9 src/sys/arch/mipsco/include/isa_machdep.h:1.10
--- src/sys/arch/mipsco/include/isa_machdep.h:1.9	Sat Oct 27 17:18:03 2012
+++ src/sys/arch/mipsco/include/isa_machdep.h	Tue Oct 18 22:04:34 2016
@@ -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 @@ int	isa_intr_alloc(isa_chipset_tag_t, in
 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 *);

Index: src/sys/arch/mvmeppc/include/isa_machdep.h
diff -u src/sys/arch/mvmeppc/include/isa_machdep.h:1.7 src/sys/arch/mvmeppc/include/isa_machdep.h:1.8
--- src/sys/arch/mvmeppc/include/isa_machdep.h:1.7	Wed Aug 19 15:09:57 2009
+++ src/sys/arch/mvmeppc/include/isa_machdep.h	Tue Oct 18 22:04:34 2016
@@ -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 @@ extern int isa_pcmciamask;
 	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)				\

Index: src/sys/arch/ofppc/include/isa_machdep.h
diff -u src/sys/arch/ofppc/include/isa_machdep.h:1.7 src/sys/arch/ofppc/include/isa_machdep.h:1.8
--- src/sys/arch/ofppc/include/isa_machdep.h:1.7	Wed Aug 19 15:01:46 2009
+++ src/sys/arch/ofppc/include/isa_machdep.h	Tue Oct 18 22:04:34 2016
@@ -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 @@ void isa_outb(uint32_t, uint8_t);
 	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)				\

Index: src/sys/arch/prep/include/isa_machdep.h
diff -u src/sys/arch/prep/include/isa_machdep.h:1.13 src/sys/arch/prep/include/isa_machdep.h:1.14
--- src/sys/arch/prep/include/isa_machdep.h:1.13	Wed Aug 19 15:02:05 2009
+++ src/sys/arch/prep/include/isa_machdep.h	Tue Oct 18 22:04:34 2016
@@ -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 @@ extern int isa_pcmciamask;
 	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)				\

Index: src/sys/arch/sandpoint/include/isa_machdep.h
diff -u src/sys/arch/sandpoint/include/isa_machdep.h:1.9 src/sys/arch/sandpoint/include/isa_machdep.h:1.10
--- src/sys/arch/sandpoint/include/isa_machdep.h:1.9	Wed Aug 19 15:02:26 2009
+++ src/sys/arch/sandpoint/include/isa_machdep.h	Tue Oct 18 22:04:34 2016
@@ -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 @@ extern struct pic_ops *isa_pic;
 	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)				\

Index: src/sys/dev/isa/isa_stub.c
diff -u src/sys/dev/isa/isa_stub.c:1.2 src/sys/dev/isa/isa_stub.c:1.3
--- src/sys/dev/isa/isa_stub.c:1.2	Tue Oct 18 03:38:50 2016
+++ src/sys/dev/isa/isa_stub.c	Tue Oct 18 22:04:34 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: isa_stub.c,v
 #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);
 
 void *
@@ -58,3 +56,4 @@ default_isa_intr_establish_xname(isa_chi
 {
 	return isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg);
 }
+#endif

Reply via email to