summaryrefslogtreecommitdiff
path: root/sys/arch/alpha/pci
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/alpha/pci')
-rw-r--r--sys/arch/alpha/pci/apecs.c1
-rw-r--r--sys/arch/alpha/pci/apecs_lca_bus_io.c1
-rw-r--r--sys/arch/alpha/pci/apecs_lca_bus_mem.c1
-rw-r--r--sys/arch/alpha/pci/apecs_pci.c1
-rw-r--r--sys/arch/alpha/pci/apecsreg.h1
-rw-r--r--sys/arch/alpha/pci/apecsvar.h1
-rw-r--r--sys/arch/alpha/pci/bt485reg.h1
-rw-r--r--sys/arch/alpha/pci/cia.c1
-rw-r--r--sys/arch/alpha/pci/cia_bus_io.c1
-rw-r--r--sys/arch/alpha/pci/cia_bus_mem.c1
-rw-r--r--sys/arch/alpha/pci/cia_pci.c1
-rw-r--r--sys/arch/alpha/pci/ciareg.h1
-rw-r--r--sys/arch/alpha/pci/ciavar.h1
-rw-r--r--sys/arch/alpha/pci/lca.c1
-rw-r--r--sys/arch/alpha/pci/lca_pci.c1
-rw-r--r--sys/arch/alpha/pci/lcareg.h1
-rw-r--r--sys/arch/alpha/pci/lcavar.h1
-rw-r--r--sys/arch/alpha/pci/pci_2100_a50.c8
-rw-r--r--sys/arch/alpha/pci/pci_2100_a50.h1
-rw-r--r--sys/arch/alpha/pci/pci_axppci_33.c8
-rw-r--r--sys/arch/alpha/pci/pci_axppci_33.h1
-rw-r--r--sys/arch/alpha/pci/pci_kn20aa.c6
-rw-r--r--sys/arch/alpha/pci/pci_kn20aa.h1
-rw-r--r--sys/arch/alpha/pci/pci_machdep.c1
-rw-r--r--sys/arch/alpha/pci/pci_machdep.h7
-rw-r--r--sys/arch/alpha/pci/pcivga.c1
-rw-r--r--sys/arch/alpha/pci/pcivgavar.h1
-rw-r--r--sys/arch/alpha/pci/pcs_bus_io_common.c1
-rw-r--r--sys/arch/alpha/pci/pcs_bus_mem_common.c1
-rw-r--r--sys/arch/alpha/pci/sio.c1
-rw-r--r--sys/arch/alpha/pci/sio_pic.c4
-rw-r--r--sys/arch/alpha/pci/sioreg.h1
-rw-r--r--sys/arch/alpha/pci/siovar.h3
-rw-r--r--sys/arch/alpha/pci/tga.c4
-rw-r--r--sys/arch/alpha/pci/tga_bt463.c1
-rw-r--r--sys/arch/alpha/pci/tga_bt485.c1
-rw-r--r--sys/arch/alpha/pci/tga_conf.c1
-rw-r--r--sys/arch/alpha/pci/tgavar.h1
38 files changed, 57 insertions, 14 deletions
diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c
index ec858ee1bab..9c57dbb14a8 100644
--- a/sys/arch/alpha/pci/apecs.c
+++ b/sys/arch/alpha/pci/apecs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: apecs.c,v 1.4 1996/07/29 23:00:01 niklas Exp $ */
/* $NetBSD: apecs.c,v 1.7 1996/04/12 06:08:01 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/apecs_lca_bus_io.c b/sys/arch/alpha/pci/apecs_lca_bus_io.c
index 22e1aa3f050..4aa40d80ab2 100644
--- a/sys/arch/alpha/pci/apecs_lca_bus_io.c
+++ b/sys/arch/alpha/pci/apecs_lca_bus_io.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: apecs_lca_bus_io.c,v 1.2 1996/07/29 23:00:04 niklas Exp $ */
/* $NetBSD: apecs_lca_bus_io.c,v 1.2.4.1 1996/06/13 18:14:55 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/apecs_lca_bus_mem.c b/sys/arch/alpha/pci/apecs_lca_bus_mem.c
index 72a892c37fe..6d03c167530 100644
--- a/sys/arch/alpha/pci/apecs_lca_bus_mem.c
+++ b/sys/arch/alpha/pci/apecs_lca_bus_mem.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: apecs_lca_bus_mem.c,v 1.2 1996/07/29 23:00:06 niklas Exp $ */
/* $NetBSD: apecs_lca_bus_mem.c,v 1.2.4.2 1996/06/13 18:14:58 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/apecs_pci.c b/sys/arch/alpha/pci/apecs_pci.c
index 0c30c45ecba..6086b9807b5 100644
--- a/sys/arch/alpha/pci/apecs_pci.c
+++ b/sys/arch/alpha/pci/apecs_pci.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: apecs_pci.c,v 1.4 1996/07/29 23:00:07 niklas Exp $ */
/* $NetBSD: apecs_pci.c,v 1.6 1996/04/12 06:08:09 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/apecsreg.h b/sys/arch/alpha/pci/apecsreg.h
index 864bfac54fe..5bf5eab8dc6 100644
--- a/sys/arch/alpha/pci/apecsreg.h
+++ b/sys/arch/alpha/pci/apecsreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: apecsreg.h,v 1.3 1996/07/29 23:00:10 niklas Exp $ */
/* $NetBSD: apecsreg.h,v 1.3 1995/11/23 02:37:19 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/apecsvar.h b/sys/arch/alpha/pci/apecsvar.h
index fe4cfdeba47..1b9d71b799e 100644
--- a/sys/arch/alpha/pci/apecsvar.h
+++ b/sys/arch/alpha/pci/apecsvar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: apecsvar.h,v 1.3 1996/07/29 23:00:11 niklas Exp $ */
/* $NetBSD: apecsvar.h,v 1.3 1996/04/12 06:08:14 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/bt485reg.h b/sys/arch/alpha/pci/bt485reg.h
index 6cd8a9258ae..4cc8f30bb1c 100644
--- a/sys/arch/alpha/pci/bt485reg.h
+++ b/sys/arch/alpha/pci/bt485reg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: bt485reg.h,v 1.3 1996/07/29 23:00:13 niklas Exp $ */
/* $NetBSD: bt485reg.h,v 1.4 1996/04/12 06:08:17 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index 942a5ed0cee..1b2a5dec748 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cia.c,v 1.3 1996/07/29 23:00:15 niklas Exp $ */
/* $NetBSD: cia.c,v 1.5.4.1 1996/06/10 00:02:39 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/cia_bus_io.c b/sys/arch/alpha/pci/cia_bus_io.c
index 12934b17687..0416a519c36 100644
--- a/sys/arch/alpha/pci/cia_bus_io.c
+++ b/sys/arch/alpha/pci/cia_bus_io.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cia_bus_io.c,v 1.2 1996/07/29 23:00:17 niklas Exp $ */
/* $NetBSD: cia_bus_io.c,v 1.2.4.2 1996/06/13 18:14:59 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/cia_bus_mem.c b/sys/arch/alpha/pci/cia_bus_mem.c
index 47413db910a..63760ad8fc2 100644
--- a/sys/arch/alpha/pci/cia_bus_mem.c
+++ b/sys/arch/alpha/pci/cia_bus_mem.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cia_bus_mem.c,v 1.2 1996/07/29 23:00:19 niklas Exp $ */
/* $NetBSD: cia_bus_mem.c,v 1.2.4.2 1996/06/13 18:15:01 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/cia_pci.c b/sys/arch/alpha/pci/cia_pci.c
index 4d9b592502b..03f98709a24 100644
--- a/sys/arch/alpha/pci/cia_pci.c
+++ b/sys/arch/alpha/pci/cia_pci.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cia_pci.c,v 1.3 1996/07/29 23:00:21 niklas Exp $ */
/* $NetBSD: cia_pci.c,v 1.2 1996/04/12 23:37:10 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/ciareg.h b/sys/arch/alpha/pci/ciareg.h
index 403afa6e3de..b3cf98b78f3 100644
--- a/sys/arch/alpha/pci/ciareg.h
+++ b/sys/arch/alpha/pci/ciareg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ciareg.h,v 1.3 1996/07/29 23:00:23 niklas Exp $ */
/* $NetBSD: ciareg.h,v 1.1.4.3 1996/06/13 18:35:27 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/ciavar.h b/sys/arch/alpha/pci/ciavar.h
index 0a96fe7347b..31f9b18b158 100644
--- a/sys/arch/alpha/pci/ciavar.h
+++ b/sys/arch/alpha/pci/ciavar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ciavar.h,v 1.3 1996/07/29 23:00:24 niklas Exp $ */
/* $NetBSD: ciavar.h,v 1.3.4.1 1996/06/10 00:04:12 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c
index 164dd0714be..264cab0ec6b 100644
--- a/sys/arch/alpha/pci/lca.c
+++ b/sys/arch/alpha/pci/lca.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lca.c,v 1.3 1996/07/29 23:00:26 niklas Exp $ */
/* $NetBSD: lca.c,v 1.5 1996/04/23 14:00:53 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/lca_pci.c b/sys/arch/alpha/pci/lca_pci.c
index 8d11ddd5ff3..cdee66d1396 100644
--- a/sys/arch/alpha/pci/lca_pci.c
+++ b/sys/arch/alpha/pci/lca_pci.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lca_pci.c,v 1.3 1996/07/29 23:00:28 niklas Exp $ */
/* $NetBSD: lca_pci.c,v 1.3 1996/04/23 14:01:00 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/lcareg.h b/sys/arch/alpha/pci/lcareg.h
index 2a36401be8d..0542039990f 100644
--- a/sys/arch/alpha/pci/lcareg.h
+++ b/sys/arch/alpha/pci/lcareg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: lcareg.h,v 1.3 1996/07/29 23:00:30 niklas Exp $ */
/* $NetBSD: lcareg.h,v 1.2 1996/04/23 14:03:46 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/lcavar.h b/sys/arch/alpha/pci/lcavar.h
index 1b2cf4bf816..7ebd8e751a9 100644
--- a/sys/arch/alpha/pci/lcavar.h
+++ b/sys/arch/alpha/pci/lcavar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: lcavar.h,v 1.3 1996/07/29 23:00:32 niklas Exp $ */
/* $NetBSD: lcavar.h,v 1.3 1996/04/12 06:08:35 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index b9420c5ce01..d396695ef09 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pci_2100_a50.c,v 1.6 1996/07/29 23:00:34 niklas Exp $ */
/* $NetBSD: pci_2100_a50.c,v 1.7 1996/04/23 14:15:55 cgd Exp $ */
/*
@@ -54,7 +55,7 @@ int dec_2100_a50_intr_map __P((void *, pcitag_t, int, int,
pci_intr_handle_t *));
const char *dec_2100_a50_intr_string __P((void *, pci_intr_handle_t));
void *dec_2100_a50_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
+ int, int (*func)(void *), void *, char *));
void dec_2100_a50_intr_disestablish __P((void *, void *));
#define APECS_SIO_DEVICE 7 /* XXX */
@@ -196,16 +197,17 @@ dec_2100_a50_intr_string(acv, ih)
}
void *
-dec_2100_a50_intr_establish(acv, ih, level, func, arg)
+dec_2100_a50_intr_establish(acv, ih, level, func, arg, name)
void *acv, *arg;
pci_intr_handle_t ih;
int level;
int (*func) __P((void *));
+ char *name;
{
struct apecs_config *acp = acv;
return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func,
- arg);
+ arg, name);
}
void
diff --git a/sys/arch/alpha/pci/pci_2100_a50.h b/sys/arch/alpha/pci/pci_2100_a50.h
index ed450aa2f97..48f02de1d39 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.h
+++ b/sys/arch/alpha/pci/pci_2100_a50.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pci_2100_a50.h,v 1.3 1996/07/29 23:00:35 niklas Exp $ */
/* $NetBSD: pci_2100_a50.h,v 1.3 1996/04/12 06:08:42 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index 008f5111636..7c70243290c 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pci_axppci_33.c,v 1.5 1996/07/29 23:00:37 niklas Exp $ */
/* $NetBSD: pci_axppci_33.c,v 1.5 1996/04/23 14:15:28 cgd Exp $ */
/*
@@ -54,7 +55,7 @@ int dec_axppci_33_intr_map __P((void *, pcitag_t, int, int,
pci_intr_handle_t *));
const char *dec_axppci_33_intr_string __P((void *, pci_intr_handle_t));
void *dec_axppci_33_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
+ int, int (*func)(void *), void *, char *));
void dec_axppci_33_intr_disestablish __P((void *, void *));
#define LCA_SIO_DEVICE 7 /* XXX */
@@ -200,16 +201,17 @@ dec_axppci_33_intr_string(lcv, ih)
}
void *
-dec_axppci_33_intr_establish(lcv, ih, level, func, arg)
+dec_axppci_33_intr_establish(lcv, ih, level, func, arg, name)
void *lcv, *arg;
pci_intr_handle_t ih;
int level;
int (*func) __P((void *));
+ char *name;
{
struct lca_config *lcp = lcv;
return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func,
- arg);
+ arg, name);
}
void
diff --git a/sys/arch/alpha/pci/pci_axppci_33.h b/sys/arch/alpha/pci/pci_axppci_33.h
index 27dfa1f4b04..9f669510798 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.h
+++ b/sys/arch/alpha/pci/pci_axppci_33.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pci_axppci_33.h,v 1.3 1996/07/29 23:00:39 niklas Exp $ */
/* $NetBSD: pci_axppci_33.h,v 1.3 1996/04/12 06:08:47 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 6a5582c7cd3..116587eebb4 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pci_kn20aa.c,v 1.5 1996/07/29 23:00:40 niklas Exp $ */
/* $NetBSD: pci_kn20aa.c,v 1.3.4.2 1996/06/13 18:35:31 cgd Exp $ */
/*
@@ -59,7 +60,7 @@ int dec_kn20aa_intr_map __P((void *, pcitag_t, int, int,
pci_intr_handle_t *));
const char *dec_kn20aa_intr_string __P((void *, pci_intr_handle_t));
void *dec_kn20aa_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
+ int, int (*func)(void *), void *, char *));
void dec_kn20aa_intr_disestablish __P((void *, void *));
#define KN20AA_PCEB_IRQ 31
@@ -197,11 +198,12 @@ dec_kn20aa_intr_string(ccv, ih)
}
void *
-dec_kn20aa_intr_establish(ccv, ih, level, func, arg)
+dec_kn20aa_intr_establish(ccv, ih, level, func, arg, name)
void *ccv, *arg;
pci_intr_handle_t ih;
int level;
int (*func) __P((void *));
+ char *name;
{
struct cia_config *ccp = ccv;
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_kn20aa.h b/sys/arch/alpha/pci/pci_kn20aa.h
index dfbd89e3f05..beaa93248a4 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.h
+++ b/sys/arch/alpha/pci/pci_kn20aa.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pci_kn20aa.h,v 1.3 1996/07/29 23:00:42 niklas Exp $ */
/* $NetBSD: pci_kn20aa.h,v 1.2 1996/04/13 00:24:35 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c
index b0a8e04c6d3..bc163c277f0 100644
--- a/sys/arch/alpha/pci/pci_machdep.c
+++ b/sys/arch/alpha/pci/pci_machdep.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pci_machdep.c,v 1.4 1996/07/29 23:00:43 niklas Exp $ */
/* $NetBSD: pci_machdep.c,v 1.5 1996/04/12 06:08:49 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h
index 1a4c5074fcb..3dd29d4c87c 100644
--- a/sys/arch/alpha/pci/pci_machdep.h
+++ b/sys/arch/alpha/pci/pci_machdep.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pci_machdep.h,v 1.4 1996/07/29 23:00:45 niklas Exp $ */
/* $NetBSD: pci_machdep.h,v 1.4 1996/04/12 06:08:52 cgd Exp $ */
/*
@@ -58,7 +59,7 @@ struct alpha_pci_chipset {
pci_intr_handle_t *));
const char *(*pc_intr_string) __P((void *, pci_intr_handle_t));
void *(*pc_intr_establish) __P((void *, pci_intr_handle_t,
- int, int (*)(void *), void *));
+ int, int (*)(void *), void *, char *));
void (*pc_intr_disestablish) __P((void *, void *));
};
@@ -81,7 +82,7 @@ struct alpha_pci_chipset {
(*(c)->pc_intr_map)((c)->pc_intr_v, (it), (ip), (il), (ihp))
#define pci_intr_string(c, ih) \
(*(c)->pc_intr_string)((c)->pc_intr_v, (ih))
-#define pci_intr_establish(c, ih, l, h, a) \
- (*(c)->pc_intr_establish)((c)->pc_intr_v, (ih), (l), (h), (a))
+#define pci_intr_establish(c, ih, l, h, a, nm) \
+ (*(c)->pc_intr_establish)((c)->pc_intr_v, (ih), (l), (h), (a), (nm))
#define pci_intr_disestablish(c, iv) \
(*(c)->pc_intr_disestablish)((c)->pc_intr_v, (iv))
diff --git a/sys/arch/alpha/pci/pcivga.c b/sys/arch/alpha/pci/pcivga.c
index 96c3cfdadf9..68b5f2d4814 100644
--- a/sys/arch/alpha/pci/pcivga.c
+++ b/sys/arch/alpha/pci/pcivga.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pcivga.c,v 1.6 1996/07/29 23:00:46 niklas Exp $ */
/* $NetBSD: pcivga.c,v 1.8 1996/04/17 21:49:58 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/pcivgavar.h b/sys/arch/alpha/pci/pcivgavar.h
index da42958de3f..f306534cf91 100644
--- a/sys/arch/alpha/pci/pcivgavar.h
+++ b/sys/arch/alpha/pci/pcivgavar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pcivgavar.h,v 1.4 1996/07/29 23:00:48 niklas Exp $ */
/* $NetBSD: pcivgavar.h,v 1.5 1996/04/12 06:08:58 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/pcs_bus_io_common.c b/sys/arch/alpha/pci/pcs_bus_io_common.c
index 3d1e904467b..8c995d30915 100644
--- a/sys/arch/alpha/pci/pcs_bus_io_common.c
+++ b/sys/arch/alpha/pci/pcs_bus_io_common.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pcs_bus_io_common.c,v 1.2 1996/07/29 23:00:50 niklas Exp $ */
/* $NetBSD: pcs_bus_io_common.c,v 1.2.4.2 1996/06/13 18:16:59 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/pcs_bus_mem_common.c b/sys/arch/alpha/pci/pcs_bus_mem_common.c
index 3697a497a15..79833a1f9da 100644
--- a/sys/arch/alpha/pci/pcs_bus_mem_common.c
+++ b/sys/arch/alpha/pci/pcs_bus_mem_common.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pcs_bus_mem_common.c,v 1.2 1996/07/29 23:00:51 niklas Exp $ */
/* $NetBSD: pcs_bus_mem_common.c,v 1.1.4.4 1996/06/13 18:17:01 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/sio.c b/sys/arch/alpha/pci/sio.c
index a43bcef227d..6a4e6901fd2 100644
--- a/sys/arch/alpha/pci/sio.c
+++ b/sys/arch/alpha/pci/sio.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sio.c,v 1.4 1996/07/29 23:00:53 niklas Exp $ */
/* $NetBSD: sio.c,v 1.8 1996/04/13 00:23:34 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c
index 6ad39660d5f..585c14edab6 100644
--- a/sys/arch/alpha/pci/sio_pic.c
+++ b/sys/arch/alpha/pci/sio_pic.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sio_pic.c,v 1.5 1996/07/29 23:00:55 niklas Exp $ */
/* $NetBSD: sio_pic.c,v 1.7.4.3 1996/06/05 22:50:23 cgd Exp $ */
/*
@@ -272,12 +273,13 @@ sio_intr_string(v, irq)
}
void *
-sio_intr_establish(v, irq, type, level, ih_fun, ih_arg)
+sio_intr_establish(v, irq, type, level, ih_fun, ih_arg, name)
void *v, *ih_arg;
int irq;
int type;
int level;
int (*ih_fun)(void *);
+ char *name;
{
struct intrhand **p, *c, *ih;
extern int cold;
diff --git a/sys/arch/alpha/pci/sioreg.h b/sys/arch/alpha/pci/sioreg.h
index 3be1f87288f..c678b3b6f76 100644
--- a/sys/arch/alpha/pci/sioreg.h
+++ b/sys/arch/alpha/pci/sioreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: sioreg.h,v 1.2 1996/07/29 23:00:57 niklas Exp $ */
/* $NetBSD: sioreg.h,v 1.1 1996/04/23 14:10:53 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/siovar.h b/sys/arch/alpha/pci/siovar.h
index 84bcfabcedd..0537724dc0c 100644
--- a/sys/arch/alpha/pci/siovar.h
+++ b/sys/arch/alpha/pci/siovar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: siovar.h,v 1.3 1996/07/29 23:00:58 niklas Exp $ */
/* $NetBSD: siovar.h,v 1.3 1996/04/12 06:09:06 cgd Exp $ */
/*
@@ -32,7 +33,7 @@ void sio_iointr __P((void *framep, int vec));
const char *sio_intr_string __P((void *, int));
void *sio_intr_establish __P((void *, int, int, int, int (*)(void *),
- void *));
+ void *, char *));
void sio_intr_disestablish __P((void *, void *));
#ifdef EVCNT_COUNTERS
diff --git a/sys/arch/alpha/pci/tga.c b/sys/arch/alpha/pci/tga.c
index efec7a02a81..e70ddbab10d 100644
--- a/sys/arch/alpha/pci/tga.c
+++ b/sys/arch/alpha/pci/tga.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tga.c,v 1.4 1996/07/29 23:01:00 niklas Exp $ */
/* $NetBSD: tga.c,v 1.6 1996/04/12 06:09:08 cgd Exp $ */
/*
@@ -249,7 +250,8 @@ tgaattach(parent, self, aux)
}
intrstr = pci_intr_string(pa->pa_pc, intrh);
sc->sc_intr = pci_intr_establish(pa->pa_pc, intrh, IPL_TTY,
- sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_intr, sc->sc_dc);
+ sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_intr, sc->sc_dc,
+ sc->sc_dev.dv_xname);
if (sc->sc_intr == NULL) {
printf(": couldn't establish interrupt");
if (intrstr != NULL)
diff --git a/sys/arch/alpha/pci/tga_bt463.c b/sys/arch/alpha/pci/tga_bt463.c
index 8d581be2ffa..54ecdf8087a 100644
--- a/sys/arch/alpha/pci/tga_bt463.c
+++ b/sys/arch/alpha/pci/tga_bt463.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tga_bt463.c,v 1.2 1996/07/29 23:01:02 niklas Exp $ */
/* $NetBSD: tga_bt463.c,v 1.2 1996/04/12 06:09:13 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/tga_bt485.c b/sys/arch/alpha/pci/tga_bt485.c
index 45fb5f65b7e..11e9d46e9c3 100644
--- a/sys/arch/alpha/pci/tga_bt485.c
+++ b/sys/arch/alpha/pci/tga_bt485.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tga_bt485.c,v 1.2 1996/07/29 23:01:04 niklas Exp $ */
/* $NetBSD: tga_bt485.c,v 1.2 1996/04/12 06:09:16 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/tga_conf.c b/sys/arch/alpha/pci/tga_conf.c
index 114e6964789..abc1fd1b86a 100644
--- a/sys/arch/alpha/pci/tga_conf.c
+++ b/sys/arch/alpha/pci/tga_conf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tga_conf.c,v 1.2 1996/07/29 23:01:05 niklas Exp $ */
/* $NetBSD: tga_conf.c,v 1.2 1996/04/12 06:09:18 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/tgavar.h b/sys/arch/alpha/pci/tgavar.h
index f4cad9b7777..2b01f701f92 100644
--- a/sys/arch/alpha/pci/tgavar.h
+++ b/sys/arch/alpha/pci/tgavar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: tgavar.h,v 1.4 1996/07/29 23:01:07 niklas Exp $ */
/* $NetBSD: tgavar.h,v 1.5 1996/04/12 06:09:21 cgd Exp $ */
/*