diff options
Diffstat (limited to 'sys/arch')
196 files changed, 224 insertions, 22 deletions
diff --git a/sys/arch/alpha/Makefile b/sys/arch/alpha/Makefile index 04781b86c58..116bfe45f14 100644 --- a/sys/arch/alpha/Makefile +++ b/sys/arch/alpha/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.2 1996/07/29 22:57:03 niklas Exp $ # $NetBSD: Makefile,v 1.3 1995/02/27 16:36:07 cgd Exp $ # Makefile for alpha tags file and boot blocks diff --git a/sys/arch/alpha/README b/sys/arch/alpha/README index 52ed304ea99..c0d5b25262d 100644 --- a/sys/arch/alpha/README +++ b/sys/arch/alpha/README @@ -1,3 +1,4 @@ +$OpenBSD: README,v 1.4 1996/07/29 22:57:06 niklas Exp $ $NetBSD: README,v 1.8.4.1 1996/06/13 20:49:01 cgd Exp $ Obtaining NetBSD/Alpha sources and binaries: diff --git a/sys/arch/alpha/STATUS b/sys/arch/alpha/STATUS index 587e159f5d8..b0d70786deb 100644 --- a/sys/arch/alpha/STATUS +++ b/sys/arch/alpha/STATUS @@ -1,3 +1,4 @@ +$OpenBSD: STATUS,v 1.4 1996/07/29 22:57:07 niklas Exp $ $NetBSD: STATUS,v 1.3.4.1 1996/06/13 20:49:04 cgd Exp $ NetBSD/Alpha's Status diff --git a/sys/arch/alpha/TODO.users b/sys/arch/alpha/TODO.users index c3d5f39ccfb..7991cb7ae27 100644 --- a/sys/arch/alpha/TODO.users +++ b/sys/arch/alpha/TODO.users @@ -1,3 +1,4 @@ +$OpenBSD: TODO.users,v 1.4 1996/07/29 22:57:08 niklas Exp $ $NetBSD: TODO.users,v 1.3.4.1 1996/06/13 20:49:07 cgd Exp $ The NetBSD/Alpha "User" To-Do List diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c index e81471449f2..3f0bbe7b631 100644 --- a/sys/arch/alpha/alpha/autoconf.c +++ b/sys/arch/alpha/alpha/autoconf.c @@ -1,3 +1,4 @@ +/* $OpenBSD: autoconf.c,v 1.3 1996/07/29 22:57:12 niklas Exp $ */ /* $NetBSD: autoconf.c,v 1.3.4.3 1996/06/14 20:42:41 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/clock.c b/sys/arch/alpha/alpha/clock.c index 9fb7678429a..82a455b716c 100644 --- a/sys/arch/alpha/alpha/clock.c +++ b/sys/arch/alpha/alpha/clock.c @@ -1,3 +1,4 @@ +/* $OpenBSD: clock.c,v 1.5 1996/07/29 22:57:13 niklas Exp $ */ /* $NetBSD: clock.c,v 1.10 1996/04/23 15:26:06 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/clockvar.h b/sys/arch/alpha/alpha/clockvar.h index 42d50358e9a..05c0d6ad797 100644 --- a/sys/arch/alpha/alpha/clockvar.h +++ b/sys/arch/alpha/alpha/clockvar.h @@ -1,3 +1,4 @@ +/* $OpenBSD: clockvar.h,v 1.3 1996/07/29 22:57:15 niklas Exp $ */ /* $NetBSD: clockvar.h,v 1.2 1996/04/17 22:01:21 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index fe920244647..8d0ba7798fc 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,3 +1,4 @@ +/* $OpenBSD: conf.c,v 1.5 1996/07/29 22:57:17 niklas Exp $ */ /* $NetBSD: conf.c,v 1.11 1996/04/12 02:07:23 cgd Exp $ */ /*- diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c index 4f462e1de86..4e79e5ca346 100644 --- a/sys/arch/alpha/alpha/cpu.c +++ b/sys/arch/alpha/alpha/cpu.c @@ -1,3 +1,4 @@ +/* $OpenBSD: cpu.c,v 1.4 1996/07/29 22:57:18 niklas Exp $ */ /* $NetBSD: cpu.c,v 1.9 1996/04/29 16:36:19 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c index ec05c75687a..9d61c61deff 100644 --- a/sys/arch/alpha/alpha/dec_2100_a50.c +++ b/sys/arch/alpha/alpha/dec_2100_a50.c @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_2100_a50.c,v 1.4 1996/07/29 22:57:20 niklas Exp $ */ /* $NetBSD: dec_2100_a50.c,v 1.6.4.2 1996/06/14 20:42:23 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_2100_a50.h b/sys/arch/alpha/alpha/dec_2100_a50.h index 895517aad27..6574866c1e8 100644 --- a/sys/arch/alpha/alpha/dec_2100_a50.h +++ b/sys/arch/alpha/alpha/dec_2100_a50.h @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_2100_a50.h,v 1.3 1996/07/29 22:57:21 niklas Exp $ */ /* $NetBSD: dec_2100_a50.h,v 1.2.6.2 1996/06/13 18:35:10 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_3000_300.c b/sys/arch/alpha/alpha/dec_3000_300.c index 43e4254efb1..73729f5e812 100644 --- a/sys/arch/alpha/alpha/dec_3000_300.c +++ b/sys/arch/alpha/alpha/dec_3000_300.c @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_3000_300.c,v 1.3 1996/07/29 22:57:23 niklas Exp $ */ /* $NetBSD: dec_3000_300.c,v 1.2.6.2 1996/06/13 18:35:12 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_3000_300.h b/sys/arch/alpha/alpha/dec_3000_300.h index bc350ff64ea..b1d7e3e90bb 100644 --- a/sys/arch/alpha/alpha/dec_3000_300.h +++ b/sys/arch/alpha/alpha/dec_3000_300.h @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_3000_300.h,v 1.3 1996/07/29 22:57:24 niklas Exp $ */ /* $NetBSD: dec_3000_300.h,v 1.2.6.2 1996/06/13 18:35:13 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_3000_500.c b/sys/arch/alpha/alpha/dec_3000_500.c index 0581672da7c..ace50cef152 100644 --- a/sys/arch/alpha/alpha/dec_3000_500.c +++ b/sys/arch/alpha/alpha/dec_3000_500.c @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_3000_500.c,v 1.3 1996/07/29 22:57:26 niklas Exp $ */ /* $NetBSD: dec_3000_500.c,v 1.1.6.2 1996/06/13 18:35:15 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_3000_500.h b/sys/arch/alpha/alpha/dec_3000_500.h index c45a5ed429a..1dd53322834 100644 --- a/sys/arch/alpha/alpha/dec_3000_500.h +++ b/sys/arch/alpha/alpha/dec_3000_500.h @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_3000_500.h,v 1.3 1996/07/29 22:57:27 niklas Exp $ */ /* $NetBSD: dec_3000_500.h,v 1.2.6.2 1996/06/13 18:35:17 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c index dd28dac0299..74e4ab96a60 100644 --- a/sys/arch/alpha/alpha/dec_axppci_33.c +++ b/sys/arch/alpha/alpha/dec_axppci_33.c @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_axppci_33.c,v 1.3 1996/07/29 22:57:29 niklas Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.4.4.2 1996/06/14 20:42:24 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_axppci_33.h b/sys/arch/alpha/alpha/dec_axppci_33.h index 79fe7325151..105e9317e18 100644 --- a/sys/arch/alpha/alpha/dec_axppci_33.h +++ b/sys/arch/alpha/alpha/dec_axppci_33.h @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_axppci_33.h,v 1.3 1996/07/29 22:57:30 niklas Exp $ */ /* $NetBSD: dec_axppci_33.h,v 1.1.4.2 1996/06/13 18:35:18 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c index 152d892c983..1b599144710 100644 --- a/sys/arch/alpha/alpha/dec_kn20aa.c +++ b/sys/arch/alpha/alpha/dec_kn20aa.c @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_kn20aa.c,v 1.3 1996/07/29 22:57:32 niklas Exp $ */ /* $NetBSD: dec_kn20aa.c,v 1.4.4.2 1996/06/14 20:42:25 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/dec_kn20aa.h b/sys/arch/alpha/alpha/dec_kn20aa.h index ef05246cd45..c8be73911b1 100644 --- a/sys/arch/alpha/alpha/dec_kn20aa.h +++ b/sys/arch/alpha/alpha/dec_kn20aa.h @@ -1,3 +1,4 @@ +/* $OpenBSD: dec_kn20aa.h,v 1.3 1996/07/29 22:57:33 niklas Exp $ */ /* $NetBSD: dec_kn20aa.h,v 1.1.4.2 1996/06/13 18:35:19 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c index 9e3d2252742..78b90a4fa83 100644 --- a/sys/arch/alpha/alpha/disksubr.c +++ b/sys/arch/alpha/alpha/disksubr.c @@ -1,3 +1,4 @@ +/* $OpenBSD: disksubr.c,v 1.4 1996/07/29 22:57:35 niklas Exp $ */ /* $NetBSD: disksubr.c,v 1.6 1996/04/29 16:34:50 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/genassym.c b/sys/arch/alpha/alpha/genassym.c index 6c4824dfb87..cdac4f4b5a2 100644 --- a/sys/arch/alpha/alpha/genassym.c +++ b/sys/arch/alpha/alpha/genassym.c @@ -1,3 +1,4 @@ +/* $OpenBSD: genassym.c,v 1.4 1996/07/29 22:57:36 niklas Exp $ */ /* $NetBSD: genassym.c,v 1.4 1996/05/17 18:29:41 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/in_cksum.c b/sys/arch/alpha/alpha/in_cksum.c index 7382354afd0..816d7f06139 100644 --- a/sys/arch/alpha/alpha/in_cksum.c +++ b/sys/arch/alpha/alpha/in_cksum.c @@ -1,3 +1,4 @@ +/* $OpenBSD: in_cksum.c,v 1.2 1996/07/29 22:57:37 niklas Exp $ */ /* $NetBSD: in_cksum.c,v 1.2.4.1 1996/05/30 23:12:50 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c index 96dc58f7a10..8520d5b4b66 100644 --- a/sys/arch/alpha/alpha/interrupt.c +++ b/sys/arch/alpha/alpha/interrupt.c @@ -1,3 +1,4 @@ +/* $OpenBSD: interrupt.c,v 1.4 1996/07/29 22:57:39 niklas Exp $ */ /* $NetBSD: interrupt.c,v 1.5 1996/04/23 13:54:32 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/locore.s b/sys/arch/alpha/alpha/locore.s index 0df2856b540..9790d7b74c3 100644 --- a/sys/arch/alpha/alpha/locore.s +++ b/sys/arch/alpha/alpha/locore.s @@ -1,3 +1,4 @@ +/* $OpenBSD: locore.s,v 1.4 1996/07/29 22:57:41 niklas Exp $ */ /* $NetBSD: locore.s,v 1.13.4.1 1996/06/13 18:06:59 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index f060b8fe2ca..2c04c966fb4 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,3 +1,4 @@ +/* $OpenBSD: machdep.c,v 1.10 1996/07/29 22:57:43 niklas Exp $ */ /* $NetBSD: machdep.c,v 1.19.4.5 1996/06/15 03:56:33 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/mainbus.c b/sys/arch/alpha/alpha/mainbus.c index 50c0feac4f8..13aff1bbbad 100644 --- a/sys/arch/alpha/alpha/mainbus.c +++ b/sys/arch/alpha/alpha/mainbus.c @@ -1,3 +1,4 @@ +/* $OpenBSD: mainbus.c,v 1.5 1996/07/29 22:57:45 niklas Exp $ */ /* $NetBSD: mainbus.c,v 1.9 1996/04/12 06:07:35 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/mcclock.c b/sys/arch/alpha/alpha/mcclock.c index 1a4c48b10eb..6bec1b29f85 100644 --- a/sys/arch/alpha/alpha/mcclock.c +++ b/sys/arch/alpha/alpha/mcclock.c @@ -1,3 +1,4 @@ +/* $OpenBSD: mcclock.c,v 1.2 1996/07/29 22:57:47 niklas Exp $ */ /* $NetBSD: mcclock.c,v 1.2 1996/04/17 22:22:32 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/mcclockvar.h b/sys/arch/alpha/alpha/mcclockvar.h index 049d3912eec..73cd23ed7ce 100644 --- a/sys/arch/alpha/alpha/mcclockvar.h +++ b/sys/arch/alpha/alpha/mcclockvar.h @@ -1,3 +1,4 @@ +/* $OpenBSD: mcclockvar.h,v 1.2 1996/07/29 22:57:48 niklas Exp $ */ /* $NetBSD: mcclockvar.h,v 1.2 1996/04/17 22:22:38 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/mem.c b/sys/arch/alpha/alpha/mem.c index 3709b3104b8..747e36b50aa 100644 --- a/sys/arch/alpha/alpha/mem.c +++ b/sys/arch/alpha/alpha/mem.c @@ -1,3 +1,4 @@ +/* $OpenBSD: mem.c,v 1.4 1996/07/29 22:57:49 niklas Exp $ */ /* $NetBSD: mem.c,v 1.6 1996/04/12 02:06:21 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/pal.s b/sys/arch/alpha/alpha/pal.s index bc03e0004ca..1dc00e428d9 100644 --- a/sys/arch/alpha/alpha/pal.s +++ b/sys/arch/alpha/alpha/pal.s @@ -1,3 +1,4 @@ +/* $OpenBSD: pal.s,v 1.3 1996/07/29 22:57:51 niklas Exp $ */ /* $NetBSD: pal.s,v 1.2 1995/11/23 02:34:23 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c index 2ea0b3f140e..dfd75311e7e 100644 --- a/sys/arch/alpha/alpha/pmap.c +++ b/sys/arch/alpha/alpha/pmap.c @@ -1,3 +1,4 @@ +/* $OpenBSD: pmap.c,v 1.4 1996/07/29 22:57:53 niklas Exp $ */ /* $NetBSD: pmap.c,v 1.8 1996/04/12 02:09:24 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/process_machdep.c b/sys/arch/alpha/alpha/process_machdep.c index 8a07130043c..c9f6b8af9d9 100644 --- a/sys/arch/alpha/alpha/process_machdep.c +++ b/sys/arch/alpha/alpha/process_machdep.c @@ -1,3 +1,4 @@ +/* $OpenBSD: process_machdep.c,v 1.3 1996/07/29 22:57:56 niklas Exp $ */ /* $NetBSD: process_machdep.c,v 1.3 1995/11/23 02:34:29 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/prom.c b/sys/arch/alpha/alpha/prom.c index 735ae81c85c..8678f12be04 100644 --- a/sys/arch/alpha/alpha/prom.c +++ b/sys/arch/alpha/alpha/prom.c @@ -1,3 +1,4 @@ +/* $OpenBSD: prom.c,v 1.3 1996/07/29 22:57:57 niklas Exp $ */ /* $NetBSD: prom.c,v 1.5.4.2 1996/06/13 18:35:21 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/prom_disp.s b/sys/arch/alpha/alpha/prom_disp.s index 0a4f6a4c832..68b176394b1 100644 --- a/sys/arch/alpha/alpha/prom_disp.s +++ b/sys/arch/alpha/alpha/prom_disp.s @@ -1,3 +1,4 @@ +/* $OpenBSD: prom_disp.s,v 1.3 1996/07/29 22:57:59 niklas Exp $ */ /* $NetBSD: prom_disp.s,v 1.4 1996/04/12 06:07:38 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/promcons.c b/sys/arch/alpha/alpha/promcons.c index d958cf0577f..cafa9a8e8c0 100644 --- a/sys/arch/alpha/alpha/promcons.c +++ b/sys/arch/alpha/alpha/promcons.c @@ -1,3 +1,4 @@ +/* $OpenBSD: promcons.c,v 1.3 1996/07/29 22:58:00 niklas Exp $ */ /* $NetBSD: promcons.c,v 1.2.6.1 1996/06/03 18:54:31 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/support.c b/sys/arch/alpha/alpha/support.c index db0f291dc0b..48c7010794e 100644 --- a/sys/arch/alpha/alpha/support.c +++ b/sys/arch/alpha/alpha/support.c @@ -1,3 +1,4 @@ +/* $OpenBSD: support.c,v 1.3 1996/07/29 22:58:02 niklas Exp $ */ /* $NetBSD: support.c,v 1.2 1995/11/23 02:34:32 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/swapgeneric.c b/sys/arch/alpha/alpha/swapgeneric.c index fb6aa241464..9d0c3d51ae0 100644 --- a/sys/arch/alpha/alpha/swapgeneric.c +++ b/sys/arch/alpha/alpha/swapgeneric.c @@ -1,3 +1,4 @@ +/* $OpenBSD: swapgeneric.c,v 1.3 1996/07/29 22:58:03 niklas Exp $ */ /* $NetBSD: swapgeneric.c,v 1.4.4.1 1996/06/13 18:02:37 cgd Exp $ */ /*- diff --git a/sys/arch/alpha/alpha/sys_machdep.c b/sys/arch/alpha/alpha/sys_machdep.c index fdca27625f8..f1bdce6a8c5 100644 --- a/sys/arch/alpha/alpha/sys_machdep.c +++ b/sys/arch/alpha/alpha/sys_machdep.c @@ -1,3 +1,4 @@ +/* $OpenBSD: sys_machdep.c,v 1.3 1996/07/29 22:58:05 niklas Exp $ */ /* $NetBSD: sys_machdep.c,v 1.3 1995/11/23 02:34:35 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c index e1ec691761a..c489c7162fd 100644 --- a/sys/arch/alpha/alpha/trap.c +++ b/sys/arch/alpha/alpha/trap.c @@ -1,3 +1,4 @@ +/* $OpenBSD: trap.c,v 1.4 1996/07/29 22:58:06 niklas Exp $ */ /* $NetBSD: trap.c,v 1.5 1995/11/23 02:34:37 cgd Exp $ */ /* diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c index 32939382780..b49d2dfd39b 100644 --- a/sys/arch/alpha/alpha/vm_machdep.c +++ b/sys/arch/alpha/alpha/vm_machdep.c @@ -1,3 +1,4 @@ +/* $OpenBSD: vm_machdep.c,v 1.4 1996/07/29 22:58:08 niklas Exp $ */ /* $NetBSD: vm_machdep.c,v 1.9 1996/04/23 15:26:10 cgd Exp $ */ /* diff --git a/sys/arch/alpha/compile/.keep_me b/sys/arch/alpha/compile/.keep_me index 3b6841a936e..c92516d7ab9 100644 --- a/sys/arch/alpha/compile/.keep_me +++ b/sys/arch/alpha/compile/.keep_me @@ -1,3 +1,4 @@ +$OpenBSD: .keep_me,v 1.2 1996/07/29 22:58:15 niklas Exp $ $NetBSD: .keep_me,v 1.1 1995/02/13 23:07:19 cgd Exp $ This normally empty directory needs to be kept in the distribution. diff --git a/sys/arch/alpha/compile/build_all b/sys/arch/alpha/compile/build_all index abd8fe68ac8..b90abb6a68f 100644 --- a/sys/arch/alpha/compile/build_all +++ b/sys/arch/alpha/compile/build_all @@ -1,5 +1,6 @@ #!/bin/sh - # +# $OpenBSD: build_all,v 1.3 1996/07/29 22:58:17 niklas Exp $ # $NetBSD: build_all,v 1.4.4.1 1996/06/15 03:46:17 cgd Exp $ cflist=`cd ../conf ; find . -type f ! -name "*[a-z.]*" ! -name ".*" | \ diff --git a/sys/arch/alpha/compile/rebuild_all b/sys/arch/alpha/compile/rebuild_all index 2a0fa61fbc5..bff75fac1c6 100644 --- a/sys/arch/alpha/compile/rebuild_all +++ b/sys/arch/alpha/compile/rebuild_all @@ -1,5 +1,6 @@ #!/bin/sh - # +# $OpenBSD: rebuild_all,v 1.3 1996/07/29 22:58:18 niklas Exp $ # $NetBSD: rebuild_all,v 1.4.4.1 1996/06/15 03:46:19 cgd Exp $ cflist=`cd ../conf ; find . -type f ! -name "*[a-z.]*" ! -name ".*" | \ diff --git a/sys/arch/alpha/eisa/eisa_machdep.h b/sys/arch/alpha/eisa/eisa_machdep.h index 0968ee61c9d..ce8ac9e426d 100644 --- a/sys/arch/alpha/eisa/eisa_machdep.h +++ b/sys/arch/alpha/eisa/eisa_machdep.h @@ -1,3 +1,4 @@ +/* $OpenBSD: eisa_machdep.h,v 1.2 1996/07/29 22:58:21 niklas Exp $ */ /* $NetBSD: eisa_machdep.h,v 1.1 1996/04/12 05:39:51 cgd Exp $ */ /* @@ -43,7 +44,7 @@ struct alpha_eisa_chipset { eisa_intr_handle_t *)); const char *(*ec_intr_string) __P((void *, eisa_intr_handle_t)); void *(*ec_intr_establish) __P((void *, eisa_intr_handle_t, - int, int, int (*)(void *), void *)); + int, int, int (*)(void *), void *, char *)); void (*ec_intr_disestablish) __P((void *, void *)); }; @@ -58,7 +59,7 @@ struct alpha_eisa_chipset { (*(c)->ec_intr_map)((c)->ec_v, (i), (hp)) #define eisa_intr_string(c, h) \ (*(c)->ec_intr_string)((c)->ec_v, (h)) -#define eisa_intr_establish(c, h, t, l, f, a) \ - (*(c)->ec_intr_establish)((c)->ec_v, (h), (t), (l), (f), (a)) +#define eisa_intr_establish(c, h, t, l, f, a, nm) \ + (*(c)->ec_intr_establish)((c)->ec_v, (h), (t), (l), (f), (a), (nm)) #define eisa_intr_disestablish(c, h) \ (*(c)->ec_intr_disestablish)((c)->ec_v, (h)) diff --git a/sys/arch/alpha/include/ansi.h b/sys/arch/alpha/include/ansi.h index 77ee9bbf2bb..6e005d9b3b6 100644 --- a/sys/arch/alpha/include/ansi.h +++ b/sys/arch/alpha/include/ansi.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ansi.h,v 1.4 1996/07/29 22:58:23 niklas Exp $ */ /* $NetBSD: ansi.h,v 1.4 1996/03/16 01:31:45 jtc Exp $ */ /*- diff --git a/sys/arch/alpha/include/asm.h b/sys/arch/alpha/include/asm.h index 8b54d605f69..2c96e4c625c 100644 --- a/sys/arch/alpha/include/asm.h +++ b/sys/arch/alpha/include/asm.h @@ -1,3 +1,4 @@ +/* $OpenBSD: asm.h,v 1.4 1996/07/29 22:58:25 niklas Exp $ */ /* $NetBSD: asm.h,v 1.4 1996/04/12 01:36:51 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/autoconf.h b/sys/arch/alpha/include/autoconf.h index 78e62bc8a22..fdc16cfa8bb 100644 --- a/sys/arch/alpha/include/autoconf.h +++ b/sys/arch/alpha/include/autoconf.h @@ -1,3 +1,4 @@ +/* $OpenBSD: autoconf.h,v 1.4 1996/07/29 22:58:27 niklas Exp $ */ /* $NetBSD: autoconf.h,v 1.2.4.2 1996/06/13 18:35:23 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h index 5f3e8334261..61cd8cbcbe5 100644 --- a/sys/arch/alpha/include/bus.h +++ b/sys/arch/alpha/include/bus.h @@ -1,3 +1,4 @@ +/* $OpenBSD: bus.h,v 1.2 1996/07/29 22:58:29 niklas Exp $ */ /* $NetBSD: bus.h,v 1.2.4.2 1996/06/13 17:44:45 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/cdefs.h b/sys/arch/alpha/include/cdefs.h index cd705e0db7d..c39c2620736 100644 --- a/sys/arch/alpha/include/cdefs.h +++ b/sys/arch/alpha/include/cdefs.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cdefs.h,v 1.4 1996/07/29 22:58:30 niklas Exp $ */ /* $NetBSD: cdefs.h,v 1.2 1995/05/03 00:13:55 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/cfbreg.h b/sys/arch/alpha/include/cfbreg.h index 3d5c21fb98d..4707077c82b 100644 --- a/sys/arch/alpha/include/cfbreg.h +++ b/sys/arch/alpha/include/cfbreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cfbreg.h,v 1.2 1996/07/29 22:58:32 niklas Exp $ */ /* $NetBSD: cfbreg.h,v 1.1 1996/05/01 23:25:00 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h index 9c7281cb7f2..9dbabd53d4a 100644 --- a/sys/arch/alpha/include/cpu.h +++ b/sys/arch/alpha/include/cpu.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cpu.h,v 1.4 1996/07/29 22:58:33 niklas Exp $ */ /* $NetBSD: cpu.h,v 1.7.4.1 1996/06/14 20:42:44 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h index 986bfeb672f..d7f713a78ba 100644 --- a/sys/arch/alpha/include/db_machdep.h +++ b/sys/arch/alpha/include/db_machdep.h @@ -1,3 +1,4 @@ +/* $OpenBSD: db_machdep.h,v 1.2 1996/07/29 22:58:35 niklas Exp $ */ /* $NetBSD: db_machdep.h,v 1.1 1995/11/23 02:35:54 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/disklabel.h b/sys/arch/alpha/include/disklabel.h index 0c41adf1c92..fe4987cfead 100644 --- a/sys/arch/alpha/include/disklabel.h +++ b/sys/arch/alpha/include/disklabel.h @@ -1,3 +1,4 @@ +/* $OpenBSD: disklabel.h,v 1.2 1996/07/29 22:58:37 niklas Exp $ */ /* $NetBSD: disklabel.h,v 1.1 1995/02/13 23:07:34 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/ecoff.h b/sys/arch/alpha/include/ecoff.h index b40c2242f2f..a6d8b13363f 100644 --- a/sys/arch/alpha/include/ecoff.h +++ b/sys/arch/alpha/include/ecoff.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ecoff.h,v 1.5 1996/07/29 22:58:39 niklas Exp $ */ /* $NetBSD: ecoff.h,v 1.3 1996/05/09 23:47:25 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/endian.h b/sys/arch/alpha/include/endian.h index a78a5bcfca1..4cbdb950046 100644 --- a/sys/arch/alpha/include/endian.h +++ b/sys/arch/alpha/include/endian.h @@ -1,3 +1,4 @@ +/* $OpenBSD: endian.h,v 1.2 1996/07/29 22:58:40 niklas Exp $ */ /* $NetBSD: endian.h,v 1.1 1995/02/13 23:07:36 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/exec.h b/sys/arch/alpha/include/exec.h index 882beb5e346..bbe03bd1f7e 100644 --- a/sys/arch/alpha/include/exec.h +++ b/sys/arch/alpha/include/exec.h @@ -1,3 +1,4 @@ +/* $OpenBSD: exec.h,v 1.3 1996/07/29 22:58:42 niklas Exp $ */ /* $NetBSD: exec.h,v 1.1 1995/02/13 23:07:37 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/fbio.h b/sys/arch/alpha/include/fbio.h index dd03eac5793..a9a4c40eae2 100644 --- a/sys/arch/alpha/include/fbio.h +++ b/sys/arch/alpha/include/fbio.h @@ -1,3 +1,4 @@ +/* $OpenBSD: fbio.h,v 1.2 1996/07/29 22:58:43 niklas Exp $ */ /* $NetBSD: fbio.h,v 1.2 1996/05/01 19:44:21 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/float.h b/sys/arch/alpha/include/float.h index 47a9efa669b..24358b119bc 100644 --- a/sys/arch/alpha/include/float.h +++ b/sys/arch/alpha/include/float.h @@ -1,3 +1,4 @@ +/* $OpenBSD: float.h,v 1.2 1996/07/29 22:58:45 niklas Exp $ */ /* $NetBSD: float.h,v 1.4 1995/06/20 20:45:22 jtc Exp $ */ /* diff --git a/sys/arch/alpha/include/frame.h b/sys/arch/alpha/include/frame.h index 694d25e160d..981d26dd4ef 100644 --- a/sys/arch/alpha/include/frame.h +++ b/sys/arch/alpha/include/frame.h @@ -1,3 +1,4 @@ +/* $OpenBSD: frame.h,v 1.2 1996/07/29 22:58:47 niklas Exp $ */ /* $NetBSD: frame.h,v 1.1 1995/02/13 23:07:39 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/ieee.h b/sys/arch/alpha/include/ieee.h index 9d5f206a6fb..eed83d82d9e 100644 --- a/sys/arch/alpha/include/ieee.h +++ b/sys/arch/alpha/include/ieee.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ieee.h,v 1.2 1996/07/29 22:58:48 niklas Exp $ */ /* $NetBSD: ieee.h,v 1.1 1995/02/13 23:07:40 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/ieeefp.h b/sys/arch/alpha/include/ieeefp.h index 99d8fffe9f6..731366c1ae3 100644 --- a/sys/arch/alpha/include/ieeefp.h +++ b/sys/arch/alpha/include/ieeefp.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ieeefp.h,v 1.2 1996/07/29 22:58:50 niklas Exp $ */ /* $NetBSD: ieeefp.h,v 1.1 1995/04/29 01:09:17 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index 8baab0eb85a..1e1edaae517 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -1,3 +1,4 @@ +/* $OpenBSD: intr.h,v 1.2 1996/07/29 22:58:52 niklas Exp $ */ /* $NetBSD: intr.h,v 1.1 1996/04/12 01:42:17 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/intrcnt.h b/sys/arch/alpha/include/intrcnt.h index 046db247e30..fbc8d214a43 100644 --- a/sys/arch/alpha/include/intrcnt.h +++ b/sys/arch/alpha/include/intrcnt.h @@ -1,3 +1,4 @@ +/* $OpenBSD: intrcnt.h,v 1.3 1996/07/29 22:58:53 niklas Exp $ */ /* $NetBSD: intrcnt.h,v 1.4.4.2 1996/06/05 03:42:24 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/kbio.h b/sys/arch/alpha/include/kbio.h index f785fdce2e3..1923e84da77 100644 --- a/sys/arch/alpha/include/kbio.h +++ b/sys/arch/alpha/include/kbio.h @@ -1,3 +1,4 @@ +/* $OpenBSD: kbio.h,v 1.2 1996/07/29 22:58:55 niklas Exp $ */ /* $NetBSD: kbio.h,v 1.1 1996/04/12 01:45:45 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/limits.h b/sys/arch/alpha/include/limits.h index 16cd93da86b..2ff6b3fcf78 100644 --- a/sys/arch/alpha/include/limits.h +++ b/sys/arch/alpha/include/limits.h @@ -1,3 +1,4 @@ +/* $OpenBSD: limits.h,v 1.3 1996/07/29 22:58:56 niklas Exp $ */ /* $NetBSD: limits.h,v 1.2 1996/04/12 01:38:25 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h index 73c09a51f81..e7d8ed09324 100644 --- a/sys/arch/alpha/include/param.h +++ b/sys/arch/alpha/include/param.h @@ -1,3 +1,4 @@ +/* $OpenBSD: param.h,v 1.5 1996/07/29 22:58:58 niklas Exp $ */ /* $NetBSD: param.h,v 1.12 1996/03/04 05:04:10 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/pcb.h b/sys/arch/alpha/include/pcb.h index a2486affd16..e24132f82db 100644 --- a/sys/arch/alpha/include/pcb.h +++ b/sys/arch/alpha/include/pcb.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pcb.h,v 1.2 1996/07/29 22:58:59 niklas Exp $ */ /* $NetBSD: pcb.h,v 1.1 1995/02/13 23:07:43 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/pmap.h b/sys/arch/alpha/include/pmap.h index 1b74e2317d6..ed63680b21d 100644 --- a/sys/arch/alpha/include/pmap.h +++ b/sys/arch/alpha/include/pmap.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pmap.h,v 1.3 1996/07/29 22:59:01 niklas Exp $ */ /* $NetBSD: pmap.h,v 1.4 1995/11/23 02:36:25 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/proc.h b/sys/arch/alpha/include/proc.h index 81da608913d..4460c2e8c25 100644 --- a/sys/arch/alpha/include/proc.h +++ b/sys/arch/alpha/include/proc.h @@ -1,3 +1,4 @@ +/* $OpenBSD: proc.h,v 1.2 1996/07/29 22:59:03 niklas Exp $ */ /* $NetBSD: proc.h,v 1.2 1995/03/24 15:01:36 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/profile.h b/sys/arch/alpha/include/profile.h index 08cebcd3359..dd163bc13a6 100644 --- a/sys/arch/alpha/include/profile.h +++ b/sys/arch/alpha/include/profile.h @@ -1,3 +1,4 @@ +/* $OpenBSD: profile.h,v 1.3 1996/07/29 22:59:05 niklas Exp $ */ /* $NetBSD: profile.h,v 1.3 1995/11/23 02:36:28 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/prom.h b/sys/arch/alpha/include/prom.h index 26a70c0d82d..d27f11e7b46 100644 --- a/sys/arch/alpha/include/prom.h +++ b/sys/arch/alpha/include/prom.h @@ -1,3 +1,4 @@ +/* $OpenBSD: prom.h,v 1.3 1996/07/29 22:59:07 niklas Exp $ */ /* $NetBSD: prom.h,v 1.2 1996/04/23 15:23:18 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/psl.h b/sys/arch/alpha/include/psl.h index f430f51ec2e..1bbf58b370f 100644 --- a/sys/arch/alpha/include/psl.h +++ b/sys/arch/alpha/include/psl.h @@ -1,3 +1,4 @@ +/* $OpenBSD: psl.h,v 1.4 1996/07/29 22:59:08 niklas Exp $ */ /* $NetBSD: psl.h,v 1.5 1996/04/23 15:24:09 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/pte.h b/sys/arch/alpha/include/pte.h index bdec6d7e8a2..f8a669a6206 100644 --- a/sys/arch/alpha/include/pte.h +++ b/sys/arch/alpha/include/pte.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pte.h,v 1.4 1996/07/29 22:59:10 niklas Exp $ */ /* $NetBSD: pte.h,v 1.4 1996/02/01 22:28:56 mycroft Exp $ */ /* diff --git a/sys/arch/alpha/include/ptrace.h b/sys/arch/alpha/include/ptrace.h index d11bb33c4f4..c729976d16b 100644 --- a/sys/arch/alpha/include/ptrace.h +++ b/sys/arch/alpha/include/ptrace.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ptrace.h,v 1.2 1996/07/29 22:59:11 niklas Exp $ */ /* $NetBSD: ptrace.h,v 1.1 1995/02/13 23:07:51 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/reg.h b/sys/arch/alpha/include/reg.h index c1577d962f7..6dbb8d0ed41 100644 --- a/sys/arch/alpha/include/reg.h +++ b/sys/arch/alpha/include/reg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: reg.h,v 1.2 1996/07/29 22:59:13 niklas Exp $ */ /* $NetBSD: reg.h,v 1.2 1995/03/28 18:14:07 jtc Exp $ */ /* diff --git a/sys/arch/alpha/include/rpb.h b/sys/arch/alpha/include/rpb.h index c652f3bfc7b..ca1f09ab7e8 100644 --- a/sys/arch/alpha/include/rpb.h +++ b/sys/arch/alpha/include/rpb.h @@ -1,3 +1,4 @@ +/* $OpenBSD: rpb.h,v 1.4 1996/07/29 22:59:15 niklas Exp $ */ /* $NetBSD: rpb.h,v 1.7 1996/04/29 16:23:11 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/setjmp.h b/sys/arch/alpha/include/setjmp.h index 9b3eb6dfa7b..44cc80a4de4 100644 --- a/sys/arch/alpha/include/setjmp.h +++ b/sys/arch/alpha/include/setjmp.h @@ -1,3 +1,4 @@ +/* $OpenBSD: setjmp.h,v 1.2 1996/07/29 22:59:16 niklas Exp $ */ /* $NetBSD: setjmp.h,v 1.1 1995/02/13 23:07:55 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/sfbreg.h b/sys/arch/alpha/include/sfbreg.h index dcef105d717..cdef5423be9 100644 --- a/sys/arch/alpha/include/sfbreg.h +++ b/sys/arch/alpha/include/sfbreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: sfbreg.h,v 1.2 1996/07/29 22:59:18 niklas Exp $ */ /* $NetBSD: sfbreg.h,v 1.1 1996/05/01 21:15:46 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/signal.h b/sys/arch/alpha/include/signal.h index de7b1c6b312..33fd77a3a79 100644 --- a/sys/arch/alpha/include/signal.h +++ b/sys/arch/alpha/include/signal.h @@ -1,3 +1,4 @@ +/* $OpenBSD: signal.h,v 1.2 1996/07/29 22:59:20 niklas Exp $ */ /* $NetBSD: signal.h,v 1.2 1995/02/16 03:08:08 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/stdarg.h b/sys/arch/alpha/include/stdarg.h index c6d328f30be..714090bcd28 100644 --- a/sys/arch/alpha/include/stdarg.h +++ b/sys/arch/alpha/include/stdarg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: stdarg.h,v 1.3 1996/07/29 22:59:21 niklas Exp $ */ /* $NetBSD: stdarg.h,v 1.3 1995/12/26 00:15:47 mycroft Exp $ */ /*- diff --git a/sys/arch/alpha/include/tgareg.h b/sys/arch/alpha/include/tgareg.h index fab595cc556..59a5f2cc740 100644 --- a/sys/arch/alpha/include/tgareg.h +++ b/sys/arch/alpha/include/tgareg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: tgareg.h,v 1.2 1996/07/29 22:59:23 niklas Exp $ */ /* $NetBSD: tgareg.h,v 1.1 1996/04/12 01:44:23 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/trap.h b/sys/arch/alpha/include/trap.h index ccc8581d25d..78a6ef53ec6 100644 --- a/sys/arch/alpha/include/trap.h +++ b/sys/arch/alpha/include/trap.h @@ -1,3 +1,4 @@ +/* $OpenBSD: trap.h,v 1.2 1996/07/29 22:59:25 niklas Exp $ */ /* $NetBSD: trap.h,v 1.1 1995/02/13 23:07:58 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/types.h b/sys/arch/alpha/include/types.h index 0eba44e1345..8f4367884a4 100644 --- a/sys/arch/alpha/include/types.h +++ b/sys/arch/alpha/include/types.h @@ -1,3 +1,4 @@ +/* $OpenBSD: types.h,v 1.2 1996/07/29 22:59:27 niklas Exp $ */ /* $NetBSD: types.h,v 1.4 1995/07/06 03:39:32 cgd Exp $ */ /*- diff --git a/sys/arch/alpha/include/varargs.h b/sys/arch/alpha/include/varargs.h index 91e822923ee..e6a8c3346dd 100644 --- a/sys/arch/alpha/include/varargs.h +++ b/sys/arch/alpha/include/varargs.h @@ -1,3 +1,4 @@ +/* $OpenBSD: varargs.h,v 1.3 1996/07/29 22:59:29 niklas Exp $ */ /* $NetBSD: varargs.h,v 1.4 1995/12/26 01:16:24 mycroft Exp $ */ /*- diff --git a/sys/arch/alpha/include/vmparam.h b/sys/arch/alpha/include/vmparam.h index 930ac5e7e21..34f99d525cb 100644 --- a/sys/arch/alpha/include/vmparam.h +++ b/sys/arch/alpha/include/vmparam.h @@ -1,3 +1,4 @@ +/* $OpenBSD: vmparam.h,v 1.3 1996/07/29 22:59:31 niklas Exp $ */ /* $NetBSD: vmparam.h,v 1.2 1995/11/23 02:36:46 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/vuid_event.h b/sys/arch/alpha/include/vuid_event.h index 26c0e72590f..a9ca5c9d112 100644 --- a/sys/arch/alpha/include/vuid_event.h +++ b/sys/arch/alpha/include/vuid_event.h @@ -1,3 +1,4 @@ +/* $OpenBSD: vuid_event.h,v 1.2 1996/07/29 22:59:33 niklas Exp $ */ /* $NetBSD: vuid_event.h,v 1.1 1996/04/12 01:45:47 cgd Exp $ */ /* diff --git a/sys/arch/alpha/include/wsconsio.h b/sys/arch/alpha/include/wsconsio.h index 58848e420f5..1f4bb1a418d 100644 --- a/sys/arch/alpha/include/wsconsio.h +++ b/sys/arch/alpha/include/wsconsio.h @@ -1,3 +1,4 @@ +/* $OpenBSD: wsconsio.h,v 1.2 1996/07/29 22:59:35 niklas Exp $ */ /* $NetBSD: wsconsio.h,v 1.1 1996/04/12 01:43:06 cgd Exp $ */ /* diff --git a/sys/arch/alpha/isa/isa_machdep.h b/sys/arch/alpha/isa/isa_machdep.h index 051811ecafe..e229a164276 100644 --- a/sys/arch/alpha/isa/isa_machdep.h +++ b/sys/arch/alpha/isa/isa_machdep.h @@ -1,3 +1,4 @@ +/* $OpenBSD: isa_machdep.h,v 1.2 1996/07/29 22:59:44 niklas Exp $ */ /* $NetBSD: isa_machdep.h,v 1.2 1996/04/12 05:39:02 cgd Exp $ */ /* @@ -38,7 +39,7 @@ struct alpha_isa_chipset { void (*ic_attach_hook) __P((struct device *, struct device *, struct isabus_attach_args *)); void *(*ic_intr_establish) __P((void *, int, int, int, - int (*)(void *), void *)); + int (*)(void *), void *, char *)); void (*ic_intr_disestablish) __P((void *, void *)); }; @@ -47,7 +48,7 @@ struct alpha_isa_chipset { */ #define isa_attach_hook(p, s, a) \ (*(a)->iba_ic->ic_attach_hook)((p), (s), (a)) -#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(c, i, t, l, f, a, nm) \ + (*(c)->ic_intr_establish)((c)->ic_v, (i), (t), (l), (f), (a), (nm)) #define isa_intr_disestablish(c, h) \ (*(c)->ic_intr_disestablish)((c)->ic_v, (h)) diff --git a/sys/arch/alpha/isa/isafcns_jensen.c b/sys/arch/alpha/isa/isafcns_jensen.c index 5ac135aea69..285d75a90ac 100644 --- a/sys/arch/alpha/isa/isafcns_jensen.c +++ b/sys/arch/alpha/isa/isafcns_jensen.c @@ -1,3 +1,4 @@ +/* $OpenBSD: isafcns_jensen.c,v 1.3 1996/07/29 22:59:46 niklas Exp $ */ /* $NetBSD: isafcns_jensen.c,v 1.2 1996/04/12 01:54:04 cgd Exp $ */ /* diff --git a/sys/arch/alpha/isa/mcclock_isa.c b/sys/arch/alpha/isa/mcclock_isa.c index fb9ac1f778b..30ea94aa83c 100644 --- a/sys/arch/alpha/isa/mcclock_isa.c +++ b/sys/arch/alpha/isa/mcclock_isa.c @@ -1,3 +1,4 @@ +/* $OpenBSD: mcclock_isa.c,v 1.2 1996/07/29 22:59:47 niklas Exp $ */ /* $NetBSD: mcclock_isa.c,v 1.2 1996/04/17 22:22:46 cgd Exp $ */ /* diff --git a/sys/arch/alpha/isa/pckbd.c b/sys/arch/alpha/isa/pckbd.c index 0a212449aeb..c10ab4a0a20 100644 --- a/sys/arch/alpha/isa/pckbd.c +++ b/sys/arch/alpha/isa/pckbd.c @@ -1,3 +1,4 @@ +/* $OpenBSD: pckbd.c,v 1.5 1996/07/29 22:59:49 niklas Exp $ */ /* $NetBSD: pckbd.c,v 1.7 1996/05/05 01:41:53 thorpej Exp $ */ /*- @@ -394,7 +395,7 @@ pckbdattach(parent, self, aux) pckbd_delay_ioh = ia->ia_delayioh; sc->sc_ih = isa_intr_establish(pckbd_ic, ia->ia_irq, IST_EDGE, - IPL_TTY, pckbdintr, sc); + IPL_TTY, pckbdintr, sc, sc->sc_dev.dv_xname); sc->sc_bellactive = sc->sc_bellpitch = 0; diff --git a/sys/arch/alpha/isa/pckbdreg.h b/sys/arch/alpha/isa/pckbdreg.h index f36f2d9ac7c..0f5aa607fff 100644 --- a/sys/arch/alpha/isa/pckbdreg.h +++ b/sys/arch/alpha/isa/pckbdreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: pckbdreg.h,v 1.2 1996/07/29 22:59:51 niklas Exp $ */ /* $NetBSD: pckbdreg.h,v 1.1 1995/08/03 00:48:30 cgd Exp $ */ /* diff --git a/sys/arch/alpha/isa/pms.c b/sys/arch/alpha/isa/pms.c index 5fc6e3ae649..3c13fe88153 100644 --- a/sys/arch/alpha/isa/pms.c +++ b/sys/arch/alpha/isa/pms.c @@ -1,3 +1,4 @@ +/* $OpenBSD: pms.c,v 1.2 1996/07/29 22:59:53 niklas Exp $ */ /* $NetBSD: pms.c,v 1.1 1996/04/12 01:53:06 cgd Exp $ */ /*- @@ -225,7 +226,7 @@ pmsattach(parent, self, aux) sc->sc_state = 0; sc->sc_ih = isa_intr_establish(pms_ic, ia->ia_irq, IST_EDGE, IPL_TTY, - pmsintr, sc); + pmsintr, sc, sc->sc_dev.dv_xname); } int diff --git a/sys/arch/alpha/isa/spkrreg.h b/sys/arch/alpha/isa/spkrreg.h index 66bdf7f6651..89a89edd0f5 100644 --- a/sys/arch/alpha/isa/spkrreg.h +++ b/sys/arch/alpha/isa/spkrreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: spkrreg.h,v 1.2 1996/07/29 22:59:55 niklas Exp $ */ /* $NetBSD: spkrreg.h,v 1.1 1996/04/12 01:54:46 cgd Exp $ */ /* diff --git a/sys/arch/alpha/isa/timerreg.h b/sys/arch/alpha/isa/timerreg.h index 04f2804f2b7..98dfaa75ceb 100644 --- a/sys/arch/alpha/isa/timerreg.h +++ b/sys/arch/alpha/isa/timerreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: timerreg.h,v 1.2 1996/07/29 22:59:57 niklas Exp $ */ /* $NetBSD: timerreg.h,v 1.1 1996/04/12 01:54:56 cgd Exp $ */ /*- 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 $ */ /* diff --git a/sys/arch/alpha/stand/Makefile b/sys/arch/alpha/stand/Makefile index 9587f1fa0a5..a5346cabaf3 100644 --- a/sys/arch/alpha/stand/Makefile +++ b/sys/arch/alpha/stand/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.3 1996/07/29 23:01:13 niklas Exp $ # $NetBSD: Makefile,v 1.3 1995/11/23 02:38:45 cgd Exp $ SUBDIR= boot bootxx installboot diff --git a/sys/arch/alpha/stand/Makefile.inc b/sys/arch/alpha/stand/Makefile.inc index 73c404a4bac..ba63f5a62ea 100644 --- a/sys/arch/alpha/stand/Makefile.inc +++ b/sys/arch/alpha/stand/Makefile.inc @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile.inc,v 1.2 1996/07/29 23:01:14 niklas Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/11/23 02:38:48 cgd Exp $ BINDIR= /usr/mdec diff --git a/sys/arch/alpha/stand/OSFpal.c b/sys/arch/alpha/stand/OSFpal.c index 54fed6eca06..0dfe77e087f 100644 --- a/sys/arch/alpha/stand/OSFpal.c +++ b/sys/arch/alpha/stand/OSFpal.c @@ -1,3 +1,4 @@ +/* $OpenBSD: OSFpal.c,v 1.3 1996/07/29 23:01:16 niklas Exp $ */ /* $NetBSD: OSFpal.c,v 1.2 1996/04/12 06:09:30 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/bbinfo.h b/sys/arch/alpha/stand/bbinfo.h index e83faf540f7..71c2bcdbde7 100644 --- a/sys/arch/alpha/stand/bbinfo.h +++ b/sys/arch/alpha/stand/bbinfo.h @@ -1,3 +1,4 @@ +/* $OpenBSD: bbinfo.h,v 1.3 1996/07/29 23:01:17 niklas Exp $ */ /* $NetBSD: bbinfo.h,v 1.2 1996/04/12 06:09:34 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/boot/Makefile b/sys/arch/alpha/stand/boot/Makefile index 1c79f284abb..d3c510de833 100644 --- a/sys/arch/alpha/stand/boot/Makefile +++ b/sys/arch/alpha/stand/boot/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.4 1996/07/29 23:01:31 niklas Exp $ # $NetBSD: Makefile,v 1.6 1996/04/12 01:35:15 cgd Exp $ .PATH: ${.CURDIR}/.. ${.CURDIR}/../../../../lib/libsa diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c index 85daa6aa43e..a2e5c0e90d3 100644 --- a/sys/arch/alpha/stand/boot/boot.c +++ b/sys/arch/alpha/stand/boot/boot.c @@ -1,3 +1,4 @@ +/* $OpenBSD: boot.c,v 1.4 1996/07/29 23:01:33 niklas Exp $ */ /* $NetBSD: boot.c,v 1.6 1996/05/10 00:15:08 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/boot/conf.c b/sys/arch/alpha/stand/boot/conf.c index 4e81e277451..4c275c4513c 100644 --- a/sys/arch/alpha/stand/boot/conf.c +++ b/sys/arch/alpha/stand/boot/conf.c @@ -1,3 +1,4 @@ +/* $OpenBSD: conf.c,v 1.3 1996/07/29 23:01:35 niklas Exp $ */ /* $NetBSD: conf.c,v 1.3 1995/11/23 02:39:31 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/boot/devopen.c b/sys/arch/alpha/stand/boot/devopen.c index 33c5695b286..b25bdfb7318 100644 --- a/sys/arch/alpha/stand/boot/devopen.c +++ b/sys/arch/alpha/stand/boot/devopen.c @@ -1,3 +1,4 @@ +/* $OpenBSD: devopen.c,v 1.2 1996/07/29 23:01:36 niklas Exp $ */ /* $NetBSD: devopen.c,v 1.1 1995/11/23 02:39:37 cgd Exp $ */ /*- diff --git a/sys/arch/alpha/stand/boot/disk.c b/sys/arch/alpha/stand/boot/disk.c index c80cc60a911..3566a0036b3 100644 --- a/sys/arch/alpha/stand/boot/disk.c +++ b/sys/arch/alpha/stand/boot/disk.c @@ -1,3 +1,4 @@ +/* $OpenBSD: disk.c,v 1.3 1996/07/29 23:01:38 niklas Exp $ */ /* $NetBSD: disk.c,v 1.3 1995/11/23 02:39:40 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/boot/disk.h b/sys/arch/alpha/stand/boot/disk.h index c60583c11e2..43f5e0be52b 100644 --- a/sys/arch/alpha/stand/boot/disk.h +++ b/sys/arch/alpha/stand/boot/disk.h @@ -1,3 +1,4 @@ +/* $OpenBSD: disk.h,v 1.2 1996/07/29 23:01:39 niklas Exp $ */ /* $NetBSD: disk.h,v 1.1 1995/11/23 02:39:42 cgd Exp $ */ int diskstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); diff --git a/sys/arch/alpha/stand/boot/filesystem.c b/sys/arch/alpha/stand/boot/filesystem.c index 8f963e9e673..4833ce6acec 100644 --- a/sys/arch/alpha/stand/boot/filesystem.c +++ b/sys/arch/alpha/stand/boot/filesystem.c @@ -1,3 +1,4 @@ +/* $OpenBSD: filesystem.c,v 1.2 1996/07/29 23:01:41 niklas Exp $ */ /* $NetBSD: filesystem.c,v 1.1 1995/11/23 02:39:46 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/boot/newvers.sh b/sys/arch/alpha/stand/boot/newvers.sh index 135bb35fd58..3a504fd6583 100644 --- a/sys/arch/alpha/stand/boot/newvers.sh +++ b/sys/arch/alpha/stand/boot/newvers.sh @@ -1,5 +1,6 @@ #!/bin/sh - # +# $OpenBSD: newvers.sh,v 1.3 1996/07/29 23:01:42 niklas Exp $ # $NetBSD: newvers.sh,v 1.2 1995/11/23 02:39:48 cgd Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 diff --git a/sys/arch/alpha/stand/boot/prom_swpal.S b/sys/arch/alpha/stand/boot/prom_swpal.S index 7adb240bd20..718ad653260 100644 --- a/sys/arch/alpha/stand/boot/prom_swpal.S +++ b/sys/arch/alpha/stand/boot/prom_swpal.S @@ -1,3 +1,4 @@ +/* $OpenBSD: prom_swpal.S,v 1.2 1996/07/29 23:01:44 niklas Exp $ */ /* $NetBSD: prom_swpal.S,v 1.2 1995/02/16 02:32:58 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/boot/test.c b/sys/arch/alpha/stand/boot/test.c index 6f9f3614bdc..3da120e34b8 100644 --- a/sys/arch/alpha/stand/boot/test.c +++ b/sys/arch/alpha/stand/boot/test.c @@ -1,3 +1,4 @@ +/* $OpenBSD: test.c,v 1.2 1996/07/29 23:01:46 niklas Exp $ */ /* $NetBSD: test.c,v 1.2 1995/02/16 02:33:00 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/boot/version b/sys/arch/alpha/stand/boot/version index 40daa71ed5d..f396a5a7ebf 100644 --- a/sys/arch/alpha/stand/boot/version +++ b/sys/arch/alpha/stand/boot/version @@ -1,3 +1,4 @@ +$OpenBSD: version,v 1.4 1996/07/29 23:01:48 niklas Exp $ $NetBSD: version,v 1.5 1996/05/09 23:54:18 cgd Exp $ 1.1: Initial version diff --git a/sys/arch/alpha/stand/bootxx.c b/sys/arch/alpha/stand/bootxx.c index 3707a45fa5a..8163c8f49ae 100644 --- a/sys/arch/alpha/stand/bootxx.c +++ b/sys/arch/alpha/stand/bootxx.c @@ -1,3 +1,4 @@ +/* $OpenBSD: bootxx.c,v 1.3 1996/07/29 23:01:19 niklas Exp $ */ /* $NetBSD: bootxx.c,v 1.2 1996/04/12 06:09:36 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/bootxx/Makefile b/sys/arch/alpha/stand/bootxx/Makefile index 937657352f7..9bd8a2fc518 100644 --- a/sys/arch/alpha/stand/bootxx/Makefile +++ b/sys/arch/alpha/stand/bootxx/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.3 1996/07/29 23:01:50 niklas Exp $ # $NetBSD: Makefile,v 1.4 1995/11/23 02:40:29 cgd Exp $ .PATH: ${.CURDIR}/.. ${.CURDIR}/../../../../lib/libsa diff --git a/sys/arch/alpha/stand/headersize.c b/sys/arch/alpha/stand/headersize.c index 23d64a5556d..3b2024e4f25 100644 --- a/sys/arch/alpha/stand/headersize.c +++ b/sys/arch/alpha/stand/headersize.c @@ -1,3 +1,4 @@ +/* $OpenBSD: headersize.c,v 1.3 1996/07/29 23:01:20 niklas Exp $ */ /* $NetBSD: headersize.c,v 1.3.4.1 1996/06/13 18:35:33 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/installboot.c b/sys/arch/alpha/stand/installboot.c index ce5e592d656..38744a982c0 100644 --- a/sys/arch/alpha/stand/installboot.c +++ b/sys/arch/alpha/stand/installboot.c @@ -1,3 +1,4 @@ +/* $OpenBSD: installboot.c,v 1.3 1996/07/29 23:01:22 niklas Exp $ */ /* $NetBSD: installboot.c,v 1.2 1995/12/20 00:17:49 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/installboot/Makefile b/sys/arch/alpha/stand/installboot/Makefile index a051929ffb8..a06945bb820 100644 --- a/sys/arch/alpha/stand/installboot/Makefile +++ b/sys/arch/alpha/stand/installboot/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.2 1996/07/29 23:01:53 niklas Exp $ # $NetBSD: Makefile,v 1.1 1995/11/23 02:41:18 cgd Exp $ .PATH: ${.CURDIR}/.. diff --git a/sys/arch/alpha/stand/prom.c b/sys/arch/alpha/stand/prom.c index 262f5f3828e..79cee77d833 100644 --- a/sys/arch/alpha/stand/prom.c +++ b/sys/arch/alpha/stand/prom.c @@ -1,3 +1,4 @@ +/* $OpenBSD: prom.c,v 1.2 1996/07/29 23:01:24 niklas Exp $ */ /* $NetBSD: prom.c,v 1.1 1995/11/23 02:39:07 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/prom_disp.S b/sys/arch/alpha/stand/prom_disp.S index cfb06148f0a..c6346865366 100644 --- a/sys/arch/alpha/stand/prom_disp.S +++ b/sys/arch/alpha/stand/prom_disp.S @@ -1,3 +1,4 @@ +/* $OpenBSD: prom_disp.S,v 1.3 1996/07/29 23:01:25 niklas Exp $ */ /* $NetBSD: prom_disp.S,v 1.3 1996/04/12 06:09:38 cgd Exp $ */ /* diff --git a/sys/arch/alpha/stand/puts.c b/sys/arch/alpha/stand/puts.c index b3c2d9479a2..47ee3340751 100644 --- a/sys/arch/alpha/stand/puts.c +++ b/sys/arch/alpha/stand/puts.c @@ -1,3 +1,5 @@ +/* $OpenBSD: puts.c,v 1.2 1996/07/29 23:01:27 niklas Exp $ */ + void puts(s) diff --git a/sys/arch/alpha/stand/start.S b/sys/arch/alpha/stand/start.S index 8d8001ffbdd..6990832353b 100644 --- a/sys/arch/alpha/stand/start.S +++ b/sys/arch/alpha/stand/start.S @@ -1,3 +1,4 @@ +/* $OpenBSD: start.S,v 1.2 1996/07/29 23:01:28 niklas Exp $ */ /* $NetBSD: start.S,v 1.1 1995/11/23 02:39:15 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c index 1de6783756b..3db8a4d2783 100644 --- a/sys/arch/alpha/tc/cfb.c +++ b/sys/arch/alpha/tc/cfb.c @@ -1,3 +1,4 @@ +/* $OpenBSD: cfb.c,v 1.2 1996/07/29 23:01:56 niklas Exp $ */ /* $NetBSD: cfb.c,v 1.1 1996/05/01 23:25:03 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/cfbvar.h b/sys/arch/alpha/tc/cfbvar.h index bd90951e812..8434cf92910 100644 --- a/sys/arch/alpha/tc/cfbvar.h +++ b/sys/arch/alpha/tc/cfbvar.h @@ -1,3 +1,4 @@ +/* $OpenBSD: cfbvar.h,v 1.2 1996/07/29 23:01:58 niklas Exp $ */ /* $NetBSD: cfbvar.h,v 1.1 1996/05/01 23:25:04 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/esp.c b/sys/arch/alpha/tc/esp.c index d1b4a2d2605..68d1e3bdba5 100644 --- a/sys/arch/alpha/tc/esp.c +++ b/sys/arch/alpha/tc/esp.c @@ -1,3 +1,4 @@ +/* $OpenBSD: esp.c,v 1.4 1996/07/29 23:02:00 niklas Exp $ */ /* $NetBSD: esp.c,v 1.8.4.1 1996/06/05 00:39:03 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/espreg.h b/sys/arch/alpha/tc/espreg.h index 4b2bf02cd70..d6602261f90 100644 --- a/sys/arch/alpha/tc/espreg.h +++ b/sys/arch/alpha/tc/espreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: espreg.h,v 1.3 1996/07/29 23:02:02 niklas Exp $ */ /* $NetBSD: espreg.h,v 1.2 1995/12/20 00:40:25 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/espvar.h b/sys/arch/alpha/tc/espvar.h index e3073a027dc..c7c3b986231 100644 --- a/sys/arch/alpha/tc/espvar.h +++ b/sys/arch/alpha/tc/espvar.h @@ -1,3 +1,4 @@ +/* $OpenBSD: espvar.h,v 1.3 1996/07/29 23:02:04 niklas Exp $ */ /* $NetBSD: espvar.h,v 1.3 1995/12/20 00:40:26 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c index 2e154efd1e3..b6e09102e31 100644 --- a/sys/arch/alpha/tc/ioasic.c +++ b/sys/arch/alpha/tc/ioasic.c @@ -1,3 +1,4 @@ +/* $OpenBSD: ioasic.c,v 1.3 1996/07/29 23:02:06 niklas Exp $ */ /* $NetBSD: ioasic.c,v 1.4.4.1 1996/06/05 00:39:05 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/ioasicreg.h b/sys/arch/alpha/tc/ioasicreg.h index c0ca70dc3f2..370c0d47d14 100644 --- a/sys/arch/alpha/tc/ioasicreg.h +++ b/sys/arch/alpha/tc/ioasicreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ioasicreg.h,v 1.2 1996/07/29 23:02:07 niklas Exp $ */ /* $NetBSD: ioasicreg.h,v 1.1 1995/12/20 00:43:22 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/mcclock_ioasic.c b/sys/arch/alpha/tc/mcclock_ioasic.c index 340a75f82c1..6a01a25b5ee 100644 --- a/sys/arch/alpha/tc/mcclock_ioasic.c +++ b/sys/arch/alpha/tc/mcclock_ioasic.c @@ -1,3 +1,4 @@ +/* $OpenBSD: mcclock_ioasic.c,v 1.2 1996/07/29 23:02:09 niklas Exp $ */ /* $NetBSD: mcclock_ioasic.c,v 1.2 1996/04/17 22:22:58 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c index c8b30499bb0..eeae075cba2 100644 --- a/sys/arch/alpha/tc/scc.c +++ b/sys/arch/alpha/tc/scc.c @@ -1,3 +1,4 @@ +/* $OpenBSD: scc.c,v 1.5 1996/07/29 23:02:11 niklas Exp $ */ /* $NetBSD: scc.c,v 1.16.4.2 1996/06/03 19:44:41 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/sccreg.h b/sys/arch/alpha/tc/sccreg.h index 515b5e6506b..2207605a58a 100644 --- a/sys/arch/alpha/tc/sccreg.h +++ b/sys/arch/alpha/tc/sccreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: sccreg.h,v 1.2 1996/07/29 23:02:13 niklas Exp $ */ /* $NetBSD: sccreg.h,v 1.2 1995/04/11 03:41:10 mycroft Exp $ */ /* diff --git a/sys/arch/alpha/tc/sccvar.h b/sys/arch/alpha/tc/sccvar.h index c00d7142077..5ffdb5baa11 100644 --- a/sys/arch/alpha/tc/sccvar.h +++ b/sys/arch/alpha/tc/sccvar.h @@ -1,3 +1,4 @@ +/* $OpenBSD: sccvar.h,v 1.2 1996/07/29 23:02:15 niklas Exp $ */ /* $NetBSD: sccvar.h,v 1.2 1995/08/03 00:52:23 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c index acf0d68da63..d593bc89fa1 100644 --- a/sys/arch/alpha/tc/sfb.c +++ b/sys/arch/alpha/tc/sfb.c @@ -1,3 +1,4 @@ +/* $OpenBSD: sfb.c,v 1.2 1996/07/29 23:02:16 niklas Exp $ */ /* $NetBSD: sfb.c,v 1.1 1996/05/01 21:15:50 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/sfbvar.h b/sys/arch/alpha/tc/sfbvar.h index afcd451f0f0..a1fa2952d72 100644 --- a/sys/arch/alpha/tc/sfbvar.h +++ b/sys/arch/alpha/tc/sfbvar.h @@ -1,3 +1,4 @@ +/* $OpenBSD: sfbvar.h,v 1.2 1996/07/29 23:02:18 niklas Exp $ */ /* $NetBSD: sfbvar.h,v 1.1 1996/05/01 21:15:51 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c index 0321893acdb..dc7c0b41fb9 100644 --- a/sys/arch/alpha/tc/tc_3000_300.c +++ b/sys/arch/alpha/tc/tc_3000_300.c @@ -1,3 +1,4 @@ +/* $OpenBSD: tc_3000_300.c,v 1.4 1996/07/29 23:02:19 niklas Exp $ */ /* $NetBSD: tc_3000_300.c,v 1.7.4.1 1996/06/05 00:39:06 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tc_3000_300.h b/sys/arch/alpha/tc/tc_3000_300.h index 9d4b35cdca9..8ef82e58802 100644 --- a/sys/arch/alpha/tc/tc_3000_300.h +++ b/sys/arch/alpha/tc/tc_3000_300.h @@ -1,3 +1,4 @@ +/* $OpenBSD: tc_3000_300.h,v 1.3 1996/07/29 23:02:21 niklas Exp $ */ /* $NetBSD: tc_3000_300.h,v 1.2 1995/12/20 00:43:28 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c index 336ce43e8ad..ccda3b062bd 100644 --- a/sys/arch/alpha/tc/tc_3000_500.c +++ b/sys/arch/alpha/tc/tc_3000_500.c @@ -1,3 +1,4 @@ +/* $OpenBSD: tc_3000_500.c,v 1.4 1996/07/29 23:02:23 niklas Exp $ */ /* $NetBSD: tc_3000_500.c,v 1.4.4.3 1996/06/13 18:35:35 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tc_3000_500.h b/sys/arch/alpha/tc/tc_3000_500.h index 676b89f730d..ea5a236e165 100644 --- a/sys/arch/alpha/tc/tc_3000_500.h +++ b/sys/arch/alpha/tc/tc_3000_500.h @@ -1,3 +1,4 @@ +/* $OpenBSD: tc_3000_500.h,v 1.3 1996/07/29 23:02:24 niklas Exp $ */ /* $NetBSD: tc_3000_500.h,v 1.2 1995/12/20 00:43:31 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tc_bus_io.c b/sys/arch/alpha/tc/tc_bus_io.c index 5bd03d0254e..e553611c1b4 100644 --- a/sys/arch/alpha/tc/tc_bus_io.c +++ b/sys/arch/alpha/tc/tc_bus_io.c @@ -1,3 +1,4 @@ +/* $OpenBSD: tc_bus_io.c,v 1.2 1996/07/29 23:02:26 niklas Exp $ */ /* $NetBSD: tc_bus_io.c,v 1.1.4.1 1996/06/13 17:41:51 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tc_bus_mem.c b/sys/arch/alpha/tc/tc_bus_mem.c index 922dd831a8b..b82678694fc 100644 --- a/sys/arch/alpha/tc/tc_bus_mem.c +++ b/sys/arch/alpha/tc/tc_bus_mem.c @@ -1,3 +1,4 @@ +/* $OpenBSD: tc_bus_mem.c,v 1.2 1996/07/29 23:02:27 niklas Exp $ */ /* $NetBSD: tc_bus_mem.c,v 1.2.4.2 1996/06/13 17:42:51 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tc_conf.h b/sys/arch/alpha/tc/tc_conf.h index 1d73b9ac660..948014a6e3f 100644 --- a/sys/arch/alpha/tc/tc_conf.h +++ b/sys/arch/alpha/tc/tc_conf.h @@ -1,3 +1,4 @@ +/* $OpenBSD: tc_conf.h,v 1.2 1996/07/29 23:02:29 niklas Exp $ */ /* $NetBSD: tc_conf.h,v 1.1 1995/12/20 00:43:32 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tc_machdep.h b/sys/arch/alpha/tc/tc_machdep.h index 5287f43b048..f5a55ec646b 100644 --- a/sys/arch/alpha/tc/tc_machdep.h +++ b/sys/arch/alpha/tc/tc_machdep.h @@ -1,3 +1,4 @@ +/* $OpenBSD: tc_machdep.h,v 1.2 1996/07/29 23:02:31 niklas Exp $ */ /* $NetBSD: tc_machdep.h,v 1.1 1995/12/20 00:09:29 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tcasic.c b/sys/arch/alpha/tc/tcasic.c index 742029d3f54..c1f2223032f 100644 --- a/sys/arch/alpha/tc/tcasic.c +++ b/sys/arch/alpha/tc/tcasic.c @@ -1,3 +1,4 @@ +/* $OpenBSD: tcasic.c,v 1.3 1996/07/29 23:02:32 niklas Exp $ */ /* $NetBSD: tcasic.c,v 1.5 1996/05/17 23:58:43 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tcds.c b/sys/arch/alpha/tc/tcds.c index 940ac21c698..dd8da7b9903 100644 --- a/sys/arch/alpha/tc/tcds.c +++ b/sys/arch/alpha/tc/tcds.c @@ -1,3 +1,4 @@ +/* $OpenBSD: tcds.c,v 1.4 1996/07/29 23:02:34 niklas Exp $ */ /* $NetBSD: tcds.c,v 1.9.4.2 1996/06/05 01:32:26 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tcds_dma.c b/sys/arch/alpha/tc/tcds_dma.c index f717ec6cd26..c62f8ea7926 100644 --- a/sys/arch/alpha/tc/tcds_dma.c +++ b/sys/arch/alpha/tc/tcds_dma.c @@ -1,3 +1,4 @@ +/* $OpenBSD: tcds_dma.c,v 1.3 1996/07/29 23:02:36 niklas Exp $ */ /* $NetBSD: tcds_dma.c,v 1.6 1995/12/20 00:40:32 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tcdsreg.h b/sys/arch/alpha/tc/tcdsreg.h index 529fad75214..beec02040ea 100644 --- a/sys/arch/alpha/tc/tcdsreg.h +++ b/sys/arch/alpha/tc/tcdsreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: tcdsreg.h,v 1.2 1996/07/29 23:02:38 niklas Exp $ */ /* $NetBSD: tcdsreg.h,v 1.1 1995/12/20 00:40:36 cgd Exp $ */ /* diff --git a/sys/arch/alpha/tc/tcdsvar.h b/sys/arch/alpha/tc/tcdsvar.h index 540db9c8538..82dd5f57b50 100644 --- a/sys/arch/alpha/tc/tcdsvar.h +++ b/sys/arch/alpha/tc/tcdsvar.h @@ -1,3 +1,4 @@ +/* $OpenBSD: tcdsvar.h,v 1.3 1996/07/29 23:02:40 niklas Exp $ */ /* $NetBSD: tcdsvar.h,v 1.3 1996/04/12 06:10:18 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/ascii.h b/sys/arch/alpha/wscons/ascii.h index dc4775022c9..7569e04fa31 100644 --- a/sys/arch/alpha/wscons/ascii.h +++ b/sys/arch/alpha/wscons/ascii.h @@ -1,3 +1,4 @@ +/* $OpenBSD: ascii.h,v 1.2 1996/07/29 23:02:46 niklas Exp $ */ /* $NetBSD: ascii.h,v 1.1 1996/04/12 02:00:42 cgd Exp $ */ #define ASCII_BEL 0x07 /* bell */ diff --git a/sys/arch/alpha/wscons/event.c b/sys/arch/alpha/wscons/event.c index 3c34d962c83..614704b3f9d 100644 --- a/sys/arch/alpha/wscons/event.c +++ b/sys/arch/alpha/wscons/event.c @@ -1,3 +1,4 @@ +/* $OpenBSD: event.c,v 1.2 1996/07/29 23:02:48 niklas Exp $ */ /* $NetBSD: event.c,v 1.1.4.1 1996/05/29 22:26:54 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/event_var.h b/sys/arch/alpha/wscons/event_var.h index b63213d315f..bb8d9337c32 100644 --- a/sys/arch/alpha/wscons/event_var.h +++ b/sys/arch/alpha/wscons/event_var.h @@ -1,3 +1,4 @@ +/* $OpenBSD: event_var.h,v 1.2 1996/07/29 23:02:50 niklas Exp $ */ /* $NetBSD: event_var.h,v 1.1 1996/04/12 02:00:45 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/kbd.c b/sys/arch/alpha/wscons/kbd.c index 67cd26fcee5..dbc00f0c542 100644 --- a/sys/arch/alpha/wscons/kbd.c +++ b/sys/arch/alpha/wscons/kbd.c @@ -1,3 +1,4 @@ +/* $OpenBSD: kbd.c,v 1.2 1996/07/29 23:02:51 niklas Exp $ */ /* $NetBSD: kbd.c,v 1.1 1996/04/12 02:00:46 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/ms.c b/sys/arch/alpha/wscons/ms.c index 240a0b4bfd6..ed544fec876 100644 --- a/sys/arch/alpha/wscons/ms.c +++ b/sys/arch/alpha/wscons/ms.c @@ -1,3 +1,4 @@ +/* $OpenBSD: ms.c,v 1.2 1996/07/29 23:02:53 niklas Exp $ */ /* $NetBSD: ms.c,v 1.1 1996/04/12 02:00:47 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/wscons.c b/sys/arch/alpha/wscons/wscons.c index 2845895227d..9d8be9ab787 100644 --- a/sys/arch/alpha/wscons/wscons.c +++ b/sys/arch/alpha/wscons/wscons.c @@ -1,3 +1,4 @@ +/* $OpenBSD: wscons.c,v 1.2 1996/07/29 23:02:55 niklas Exp $ */ /* $NetBSD: wscons.c,v 1.3.4.1 1996/06/03 18:54:35 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/wscons_emul.c b/sys/arch/alpha/wscons/wscons_emul.c index cb218fd5cd0..623ee8d2511 100644 --- a/sys/arch/alpha/wscons/wscons_emul.c +++ b/sys/arch/alpha/wscons/wscons_emul.c @@ -1,3 +1,4 @@ +/* $OpenBSD: wscons_emul.c,v 1.2 1996/07/29 23:02:57 niklas Exp $ */ /* $NetBSD: wscons_emul.c,v 1.2 1996/04/12 06:10:29 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/wscons_emul.h b/sys/arch/alpha/wscons/wscons_emul.h index acae6a9b158..334e556464d 100644 --- a/sys/arch/alpha/wscons/wscons_emul.h +++ b/sys/arch/alpha/wscons/wscons_emul.h @@ -1,3 +1,4 @@ +/* $OpenBSD: wscons_emul.h,v 1.2 1996/07/29 23:02:59 niklas Exp $ */ /* $NetBSD: wscons_emul.h,v 1.2 1996/04/12 06:10:32 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/wscons_raster.h b/sys/arch/alpha/wscons/wscons_raster.h index 33edc0cab95..9de352b40cd 100644 --- a/sys/arch/alpha/wscons/wscons_raster.h +++ b/sys/arch/alpha/wscons/wscons_raster.h @@ -1,3 +1,4 @@ +/* $OpenBSD: wscons_raster.h,v 1.2 1996/07/29 23:03:00 niklas Exp $ */ /* $NetBSD: wscons_raster.h,v 1.1 1996/04/12 02:00:51 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/wscons_rfont.h b/sys/arch/alpha/wscons/wscons_rfont.h index c836524b372..b9321173025 100644 --- a/sys/arch/alpha/wscons/wscons_rfont.h +++ b/sys/arch/alpha/wscons/wscons_rfont.h @@ -1,3 +1,4 @@ +/* $OpenBSD: wscons_rfont.h,v 1.2 1996/07/29 23:03:02 niklas Exp $ */ /* $NetBSD: wscons_rfont.h,v 1.1 1996/04/12 02:00:52 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/wscons_rinit.c b/sys/arch/alpha/wscons/wscons_rinit.c index 7b7348a3746..66e3dcaeb6d 100644 --- a/sys/arch/alpha/wscons/wscons_rinit.c +++ b/sys/arch/alpha/wscons/wscons_rinit.c @@ -1,3 +1,4 @@ +/* $OpenBSD: wscons_rinit.c,v 1.2 1996/07/29 23:03:04 niklas Exp $ */ /* $NetBSD: wscons_rinit.c,v 1.1 1996/04/12 02:00:54 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/wscons_rops.c b/sys/arch/alpha/wscons/wscons_rops.c index f571bf184d3..98ed8eab10b 100644 --- a/sys/arch/alpha/wscons/wscons_rops.c +++ b/sys/arch/alpha/wscons/wscons_rops.c @@ -1,3 +1,4 @@ +/* $OpenBSD: wscons_rops.c,v 1.2 1996/07/29 23:03:06 niklas Exp $ */ /* $NetBSD: wscons_rops.c,v 1.1 1996/04/12 02:00:55 cgd Exp $ */ /* diff --git a/sys/arch/alpha/wscons/wsconsvar.h b/sys/arch/alpha/wscons/wsconsvar.h index 433480d52ea..361113545eb 100644 --- a/sys/arch/alpha/wscons/wsconsvar.h +++ b/sys/arch/alpha/wscons/wsconsvar.h @@ -1,3 +1,4 @@ +/* $OpenBSD: wsconsvar.h,v 1.2 1996/07/29 23:03:07 niklas Exp $ */ /* $NetBSD: wsconsvar.h,v 1.2 1996/04/12 06:10:36 cgd Exp $ */ /* |