diff options
Diffstat (limited to 'sys')
931 files changed, 1044 insertions, 16037 deletions
diff --git a/sys/Makefile b/sys/Makefile index 00d80648ef6d5..26cc6758d9f90 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1994/08/02 07:38:17 davidg Exp $ +# Makefile,v 1.3 1994/08/25 13:54:28 paul Exp SUBDIR= ${MACHINE}/boot libkern diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 42906268b3578..c575841a8a5c8 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $Id: newvers.sh,v 1.6.2.2 1994/11/16 06:33:27 phk Exp $ +# newvers.sh,v 1.6.2.2.2.1 1994/11/22 06:32:34 phk Exp if [ ! -r version ] then diff --git a/sys/conf/nfsswapkernel.c b/sys/conf/nfsswapkernel.c index 80cb84a3734f4..7d2a13a6997a8 100644 --- a/sys/conf/nfsswapkernel.c +++ b/sys/conf/nfsswapkernel.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)nfsswapvmunix.c 8.1 (Berkeley) 6/10/93 - * $Id: nfsswapvmunix.c,v 1.2 1994/08/02 07:38:29 davidg Exp $ + * nfsswapkernel.c,v 1.1 1994/08/05 09:25:31 davidg Exp */ /* diff --git a/sys/conf/param.c b/sys/conf/param.c index f714cab0a6532..541936536fe52 100644 --- a/sys/conf/param.c +++ b/sys/conf/param.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.c 8.2 (Berkeley) 1/21/94 - * $Id: param.c,v 1.3 1994/08/02 07:38:30 davidg Exp $ + * param.c,v 1.4 1994/09/13 14:46:24 dfr Exp */ #include <sys/param.h> diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh index 4cda02af41d82..8a69e9ca47b67 100644 --- a/sys/conf/systags.sh +++ b/sys/conf/systags.sh @@ -38,7 +38,7 @@ # # First written May 16, 1992 by Van Jacobson, Lawrence Berkeley Laboratory. # -# $Id$ +# systags.sh,v 1.2 1994/08/02 07:38:32 davidg Exp rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles MACHINE=`machine` diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c index 7178bbe1c96c8..1de0f4e8df07b 100644 --- a/sys/ddb/db_access.c +++ b/sys/ddb/db_access.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_access.c,v 1.5 1994/08/13 03:49:13 wollman Exp $ + * db_access.c,v 1.6 1994/08/18 22:34:18 wollman Exp */ /* diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h index a62edbacc6adb..7bf8a188af458 100644 --- a/sys/ddb/db_access.h +++ b/sys/ddb/db_access.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_access.h,v 1.2 1993/10/16 16:47:05 rgrimes Exp $ + * db_access.h,v 1.3 1993/11/07 17:39:20 wollman Exp */ #ifndef _DDB_DB_ACCESS_H_ diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c index b704ded2d648d..620e4f670ad80 100644 --- a/sys/ddb/db_aout.c +++ b/sys/ddb/db_aout.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_aout.c,v 1.8 1994/09/05 14:04:56 bde Exp $ + * db_aout.c,v 1.9 1994/09/27 03:34:52 phk Exp */ /* diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c index cb9c55e0a1b70..69e9b7a204e5f 100644 --- a/sys/ddb/db_break.c +++ b/sys/ddb/db_break.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_break.c,v 1.4 1994/08/13 03:49:15 wollman Exp $ + * db_break.c,v 1.5 1994/08/18 22:34:19 wollman Exp */ /* diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h index dc66dcab75d4e..8225ee3d3fc6c 100644 --- a/sys/ddb/db_break.h +++ b/sys/ddb/db_break.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id$ + * db_break.h,v 1.2 1993/10/16 16:47:09 rgrimes Exp */ /* diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 04793c91ebe39..5986ab0ec02f3 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_command.c,v 1.7 1994/08/18 22:34:20 wollman Exp $ + * db_command.c,v 1.8 1994/08/27 16:14:08 davidg Exp */ /* diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h index 9000cd049649f..5f175bd523d40 100644 --- a/sys/ddb/db_command.h +++ b/sys/ddb/db_command.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_command.h,v 1.4 1994/08/13 03:49:16 wollman Exp $ + * db_command.h,v 1.5 1994/08/18 22:34:21 wollman Exp */ #ifndef _DDB_DB_COMMAND_H_ diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c index 9d3924bd7154c..01ef1f9220493 100644 --- a/sys/ddb/db_examine.c +++ b/sys/ddb/db_examine.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_examine.c,v 1.5 1994/08/13 03:49:17 wollman Exp $ + * db_examine.c,v 1.6 1994/08/18 22:34:22 wollman Exp */ /* diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c index 1c7eea1fb8408..b283ab44fdb31 100644 --- a/sys/ddb/db_expr.c +++ b/sys/ddb/db_expr.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_expr.c,v 1.3 1993/11/25 01:30:06 wollman Exp $ + * db_expr.c,v 1.4 1994/08/13 03:49:18 wollman Exp */ /* diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index 4697a8c8f3fcb..255124d8ee288 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_input.c,v 1.5 1994/08/13 03:49:19 wollman Exp $ + * db_input.c,v 1.6 1994/08/18 22:34:23 wollman Exp */ /* diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c index 8f5f4b0b4813f..f6fffe5ee3702 100644 --- a/sys/ddb/db_lex.c +++ b/sys/ddb/db_lex.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_lex.c,v 1.4 1994/08/13 03:49:20 wollman Exp $ + * db_lex.c,v 1.5 1994/08/18 22:34:23 wollman Exp */ /* diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h index db1d2b9f20ce9..56e5c73b4d26a 100644 --- a/sys/ddb/db_lex.h +++ b/sys/ddb/db_lex.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_lex.h,v 1.3 1993/11/07 17:39:23 wollman Exp $ + * db_lex.h,v 1.4 1994/08/18 22:34:24 wollman Exp */ #ifndef _DDB_DB_LEX_H_ diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index cc70b63428220..6c06fdcc957dc 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_output.c,v 1.9 1994/09/27 03:34:54 phk Exp $ + * db_output.c,v 1.10 1994/10/30 20:55:44 bde Exp */ /* diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h index 3bfd7108c50a6..1e34179bc6c03 100644 --- a/sys/ddb/db_output.h +++ b/sys/ddb/db_output.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_output.h,v 1.5 1994/09/27 03:34:55 phk Exp $ + * db_output.h,v 1.6 1994/09/27 12:15:53 davidg Exp */ #ifndef _DDB_DB_OUTPUT_H_ diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c index e9a9fd3e01816..f844271523f15 100644 --- a/sys/ddb/db_print.c +++ b/sys/ddb/db_print.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_print.c,v 1.5 1994/08/18 22:34:25 wollman Exp $ + * db_print.c,v 1.6 1994/09/27 03:34:56 phk Exp */ /* diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c index da8510e59cb72..9febff9e59403 100644 --- a/sys/ddb/db_ps.c +++ b/sys/ddb/db_ps.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: db_ps.c,v 1.2 1994/09/27 20:35:55 phk Exp $ + * db_ps.c,v 1.3 1994/09/28 19:16:24 phk Exp */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c index 4b1bd15c74407..a5b80dca1156e 100644 --- a/sys/ddb/db_run.c +++ b/sys/ddb/db_run.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_run.c,v 1.3 1993/11/25 01:30:10 wollman Exp $ + * db_run.c,v 1.4 1994/08/13 03:49:22 wollman Exp */ /* diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c index 0fd37f4a0c201..37083e3c34e4c 100644 --- a/sys/ddb/db_sym.c +++ b/sys/ddb/db_sym.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_sym.c,v 1.6 1994/08/20 03:48:26 davidg Exp $ + * db_sym.c,v 1.7 1994/09/27 03:34:57 phk Exp */ /* diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h index 661f16b8cbf3c..d5df23328fb8d 100644 --- a/sys/ddb/db_sym.h +++ b/sys/ddb/db_sym.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_sym.h,v 1.5 1994/08/20 03:48:27 davidg Exp $ + * db_sym.h,v 1.6 1994/09/27 03:34:57 phk Exp */ #ifndef _DDB_DB_SYM_H_ diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c index bc65ed9762423..bf28c4f79b3e9 100644 --- a/sys/ddb/db_trap.c +++ b/sys/ddb/db_trap.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_trap.c,v 1.5 1994/08/18 22:34:27 wollman Exp $ + * db_trap.c,v 1.6 1994/10/02 19:36:21 phk Exp */ /* diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c index b803e5b34628c..db456335f0959 100644 --- a/sys/ddb/db_variables.c +++ b/sys/ddb/db_variables.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_variables.c,v 1.5 1994/08/18 22:34:27 wollman Exp $ + * db_variables.c,v 1.6 1994/09/27 03:34:58 phk Exp */ /* diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h index 35e5a00018172..1a865f7f1298a 100644 --- a/sys/ddb/db_variables.h +++ b/sys/ddb/db_variables.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_variables.h,v 1.2 1993/10/16 16:47:31 rgrimes Exp $ + * db_variables.h,v 1.3 1993/11/25 01:30:14 wollman Exp */ /* diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c index fb6680fd47a49..aac50fd022bd4 100644 --- a/sys/ddb/db_watch.c +++ b/sys/ddb/db_watch.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_watch.c,v 1.4 1994/08/13 03:49:25 wollman Exp $ + * db_watch.c,v 1.5 1994/08/18 22:34:28 wollman Exp */ /* diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h index d564ad24afbfe..d3ec020207ff1 100644 --- a/sys/ddb/db_watch.h +++ b/sys/ddb/db_watch.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_watch.h,v 1.2 1993/10/16 16:47:33 rgrimes Exp $ + * db_watch.h,v 1.3 1994/08/18 22:34:29 wollman Exp */ /* diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c index e2625ca0df5f1..91f37f1ae0f69 100644 --- a/sys/ddb/db_write_cmd.c +++ b/sys/ddb/db_write_cmd.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_write_cmd.c,v 1.3 1993/11/25 01:30:16 wollman Exp $ + * db_write_cmd.c,v 1.4 1994/08/13 03:49:26 wollman Exp */ /* diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h index a72b5ca0a7c29..16c39d0172445 100644 --- a/sys/ddb/ddb.h +++ b/sys/ddb/ddb.h @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ddb.h,v 1.3 1994/09/27 12:11:09 davidg Exp $ + * ddb.h,v 1.4 1994/09/27 12:15:56 davidg Exp */ /* diff --git a/sys/gnu/i386/fpemul/control_w.h b/sys/gnu/i386/fpemul/control_w.h index d7ede076124fc..a87e026912fef 100644 --- a/sys/gnu/i386/fpemul/control_w.h +++ b/sys/gnu/i386/fpemul/control_w.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: control_w.h,v 1.2 1994/04/29 21:02:30 gclarkii Exp $ + * control_w.h,v 1.3 1994/06/10 07:44:07 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/div_small.s b/sys/gnu/i386/fpemul/div_small.s index d25313b3792c1..3d4a906035fbc 100644 --- a/sys/gnu/i386/fpemul/div_small.s +++ b/sys/gnu/i386/fpemul/div_small.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: div_small.s,v 1.2 1994/04/29 21:07:11 gclarkii Exp $ + * div_small.s,v 1.3 1994/06/10 07:44:08 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c index f9f6eb1a0ff5f..5ee06d9219e10 100644 --- a/sys/gnu/i386/fpemul/errors.c +++ b/sys/gnu/i386/fpemul/errors.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: errors.c,v 1.2 1994/04/29 21:07:12 gclarkii Exp $ + * errors.c,v 1.3 1994/06/10 07:44:10 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/exception.h b/sys/gnu/i386/fpemul/exception.h index 11f9d02160d8a..89a078fe818a3 100644 --- a/sys/gnu/i386/fpemul/exception.h +++ b/sys/gnu/i386/fpemul/exception.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: exception.h,v 1.2 1994/04/29 21:07:13 gclarkii Exp $ + * exception.h,v 1.3 1994/06/10 07:44:12 rich Exp * * */ diff --git a/sys/gnu/i386/fpemul/fpu_arith.c b/sys/gnu/i386/fpemul/fpu_arith.c index a1da514d1fe30..fb78413eb1b8e 100644 --- a/sys/gnu/i386/fpemul/fpu_arith.c +++ b/sys/gnu/i386/fpemul/fpu_arith.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_arith.c,v 1.2 1994/04/29 21:07:14 gclarkii Exp $ + * fpu_arith.c,v 1.3 1994/06/10 07:44:14 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/fpu_asm.h b/sys/gnu/i386/fpemul/fpu_asm.h index e618c04e1f353..aec6b06dbfe28 100644 --- a/sys/gnu/i386/fpemul/fpu_asm.h +++ b/sys/gnu/i386/fpemul/fpu_asm.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_asm.h,v 1.2 1994/04/29 21:07:14 gclarkii Exp $ + * fpu_asm.h,v 1.3 1994/06/10 07:44:16 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/fpu_aux.c b/sys/gnu/i386/fpemul/fpu_aux.c index 629e45a794728..7766c212f095b 100644 --- a/sys/gnu/i386/fpemul/fpu_aux.c +++ b/sys/gnu/i386/fpemul/fpu_aux.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_aux.c,v 1.2 1994/04/29 21:16:19 gclarkii Exp $ + * fpu_aux.c,v 1.3 1994/06/10 07:44:17 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/fpu_emu.h b/sys/gnu/i386/fpemul/fpu_emu.h index b62a9cf894765..2dcf256bd75f7 100644 --- a/sys/gnu/i386/fpemul/fpu_emu.h +++ b/sys/gnu/i386/fpemul/fpu_emu.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_emu.h,v 1.2 1994/04/29 21:16:20 gclarkii Exp $ + * fpu_emu.h,v 1.3 1994/06/10 07:44:19 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c index 09e32c0721c57..ae851ba8293f1 100644 --- a/sys/gnu/i386/fpemul/fpu_entry.c +++ b/sys/gnu/i386/fpemul/fpu_entry.c @@ -55,7 +55,7 @@ * * W. Metzenthen June 1994. * - * $Id: fpu_entry.c,v 1.4 1994/06/22 05:52:14 jkh Exp $ + * fpu_entry.c,v 1.5 1994/08/30 20:18:52 davidg Exp * */ diff --git a/sys/gnu/i386/fpemul/fpu_etc.c b/sys/gnu/i386/fpemul/fpu_etc.c index 936e39a8b8bb8..ff7f3debe0a6b 100644 --- a/sys/gnu/i386/fpemul/fpu_etc.c +++ b/sys/gnu/i386/fpemul/fpu_etc.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_etc.c,v 1.2 1994/04/29 21:16:22 gclarkii Exp $ + * fpu_etc.c,v 1.3 1994/06/10 07:44:24 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/fpu_proto.h b/sys/gnu/i386/fpemul/fpu_proto.h index 255aa5dbb02bf..bff302ae68a22 100644 --- a/sys/gnu/i386/fpemul/fpu_proto.h +++ b/sys/gnu/i386/fpemul/fpu_proto.h @@ -1,6 +1,6 @@ /* * - * $Id:$ + * fpu_proto.h,v 1.2 1994/04/29 21:16:23 gclarkii Exp * */ diff --git a/sys/gnu/i386/fpemul/fpu_system.h b/sys/gnu/i386/fpemul/fpu_system.h index 8bcc14c0922b1..a123a1d7be870 100644 --- a/sys/gnu/i386/fpemul/fpu_system.h +++ b/sys/gnu/i386/fpemul/fpu_system.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_system.h,v 1.2 1994/04/29 21:16:24 gclarkii Exp $ + * fpu_system.h,v 1.3 1994/06/10 07:44:25 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c index ca32f91d0aef9..5d32b5e1f0892 100644 --- a/sys/gnu/i386/fpemul/fpu_trig.c +++ b/sys/gnu/i386/fpemul/fpu_trig.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_trig.c,v 1.3 1994/04/29 21:16:25 gclarkii Exp $ + * fpu_trig.c,v 1.4 1994/06/10 07:44:27 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/get_address.c b/sys/gnu/i386/fpemul/get_address.c index 5839e57c26847..d838242ad4581 100644 --- a/sys/gnu/i386/fpemul/get_address.c +++ b/sys/gnu/i386/fpemul/get_address.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: get_address.c,v 1.2 1994/04/29 21:16:26 gclarkii Exp $ + * get_address.c,v 1.3 1994/06/10 07:44:29 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c index e45b67ecefd8e..286f1cddd09a1 100644 --- a/sys/gnu/i386/fpemul/load_store.c +++ b/sys/gnu/i386/fpemul/load_store.c @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: load_store.c,v 1.3 1994/06/10 07:44:30 rich Exp $ + * load_store.c,v 1.4 1994/09/21 22:22:46 bde Exp * */ diff --git a/sys/gnu/i386/fpemul/math_emu.h b/sys/gnu/i386/fpemul/math_emu.h index 4dc90b83a9846..f38b42d227237 100644 --- a/sys/gnu/i386/fpemul/math_emu.h +++ b/sys/gnu/i386/fpemul/math_emu.h @@ -1,6 +1,6 @@ /* * - * $Id:$ + * math_emu.h,v 1.2 1994/04/29 21:23:24 gclarkii Exp * */ diff --git a/sys/gnu/i386/fpemul/poly_2xm1.c b/sys/gnu/i386/fpemul/poly_2xm1.c index b7e81f241f1c8..72a5eec8c600d 100644 --- a/sys/gnu/i386/fpemul/poly_2xm1.c +++ b/sys/gnu/i386/fpemul/poly_2xm1.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_2xm1.c,v 1.2 1994/04/29 21:23:25 gclarkii Exp $ + * poly_2xm1.c,v 1.3 1994/06/10 07:44:32 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/poly_atan.c b/sys/gnu/i386/fpemul/poly_atan.c index 179049fcfb10b..0a971adc6a25c 100644 --- a/sys/gnu/i386/fpemul/poly_atan.c +++ b/sys/gnu/i386/fpemul/poly_atan.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_atan.c,v 1.3 1994/04/29 21:23:26 gclarkii Exp $ + * poly_atan.c,v 1.4 1994/06/10 07:44:34 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/poly_div.s b/sys/gnu/i386/fpemul/poly_div.s index 3ac5bf06fe1bb..31914e0c35f02 100644 --- a/sys/gnu/i386/fpemul/poly_div.s +++ b/sys/gnu/i386/fpemul/poly_div.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_div.s,v 1.2 1994/04/29 21:23:27 gclarkii Exp $ + * poly_div.s,v 1.3 1994/06/10 07:44:36 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/poly_l2.c b/sys/gnu/i386/fpemul/poly_l2.c index 0607c1609d283..0a4074a485c9f 100644 --- a/sys/gnu/i386/fpemul/poly_l2.c +++ b/sys/gnu/i386/fpemul/poly_l2.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_l2.c,v 1.4 1994/04/30 16:47:08 gclarkii Exp $ + * poly_l2.c,v 1.5 1994/06/10 07:44:38 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/poly_mul64.s b/sys/gnu/i386/fpemul/poly_mul64.s index c0f5d0fc5ba9b..4cd2575aa31a5 100644 --- a/sys/gnu/i386/fpemul/poly_mul64.s +++ b/sys/gnu/i386/fpemul/poly_mul64.s @@ -59,7 +59,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_mul64.s,v 1.2 1994/04/29 21:23:29 gclarkii Exp $ + * poly_mul64.s,v 1.3 1994/06/10 07:44:39 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/poly_sin.c b/sys/gnu/i386/fpemul/poly_sin.c index a1aa11c1ca661..11f60b4f66664 100644 --- a/sys/gnu/i386/fpemul/poly_sin.c +++ b/sys/gnu/i386/fpemul/poly_sin.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_sin.c,v 1.4 1994/06/10 07:44:41 rich Exp $ + * poly_sin.c,v 1.5 1994/08/31 04:45:22 davidg Exp * */ diff --git a/sys/gnu/i386/fpemul/poly_tan.c b/sys/gnu/i386/fpemul/poly_tan.c index 7f703880a36aa..18b28444d46af 100644 --- a/sys/gnu/i386/fpemul/poly_tan.c +++ b/sys/gnu/i386/fpemul/poly_tan.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_tan.c,v 1.3 1994/04/29 21:23:31 gclarkii Exp $ + * poly_tan.c,v 1.4 1994/06/10 07:44:42 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/polynomial.s b/sys/gnu/i386/fpemul/polynomial.s index f54c729fe6fdf..2b56303fbd879 100644 --- a/sys/gnu/i386/fpemul/polynomial.s +++ b/sys/gnu/i386/fpemul/polynomial.s @@ -64,7 +64,7 @@ * W. Metzenthen June 1994. * * - * $Id: polynomial.s,v 1.2 1994/04/29 21:23:31 gclarkii Exp $ + * polynomial.s,v 1.3 1994/06/10 07:44:43 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_add_sub.c b/sys/gnu/i386/fpemul/reg_add_sub.c index a122452f19f9f..02d87dd616621 100644 --- a/sys/gnu/i386/fpemul/reg_add_sub.c +++ b/sys/gnu/i386/fpemul/reg_add_sub.c @@ -55,7 +55,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_add_sub.c,v 1.2 1994/04/29 21:30:15 gclarkii Exp $ + * reg_add_sub.c,v 1.3 1994/06/10 07:44:44 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_compare.c b/sys/gnu/i386/fpemul/reg_compare.c index b1c987a40cb8b..0625c31aedfb9 100644 --- a/sys/gnu/i386/fpemul/reg_compare.c +++ b/sys/gnu/i386/fpemul/reg_compare.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_compare.c,v 1.3 1994/06/10 07:44:47 rich Exp $ + * reg_compare.c,v 1.4 1994/08/31 04:45:23 davidg Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_constant.h b/sys/gnu/i386/fpemul/reg_constant.h index 6e4ffa86d78e3..49f2dd708ecd4 100644 --- a/sys/gnu/i386/fpemul/reg_constant.h +++ b/sys/gnu/i386/fpemul/reg_constant.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_constant.h,v 1.2 1994/04/29 21:30:18 gclarkii Exp $ + * reg_constant.h,v 1.3 1994/06/10 07:44:49 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_div.s b/sys/gnu/i386/fpemul/reg_div.s index 5de5a466c49f1..0d415276e0b41 100644 --- a/sys/gnu/i386/fpemul/reg_div.s +++ b/sys/gnu/i386/fpemul/reg_div.s @@ -60,7 +60,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_div.s,v 1.2 1994/04/29 21:30:19 gclarkii Exp $ + * reg_div.s,v 1.3 1994/06/10 07:44:50 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c index 8fde12fd18d47..39142df0e9ee0 100644 --- a/sys/gnu/i386/fpemul/reg_ld_str.c +++ b/sys/gnu/i386/fpemul/reg_ld_str.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_ld_str.c,v 1.4 1994/08/31 04:45:24 davidg Exp $ + * reg_ld_str.c,v 1.5 1994/09/21 22:22:48 bde Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_mul.c b/sys/gnu/i386/fpemul/reg_mul.c index b51e9fcf2ed7d..d16f0d73e2ccf 100644 --- a/sys/gnu/i386/fpemul/reg_mul.c +++ b/sys/gnu/i386/fpemul/reg_mul.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_mul.c,v 1.2 1994/04/29 21:30:21 gclarkii Exp $ + * reg_mul.c,v 1.3 1994/06/10 07:44:53 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_norm.s b/sys/gnu/i386/fpemul/reg_norm.s index 6f9dd7c9693a7..b8b7eadf7c898 100644 --- a/sys/gnu/i386/fpemul/reg_norm.s +++ b/sys/gnu/i386/fpemul/reg_norm.s @@ -61,7 +61,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_norm.s,v 1.2 1994/04/29 21:30:22 gclarkii Exp $ + * reg_norm.s,v 1.3 1994/06/10 07:44:54 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_round.s b/sys/gnu/i386/fpemul/reg_round.s index 99a2a8aa352eb..e908c02d8dd7b 100644 --- a/sys/gnu/i386/fpemul/reg_round.s +++ b/sys/gnu/i386/fpemul/reg_round.s @@ -65,7 +65,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_round.s,v 1.2 1994/04/29 21:30:23 gclarkii Exp $ + * reg_round.s,v 1.3 1994/06/10 07:44:55 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_u_add.s b/sys/gnu/i386/fpemul/reg_u_add.s index 86c84753e679f..8ee21ba9c4e0e 100644 --- a/sys/gnu/i386/fpemul/reg_u_add.s +++ b/sys/gnu/i386/fpemul/reg_u_add.s @@ -62,7 +62,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_add.s,v 1.2 1994/04/29 21:34:23 gclarkii Exp $ + * reg_u_add.s,v 1.3 1994/06/10 07:44:56 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_u_div.s b/sys/gnu/i386/fpemul/reg_u_div.s index 4952923886a20..dfb9c6c91405f 100644 --- a/sys/gnu/i386/fpemul/reg_u_div.s +++ b/sys/gnu/i386/fpemul/reg_u_div.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_div.s,v 1.2 1994/04/29 21:34:24 gclarkii Exp $ + * reg_u_div.s,v 1.3 1994/06/10 07:44:57 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_u_mul.s b/sys/gnu/i386/fpemul/reg_u_mul.s index 798f2046c8ebc..9802db554c20b 100644 --- a/sys/gnu/i386/fpemul/reg_u_mul.s +++ b/sys/gnu/i386/fpemul/reg_u_mul.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_mul.s,v 1.2 1994/04/29 21:34:25 gclarkii Exp $ + * reg_u_mul.s,v 1.3 1994/06/10 07:44:58 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/reg_u_sub.s b/sys/gnu/i386/fpemul/reg_u_sub.s index 3161e190284b2..4073eb3a89265 100644 --- a/sys/gnu/i386/fpemul/reg_u_sub.s +++ b/sys/gnu/i386/fpemul/reg_u_sub.s @@ -61,7 +61,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_sub.s,v 1.2 1994/04/29 21:34:26 gclarkii Exp $ + * reg_u_sub.s,v 1.3 1994/06/10 07:44:59 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/status_w.h b/sys/gnu/i386/fpemul/status_w.h index 75b87b4757d1c..aef9c7ef33fd2 100644 --- a/sys/gnu/i386/fpemul/status_w.h +++ b/sys/gnu/i386/fpemul/status_w.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: status_w.h,v 1.2 1994/04/29 21:34:27 gclarkii Exp $ + * status_w.h,v 1.3 1994/06/10 07:45:01 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/version.h b/sys/gnu/i386/fpemul/version.h index 9c08aeda7e2fa..021524a3ee88e 100644 --- a/sys/gnu/i386/fpemul/version.h +++ b/sys/gnu/i386/fpemul/version.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: version.h,v 1.2 1994/04/29 21:34:28 gclarkii Exp $ + * version.h,v 1.3 1994/06/10 07:45:02 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/wm_shrx.s b/sys/gnu/i386/fpemul/wm_shrx.s index 9de9464485975..29f6a6308f4bd 100644 --- a/sys/gnu/i386/fpemul/wm_shrx.s +++ b/sys/gnu/i386/fpemul/wm_shrx.s @@ -62,7 +62,7 @@ * W. Metzenthen June 1994. * * - * $Id: wm_shrx.s,v 1.2 1994/04/29 21:34:29 gclarkii Exp $ + * wm_shrx.s,v 1.3 1994/06/10 07:45:03 rich Exp * */ diff --git a/sys/gnu/i386/fpemul/wm_sqrt.s b/sys/gnu/i386/fpemul/wm_sqrt.s index b1bc03b2a9336..2e3bc51a4a21d 100644 --- a/sys/gnu/i386/fpemul/wm_sqrt.s +++ b/sys/gnu/i386/fpemul/wm_sqrt.s @@ -60,7 +60,7 @@ * W. Metzenthen June 1994. * * - * $Id: wm_sqrt.s,v 1.2 1994/04/29 21:34:30 gclarkii Exp $ + * wm_sqrt.s,v 1.3 1994/06/10 07:45:04 rich Exp * */ diff --git a/sys/gnu/misc/aic7xxx/COPYING b/sys/gnu/misc/aic7xxx/COPYING deleted file mode 100644 index a43ea2126fb6b..0000000000000 --- a/sys/gnu/misc/aic7xxx/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/sys/gnu/misc/aic7xxx/COPYRIGHT b/sys/gnu/misc/aic7xxx/COPYRIGHT deleted file mode 100644 index 905285da67595..0000000000000 --- a/sys/gnu/misc/aic7xxx/COPYRIGHT +++ /dev/null @@ -1,16 +0,0 @@ -Adaptec 274x device driver for Linux. -Copyright (c) 1994 The University of Calgary Department of Computer Science. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/sys/gnu/misc/aic7xxx/README b/sys/gnu/misc/aic7xxx/README deleted file mode 100644 index 1e4e5a011a697..0000000000000 --- a/sys/gnu/misc/aic7xxx/README +++ /dev/null @@ -1,94 +0,0 @@ -@(#)README 1.16 94/11/09 jda - -AHA274x/284x DRIVER - -*** THIS SHOULD BE CONSIDERED BETA SOFTWARE *** - -BACKGROUND & LIMITATIONS - -For various reasons, we ended up with one of these cards under the -impression that support was soon forthcoming. In mid-May, I asked -Scott Ferris (the official person who's supposed to be writing this -driver) what documentation he used, _finally_ got it from Adaptec, -and started writing this driver. It is now at what I would consider -a stable state - it runs our news server and is battered by SCSI -requests 24 hours a day without dying. There are a few devices it -reportedly doesn't like working with - those are being sorted out. Due -to some unexpected equipment loans, I am able to support this at least -for the time being. - -YOU MUST HAVE THE BIOS ENABLED OR THIS WILL NOT WORK. The BIOS extracts -some configuration information that I cannot get to portably yet, as -well as provides some self-tests which this driver does not attempt to -duplicate. - -Scott's driver development is stalled for now, and after discussions -with him, this is now officially out of "pre-alpha" status and into -beta until the remaining device problems can be resolved. The latest -patches can be obtained via anonymous ftp from ftp.cpsc.ucalgary.ca in -/pub/systems/linux/aha274x. - -It supports both EISA 274x and VL-bus 284x, either single or twin-bus cards -(but not the second SCSI bus of twin cards - see aha274x.c), and supports -disconnection, synchronous SCSI, and scatter-gather. Unlike previous -versions, abort() and reset() are now implemented, and both hosts.c and -aha274x.c should give a clean compile. Code is now present to detect parity -errors, but has not been tested. - -I wrote this using a 1.0.9 kernel. Unfortunately, I'm getting tired of -#ifdef'ing everything to handle two or three different evolutionary steps -in the SCSI kernel code, so I've upgraded my system to 1.1.49, and will -only leave in code to support versions from about 1.1.45 onward. - -Thanks to patches supplied by Mark Olson <molson@tricord.com>, this driver -will now work with the 284x series (the VL-bus version of this card). The -294x (PCI-bus) support is based on patches sent to me by Mark Olson and -Alan Hourihane <alanh@fairlite.demon.co.uk>. - -Under protest, this driver is subject to the GPL - see the file -COPYING for details. - -Thanks to the following people for bug fixes/code improvements (also -thanks to the people who have sent me feedback): - - "David F. Carlson" <dave@ee.rochester.edu> - Jimen Ching <jiching@wiliki.eng.hawaii.edu> - mday@artisoft.com (Matt Day) - "Dean W. Gehnert" <deang@ims.com> - Darcy Grant <darcy@cpsc.ucalgary.ca> - Alan Hourihane <alanh@fairlite.demon.co.uk> - isely@fncrd8.fnal.gov (Mike Isely) - Mike Jerger <jerger@ux1.cso.uiuc.edu> - tm@netcom.com (Toshiyasu Morita) - neal@interact.org (Neal Norwitz) - Mark Olson <molson@tricord.com> - map@europa.ecn.uoknor.edu (Michael A. Parker) - Thomas Scheunemann <thomas@dagobert.uni-duisburg.de> - -Special thanks to Drew Eckhardt <drew@kinglear.cs.Colorado.EDU> for -fielding my questions about synchronous negotiation. Steffen Moeller -<smoe0024@rz.uni-hildesheim.de> sent me installation instructions which -were previously included in this README. - -David Pirie <pirie@cpsc.ucalgary.ca> was nice enough to loan me his -2842 card for a week so I could track down one bug, as well as his -CD-ROM drive later, and also thanks to Doug Fortune at Riley's Data Share -in Calgary, who arranged a long-term loan of a 2842 board for further work. - -Many thanks to the fearless prerelease testers! Dean Gehnert has been -building Slackware boot disks for the driver, which are available from -ftp.cpsc.ucalgary.ca in /pub/systems/linux/aha274x/slackware_boot. - -Carl Riches <cgr@poplar1.cfr.washington.edu> has set up a mailing list -for aic7xxx driver development. To subscribe, send a message to -aic7770-list@poplar1.cfr.washington.edu with a message body of: - - subscribe AIC7770-LIST <your name here, without the angle brackets> - -Please direct questions and discussions to that list instead of me. When -sending bug reports, please include a description of your hardware, the -release numbers displayed by the driver at boot time, and as accurate a -facsimilie of any error message you're mailing about. - -John Aycock -aycock@cpsc.ucalgary.ca diff --git a/sys/gnu/misc/aic7xxx/README-FIRST b/sys/gnu/misc/aic7xxx/README-FIRST deleted file mode 100644 index 056dbc82cd614..0000000000000 --- a/sys/gnu/misc/aic7xxx/README-FIRST +++ /dev/null @@ -1,19 +0,0 @@ -This is VERY MUCH ALPHA SOFTWARE. You MUST know what you're doing to -use this, or else!!! - -Ok, everything's been renamed to reference an "aic7xxx" driver instead -of "aha274x", and a merger of the two PCI patches I had has been put in, -along with re-doing the detection and configuration routines. To summarize -the status: it compiles cleanly. I don't expect it to work off the bat, -but it's for the 294x development people to synchronize their code -together. - -The file scsi-diffs-1.1.59 is NOT a proper patch file, but some diffs -to kernel files concatenated together. I've sent these off to Drew, -but if you're testing this you'll have to apply them - it allows a -per-driver-instance can_queue variable, which for the aic7xxx driver -is the number of SCBs the card supports. - -Good luck! I await your comments.. Mark, Alan - let me know where I -broke it, please ;-) -:ja diff --git a/sys/gnu/misc/aic7xxx/aic7770_seq.h b/sys/gnu/misc/aic7xxx/aic7770_seq.h deleted file mode 100644 index b59e8985bedf5..0000000000000 --- a/sys/gnu/misc/aic7xxx/aic7770_seq.h +++ /dev/null @@ -1,353 +0,0 @@ -#define AIC7XXX_SEQ_VERSION "1.30" - 0x04, 0x03, 0x18, 0x1a, - 0x0f, 0x9c, 0x00, 0x1e, - 0xff, 0x9b, 0x90, 0x02, - 0x70, 0xa1, 0x6e, 0x02, - 0xff, 0x6e, 0x64, 0x02, - 0x00, 0x57, 0x08, 0x1e, - 0xff, 0x90, 0x9b, 0x02, - 0x00, 0x65, 0x00, 0x10, - 0x00, 0x57, 0x57, 0x00, - 0x00, 0xa1, 0xf3, 0x16, - 0xff, 0x6a, 0x50, 0x02, - 0xff, 0x6a, 0x34, 0x02, - 0x00, 0xa1, 0x05, 0x17, - 0x07, 0xa1, 0x65, 0x02, - 0x00, 0x65, 0x65, 0x00, - 0x80, 0x65, 0xc2, 0x16, - 0xff, 0x65, 0x64, 0x02, - 0x00, 0x37, 0x13, 0x18, - 0x38, 0x6a, 0x53, 0x17, - 0x48, 0x6a, 0x00, 0x00, - 0x40, 0x0b, 0x1c, 0x1a, - 0x10, 0x0b, 0x14, 0x1e, - 0x40, 0x0b, 0x16, 0x1e, - 0x00, 0x65, 0x1c, 0x10, - 0x10, 0x6a, 0x00, 0x00, - 0x20, 0x0b, 0x19, 0x1e, - 0x00, 0x19, 0xf3, 0x16, - 0x80, 0x6a, 0x34, 0x00, - 0xff, 0x6a, 0x00, 0x02, - 0x08, 0x6a, 0x0c, 0x00, - 0x08, 0x0c, 0xbb, 0x1a, - 0x01, 0x0c, 0x1e, 0x1e, - 0xe0, 0x03, 0x64, 0x02, - 0x00, 0x6a, 0x28, 0x1c, - 0x40, 0x64, 0x3e, 0x1c, - 0x80, 0x64, 0x54, 0x1c, - 0xc0, 0x64, 0x61, 0x1c, - 0xa0, 0x64, 0x64, 0x1c, - 0xe0, 0x64, 0x7c, 0x1c, - 0x01, 0x6a, 0x91, 0x00, - 0x00, 0x6a, 0x5e, 0x17, - 0x00, 0x65, 0x01, 0x17, - 0x00, 0x65, 0x2b, 0x17, - 0x03, 0x6a, 0x64, 0x00, - 0x8c, 0x6a, 0x66, 0x00, - 0xb7, 0x6a, 0xbe, 0x16, - 0x03, 0x6a, 0x64, 0x00, - 0x08, 0x6a, 0x66, 0x00, - 0xb7, 0x6a, 0xbe, 0x16, - 0x04, 0x6a, 0x64, 0x00, - 0x88, 0x6a, 0x66, 0x00, - 0xb3, 0x6a, 0xbe, 0x16, - 0x3d, 0x6a, 0xe6, 0x16, - 0x03, 0x6a, 0x64, 0x00, - 0xb7, 0x6a, 0x66, 0x00, - 0x08, 0x6a, 0xbe, 0x16, - 0x04, 0x6a, 0x64, 0x00, - 0xb3, 0x6a, 0x66, 0x00, - 0x14, 0x6a, 0xbe, 0x16, - 0x00, 0x65, 0x40, 0x17, - 0xff, 0x51, 0xb2, 0x02, - 0x00, 0x65, 0x1e, 0x10, - 0x40, 0x6a, 0x5e, 0x17, - 0x00, 0x65, 0x01, 0x17, - 0x00, 0x65, 0x2b, 0x17, - 0x03, 0x6a, 0x64, 0x00, - 0x8c, 0x6a, 0x66, 0x00, - 0xb7, 0x6a, 0xbe, 0x16, - 0x03, 0x6a, 0x64, 0x00, - 0x08, 0x6a, 0x66, 0x00, - 0xb7, 0x6a, 0xbe, 0x16, - 0x04, 0x6a, 0x64, 0x00, - 0x88, 0x6a, 0x66, 0x00, - 0xb3, 0x6a, 0xbe, 0x16, - 0x39, 0x6a, 0xe6, 0x16, - 0x03, 0x6a, 0x64, 0x00, - 0xb7, 0x6a, 0x66, 0x00, - 0x08, 0x6a, 0xbe, 0x16, - 0x04, 0x6a, 0x64, 0x00, - 0xb3, 0x6a, 0x66, 0x00, - 0x14, 0x6a, 0xbe, 0x16, - 0x00, 0x65, 0x40, 0x17, - 0xff, 0x51, 0xb2, 0x02, - 0x00, 0x65, 0x1e, 0x10, - 0x80, 0x6a, 0x5e, 0x17, - 0x00, 0x65, 0x01, 0x17, - 0x03, 0x6a, 0x64, 0x00, - 0x8c, 0x6a, 0x66, 0x00, - 0xab, 0x6a, 0xbe, 0x16, - 0x03, 0x6a, 0x64, 0x00, - 0x08, 0x6a, 0x66, 0x00, - 0xab, 0x6a, 0xbe, 0x16, - 0x04, 0x6a, 0x64, 0x00, - 0x88, 0x6a, 0x66, 0x00, - 0xa7, 0x6a, 0xbe, 0x16, - 0x3d, 0x6a, 0xe6, 0x16, - 0x00, 0x65, 0x1e, 0x10, - 0xc0, 0x6a, 0x5e, 0x17, - 0xae, 0x6a, 0xc9, 0x16, - 0x00, 0x65, 0x1e, 0x10, - 0xa0, 0x6a, 0x5e, 0x17, - 0x08, 0x6a, 0xc2, 0x16, - 0x37, 0x6a, 0x65, 0x00, - 0xff, 0x36, 0x66, 0x02, - 0xff, 0x6a, 0x64, 0x02, - 0x02, 0x0b, 0x69, 0x1e, - 0x10, 0x0c, 0x79, 0x1a, - 0x01, 0x66, 0x6d, 0x18, - 0x40, 0x6a, 0x0c, 0x00, - 0x00, 0x65, 0xe3, 0x16, - 0xff, 0x6c, 0x06, 0x02, - 0x04, 0x0b, 0x6f, 0x1e, - 0xff, 0x66, 0x66, 0x06, - 0x01, 0x64, 0x64, 0x06, - 0x00, 0x36, 0x69, 0x18, - 0x08, 0x0c, 0x79, 0x1a, - 0x01, 0x0c, 0x73, 0x1e, - 0xe0, 0x03, 0x64, 0x02, - 0xa0, 0x64, 0x79, 0x18, - 0x10, 0x6a, 0x5e, 0x17, - 0x00, 0x65, 0x1e, 0x10, - 0x40, 0x6a, 0x0c, 0x00, - 0xff, 0x6a, 0x35, 0x02, - 0x00, 0x65, 0x1e, 0x10, - 0xe0, 0x6a, 0x5e, 0x17, - 0x64, 0x6a, 0xcf, 0x16, - 0x00, 0x6a, 0x31, 0x00, - 0x00, 0x6a, 0x8a, 0x18, - 0x70, 0xa1, 0x6e, 0x02, - 0xff, 0x6e, 0x64, 0x02, - 0x00, 0x57, 0x57, 0x04, - 0xff, 0xae, 0x87, 0x1e, - 0x00, 0x65, 0xd7, 0x16, - 0x51, 0x6a, 0x91, 0x00, - 0x00, 0x65, 0x1e, 0x10, - 0xff, 0x90, 0x9d, 0x02, - 0x02, 0x6a, 0x91, 0x00, - 0x00, 0x65, 0xb9, 0x10, - 0x01, 0x64, 0x99, 0x18, - 0x64, 0x6a, 0xd1, 0x16, - 0x03, 0x64, 0xb5, 0x18, - 0x64, 0x6a, 0xd1, 0x16, - 0x01, 0x64, 0xb5, 0x18, - 0x4c, 0x6a, 0xd1, 0x16, - 0x4d, 0x6a, 0xd1, 0x16, - 0x41, 0x6a, 0x91, 0x00, - 0x00, 0x65, 0x4e, 0x17, - 0xff, 0x65, 0x66, 0x02, - 0xff, 0x4c, 0x6d, 0x02, - 0xff, 0x64, 0x64, 0x04, - 0x00, 0x4f, 0x4f, 0x02, - 0xff, 0x4c, 0x04, 0x02, - 0x00, 0x65, 0xb9, 0x10, - 0x04, 0x64, 0x9c, 0x18, - 0x04, 0xa0, 0xa0, 0x00, - 0x00, 0x65, 0xb9, 0x10, - 0x02, 0x64, 0x9f, 0x18, - 0x00, 0x65, 0x23, 0x17, - 0x00, 0x65, 0xb9, 0x10, - 0x03, 0x64, 0xa2, 0x18, - 0x00, 0x65, 0x1b, 0x17, - 0x00, 0x65, 0xb9, 0x10, - 0x80, 0x64, 0xaa, 0x1e, - 0x78, 0x64, 0xb5, 0x1a, - 0x00, 0x64, 0x0a, 0x17, - 0x80, 0x35, 0xb9, 0x1a, - 0x04, 0xa0, 0xa0, 0x04, - 0xc0, 0x6a, 0x34, 0x00, - 0x00, 0x65, 0x1b, 0x17, - 0x00, 0x65, 0xb9, 0x10, - 0x07, 0x64, 0xb5, 0x18, - 0x70, 0x05, 0x6e, 0x02, - 0xff, 0x6e, 0x64, 0x02, - 0x00, 0x4f, 0xb9, 0x1e, - 0x00, 0x65, 0x4e, 0x17, - 0xff, 0x65, 0x66, 0x02, - 0xff, 0x6a, 0x6d, 0x02, - 0xff, 0x64, 0x64, 0x04, - 0x00, 0x4f, 0x4f, 0x02, - 0xff, 0x6a, 0x04, 0x02, - 0x00, 0x65, 0xb9, 0x10, - 0x10, 0x4e, 0x65, 0x00, - 0x00, 0x65, 0x5e, 0x17, - 0x11, 0x6a, 0x91, 0x00, - 0x07, 0x6a, 0xc2, 0x16, - 0x00, 0x65, 0xd7, 0x16, - 0x00, 0x65, 0x1e, 0x10, - 0x40, 0x6a, 0x0c, 0x00, - 0xff, 0x6a, 0x4e, 0x02, - 0x00, 0x65, 0x00, 0x10, - 0xff, 0x6c, 0x6d, 0x02, - 0xff, 0x64, 0x64, 0x06, - 0x00, 0x6a, 0xbe, 0x18, - 0xff, 0x6a, 0x6a, 0x03, - 0x40, 0x6a, 0x60, 0x00, - 0x80, 0x35, 0xc7, 0x1a, - 0x80, 0x6a, 0x35, 0x00, - 0x01, 0x6a, 0x36, 0x00, - 0xff, 0x65, 0x37, 0x02, - 0xff, 0x6a, 0x60, 0x02, - 0xff, 0x6a, 0x6a, 0x03, - 0x02, 0x0b, 0xc9, 0x1e, - 0xff, 0x65, 0x66, 0x02, - 0x00, 0x65, 0xe3, 0x16, - 0xff, 0x06, 0x6d, 0x02, - 0x04, 0x0b, 0xcd, 0x1e, - 0xff, 0x6a, 0x6a, 0x03, - 0xff, 0x65, 0x66, 0x02, - 0xff, 0x12, 0x6d, 0x03, - 0xff, 0x65, 0x66, 0x02, - 0x00, 0x65, 0xe3, 0x16, - 0xff, 0x06, 0x6a, 0x02, - 0x04, 0x0b, 0xd4, 0x1e, - 0x02, 0x0b, 0xd5, 0x1e, - 0xff, 0x12, 0x6d, 0x03, - 0x00, 0x65, 0xe3, 0x16, - 0xff, 0x06, 0x6a, 0x02, - 0x04, 0x0b, 0xd9, 0x1e, - 0xff, 0x6a, 0x6a, 0x03, - 0x02, 0x0b, 0xdb, 0x1e, - 0x00, 0x65, 0xe3, 0x16, - 0x80, 0x30, 0xe0, 0x1e, - 0x40, 0x6a, 0x0c, 0x00, - 0xff, 0x6a, 0x30, 0x02, - 0xff, 0x65, 0x06, 0x02, - 0x04, 0x0b, 0xe1, 0x1e, - 0xff, 0x6a, 0x6a, 0x03, - 0xff, 0x6a, 0x0a, 0x02, - 0xff, 0x6a, 0x09, 0x02, - 0x01, 0x6a, 0x08, 0x01, - 0xff, 0x65, 0x93, 0x02, - 0x01, 0x0b, 0xe9, 0x1a, - 0x10, 0x0c, 0xe7, 0x1e, - 0x04, 0x65, 0xed, 0x1a, - 0xfe, 0x65, 0x65, 0x02, - 0x02, 0x65, 0x93, 0x00, - 0x02, 0x93, 0xec, 0x1a, - 0xff, 0x6a, 0x93, 0x02, - 0x38, 0x93, 0xee, 0x1a, - 0x03, 0x6a, 0x64, 0x00, - 0xaf, 0x6a, 0x66, 0x00, - 0x08, 0x6a, 0xbe, 0x16, - 0xff, 0x6a, 0x6a, 0x03, - 0xff, 0x6a, 0x1f, 0x02, - 0xf0, 0x65, 0x05, 0x02, - 0x07, 0x5a, 0x64, 0x02, - 0x00, 0x05, 0x05, 0x00, - 0xff, 0x6a, 0x30, 0x02, - 0xff, 0x6a, 0x4e, 0x02, - 0x0a, 0x6a, 0x01, 0x00, - 0x38, 0x5a, 0x64, 0x02, - 0x04, 0x64, 0x02, 0x00, - 0x84, 0x6a, 0x11, 0x00, - 0x00, 0x65, 0x1b, 0x17, - 0x00, 0x65, 0x4e, 0x17, - 0xff, 0x6c, 0x04, 0x02, - 0xff, 0x6a, 0x6a, 0x03, - 0x80, 0x34, 0x04, 0x1f, - 0x40, 0x34, 0x04, 0x1b, - 0x21, 0x6a, 0x91, 0x00, - 0xff, 0x6a, 0x6a, 0x03, - 0x70, 0x65, 0x6e, 0x02, - 0xff, 0x6e, 0x64, 0x02, - 0x00, 0x32, 0x09, 0x1f, - 0xff, 0x6a, 0x64, 0x03, - 0x40, 0x6a, 0x64, 0x01, - 0x07, 0x65, 0x64, 0x02, - 0x00, 0x19, 0x66, 0x00, - 0xf7, 0x66, 0x66, 0x02, - 0xff, 0x6a, 0x65, 0x02, - 0xff, 0x65, 0x90, 0x02, - 0xff, 0x66, 0x64, 0x02, - 0x00, 0xa1, 0x13, 0x19, - 0x04, 0xa0, 0x13, 0x1f, - 0xff, 0x6a, 0x6a, 0x03, - 0x01, 0x65, 0x65, 0x06, - 0xff, 0x56, 0x64, 0x02, - 0x00, 0x65, 0x0e, 0x19, - 0x31, 0x6a, 0x91, 0x00, - 0x06, 0x6a, 0xc2, 0x16, - 0x10, 0x4e, 0x65, 0x00, - 0x00, 0x65, 0x5e, 0x17, - 0xff, 0x6a, 0x6a, 0x03, - 0xff, 0xa2, 0x51, 0x02, - 0x04, 0x6a, 0x64, 0x00, - 0x52, 0x6a, 0x66, 0x00, - 0xa3, 0x6a, 0xbe, 0x16, - 0x80, 0x6a, 0x50, 0x00, - 0x10, 0xa0, 0x22, 0x1b, - 0xff, 0x6a, 0x50, 0x02, - 0xff, 0x6a, 0x6a, 0x03, - 0xff, 0x51, 0xa2, 0x02, - 0x04, 0x6a, 0x64, 0x00, - 0xa3, 0x6a, 0x66, 0x00, - 0x52, 0x6a, 0xbe, 0x16, - 0xef, 0xa0, 0xa0, 0x02, - 0x80, 0x50, 0x2a, 0x1f, - 0x10, 0xa0, 0xa0, 0x00, - 0xff, 0x6a, 0x6a, 0x03, - 0xff, 0x51, 0x3f, 0x1f, - 0x80, 0x50, 0x3f, 0x1b, - 0xff, 0x6a, 0x8e, 0x02, - 0xff, 0x6a, 0x8d, 0x02, - 0x08, 0x6a, 0x8c, 0x00, - 0x04, 0x6a, 0x64, 0x00, - 0x88, 0x6a, 0x66, 0x00, - 0x52, 0x6a, 0xbe, 0x16, - 0x0d, 0x6a, 0x93, 0x00, - 0x08, 0x94, 0x34, 0x1f, - 0xff, 0x6a, 0x93, 0x02, - 0x08, 0x93, 0x36, 0x1b, - 0xff, 0x99, 0xb3, 0x02, - 0xff, 0x99, 0xb4, 0x02, - 0xff, 0x99, 0xb5, 0x02, - 0xff, 0x99, 0xb6, 0x02, - 0xff, 0x99, 0xb7, 0x02, - 0xff, 0x99, 0xb8, 0x02, - 0xff, 0x99, 0xb9, 0x02, - 0xff, 0x99, 0x6a, 0x02, - 0xff, 0x6a, 0x6a, 0x03, - 0xff, 0x51, 0x4d, 0x1f, - 0xff, 0x08, 0x4c, 0x1b, - 0xff, 0x09, 0x4c, 0x1b, - 0xff, 0x0a, 0x4c, 0x1b, - 0xff, 0x6a, 0x50, 0x02, - 0xff, 0x51, 0x51, 0x06, - 0xff, 0x6a, 0x64, 0x02, - 0x08, 0x52, 0x52, 0x06, - 0x00, 0x53, 0x53, 0x08, - 0x00, 0x54, 0x54, 0x08, - 0x00, 0x55, 0x55, 0x08, - 0xff, 0x6a, 0x6a, 0x03, - 0x80, 0x6a, 0x50, 0x00, - 0xff, 0x6a, 0x6a, 0x03, - 0x4c, 0x05, 0x64, 0x0a, - 0x07, 0x64, 0x64, 0x02, - 0x20, 0x64, 0x65, 0x06, - 0x70, 0x05, 0x6e, 0x02, - 0xff, 0x6e, 0x64, 0x03, - 0xff, 0x65, 0x66, 0x02, - 0x00, 0x65, 0x4e, 0x17, - 0x00, 0x4f, 0x57, 0x1b, - 0xff, 0x6a, 0x6a, 0x03, - 0x01, 0x6a, 0x6d, 0x00, - 0x03, 0x6a, 0x6d, 0x00, - 0x01, 0x6a, 0x6d, 0x00, - 0x19, 0x6a, 0x6d, 0x00, - 0x0f, 0x6a, 0x6d, 0x00, - 0xc9, 0x66, 0x36, 0x06, - 0xff, 0x6a, 0x6a, 0x03, - 0xff, 0x65, 0x4e, 0x02, - 0xff, 0x65, 0x03, 0x03, diff --git a/sys/gnu/misc/aic7xxx/aic7xxx.1 b/sys/gnu/misc/aic7xxx/aic7xxx.1 deleted file mode 100644 index 2009f8c7ad6ec..0000000000000 --- a/sys/gnu/misc/aic7xxx/aic7xxx.1 +++ /dev/null @@ -1,54 +0,0 @@ -.\" Copyright (c) 1994 -.\" Justin T. Gibbs. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by Justin T. Gibbs. -.\" 4. The name of Justin T. Gibbs may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JUSTIN T. GIBBS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" @(#)aic7770.1 11/15/94 -.\" -.Dd November 11, 1994 -.Dt AIC7770 1 -.Os BSD 4 -.Sh NAME -.Nm aic7770 -.Nd aic7770 SCSI controller assembler -.Sh SYNOPSIS -.Nm aic7770 -.Op Fl o destination -.Ar source-file -.Sh DESCRIPTION -.Ar Source-file -is a file containing Aic7770 compatible assembly code. The output of the -assembler defaults to -.Ar a.out -but can be optionally redirected to -.Ar destination. -.Pp -.Sh AUTHOR -This aic7770 compiler was written by John Aycock (aycock@cpsc.ucalgary.ca) and -is subject to the GNU Public License. - diff --git a/sys/gnu/misc/aic7xxx/aic7xxx.c b/sys/gnu/misc/aic7xxx/aic7xxx.c deleted file mode 100644 index 417a352762d31..0000000000000 --- a/sys/gnu/misc/aic7xxx/aic7xxx.c +++ /dev/null @@ -1,584 +0,0 @@ -/* - * Adaptec 274x device driver for Linux. - * Copyright (c) 1994 The University of Calgary Department of Computer Science. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comments are started by `#' and continue to the end of the line; lines - * may be of the form: - * - * <label>* - * <label>* <undef-sym> = <value> - * <label>* <opcode> <operand>* - * - * A <label> is an <undef-sym> ending in a colon. Spaces, tabs, and commas - * are token separators. - */ - -/* #define _POSIX_SOURCE 1 */ -#define _POSIX_C_SOURCE 2 - -#include <ctype.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <unistd.h> - -#define MEMORY 512 /* 2^9 29-bit words */ -#define MAXLINE 1024 -#define MAXTOKEN 32 -#define ADOTOUT "a.out" -#define NOVALUE -1 - -/* - * AIC-7770 register definitions - */ -#define R_SINDEX 0x65 -#define R_ALLONES 0x69 -#define R_ALLZEROS 0x6a -#define R_NONE 0x6a - -static -char sccsid[] = - "@(#)aic7770.c 1.10 94/07/22 jda"; - -int debug; -int lineno, LC; -char *filename; -FILE *ifp, *ofp; -unsigned char M[MEMORY][4]; - -void error(char *s) -{ - fprintf(stderr, "%s: %s at line %d\n", filename, s, lineno); - exit(EXIT_FAILURE); -} - -void *Malloc(size_t size) -{ - void *p = malloc(size); - if (!p) - error("out of memory"); - return(p); -} - -void *Realloc(void *ptr, size_t size) -{ - void *p = realloc(ptr, size); - if (!p) - error("out of memory"); - return(p); -} - -char *Strdup(char *s) -{ - char *p = (char *)Malloc(strlen(s) + 1); - strcpy(p, s); - return(p); -} - -typedef struct sym_t { - struct sym_t *next; /* MUST BE FIRST */ - char *name; - int value; - int npatch, *patch; -} sym_t; - -sym_t *head; - -void define(char *name, int value) -{ - sym_t *p, *q; - - for (p = head, q = (sym_t *)&head; p; p = p->next) { - if (!strcmp(p->name, name)) - error("redefined symbol"); - q = p; - } - - p = q->next = (sym_t *)Malloc(sizeof(sym_t)); - p->next = NULL; - p->name = Strdup(name); - p->value = value; - p->npatch = 0; - p->patch = NULL; - - if (debug) { - fprintf(stderr, "\"%s\" ", p->name); - if (p->value != NOVALUE) - fprintf(stderr, "defined as 0x%x\n", p->value); - else - fprintf(stderr, "undefined\n"); - } -} - -sym_t *lookup(char *name) -{ - sym_t *p; - - for (p = head; p; p = p->next) - if (!strcmp(p->name, name)) - return(p); - return(NULL); -} - -void patch(sym_t *p, int location) -{ - p->npatch += 1; - p->patch = (int *)Realloc(p->patch, p->npatch * sizeof(int *)); - - p->patch[p->npatch - 1] = location; -} - -void backpatch(void) -{ - int i; - sym_t *p; - - for (p = head; p; p = p->next) { - - if (p->value == NOVALUE) { - fprintf(stderr, - "%s: undefined symbol \"%s\"\n", - filename, p->name); - exit(EXIT_FAILURE); - } - - if (p->npatch) { - if (debug) - fprintf(stderr, - "\"%s\" (0x%x) patched at", - p->name, p->value); - - for (i = 0; i < p->npatch; i++) { - M[p->patch[i]][0] &= ~1; - M[p->patch[i]][0] |= ((p->value >> 8) & 1); - M[p->patch[i]][1] = p->value & 0xff; - - if (debug) - fprintf(stderr, " 0x%x", p->patch[i]); - } - - if (debug) - fputc('\n', stderr); - } - } -} - -/* - * Output words in byte-reversed order (least significant first) - * since the sequencer RAM is loaded that way. - */ -void output(FILE *fp) -{ - int i; - - for (i = 0; i < LC; i++) - fprintf(fp, "\t0x%02x, 0x%02x, 0x%02x, 0x%02x,\n", - M[i][3], - M[i][2], - M[i][1], - M[i][0]); -} - -char **getl(int *n) -{ - int i; - char *p; - static char buf[MAXLINE]; - static char *a[MAXTOKEN]; - - i = 0; - - while (fgets(buf, sizeof(buf), ifp)) { - - lineno += 1; - - if (buf[strlen(buf)-1] != '\n') - error("line too long"); - - p = strchr(buf, '#'); - if (p) - *p = '\0'; - - for (p = strtok(buf, ", \t\n"); p; p = strtok(NULL, ", \t\n")) - if (i < MAXTOKEN-1) - a[i++] = p; - else - error("too many tokens"); - if (i) { - *n = i; - return(a); - } - } - return(NULL); -} - -#define A 0x8000 /* `A'ccumulator ok */ -#define I 0x4000 /* use as immediate value */ -#define SL 0x2000 /* shift left */ -#define SR 0x1000 /* shift right */ -#define RL 0x0800 /* rotate left */ -#define RR 0x0400 /* rotate right */ -#define LO 0x8000 /* lookup: ori-{jmp,jc,jnc,call} */ -#define LA 0x4000 /* lookup: and-{jz,jnz} */ -#define LX 0x2000 /* lookup: xor-{je,jne} */ -#define NA -1 /* not applicable */ - -struct { - char *name; - int n; /* number of operands, including opcode */ - unsigned int op; /* immediate or L?|pos_from_0 */ - unsigned int dest; /* NA, pos_from_0, or I|immediate */ - unsigned int src; /* NA, pos_from_0, or I|immediate */ - unsigned int imm; /* pos_from_0, A|pos_from_0, or I|immediate */ - unsigned int addr; /* NA or pos_from_0 */ - int fmt; /* instruction format - 1, 2, or 3 */ -} instr[] = { -/* - * N OP DEST SRC IMM ADDR FMT - */ - "mov", 3, 1, 1, 2, I|0xff, NA, 1, - "mov", 4, LO|2, NA, 1, I|0, 3, 3, - "mvi", 3, 0, 1, I|R_ALLZEROS, A|2, NA, 1, - "mvi", 4, LO|2, NA, I|R_ALLZEROS, 1, 3, 3, - "not", 2, 2, 1, 1, I|0xff, NA, 1, - "not", 3, 2, 1, 2, I|0xff, NA, 1, - "and", 3, 1, 1, 1, A|2, NA, 1, - "and", 4, 1, 1, 3, A|2, NA, 1, - "or", 3, 0, 1, 1, A|2, NA, 1, - "or", 4, 0, 1, 3, A|2, NA, 1, - "or", 5, LO|3, NA, 1, 2, 4, 3, - "xor", 3, 2, 1, 1, A|2, NA, 1, - "xor", 4, 2, 1, 3, A|2, NA, 1, - "nop", 1, 1, I|R_NONE, I|R_ALLZEROS, I|0xff, NA, 1, - "inc", 2, 3, 1, 1, I|1, NA, 1, - "inc", 3, 3, 1, 2, I|1, NA, 1, - "dec", 2, 3, 1, 1, I|0xff, NA, 1, - "dec", 3, 3, 1, 2, I|0xff, NA, 1, - "jmp", 2, LO|0, NA, I|R_SINDEX, I|0, 1, 3, - "jc", 2, LO|0, NA, I|R_SINDEX, I|0, 1, 3, - "jnc", 2, LO|0, NA, I|R_SINDEX, I|0, 1, 3, - "call", 2, LO|0, NA, I|R_SINDEX, I|0, 1, 3, - "test", 5, LA|3, NA, 1, A|2, 4, 3, - "cmp", 5, LX|3, NA, 1, A|2, 4, 3, - "ret", 1, 1, I|R_NONE, I|R_ALLZEROS, I|0xff, NA, 1, - "clc", 1, 3, I|R_NONE, I|R_ALLZEROS, I|1, NA, 1, - "clc", 4, 3, 2, I|R_ALLZEROS, A|3, NA, 1, - "stc", 1, 3, I|R_NONE, I|R_ALLONES, I|1, NA, 1, - "stc", 2, 3, 1, I|R_ALLONES, I|1, NA, 1, - "add", 3, 3, 1, 1, A|2, NA, 1, - "add", 4, 3, 1, 3, A|2, NA, 1, - "adc", 3, 4, 1, 1, A|2, NA, 1, - "adc", 4, 4, 1, 3, A|2, NA, 1, - "shl", 3, 5, 1, 1, SL|2, NA, 2, - "shl", 4, 5, 1, 2, SL|3, NA, 2, - "shr", 3, 5, 1, 1, SR|2, NA, 2, - "shr", 4, 5, 1, 2, SR|3, NA, 2, - "rol", 3, 5, 1, 1, RL|2, NA, 2, - "rol", 4, 5, 1, 2, RL|3, NA, 2, - "ror", 3, 5, 1, 1, RR|2, NA, 2, - "ror", 4, 5, 1, 2, RR|3, NA, 2, - /* - * Extensions (note also that mvi allows A) - */ - "clr", 2, 1, 1, I|R_ALLZEROS, I|0xff, NA, 1, - 0 -}; - -int eval_operand(char **a, int spec) -{ - int i; - unsigned int want = spec & (LO|LA|LX); - - static struct { - unsigned int what; - char *name; - int value; - } jmptab[] = { - LO, "jmp", 8, - LO, "jc", 9, - LO, "jnc", 10, - LO, "call", 11, - LA, "jz", 15, - LA, "jnz", 13, - LX, "je", 14, - LX, "jne", 12, - }; - - spec &= ~(LO|LA|LX); - - for (i = 0; i < sizeof(jmptab)/sizeof(jmptab[0]); i++) - if (jmptab[i].what == want && - !strcmp(jmptab[i].name, a[spec])) - { - return(jmptab[i].value); - } - - if (want) - error("invalid jump"); - - return(spec); /* "case 0" - no flags set */ -} - -int eval_sdi(char **a, int spec) -{ - sym_t *p; - unsigned val; - - if (spec == NA) - return(NA); - - switch (spec & (A|I|SL|SR|RL|RR)) { - case SL: - case SR: - case RL: - case RR: - if (isdigit(*a[spec &~ (SL|SR|RL|RR)])) - val = strtol(a[spec &~ (SL|SR|RL|RR)], NULL, 0); - else { - p = lookup(a[spec &~ (SL|SR|RL|RR)]); - if (!p) - error("undefined symbol used"); - val = p->value; - } - - switch (spec & (SL|SR|RL|RR)) { /* blech */ - case SL: - if (val > 7) - return(0xf0); - return(((val % 8) << 4) | - (val % 8)); - case SR: - if (val > 7) - return(0xf0); - return(((val % 8) << 4) | - (1 << 3) | - ((8 - (val % 8)) % 8)); - case RL: - return(val % 8); - case RR: - return((8 - (val % 8)) % 8); - } - case I: - return(spec &~ I); - case A: - /* - * An immediate field of zero selects - * the accumulator. Vigorously object - * if zero is given otherwise - it's - * most likely an error. - */ - spec &= ~A; - if (!strcmp("A", a[spec])) - return(0); - if (isdigit(*a[spec]) && - strtol(a[spec], NULL, 0) == 0) - { - error("immediate value of zero selects accumulator"); - } - /* falls through */ - case 0: - if (isdigit(*a[spec])) - return(strtol(a[spec], NULL, 0)); - p = lookup(a[spec]); - if (p) - return(p->value); - error("undefined symbol used"); - } - - return(NA); /* shut the compiler up */ -} - -int eval_addr(char **a, int spec) -{ - sym_t *p; - - if (spec == NA) - return(NA); - if (isdigit(*a[spec])) - return(strtol(a[spec], NULL, 0)); - - p = lookup(a[spec]); - - if (p) { - if (p->value != NOVALUE) - return(p->value); - patch(p, LC); - } else { - define(a[spec], NOVALUE); - p = lookup(a[spec]); - patch(p, LC); - } - - return(NA); /* will be patched in later */ -} - -int crack(char **a, int n) -{ - int i; - int I_imm, I_addr; - int I_op, I_dest, I_src, I_ret; - - /* - * Check for "ret" at the end of the line; remove - * it unless it's "ret" alone - we still want to - * look it up in the table. - */ - I_ret = (strcmp(a[n-1], "ret") ? 0 : !0); - if (I_ret && n > 1) - n -= 1; - - for (i = 0; instr[i].name; i++) { - /* - * Look for match in table given constraints, - * currently just the name and the number of - * operands. - */ - if (!strcmp(instr[i].name, *a) && instr[i].n == n) - break; - } - if (!instr[i].name) - error("unknown opcode or wrong number of operands"); - - I_op = eval_operand(a, instr[i].op); - I_src = eval_sdi(a, instr[i].src); - I_imm = eval_sdi(a, instr[i].imm); - I_dest = eval_sdi(a, instr[i].dest); - I_addr = eval_addr(a, instr[i].addr); - - switch (instr[i].fmt) { - case 1: - case 2: - M[LC][0] = (I_op << 1) | I_ret; - M[LC][1] = I_dest; - M[LC][2] = I_src; - M[LC][3] = I_imm; - break; - case 3: - if (I_ret) - error("illegal use of \"ret\""); - M[LC][0] = (I_op << 1) | ((I_addr >> 8) & 1); - M[LC][1] = I_addr & 0xff; - M[LC][2] = I_src; - M[LC][3] = I_imm; - break; - } - - return(1); /* no two-byte instructions yet */ -} - -#undef SL -#undef SR -#undef RL -#undef RR -#undef LX -#undef LA -#undef LO -#undef I -#undef A - -void assemble(void) -{ - int n; - char **a; - sym_t *p; - - while ((a = getl(&n))) { - - while (a[0][strlen(*a)-1] == ':') { - a[0][strlen(*a)-1] = '\0'; - p = lookup(*a); - if (p) - p->value = LC; - else - define(*a, LC); - a += 1; - n -= 1; - } - - if (!n) /* line was all labels */ - continue; - - if (n == 3 && !strcmp("VERSION", *a)) - fprintf(ofp, "#define %s \"%s\"\n", a[1], a[2]); - else { - if (n == 3 && !strcmp("=", a[1])) - define(*a, strtol(a[2], NULL, 0)); - else - LC += crack(a, n); - } - } - - backpatch(); - output(ofp); - - if (debug) - output(stderr); -} - -int main(int argc, char **argv) -{ - int c; - - while ((c = getopt(argc, argv, "dho:")) != EOF) { - switch (c) { - case 'd': - debug = !0; - break; - case 'o': - ofp = fopen(optarg, "w"); - if (!ofp) { - perror(optarg); - exit(EXIT_FAILURE); - } - break; - case 'h': - printf("usage: %s [-d] [-ooutput] input\n", *argv); - exit(EXIT_SUCCESS); - case NULL: - /* - * An impossible option to shut the compiler - * up about sccsid[]. - */ - exit((int)sccsid); - default: - exit(EXIT_FAILURE); - } - } - - if (argc - optind != 1) { - fprintf(stderr, "%s: must have one input file\n", *argv); - exit(EXIT_FAILURE); - } - filename = argv[optind]; - - ifp = fopen(filename, "r"); - if (!ifp) { - perror(filename); - exit(EXIT_FAILURE); - } - - if (!ofp) { - ofp = fopen(ADOTOUT, "w"); - if (!ofp) { - perror(ADOTOUT); - exit(EXIT_FAILURE); - } - } - - assemble(); - exit(EXIT_SUCCESS); -} diff --git a/sys/gnu/misc/aic7xxx/aic7xxx.seq b/sys/gnu/misc/aic7xxx/aic7xxx.seq deleted file mode 100644 index 9b83b84f5472d..0000000000000 --- a/sys/gnu/misc/aic7xxx/aic7xxx.seq +++ /dev/null @@ -1,1064 +0,0 @@ -# @(#)aic7xxx.seq 1.30 94/11/09 jda -# -# Adaptec 274x device driver for Linux. -# Copyright (c) 1994 The University of Calgary Department of Computer Science. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -VERSION AIC7XXX_SEQ_VERSION 1.30 - -MAXSCB-1 = 0xf - -SCSISEQ = 0x00 -SXFRCTL0 = 0x01 -SXFRCTL1 = 0x02 -SCSISIGI = 0x03 -SCSISIGO = 0x03 -SCSIRATE = 0x04 -SCSIID = 0x05 -SCSIDATL = 0x06 -STCNT = 0x08 -STCNT+0 = 0x08 -STCNT+1 = 0x09 -STCNT+2 = 0x0a -SSTAT0 = 0x0b -CLRSINT1 = 0x0c -SSTAT1 = 0x0c -SIMODE1 = 0x11 -SCSIBUSL = 0x12 -SHADDR = 0x14 -SELID = 0x19 -SBLKCTL = 0x1f -SEQCTL = 0x60 -A = 0x64 # == ACCUM -SINDEX = 0x65 -DINDEX = 0x66 -ALLZEROS = 0x6a -NONE = 0x6a -SINDIR = 0x6c -DINDIR = 0x6d -FUNCTION1 = 0x6e -HADDR = 0x88 -HCNT = 0x8c -HCNT+0 = 0x8c -HCNT+1 = 0x8d -HCNT+2 = 0x8e -SCBPTR = 0x90 -INTSTAT = 0x91 -DFCNTRL = 0x93 -DFSTATUS = 0x94 -DFDAT = 0x99 -QINFIFO = 0x9b -QINCNT = 0x9c -QOUTFIFO = 0x9d - -SCSICONF = 0x5a - -# The two reserved bytes at SCBARRAY+1[23] are expected to be set to -# zero, and the reserved bit in SCBARRAY+0 is used as an internal flag -# to indicate whether or not to reload scatter-gather parameters after -# a disconnect. -# -SCBARRAY+0 = 0xa0 -SCBARRAY+1 = 0xa1 -SCBARRAY+2 = 0xa2 -SCBARRAY+3 = 0xa3 -SCBARRAY+7 = 0xa7 -SCBARRAY+11 = 0xab -SCBARRAY+14 = 0xae -SCBARRAY+15 = 0xaf -SCBARRAY+16 = 0xb0 -SCBARRAY+17 = 0xb1 -SCBARRAY+18 = 0xb2 -SCBARRAY+19 = 0xb3 -SCBARRAY+20 = 0xb4 -SCBARRAY+21 = 0xb5 -SCBARRAY+22 = 0xb6 -SCBARRAY+23 = 0xb7 -SCBARRAY+24 = 0xb8 -SCBARRAY+25 = 0xb9 - -SIGNAL_0 = 0x01 # unknown scsi bus phase -SIGNAL_1 = 0x11 # message reject -SIGNAL_2 = 0x21 # no IDENTIFY after reconnect -SIGNAL_3 = 0x31 # no cmd match for reconnect -SIGNAL_4 = 0x41 # SDTR -> SCSIRATE conversion -STATUS_ERROR = 0x51 - -# The host adapter card (at least the BIOS) uses 20-2f for SCSI -# device information, 32-33 and 5a-5f as well. Since we don't support -# wide or twin-bus SCSI, 28-2f can be reclaimed. As it turns out, the -# BIOS trashes 20-27 anyway, writing the synchronous negotiation results -# on top of the BIOS values, so we re-use those for our per-target -# scratchspace (actually a value that can be copied directly into -# SCSIRATE). This implies, since we can't get the BIOS config values, -# that all targets will be negotiated with for synchronous transfer. -# NEEDSDTR has one bit per target indicating if an SDTR message is -# needed for that device - this will be set initially, as well as -# after a bus reset condition. -# -# The high bit of DROPATN is set if ATN should be dropped before the ACK -# when outb is called. REJBYTE contains the first byte of a MESSAGE IN -# message, so the driver can report an intelligible error if a message is -# rejected. -# -# RESELECT's high bit is true if we are currently handling a reselect; -# its next-highest bit is true ONLY IF we've seen an IDENTIFY message -# from the reselecting target. If we haven't had IDENTIFY, then we have -# no idea what the lun is, and we can't select the right SCB register -# bank, so force a kernel panic if the target attempts a data in/out or -# command phase instead of corrupting something. -# -# Note that SG_NEXT occupies four bytes. -# -SYNCNEG = 0x20 -DISC_DSB_A = 0x32 - -DROPATN = 0x30 -REJBYTE = 0x31 -RESELECT = 0x34 - -MSG_FLAGS = 0x35 -MSG_LEN = 0x36 -MSG_START+0 = 0x37 -MSG_START+1 = 0x38 -MSG_START+2 = 0x39 -MSG_START+3 = 0x3a -MSG_START+4 = 0x3b -MSG_START+5 = 0x3c --MSG_START+0 = 0xc9 # 2's complement of MSG_START+0 - -ARG_1 = 0x4c # sdtr conversion args & return -ARG_2 = 0x4d -RETURN_1 = 0x4c - -SIGSTATE = 0x4e # value written to SCSISIGO -NEEDSDTR = 0x4f # send SDTR message, 1 bit/trgt - -SG_SIZEOF = 0x8 # sizeof(struct scatterlist) -SG_NOLOAD = 0x50 # load SG pointer/length? -SG_COUNT = 0x51 # working value of SG count -SG_NEXT = 0x52 # working value of SG pointer -SG_NEXT+0 = 0x52 -SG_NEXT+1 = 0x53 -SG_NEXT+2 = 0x54 -SG_NEXT+3 = 0x55 - -SCBCOUNT = 0x56 # the actual number of SCBs -ACTIVE_A = 0x57 - -# Poll QINCNT for work - the lower three bits contain -# the number of entries in the Queue In FIFO. -# -start: - test SCSISIGI,0x4 jnz reselect # BSYI - test QINCNT,MAXSCB-1 jz start - -# We have at least one queued SCB now. Set the SCB pointer -# from the FIFO so we see the right bank of SCB registers, -# then set SCSI options and set the initiator and target -# SCSI IDs. -# - mov SCBPTR,QINFIFO - -# See if there is not already an active SCB for this target. This code -# will have to be modified when we add support for dual and wide busses. - - and FUNCTION1,0x70,SCBARRAY+1 - mov A,FUNCTION1 - test ACTIVE_A,A jz active -# Place the currently active back on the queue for later processing - mov QINFIFO, SCBPTR - jmp start - -# Mark the current target as busy and get working on the SCB -active: - or ACTIVE_A,A - mov SCBARRAY+1 call initialize - clr SG_NOLOAD - clr RESELECT - -# As soon as we get a successful selection, the target should go -# into the message out phase since we have ATN asserted. Prepare -# the message to send, locking out the device driver. If the device -# driver hasn't beaten us with an ABORT or RESET message, then tack -# on a SDTR negotation if required. -# -# Messages are stored in scratch RAM starting with a flag byte (high bit -# set means active message), one length byte, and then the message itself. -# - mov SCBARRAY+1 call disconnect # disconnect ok? - - and SINDEX,0x7,SCBARRAY+1 # lun - or SINDEX,A # return value from disconnect - or SINDEX,0x80 call mk_mesg # IDENTIFY message - - mov A,SINDEX - cmp MSG_START+0,A jne !message # did driver beat us? - mvi MSG_START+1 call mk_sdtr # build SDTR message if needed - -!message: - -# Enable selection phase as an initiator, and do automatic ATN -# after the selection. -# - mvi SCSISEQ,0x48 # ENSELO|ENAUTOATNO - -# Wait for successful arbitration. The AIC-7770 documentation says -# that SELINGO indicates successful arbitration, and that it should -# be used to look for SELDO. However, if the sequencer is paused at -# just the right time - a parallel fsck(8) on two drives did it for -# me - then SELINGO can flip back to false before we've seen it. This -# makes the sequencer sit in the arbitration loop forever. This is -# Not Good. -# -# Therefore, I've added a check in the arbitration loop for SELDO -# too. This could arguably be made a critical section by disabling -# pauses, but I don't want to make a potentially infinite loop a CS. -# I suppose you could fold it into the select loop, too, but since -# I've been hunting this bug for four days it's kinda like a trophy. -# -arbitrate: - test SSTAT0,0x40 jnz *select # SELDO - test SSTAT0,0x10 jz arbitrate # SELINGO - -# Wait for a successful selection. If the hardware selection -# timer goes off, then the driver gets the interrupt, so we don't -# need to worry about it. -# -select: - test SSTAT0,0x40 jz select # SELDO - jmp *select - -# Reselection is being initiated by a target - we've seen the BSY -# line driven active, and we didn't do it! Enable the reselection -# hardware, and wait for it to finish. Make a note that we've been -# reselected, but haven't seen an IDENTIFY message from the target -# yet. -# -reselect: - mvi SCSISEQ,0x10 # ENRSELI - -reselect1: - test SSTAT0,0x20 jz reselect1 # SELDI - mov SELID call initialize - - mvi RESELECT,0x80 # reselected, no IDENTIFY - -# After the [re]selection, make sure that the [re]selection enable -# bit is off. This chip is flaky enough without extra things -# turned on. Also clear the BUSFREE bit in SSTAT1 since we'll be -# using it shortly. -# -*select: - clr SCSISEQ - mvi CLRSINT1,0x8 # CLRBUSFREE - -# Main loop for information transfer phases. If BSY is false, then -# we have a bus free condition, expected or not. Otherwise, wait -# for the target to assert REQ before checking MSG, C/D and I/O -# for the bus phase. -# -# We can't simply look at the values of SCSISIGI here (if we want -# to do synchronous data transfer), because the target won't assert -# REQ if it's already sent us some data that we haven't acknowledged -# yet. -# -ITloop: - test SSTAT1,0x8 jnz p_busfree # BUSFREE - test SSTAT1,0x1 jz ITloop # REQINIT - - and A,0xe0,SCSISIGI # CDI|IOI|MSGI - - cmp ALLZEROS,A je p_dataout - cmp A,0x40 je p_datain - cmp A,0x80 je p_command - cmp A,0xc0 je p_status - cmp A,0xa0 je p_mesgout - cmp A,0xe0 je p_mesgin - - mvi INTSTAT,SIGNAL_0 # unknown - signal driver - -p_dataout: - mvi 0 call scsisig # !CDO|!IOO|!MSGO - call assert - call sg_load - - mvi A,3 - mvi DINDEX,HCNT - mvi SCBARRAY+23 call bcopy - - mvi A,3 - mvi DINDEX,STCNT - mvi SCBARRAY+23 call bcopy - - mvi A,4 - mvi DINDEX,HADDR - mvi SCBARRAY+19 call bcopy - - mvi 0x3d call dma # SCSIEN|SDMAEN|HDMAEN| - # DIRECTION|FIFORESET - -# After a DMA finishes, save the final transfer pointer and count -# back into the SCB, in case a device disconnects in the middle of -# a transfer. Use SHADDR and STCNT instead of HADDR and HCNT, since -# it's a reflection of how many bytes were transferred on the SCSI -# (as opposed to the host) bus. -# - mvi A,3 - mvi DINDEX,SCBARRAY+23 - mvi STCNT call bcopy - - mvi A,4 - mvi DINDEX,SCBARRAY+19 - mvi SHADDR call bcopy - - call sg_advance - mov SCBARRAY+18,SG_COUNT # residual S/G count - - jmp ITloop - -p_datain: - mvi 0x40 call scsisig # !CDO|IOO|!MSGO - call assert - call sg_load - - mvi A,3 - mvi DINDEX,HCNT - mvi SCBARRAY+23 call bcopy - - mvi A,3 - mvi DINDEX,STCNT - mvi SCBARRAY+23 call bcopy - - mvi A,4 - mvi DINDEX,HADDR - mvi SCBARRAY+19 call bcopy - - mvi 0x39 call dma # SCSIEN|SDMAEN|HDMAEN| - # !DIRECTION|FIFORESET - mvi A,3 - mvi DINDEX,SCBARRAY+23 - mvi STCNT call bcopy - - mvi A,4 - mvi DINDEX,SCBARRAY+19 - mvi SHADDR call bcopy - - call sg_advance - mov SCBARRAY+18,SG_COUNT # residual S/G count - - jmp ITloop - -# Command phase. Set up the DMA registers and let 'er rip - the -# two bytes after the SCB SCSI_cmd_length are zeroed by the driver, -# so we can copy those three bytes directly into HCNT. -# -p_command: - mvi 0x80 call scsisig # CDO|!IOO|!MSGO - call assert - - mvi A,3 - mvi DINDEX,HCNT - mvi SCBARRAY+11 call bcopy - - mvi A,3 - mvi DINDEX,STCNT - mvi SCBARRAY+11 call bcopy - - mvi A,4 - mvi DINDEX,HADDR - mvi SCBARRAY+7 call bcopy - - mvi 0x3d call dma # SCSIEN|SDMAEN|HDMAEN| - # DIRECTION|FIFORESET - jmp ITloop - -# Status phase. Wait for the data byte to appear, then read it -# and store it into the SCB. -# -p_status: - mvi 0xc0 call scsisig # CDO|IOO|!MSGO - - mvi SCBARRAY+14 call inb - jmp ITloop - -# Message out phase. If there is no active message, but the target -# took us into this phase anyway, build a no-op message and send it. -# -p_mesgout: - mvi 0xa0 call scsisig # CDO|!IOO|MSGO - mvi 0x8 call mk_mesg # build NOP message - -# Set up automatic PIO transfer from MSG_START. Bit 3 in -# SXFRCTL0 (SPIOEN) is already on. -# - mvi SINDEX,MSG_START+0 - mov DINDEX,MSG_LEN - clr A - -# When target asks for a byte, drop ATN if it's the last one in -# the message. Otherwise, keep going until the message is exhausted. -# (We can't use outb for this since it wants the input in SINDEX.) -# -# Keep an eye out for a phase change, in case the target issues -# a MESSAGE REJECT. -# -p_mesgout2: - test SSTAT0,0x2 jz p_mesgout2 # SPIORDY - test SSTAT1,0x10 jnz p_mesgout6 # PHASEMIS - - cmp DINDEX,1 jne p_mesgout3 # last byte? - mvi CLRSINT1,0x40 # CLRATNO - drop ATN - -# Write a byte to the SCSI bus. The AIC-7770 refuses to automatically -# send ACKs in automatic PIO or DMA mode unless you make sure that the -# "expected" bus phase in SCSISIGO matches the actual bus phase. This -# behaviour is completely undocumented and caused me several days of -# grief. -# -# After plugging in different drives to test with and using a longer -# SCSI cable, I found that I/O in Automatic PIO mode ceased to function, -# especially when transferring >1 byte. It seems to be much more stable -# if STCNT is set to one before the transfer, and SDONE (in SSTAT0) is -# polled for transfer completion - for both output _and_ input. The -# only theory I have is that SPIORDY doesn't drop right away when SCSIDATL -# is accessed (like the documentation says it does), and that on a longer -# cable run, the sequencer code was fast enough to loop back and see -# an SPIORDY that hadn't dropped yet. -# -p_mesgout3: - call one_stcnt - mov SCSIDATL,SINDIR - -p_mesgout4: - test SSTAT0,0x4 jz p_mesgout4 # SDONE - dec DINDEX - inc A - cmp MSG_LEN,A jne p_mesgout2 - -# If the next bus phase after ATN drops is a message out, it means -# that the target is requesting that the last message(s) be resent. -# -p_mesgout5: - test SSTAT1,0x8 jnz p_mesgout6 # BUSFREE - test SSTAT1,0x1 jz p_mesgout5 # REQINIT - - and A,0xe0,SCSISIGI # CDI|IOI|MSGI - cmp A,0xa0 jne p_mesgout6 - mvi 0x10 call scsisig # ATNO - re-assert ATN - - jmp ITloop - -p_mesgout6: - mvi CLRSINT1,0x40 # CLRATNO - in case of PHASEMIS - clr MSG_FLAGS # no active msg - jmp ITloop - -# Message in phase. Bytes are read using Automatic PIO mode, but not -# using inb. This alleviates a race condition, namely that if ATN had -# to be asserted under Automatic PIO mode, it had to beat the SCSI -# circuitry sending an ACK to the target. This showed up under heavy -# loads and really confused things, since ABORT commands wouldn't be -# seen by the drive after an IDENTIFY message in until it had changed -# to a data I/O phase. -# -p_mesgin: - mvi 0xe0 call scsisig # CDO|IOO|MSGO - mvi A call inb_first # read the 1st message byte - mvi REJBYTE,A # save it for the driver - - cmp ALLZEROS,A jne p_mesgin1 - -# We got a "command complete" message, so put the SCB pointer -# into the Queue Out, and trigger a completion interrupt. -# Check status for non zero return and interrupt driver if needed -# This allows the driver to do a sense command to find out the -# source of error. We don't bother to post to the QOUTFIFO in -# the error case since it would require extra work in the kernel -# driver to ensure that the entry was removed before the command -# complete code tried processing it. - -# First, mark this target as free. - and FUNCTION1,0x70,SCBARRAY+1 - mov A,FUNCTION1 - xor ACTIVE_A,A - - test SCBARRAY+14,0xff jz status_ok # 0 Status? - call inb_last # ack & turn auto PIO back on - mvi INTSTAT,STATUS_ERROR # let driver know - jmp ITloop -status_ok: - mov QOUTFIFO,SCBPTR - mvi INTSTAT,0x2 # CMDCMPLT - jmp p_mesgin_done - -# Is it an extended message? We only support the synchronous data -# transfer request message, which will probably be in response to -# an SDTR message out from us. If it's not an SDTR, reject it - -# apparently this can be done after any message in byte, according -# to the SCSI-2 spec. -# -# XXX - we should really reject this if we didn't initiate the SDTR -# negotiation; this may cause problems with unusual devices. -# -p_mesgin1: - cmp A,1 jne p_mesgin2 # extended message code? - - mvi A call inb_next - cmp A,3 jne p_mesginN # extended mesg length = 3 - mvi A call inb_next - cmp A,1 jne p_mesginN # SDTR code - - mvi ARG_1 call inb_next # xfer period - mvi ARG_2 call inb_next # REQ/ACK offset - mvi INTSTAT,SIGNAL_4 # call driver to convert - - call ndx_sdtr # index sync config for target - mov DINDEX,SINDEX - mov DINDIR,RETURN_1 # save returned value - - not A # turn off "need sdtr" flag - and NEEDSDTR,A - -# Even though the SCSI-2 specification says that a device responding -# to our SDTR message should honor our parameters for transmitting -# to us, it doesn't seem to work too well in real life. In particular, -# a lot of CD-ROM and tape units don't function: try using the SDTR -# parameters the device sent us for both transmitting and receiving. -# - mov SCSIRATE,RETURN_1 - jmp p_mesgin_done - -# Is it a disconnect message? Set a flag in the SCB to remind us -# and await the bus going free. -# -p_mesgin2: - cmp A,4 jne p_mesgin3 # disconnect code? - - or SCBARRAY+0,0x4 # set "disconnected" bit - jmp p_mesgin_done - -# Save data pointers message? Copy working values into the SCB, -# usually in preparation for a disconnect. -# -p_mesgin3: - cmp A,2 jne p_mesgin4 # save data pointers code? - - call sg_ram2scb - jmp p_mesgin_done - -# Restore pointers message? Data pointers are recopied from the -# SCB anyway at the start of any DMA operation, so the only thing -# to copy is the scatter-gather values. -# -p_mesgin4: - cmp A,3 jne p_mesgin5 # restore pointers code? - - call sg_scb2ram - jmp p_mesgin_done - -# Identify message? For a reconnecting target, this tells us the lun -# that the reconnection is for - find the correct SCB and switch to it, -# clearing the "disconnected" bit so we don't "find" it by accident later. -# -p_mesgin5: - test A,0x80 jz p_mesgin6 # identify message? - - test A,0x78 jnz p_mesginN # !DiscPriv|!LUNTAR|!Reserved - - mov A call findSCB # switch to correct SCB - -# If a active message is present after calling findSCB, then either it -# or the driver is trying to abort the command. Either way, something -# untoward has happened and we should just leave it alone. -# - test MSG_FLAGS,0x80 jnz p_mesgin_done - - xor SCBARRAY+0,0x4 # clear disconnect bit in SCB - mvi RESELECT,0xc0 # make note of IDENTIFY - - call sg_scb2ram # implied restore pointers - # required on reselect - jmp p_mesgin_done - -# Message reject? If we have an outstanding SDTR negotiation, assume -# that it's a response from the target selecting asynchronous transfer, -# otherwise just ignore it since we have no clue what it pertains to. -# -# XXX - I don't have a device that responds this way. Does this code -# actually work? -# -p_mesgin6: - cmp A,7 jne p_mesgin7 # message reject code? - - and FUNCTION1,0x70,SCSIID # outstanding SDTR message? - mov A,FUNCTION1 - test NEEDSDTR,A jz p_mesgin_done # no - ignore rejection - - call ndx_sdtr # note use of asynch xfer - mov DINDEX,SINDEX - clr DINDIR - - not A # turn off "active sdtr" flag - and NEEDSDTR,A - - clr SCSIRATE # select asynch xfer - jmp p_mesgin_done - -# [ ADD MORE MESSAGE HANDLING HERE ] -# -p_mesgin7: - -# We have no idea what this message in is, and there's no way -# to pass it up to the kernel, so we issue a message reject and -# hope for the best. Since we're now using manual PIO mode to -# read in the message, there should no longer be a race condition -# present when we assert ATN. In any case, rejection should be a -# rare occurrence - signal the driver when it happens. -# -p_mesginN: - or SINDEX,0x10,SIGSTATE # turn on ATNO - call scsisig - mvi INTSTAT,SIGNAL_1 # let driver know - - mvi 0x7 call mk_mesg # MESSAGE REJECT message - -p_mesgin_done: - call inb_last # ack & turn auto PIO back on - jmp ITloop - -# Bus free phase. It might be useful to interrupt the device -# driver if we aren't expecting this. For now, make sure that -# ATN isn't being asserted and look for a new command. -# -p_busfree: - mvi CLRSINT1,0x40 # CLRATNO - clr SIGSTATE - jmp start - -# Bcopy: number of bytes to transfer should be in A, DINDEX should -# contain the destination address, and SINDEX should contain the -# source address. All input parameters are trashed on return. -# -bcopy: - mov DINDIR,SINDIR - dec A - cmp ALLZEROS,A jne bcopy - ret - -# Locking the driver out, build a one-byte message passed in SINDEX -# if there is no active message already. SINDEX is returned intact. -# -mk_mesg: - mvi SEQCTL,0x40 # PAUSEDIS - test MSG_FLAGS,0x80 jnz mk_mesg1 # active message? - - mvi MSG_FLAGS,0x80 # if not, there is now - mvi MSG_LEN,1 # length = 1 - mov MSG_START+0,SINDEX # 1-byte message - -mk_mesg1: - clr SEQCTL # !PAUSEDIS - ret - -# Input byte in Automatic PIO mode. The address to store the byte -# in should be in SINDEX. DINDEX will be used by this routine. -# -inb: - test SSTAT0,0x2 jz inb # SPIORDY - mov DINDEX,SINDEX - call one_stcnt # xfer one byte - mov DINDIR,SCSIDATL -inb1: - test SSTAT0,0x4 jz inb1 # SDONE - wait to "finish" - ret - -# Carefully read data in Automatic PIO mode. I first tried this using -# Manual PIO mode, but it gave me continual underrun errors, probably -# indicating that I did something wrong, but I feel more secure leaving -# Automatic PIO on all the time. -# -# According to Adaptec's documentation, an ACK is not sent on input from -# the target until SCSIDATL is read from. So we wait until SCSIDATL is -# latched (the usual way), then read the data byte directly off the bus -# using SCSIBUSL. When we have pulled the ATN line, or we just want to -# acknowledge the byte, then we do a dummy read from SCISDATL. The SCSI -# spec guarantees that the target will hold the data byte on the bus until -# we send our ACK. -# -# The assumption here is that these are called in a particular sequence, -# and that REQ is already set when inb_first is called. inb_{first,next} -# use the same calling convention as inb. -# -inb_first: - mov DINDEX,SINDEX - mov DINDIR,SCSIBUSL ret # read byte directly from bus - -inb_next: - mov DINDEX,SINDEX # save SINDEX - - call one_stcnt # xfer one byte - mov NONE,SCSIDATL # dummy read from latch to ACK -inb_next1: - test SSTAT0,0x4 jz inb_next1 # SDONE -inb_next2: - test SSTAT0,0x2 jz inb_next2 # SPIORDY - wait for next byte - mov DINDIR,SCSIBUSL ret # read byte directly from bus - -inb_last: - call one_stcnt # ACK with dummy read - mov NONE,SCSIDATL -inb_last1: - test SSTAT0,0x4 jz inb_last1 # wait for completion - ret - -# Output byte in Automatic PIO mode. The byte to output should be -# in SINDEX. If DROPATN's high bit is set, then ATN will be dropped -# before the byte is output. -# -outb: - test SSTAT0,0x2 jz outb # SPIORDY - call one_stcnt # xfer one byte - - test DROPATN,0x80 jz outb1 - mvi CLRSINT1,0x40 # CLRATNO - clr DROPATN -outb1: - mov SCSIDATL,SINDEX -outb2: - test SSTAT0,0x4 jz outb2 # SDONE - ret - -# Write the value "1" into the STCNT registers, for Automatic PIO -# transfers. -# -one_stcnt: - clr STCNT+2 - clr STCNT+1 - mvi STCNT+0,1 ret - -# DMA data transfer. HADDR and HCNT must be loaded first, and -# SINDEX should contain the value to load DFCNTRL with - 0x3d for -# host->scsi, or 0x39 for scsi->host. The SCSI channel is cleared -# during initialization. -# -dma: - mov DFCNTRL,SINDEX -dma1: -dma2: - test SSTAT0,0x1 jnz dma3 # DMADONE - test SSTAT1,0x10 jz dma1 # PHASEMIS, ie. underrun - -# We will be "done" DMAing when the transfer count goes to zero, or -# the target changes the phase (in light of this, it makes sense that -# the DMA circuitry doesn't ACK when PHASEMIS is active). If we are -# doing a SCSI->Host transfer, flush the data FIFO. -# -dma3: - test SINDEX,0x4 jnz dma5 # DIRECTION - and SINDEX,0xfe # mask out FIFORESET - or DFCNTRL,0x2,SINDEX # FIFOFLUSH -dma4: - test DFCNTRL,0x2 jnz dma4 # FIFOFLUSHACK - -# Now shut the DMA enables off, and copy STCNT (ie. the underrun -# amount, if any) to the SCB registers; SG_COUNT will get copied to -# the SCB's residual S/G count field after sg_advance is called. Make -# sure that the DMA enables are actually off first lest we get an ILLSADDR. -# -dma5: - clr DFCNTRL # disable DMA -dma6: - test DFCNTRL,0x38 jnz dma6 # SCSIENACK|SDMAENACK|HDMAENACK - - mvi A,3 - mvi DINDEX,SCBARRAY+15 - mvi STCNT call bcopy - - ret - -# Common SCSI initialization for selection and reselection. Expects -# the target SCSI ID to be in the upper four bits of SINDEX, and A's -# contents are stomped on return. -# -initialize: - clr SBLKCTL # channel A, !wide - and SCSIID,0xf0,SINDEX # target ID - and A,0x7,SCSICONF # SCSI_ID_A[210] - or SCSIID,A - -# Esundry initialization. -# - clr DROPATN - clr SIGSTATE - -# Turn on Automatic PIO mode now, before we expect to see an REQ -# from the target. It shouldn't hurt anything to leave it on. Set -# CLRCHN here before the target has entered a data transfer mode - -# with synchronous SCSI, if you do it later, you blow away some -# data in the SCSI FIFO that the target has already sent to you. -# - mvi SXFRCTL0,0xa # SPIOEN|CLRCHN - -# Set SCSI bus parity checking and the selection timeout value, -# and enable the hardware selection timer. Set the SELTO interrupt -# to signal the driver. -# - and A,0x38,SCSICONF # PARITY_ENB_A|SEL_TIM_A[10] - or SXFRCTL1,0x4,A # ENSTIMER - mvi SIMODE1,0x84 # ENSELTIMO|ENSCSIPERR - -# Initialize scatter-gather pointers by setting up the working copy -# in scratch RAM. -# - call sg_scb2ram - -# Initialize SCSIRATE with the appropriate value for this target. -# - call ndx_sdtr - mov SCSIRATE,SINDIR - ret - -# Assert that if we've been reselected, then we've seen an IDENTIFY -# message. -# -assert: - test RESELECT,0x80 jz assert1 # reselected? - test RESELECT,0x40 jnz assert1 # seen IDENTIFY? - - mvi INTSTAT,SIGNAL_2 # no - cause a kernel panic - -assert1: - ret - -# Find out if disconnection is ok from the information the BIOS has left -# us. The target ID should be in the upper four bits of SINDEX; A will -# contain either 0x40 (disconnection ok) or 0x00 (diconnection not ok) -# on exit. -# -# This is the only place the target ID is limited to three bits, so we -# can use the FUNCTION1 register. -# -disconnect: - and FUNCTION1,0x70,SINDEX # strip off extra just in case - mov A,FUNCTION1 - test DISC_DSB_A,A jz disconnect1 # bit nonzero if DISabled - - clr A ret -disconnect1: - mvi A,0x40 ret - -# Locate the SCB matching the target ID in SELID and the lun in the lower -# three bits of SINDEX, and switch the SCB to it. Have the kernel print -# a warning message if it can't be found, and generate an ABORT message -# to the target. We keep the value of the t/c/l that we are trying to -# in DINDEX so it is not overwritten during our check to see if we are -# at the last SCB. -# -findSCB: - and A,0x7,SINDEX # lun in lower three bits - or DINDEX,A,SELID # can I do this? - and DINDEX,0xf7 # only channel A implemented - - clr SINDEX - -findSCB1: - mov SCBPTR,SINDEX # switch to new SCB - mov A,DINDEX - cmp SCBARRAY+1,A jne findSCB2 # target ID/channel/lun match? - test SCBARRAY+0,0x4 jz findSCB2 # should be disconnected - - ret - -findSCB2: - inc SINDEX - mov A,SCBCOUNT - cmp SINDEX,A jne findSCB1 - - mvi INTSTAT,SIGNAL_3 # not found - signal kernel - mvi 0x6 call mk_mesg # ABORT message - - or SINDEX,0x10,SIGSTATE # assert ATNO - call scsisig - ret - -# Make a working copy of the scatter-gather parameters in the SCB. -# -sg_scb2ram: - mov SG_COUNT,SCBARRAY+2 - - mvi A,4 - mvi DINDEX,SG_NEXT - mvi SCBARRAY+3 call bcopy - - mvi SG_NOLOAD,0x80 - test SCBARRAY+0,0x10 jnz sg_scb2ram1 # don't reload s/g? - clr SG_NOLOAD - -sg_scb2ram1: - ret - -# Copying RAM values back to SCB, for Save Data Pointers message. -# -sg_ram2scb: - mov SCBARRAY+2,SG_COUNT - - mvi A,4 - mvi DINDEX,SCBARRAY+3 - mvi SG_NEXT call bcopy - - and SCBARRAY+0,0xef,SCBARRAY+0 - test SG_NOLOAD,0x80 jz sg_ram2scb1 # reload s/g? - or SCBARRAY+0,0x10 - -sg_ram2scb1: - ret - -# Load a struct scatter if needed and set up the data address and -# length. If the working value of the SG count is nonzero, then -# we need to load a new set of values. -# -# This, like the above DMA, assumes a little-endian host data storage. -# -sg_load: - test SG_COUNT,0xff jz sg_load3 # SG being used? - test SG_NOLOAD,0x80 jnz sg_load3 # don't reload s/g? - - clr HCNT+2 - clr HCNT+1 - mvi HCNT+0,SG_SIZEOF - - mvi A,4 - mvi DINDEX,HADDR - mvi SG_NEXT call bcopy - - mvi DFCNTRL,0xd # HDMAEN|DIRECTION|FIFORESET - -# Wait for DMA from host memory to data FIFO to complete, then disable -# DMA and wait for it to acknowledge that it's off. -# -sg_load1: - test DFSTATUS,0x8 jz sg_load1 # HDONE - - clr DFCNTRL # disable DMA -sg_load2: - test DFCNTRL,0x8 jnz sg_load2 # HDMAENACK - -# Copy data from FIFO into SCB data pointer and data count. This assumes -# that the struct scatterlist has this structure (this and sizeof(struct -# scatterlist) == 12 are asserted in aic7xxx.c): -# -# struct scatterlist { -# char *address; /* four bytes, little-endian order */ -# ... /* four bytes, ignored */ -# unsigned short length; /* two bytes, little-endian order */ -# } -# - -# Not in FreeBSD. the scatter list is only 8 bytes. -# -# struct ahc_dma_seg { -# physaddr addr; /* four bytes, little-endian order */ -# long len; /* four bytes, little endian order */ -# }; -# - - mov SCBARRAY+19,DFDAT # new data address - mov SCBARRAY+20,DFDAT - mov SCBARRAY+21,DFDAT - mov SCBARRAY+22,DFDAT - - mov SCBARRAY+23,DFDAT - mov SCBARRAY+24,DFDAT - mov SCBARRAY+25,DFDAT - mov NONE,DFDAT #Only support 24 bit length. - -sg_load3: - ret - -# Advance the scatter-gather pointers only IF NEEDED. If SG is enabled, -# and the SCSI transfer count is zero (note that this should be called -# right after a DMA finishes), then move the working copies of the SG -# pointer/length along. If the SCSI transfer count is not zero, then -# presumably the target is disconnecting - do not reload the SG values -# next time. -# -sg_advance: - test SG_COUNT,0xff jz sg_advance2 # s/g enabled? - - test STCNT+0,0xff jnz sg_advance1 # SCSI transfer count nonzero? - test STCNT+1,0xff jnz sg_advance1 - test STCNT+2,0xff jnz sg_advance1 - - clr SG_NOLOAD # reload s/g next time - dec SG_COUNT # one less segment to go - - clr A # add sizeof(struct scatter) - add SG_NEXT+0,SG_SIZEOF,SG_NEXT+0 - adc SG_NEXT+1,A,SG_NEXT+1 - adc SG_NEXT+2,A,SG_NEXT+2 - adc SG_NEXT+3,A,SG_NEXT+3 - - ret - -sg_advance1: - mvi SG_NOLOAD,0x80 # don't reload s/g next time -sg_advance2: - ret - -# Add the array base SYNCNEG to the target offset (the target address -# is in SCSIID), and return the result in SINDEX. The accumulator -# contains the 3->8 decoding of the target ID on return. -# -ndx_sdtr: - shr A,SCSIID,4 - and A,0x7 - add SINDEX,SYNCNEG,A - - and FUNCTION1,0x70,SCSIID # 3-bit target address decode - mov A,FUNCTION1 ret - -# If we need to negotiate transfer parameters, build the SDTR message -# starting at the address passed in SINDEX. DINDEX is modified on return. -# -mk_sdtr: - mov DINDEX,SINDEX # save SINDEX - - call ndx_sdtr - test NEEDSDTR,A jnz mk_sdtr1 # do we need negotiation? - ret - -mk_sdtr1: - mvi DINDIR,1 # extended message - mvi DINDIR,3 # extended message length = 3 - mvi DINDIR,1 # SDTR code - mvi DINDIR,25 # REQ/ACK transfer period - mvi DINDIR,15 # REQ/ACK offset - - add MSG_LEN,-MSG_START+0,DINDEX # update message length - ret - -# Set SCSI bus control signal state. This also saves the last-written -# value into a location where the higher-level driver can read it - if -# it has to send an ABORT or RESET message, then it needs to know this -# so it can assert ATN without upsetting SCSISIGO. The new value is -# expected in SINDEX. Change the actual state last to avoid contention -# from the driver. -# -scsisig: - mov SIGSTATE,SINDEX - mov SCSISIGO,SINDEX ret - diff --git a/sys/i386/Makefile b/sys/i386/Makefile index 4ad5a34556fb8..25589c572a68b 100644 --- a/sys/i386/Makefile +++ b/sys/i386/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 7.3 (Berkeley) 6/9/91 -# $Id$ +# Makefile,v 1.2 1993/10/16 19:15:20 rgrimes Exp # Makefile for i386 tags file diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index d419da442b9a9..ad90acf4e02b7 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -13,7 +13,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.6 1994/11/07 04:23:58 phk Exp $ + * apm.c,v 1.7 1994/11/15 14:09:18 bde Exp */ #include "apm.h" diff --git a/sys/i386/apm/apm_init/Makefile b/sys/i386/apm/apm_init/Makefile index fc6464e07c3b8..4c3db270046b7 100644 --- a/sys/i386/apm/apm_init/Makefile +++ b/sys/i386/apm/apm_init/Makefile @@ -12,7 +12,7 @@ # # Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) # -# $Id$ +# Makefile,v 1.2 1994/10/01 05:12:29 davidg Exp # OBJS = apm_init.o real_prot.o table.o diff --git a/sys/i386/apm/apm_init/apm_init.S b/sys/i386/apm/apm_init/apm_init.S index 527694778c2dc..90d2cb3a3ff1e 100644 --- a/sys/i386/apm/apm_init/apm_init.S +++ b/sys/i386/apm/apm_init/apm_init.S @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_init.S,v 1.2 1994/10/01 05:12:29 davidg Exp $ + * apm_init.S,v 1.3 1994/10/01 21:29:49 phk Exp */ /* diff --git a/sys/i386/apm/apm_init/bin2asm.c b/sys/i386/apm/apm_init/bin2asm.c index 557724700f6ca..d419b30dbca70 100644 --- a/sys/i386/apm/apm_init/bin2asm.c +++ b/sys/i386/apm/apm_init/bin2asm.c @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id$ + * bin2asm.c,v 1.2 1994/10/01 05:12:30 davidg Exp */ #include <stdio.h> diff --git a/sys/i386/apm/apm_init/real_prot.S b/sys/i386/apm/apm_init/real_prot.S index d61a394bb7635..b56faf9ac5b27 100644 --- a/sys/i386/apm/apm_init/real_prot.S +++ b/sys/i386/apm/apm_init/real_prot.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:13 rpd - * $Id: asm.S,v 1.2 1993/10/16 19:11:27 rgrimes Exp $ + * real_prot.S,v 1.1 1994/10/01 02:55:51 davidg Exp */ diff --git a/sys/i386/apm/apm_init/real_prot.h b/sys/i386/apm/apm_init/real_prot.h index bc02200a00a7f..fe0e1ba78e203 100644 --- a/sys/i386/apm/apm_init/real_prot.h +++ b/sys/i386/apm/apm_init/real_prot.h @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.7 92/02/29 15:33:41 rpd - * $Id: asm.h,v 1.3 1993/10/16 19:11:29 rgrimes Exp $ + * real_prot.h,v 1.1 1994/10/01 02:55:52 davidg Exp */ /* diff --git a/sys/i386/apm/apm_init/rmaouthdr b/sys/i386/apm/apm_init/rmaouthdr index 47838b0693521..615a829160eeb 100644 --- a/sys/i386/apm/apm_init/rmaouthdr +++ b/sys/i386/apm/apm_init/rmaouthdr @@ -1,6 +1,6 @@ #!/bin/csh -f # # from: Mach, Revision 2.2 92/04/04 11:36:01 rpd -# $Id: rmaouthdr,v 1.3 1993/10/16 19:11:37 rgrimes Exp $ +# rmaouthdr,v 1.1 1994/10/01 02:55:53 davidg Exp # dd if=$1 of=$2 ibs=32 skip=1 obs=1024b diff --git a/sys/i386/apm/apm_init/table.c b/sys/i386/apm/apm_init/table.c index f859bff0f327d..f8381ee80120f 100644 --- a/sys/i386/apm/apm_init/table.c +++ b/sys/i386/apm/apm_init/table.c @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id$ + * table.c,v 1.2 1994/10/01 05:12:31 davidg Exp */ #include <apm_bios.h> diff --git a/sys/i386/apm/apm_setup.h b/sys/i386/apm/apm_setup.h index 6f564c9c129aa..40ca7ca992672 100644 --- a/sys/i386/apm/apm_setup.h +++ b/sys/i386/apm/apm_setup.h @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id$ + * apm_setup.h,v 1.2 1994/10/01 05:12:23 davidg Exp */ extern u_long apm_version; diff --git a/sys/i386/apm/apm_setup.s b/sys/i386/apm/apm_setup.s index d354679a98d1c..7ad692861ebde 100644 --- a/sys/i386/apm/apm_setup.s +++ b/sys/i386/apm/apm_setup.s @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_setup.s,v 1.3 1994/10/02 01:45:42 phk Exp $ + * apm_setup.s,v 1.4 1994/10/10 01:14:03 phk Exp */ #define ASM diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile index b5d0d462b3cd5..2f08b59fe79dc 100644 --- a/sys/i386/boot/Makefile +++ b/sys/i386/boot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.22 1994/10/28 04:56:51 phk Exp $ +# Makefile,v 1.23 1994/10/28 22:11:50 phk Exp SUBDIR= biosboot netboot diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile index 15a2e30f63f60..1121f0cb1492f 100644 --- a/sys/i386/boot/biosboot/Makefile +++ b/sys/i386/boot/biosboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.21 1994/10/28 07:54:13 rgrimes Exp $ +# Makefile,v 1.22 1994/11/05 21:06:16 ache Exp # PROG= boot diff --git a/sys/i386/boot/biosboot/README.386BSD b/sys/i386/boot/biosboot/README.386BSD index cc5cb8fe2fbcd..a889828213418 100644 --- a/sys/i386/boot/biosboot/README.386BSD +++ b/sys/i386/boot/biosboot/README.386BSD @@ -148,4 +148,4 @@ Before you do this ensure you have a booting floppy with correct disktab and bootblock files on it so that if it doesn't work, you can re-disklabel from the floppy. -$Id$ +README.386BSD,v 1.2 1993/10/16 19:11:25 rgrimes Exp diff --git a/sys/i386/boot/biosboot/README.MACH b/sys/i386/boot/biosboot/README.MACH index cb6232936e281..2ae336914043b 100644 --- a/sys/i386/boot/biosboot/README.MACH +++ b/sys/i386/boot/biosboot/README.MACH @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:33:55 rpd - * $Id$ + * README.MACH,v 1.3 1993/10/16 19:11:26 rgrimes Exp */ ********NOTE: This is not all relevant to the 386BSD version********** diff --git a/sys/i386/boot/biosboot/asm.S b/sys/i386/boot/biosboot/asm.S index 90f523f4425a9..11acf9afa462c 100644 --- a/sys/i386/boot/biosboot/asm.S +++ b/sys/i386/boot/biosboot/asm.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:13 rpd - * $Id: asm.S,v 1.4 1994/10/02 05:18:24 rgrimes Exp $ + * asm.S,v 1.5 1994/10/06 09:41:01 rgrimes Exp */ diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h index 43242bdec0fab..e1a563c7da681 100644 --- a/sys/i386/boot/biosboot/asm.h +++ b/sys/i386/boot/biosboot/asm.h @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.7 92/02/29 15:33:41 rpd - * $Id$ + * asm.h,v 1.3 1993/10/16 19:11:29 rgrimes Exp */ #define S_ARG0 4(%esp) diff --git a/sys/i386/boot/biosboot/bios.S b/sys/i386/boot/biosboot/bios.S index 54ccf6ea0ec69..88174a6949bde 100644 --- a/sys/i386/boot/biosboot/bios.S +++ b/sys/i386/boot/biosboot/bios.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd - * $Id: bios.S,v 1.3 1994/10/02 05:18:25 rgrimes Exp $ + * bios.S,v 1.4 1994/11/18 05:02:12 phk Exp */ /* diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c index 36afb666e4f13..08a5070ee3619 100644 --- a/sys/i386/boot/biosboot/boot.c +++ b/sys/i386/boot/biosboot/boot.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $Id: boot.c,v 1.25 1994/11/18 10:21:31 phk Exp $ + * boot.c,v 1.26 1994/11/18 13:40:19 jkh Exp */ diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h index 20469905fda24..7af930c54e9f8 100644 --- a/sys/i386/boot/biosboot/boot.h +++ b/sys/i386/boot/biosboot/boot.h @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:03 rpd - * $Id: boot.h,v 1.3 1993/10/16 19:11:32 rgrimes Exp $ + * boot.h,v 1.4 1994/08/21 17:47:26 paul Exp */ #include <sys/types.h> diff --git a/sys/i386/boot/biosboot/boot2.S b/sys/i386/boot/biosboot/boot2.S index 5984f836590bc..0a6c9be471f23 100644 --- a/sys/i386/boot/biosboot/boot2.S +++ b/sys/i386/boot/biosboot/boot2.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:26 rpd - * $Id: boot2.S,v 1.4 1994/06/22 05:52:25 jkh Exp $ + * boot2.S,v 1.5 1994/08/30 01:38:03 bde Exp */ #include "asm.h" diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c index a63ca5a73fe52..d0565a86a1ca7 100644 --- a/sys/i386/boot/biosboot/disk.c +++ b/sys/i386/boot/biosboot/disk.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:49 rpd - * $Id: disk.c,v 1.4 1994/02/22 22:59:40 rgrimes Exp $ + * disk.c,v 1.5 1994/05/16 03:06:00 ache Exp */ /* diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c index 25dc3229581e9..e2bcd767a525a 100644 --- a/sys/i386/boot/biosboot/io.c +++ b/sys/i386/boot/biosboot/io.c @@ -25,7 +25,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:57 rpd - * $Id: io.c,v 1.9 1994/09/20 22:24:59 adam Exp $ + * io.c,v 1.10 1994/11/07 11:26:29 davidg Exp */ #include <machine/cpufunc.h> diff --git a/sys/i386/boot/biosboot/start.S b/sys/i386/boot/biosboot/start.S index d0bcbf89859a1..61db53a4280bf 100644 --- a/sys/i386/boot/biosboot/start.S +++ b/sys/i386/boot/biosboot/start.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:29 rpd - * $Id: start.S,v 1.4 1994/10/02 05:18:26 rgrimes Exp $ + * start.S,v 1.5 1994/10/06 09:41:05 rgrimes Exp */ /* diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c index daaa7a7f0153c..203d7632134c4 100644 --- a/sys/i386/boot/biosboot/sys.c +++ b/sys/i386/boot/biosboot/sys.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $Id: sys.c,v 1.5 1994/09/20 22:25:00 adam Exp $ + * sys.c,v 1.6 1994/11/07 11:26:30 davidg Exp */ #include "boot.h" diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c index 677a12f473c06..29b5d4f90d1eb 100644 --- a/sys/i386/boot/biosboot/table.c +++ b/sys/i386/boot/biosboot/table.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:43 rpd - * $Id: table.c,v 1.3 1993/10/16 19:11:40 rgrimes Exp $ + * table.c,v 1.4 1994/08/30 01:38:04 bde Exp */ /* diff --git a/sys/i386/boot/netboot/Makefile b/sys/i386/boot/netboot/Makefile index bce4acf3b7195..a68dddd596847 100644 --- a/sys/i386/boot/netboot/Makefile +++ b/sys/i386/boot/netboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1994/10/28 22:13:22 phk Exp $ +# Makefile,v 1.3 1994/11/17 12:16:01 jkh Exp # # Makefile for NETBOOT # diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index c3fc809954e73..a01ad9b94e239 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -1,7 +1,7 @@ # # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks # -# $Id: GENERIC,v 1.19 1994/11/17 20:20:53 gibbs Exp $ +# GENERIC,v 1.20 1994/11/18 19:10:25 jkh Exp # machine "i386" diff --git a/sys/i386/conf/GENERICAH b/sys/i386/conf/GENERICAH index 3022340122197..f73096d67563b 100644 --- a/sys/i386/conf/GENERICAH +++ b/sys/i386/conf/GENERICAH @@ -1,7 +1,7 @@ # # GENERICAH -- Generic machine with WD/AHx/NCR family disks # -# $Id: GENERICAH,v 1.53 1994/10/20 00:53:26 phk Exp $ +# GENERICAH,v 1.54 1994/11/13 10:17:05 gibbs Exp # machine "i386" diff --git a/sys/i386/conf/GENERICBT b/sys/i386/conf/GENERICBT index 9c1009e03dc18..259bb41f03e08 100644 --- a/sys/i386/conf/GENERICBT +++ b/sys/i386/conf/GENERICBT @@ -1,7 +1,7 @@ # # GENERICBT -- Generic machine with WD/BTx family disks # -# $Id: GENERICBT,v 1.49 1994/10/20 00:53:28 phk Exp $ +# GENERICBT,v 1.50 1994/11/13 10:17:06 gibbs Exp # machine "i386" diff --git a/sys/i386/conf/IPFIREWALL b/sys/i386/conf/IPFIREWALL index 937128692292a..45317b87a43b6 100644 --- a/sys/i386/conf/IPFIREWALL +++ b/sys/i386/conf/IPFIREWALL @@ -1,7 +1,7 @@ # # IPFIREWALL -- Sample Generic kernel suitable for building an IP firewall. # -# $Id: IPFIREWALL,v 1.1 1994/10/28 15:09:36 jkh Exp $ +# IPFIREWALL,v 1.2 1994/11/13 10:17:07 gibbs Exp # machine "i386" diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 4989e3d79997f..0e664c5382168 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -4,7 +4,7 @@ # # This kernel is NOT MEANT to be runnable! # -# $Id: LINT,v 1.107 1994/11/08 07:39:28 jkh Exp $ +# LINT,v 1.108 1994/11/15 14:28:46 bde Exp # # diff --git a/sys/i386/conf/MINI b/sys/i386/conf/MINI index e038ee50702a5..60007ba39c9b0 100644 --- a/sys/i386/conf/MINI +++ b/sys/i386/conf/MINI @@ -1,7 +1,7 @@ # # MINI -- A kernel to get FreeBSD on onto a disk. # -# $Id: MINI,v 1.4 1994/10/20 00:19:37 phk Exp $ +# MINI,v 1.5 1994/10/20 00:53:30 phk Exp # machine "i386" diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index be75bff7d5fe1..a8cbb3ef45a8f 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.48 1994/10/25 19:34:57 bde Exp $ +# Makefile.i386,v 1.49 1994/11/15 14:43:45 bde Exp # # Makefile for FreeBSD # diff --git a/sys/i386/conf/devices.i386 b/sys/i386/conf/devices.i386 index 2b3061a89d25b..1b0d0a3cd9cdf 100644 --- a/sys/i386/conf/devices.i386 +++ b/sys/i386/conf/devices.i386 @@ -1,6 +1,6 @@ # This file tells what major numbers the various possible swap devices have. # -# $Id: devices.i386,v 1.5 1994/01/04 20:09:28 nate Exp $ +# devices.i386,v 1.6 1994/03/21 20:48:49 ats Exp # wd 0 dk 1 diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 75f7355da8208..26b3e1061cecb 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.62 1994/11/18 08:20:56 jkh Exp $ +# files.i386,v 1.63 1994/11/18 09:08:01 gibbs Exp # i386/apm/apm.c optional apm device-driver i386/apm/apm_setup.s optional apm diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index a32f564649102..931fdce76f40f 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.15 1994/10/22 17:51:45 phk Exp $ + * autoconf.c,v 1.16 1994/11/12 01:47:35 phk Exp */ /* diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index 5544e035da732..b9dba60d170b1 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -41,7 +41,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.40 1994/11/01 01:47:22 pst Exp $ + * conf.c,v 1.41 1994/11/03 17:49:01 pst Exp */ #include <sys/param.h> diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c index 9ed6e62ecc087..f022a8131c42c 100644 --- a/sys/i386/i386/cons.c +++ b/sys/i386/i386/cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.16 1994/10/20 00:07:45 phk Exp $ + * cons.c,v 1.17 1994/10/31 17:20:14 joerg Exp */ diff --git a/sys/i386/i386/cons.h b/sys/i386/i386/cons.h index 1e1b2f239207f..1f2ea524a1814 100644 --- a/sys/i386/i386/cons.h +++ b/sys/i386/i386/cons.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.h 7.2 (Berkeley) 5/9/91 - * $Id: cons.h,v 1.5 1994/05/25 08:53:05 rgrimes Exp $ + * cons.h,v 1.6 1994/10/20 00:07:46 phk Exp */ #ifndef _MACHINE_CONS_H_ diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c index 49014f0a17d49..38187fffb27a4 100644 --- a/sys/i386/i386/db_disasm.c +++ b/sys/i386/i386/db_disasm.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_disasm.c,v 1.6 1994/08/13 03:49:35 wollman Exp $ + * db_disasm.c,v 1.7 1994/10/08 22:19:47 phk Exp */ /* diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c index 8f08cc3ae426a..f690b77e054c4 100644 --- a/sys/i386/i386/db_interface.c +++ b/sys/i386/i386/db_interface.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_interface.c,v 1.9 1994/09/02 04:12:02 davidg Exp $ + * db_interface.c,v 1.10 1994/09/15 11:38:59 davidg Exp */ /* diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c index ae6b98b06e454..694ffdb3719b7 100644 --- a/sys/i386/i386/db_trace.c +++ b/sys/i386/i386/db_trace.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_trace.c,v 1.7 1994/08/06 10:25:33 davidg Exp $ + * db_trace.c,v 1.8 1994/08/13 03:49:37 wollman Exp */ #include <sys/param.h> diff --git a/sys/i386/i386/dkbad.c b/sys/i386/i386/dkbad.c index cc70487ae3048..45761b1682793 100644 --- a/sys/i386/i386/dkbad.c +++ b/sys/i386/i386/dkbad.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)dkbad.c 5.4 (Berkeley) 1/19/91 - * $Id: dkbad.c,v 1.3 1993/12/19 00:50:01 wollman Exp $ + * dkbad.c,v 1.4 1994/08/13 03:49:38 wollman Exp */ diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index d746f12d5fad6..2717c92b71d64 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.4 1994/08/13 03:49:38 wollman Exp $ + * exception.s,v 1.5 1994/09/28 03:37:49 bde Exp */ #include "npx.h" /* NNPX */ diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index d3cd26d665a87..2a0b51d0587f6 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $Id: genassym.c,v 1.19 1994/10/26 22:01:11 bde Exp $ + * genassym.c,v 1.20 1994/11/18 05:27:32 phk Exp */ #include <stdio.h> diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c index 2d6d77a13a946..efb55f143f9de 100644 --- a/sys/i386/i386/in_cksum.c +++ b/sys/i386/i386/in_cksum.c @@ -32,7 +32,7 @@ * * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 - * $Id: in_cksum.c,v 1.5 1994/03/07 11:47:30 davidg Exp $ + * in_cksum.c,v 1.6 1994/08/13 03:49:39 wollman Exp */ #include <sys/param.h> diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index 7f32a04d9edb2..dafae96025bdb 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.44 1994/11/06 22:18:45 phk Exp $ + * locore.s,v 1.45 1994/11/18 05:27:34 phk Exp */ /* diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index c6a2c47b9d539..c387cca7035af 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.87 1994/11/06 04:46:53 davidg Exp $ + * machdep.c,v 1.88 1994/11/07 03:51:32 phk Exp */ #include "npx.h" diff --git a/sys/i386/i386/math_emu.h b/sys/i386/i386/math_emu.h index 453a903554a62..977408dd9735e 100644 --- a/sys/i386/i386/math_emu.h +++ b/sys/i386/i386/math_emu.h @@ -3,7 +3,7 @@ * * (C) 1991 Linus Torvalds * - * $Id$ + * math_emu.h,v 1.2 1993/10/16 14:15:02 rgrimes Exp */ #ifndef _LINUX_MATH_EMU_H #define _LINUX_MATH_EMU_H diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c index e1b826977a716..6cd6bc9dca562 100644 --- a/sys/i386/i386/math_emulate.c +++ b/sys/i386/i386/math_emulate.c @@ -6,7 +6,7 @@ * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj] * * from: 386BSD 0.1 - * $Id: math_emulate.c,v 1.9 1994/05/25 08:54:14 rgrimes Exp $ + * math_emulate.c,v 1.10 1994/09/15 10:58:35 davidg Exp */ /* diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index 0d956888a0894..2cee30b6320cf 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.8 1994/05/25 08:54:24 rgrimes Exp $ + * mem.c,v 1.9 1994/08/06 10:25:34 davidg Exp */ /* diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s index 19031c727c0b2..01405791ea58f 100644 --- a/sys/i386/i386/microtime.s +++ b/sys/i386/i386/microtime.s @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: Steve McCanne's microtime code - * $Id: microtime.s,v 1.6 1994/08/13 17:45:09 wollman Exp $ + * microtime.s,v 1.7 1994/11/05 23:53:46 bde Exp */ #include <machine/asmacros.h> diff --git a/sys/i386/i386/ns_cksum.c b/sys/i386/i386/ns_cksum.c index 142c9f827eec1..c551a81008299 100644 --- a/sys/i386/i386/ns_cksum.c +++ b/sys/i386/i386/ns_cksum.c @@ -32,7 +32,7 @@ * * from: @(#)ns_cksum.c 7.7 (Berkeley) 4/29/91 * from NetBSD: ns_cksum.c,v 1.2 1993/05/22 07:59:55 cgd Exp - * $Id: ns_cksum.c,v 1.2 1993/12/19 00:50:07 wollman Exp $ + * ns_cksum.c,v 1.3 1994/08/13 03:49:43 wollman Exp */ #include <sys/param.h> diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index c279f9004f18e..d629fd12d8f33 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.36 1994/09/16 13:33:26 davidg Exp $ + * pmap.c,v 1.37 1994/10/08 22:19:49 phk Exp */ /* diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c index d122fc6f3f090..c3454cd375a12 100644 --- a/sys/i386/i386/procfs_machdep.c +++ b/sys/i386/i386/procfs_machdep.c @@ -37,7 +37,7 @@ * @(#)procfs_machdep.c 8.3 (Berkeley) 1/27/94 * * From: - * $Id: procfs_i386.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ + * procfs_machdep.c,v 1.2 1994/05/25 08:54:48 rgrimes Exp */ /* diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s index 415d98d171c87..413728a840f5e 100644 --- a/sys/i386/i386/support.s +++ b/sys/i386/i386/support.s @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: support.s,v 1.18 1994/09/16 13:33:27 davidg Exp $ + * support.s,v 1.19 1994/09/25 21:31:47 davidg Exp */ #include "assym.s" /* system definitions */ diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c index 2bad4b213b8eb..d1f117e220bb8 100644 --- a/sys/i386/i386/swapgeneric.c +++ b/sys/i386/i386/swapgeneric.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)swapgeneric.c 5.5 (Berkeley) 5/9/91 - * $Id: swapgeneric.c,v 1.3 1993/11/03 18:05:42 nate Exp $ + * swapgeneric.c,v 1.4 1994/08/13 03:49:45 wollman Exp */ #include <machine/pte.h> diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s index 571d9c9dbc8bf..da6077189f711 100644 --- a/sys/i386/i386/swtch.s +++ b/sys/i386/i386/swtch.s @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: swtch.s,v 1.16 1994/10/25 07:25:56 davidg Exp $ + * swtch.s,v 1.17 1994/10/30 20:09:13 bde Exp */ #include "npx.h" /* for NNPX */ diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw index ce017d599801c..da3afb5d937e6 100644 --- a/sys/i386/i386/symbols.raw +++ b/sys/i386/i386/symbols.raw @@ -1,6 +1,6 @@ # @(#)symbols.raw 7.6 (Berkeley) 5/8/91 # -# $Id: symbols.raw,v 1.3 1994/05/25 08:55:13 rgrimes Exp $ +# symbols.raw,v 1.4 1994/10/09 07:34:30 davidg Exp # diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index f9b90c51d6517..64670f42d645b 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $Id: sys_machdep.c,v 1.5 1994/08/13 03:49:46 wollman Exp $ + * sys_machdep.c,v 1.6 1994/10/30 20:23:23 bde Exp */ #include <sys/param.h> diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 1aa5202f1cfd4..9fa13c801ea7b 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.40 1994/10/21 01:18:38 wollman Exp $ + * trap.c,v 1.41 1994/10/30 20:25:21 bde Exp */ /* diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index 31c456f4b6856..3885e51600b60 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -38,7 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.14 1994/11/13 01:55:33 jkh Exp $ + * userconfig.c,v 1.15 1994/11/14 03:22:28 bde Exp */ #include <sys/param.h> diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 9663065f8686d..a187d82c02176 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.28 1994/09/02 04:12:07 davidg Exp $ + * vm_machdep.c,v 1.29 1994/10/08 22:19:51 phk Exp */ #include "npx.h" diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h index 0a25b84ee5840..85a4ed570ca55 100644 --- a/sys/i386/ibcs2/coff.h +++ b/sys/i386/ibcs2/coff.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: coff.h,v 1.1 1994/10/12 19:37:16 sos Exp $ + * coff.h,v 1.1 1994/10/14 08:53:14 sos Exp */ #ifndef _COFF_H diff --git a/sys/i386/ibcs2/ibcs2.h b/sys/i386/ibcs2/ibcs2.h index 6d6f3921aa909..e4466ce908352 100644 --- a/sys/i386/ibcs2/ibcs2.h +++ b/sys/i386/ibcs2/ibcs2.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2.h,v 1.2 1994/10/14 08:53:16 sos Exp $ + * ibcs2.h,v 1.3 1994/10/17 22:13:06 sos Exp */ /* trace all iBCS2 system calls */ diff --git a/sys/i386/ibcs2/ibcs2_dummy.c b/sys/i386/ibcs2/ibcs2_dummy.c index f267e4c98aec7..e2d42c4687915 100644 --- a/sys/i386/ibcs2/ibcs2_dummy.c +++ b/sys/i386/ibcs2/ibcs2_dummy.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_dummy.c,v 1.14 1994/10/13 23:10:58 sos Exp $ + * ibcs2_dummy.c,v 1.1 1994/10/14 08:52:59 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_file.c b/sys/i386/ibcs2/ibcs2_file.c index c39684b1e72ba..2bc6a94b0c9dc 100644 --- a/sys/i386/ibcs2/ibcs2_file.c +++ b/sys/i386/ibcs2/ibcs2_file.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ibcs2_file.c,v 1.8 1994/10/13 23:10:58 sos Exp $ + * ibcs2_file.c,v 1.1 1994/10/14 08:53:01 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c index 4e3b991c0f92b..7f96db8406373 100644 --- a/sys/i386/ibcs2/ibcs2_ioctl.c +++ b/sys/i386/ibcs2/ibcs2_ioctl.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_ioctl.c,v 1.2 1994/10/17 22:13:07 sos Exp $ + * ibcs2_ioctl.c,v 1.3 1994/10/23 19:19:42 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c index f760e2ee78724..bdd270e091994 100644 --- a/sys/i386/ibcs2/ibcs2_ipc.c +++ b/sys/i386/ibcs2/ibcs2_ipc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_ipc.c,v 1.3 1994/10/12 19:38:03 sos Exp $ + * ibcs2_ipc.c,v 1.1 1994/10/14 08:53:04 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c index 83f6be8c25730..846602066c67c 100644 --- a/sys/i386/ibcs2/ibcs2_isc.c +++ b/sys/i386/ibcs2/ibcs2_isc.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_isc.c,v 1.5 1994/10/12 19:38:03 sos Exp $ + * ibcs2_isc.c,v 1.1 1994/10/14 08:53:05 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index c4dfe6cabbaeb..d0776e3522ee8 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ibcs2_misc.c,v 1.16 1994/10/13 23:10:58 sos Exp $ + * ibcs2_misc.c,v 1.1 1994/10/14 08:53:06 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c index 7824a0b087548..db3511fff81a5 100644 --- a/sys/i386/ibcs2/ibcs2_signal.c +++ b/sys/i386/ibcs2/ibcs2_signal.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ibcs2_signal.c,v 1.9 1994/10/12 19:38:03 sos Exp $ + * ibcs2_signal.c,v 1.1 1994/10/14 08:53:07 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c index 08873a933a035..9dc2d418e95ab 100644 --- a/sys/i386/ibcs2/ibcs2_socksys.c +++ b/sys/i386/ibcs2/ibcs2_socksys.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_socksys.c,v 1.1 1994/10/14 08:53:08 sos Exp $ + * ibcs2_socksys.c,v 1.2 1994/10/17 22:13:08 sos Exp */ #include <sys/param.h> diff --git a/sys/i386/ibcs2/ibcs2_socksys.h b/sys/i386/ibcs2/ibcs2_socksys.h index bfce6055cc010..2ca606970d92b 100644 --- a/sys/i386/ibcs2/ibcs2_socksys.h +++ b/sys/i386/ibcs2/ibcs2_socksys.h @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_socksys.h,v 1.1 1994/10/14 08:53:16 sos Exp $ + * ibcs2_socksys.h,v 1.2 1994/10/17 22:13:10 sos Exp */ struct ss_call { diff --git a/sys/i386/ibcs2/ibcs2_stats.c b/sys/i386/ibcs2/ibcs2_stats.c index 749c632e4f285..7b4891b8b9462 100644 --- a/sys/i386/ibcs2/ibcs2_stats.c +++ b/sys/i386/ibcs2/ibcs2_stats.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ibcs2_stats.c,v 1.11 1994/10/13 23:10:58 sos Exp $ + * ibcs2_stats.c,v 1.1 1994/10/14 08:53:09 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c index 1f1422d07e17b..0c5a3000b6605 100644 --- a/sys/i386/ibcs2/ibcs2_sysent.c +++ b/sys/i386/ibcs2/ibcs2_sysent.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_sysent.c,v 1.14 1994/10/13 23:10:58 sos Exp $ + * ibcs2_sysent.c,v 1.1 1994/10/14 08:53:10 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c index bca0fe999c5ac..fc28aba1613d9 100644 --- a/sys/i386/ibcs2/ibcs2_sysi86.c +++ b/sys/i386/ibcs2/ibcs2_sysi86.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_sysi86.c,v 1.4 1994/10/12 19:38:38 sos Exp $ + * ibcs2_sysi86.c,v 1.1 1994/10/14 08:53:11 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c index 051ed5801caf5..1ba16da6d0691 100644 --- a/sys/i386/ibcs2/ibcs2_xenix.c +++ b/sys/i386/ibcs2/ibcs2_xenix.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ibcs2_xenix.c,v 1.10 1994/10/12 19:38:38 sos Exp $ + * ibcs2_xenix.c,v 1.1 1994/10/14 08:53:12 sos Exp */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index 5d57d1804eb8d..13e82b1d40058 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_coff.c,v 1.11 1994/10/12 19:38:03 sos Exp $ + * imgact_coff.c,v 1.1 1994/10/14 08:53:13 sos Exp */ #include <sys/param.h> diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h index 77ec887cd6aee..f8936714e8075 100644 --- a/sys/i386/include/ansi.h +++ b/sys/i386/include/ansi.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $Id$ + * ansi.h,v 1.5 1994/08/02 07:38:38 davidg Exp */ #ifndef _ANSI_H_ diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h index e3afdc109904c..8c8bb4020c505 100644 --- a/sys/i386/include/apm_bios.h +++ b/sys/i386/include/apm_bios.h @@ -12,7 +12,7 @@ * * Aug, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_bios.h,v 1.2 1994/10/01 05:13:36 davidg Exp $ + * apm_bios.h,v 1.3 1994/10/02 17:31:27 phk Exp */ #ifndef _MACHINE_APM_BIOS_H_ diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h index f23a6c250e140..29f19fe89f533 100644 --- a/sys/i386/include/apm_segments.h +++ b/sys/i386/include/apm_segments.h @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id$ + * apm_segments.h,v 1.2 1994/10/01 05:13:37 davidg Exp */ #ifndef _MACHINE_APM_SEGMENTS_H diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h index b2a6dc839f2e2..bedf4e552c2ed 100644 --- a/sys/i386/include/asmacros.h +++ b/sys/i386/include/asmacros.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: asmacros.h,v 1.4 1994/08/19 11:20:11 jkh Exp $ + * asmacros.h,v 1.5 1994/09/08 12:25:18 bde Exp */ #ifndef _MACHINE_ASMACROS_H_ diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h index b86a034715f79..f69b1a3d1eb49 100644 --- a/sys/i386/include/bootinfo.h +++ b/sys/i386/include/bootinfo.h @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.h,v 1.2 1994/11/18 05:02:43 phk Exp $ + * bootinfo.h,v 1.3 1994/11/18 05:26:52 phk Exp */ #ifndef _MACHINE_BOOTINFO_H_ diff --git a/sys/i386/include/cons.h b/sys/i386/include/cons.h index faa17d12332c7..2d3693282414e 100644 --- a/sys/i386/include/cons.h +++ b/sys/i386/include/cons.h @@ -3,6 +3,6 @@ * needs to access these functions. In the mean time, just include the * header where it sits. * - * $Id$ + * cons.h,v 1.2 1994/08/02 07:38:41 davidg Exp */ #include <i386/i386/cons.h> diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h index e6159c41738aa..9fa9f049c6c51 100644 --- a/sys/i386/include/console.h +++ b/sys/i386/include/console.h @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: console.h,v 1.12 1994/10/01 02:56:07 davidg Exp $ + * console.h,v 1.13 1994/10/17 22:11:52 sos Exp */ #ifndef _CONSOLE_H_ diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h index e80564af6fe18..133d53a287164 100644 --- a/sys/i386/include/cpu.h +++ b/sys/i386/include/cpu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $Id: cpu.h,v 1.15 1994/10/18 03:37:31 ache Exp $ + * cpu.h,v 1.16 1994/11/05 22:44:34 bde Exp */ #ifndef _MACHINE_CPU_H_ diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 63a521650b0e9..d120e8a5db2fc 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -61,7 +61,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * - * $Id: cpufunc.h,v 1.27 1994/09/25 21:31:55 davidg Exp $ + * cpufunc.h,v 1.27.2.1 1994/11/19 19:07:38 phk Exp */ diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h index 52d8e20512242..b23935b363a94 100644 --- a/sys/i386/include/cputypes.h +++ b/sys/i386/include/cputypes.h @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cputypes.h,v 1.2 1993/11/07 17:42:49 wollman Exp $ + * cputypes.h,v 1.3 1994/09/04 19:59:23 pst Exp */ #ifndef _MACHINE_CPUTYPES_H_ diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h index 7e7bec08ba192..afdbf965959ff 100644 --- a/sys/i386/include/db_machdep.h +++ b/sys/i386/include/db_machdep.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $Id: db_machdep.h,v 1.5 1994/10/02 19:36:30 phk Exp $ + * db_machdep.h,v 1.6 1994/10/19 21:13:51 bde Exp */ #ifndef _I386_DB_MACHDEP_H_ diff --git a/sys/i386/include/devconf.h b/sys/i386/include/devconf.h index 0eac2b97fe355..c2b978bb3a27c 100644 --- a/sys/i386/include/devconf.h +++ b/sys/i386/include/devconf.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devconf.h,v 1.5 1994/10/23 21:26:53 wollman Exp $ + * devconf.h,v 1.6 1994/11/02 23:44:11 se Exp */ /* * devconf.h - machine-dependent device configuration table diff --git a/sys/i386/include/dkio.h b/sys/i386/include/dkio.h index c6d78d5aa2fbc..3626ad12d2cb1 100644 --- a/sys/i386/include/dkio.h +++ b/sys/i386/include/dkio.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)dkio.h 5.2 (Berkeley) 1/18/91 - * $Id: dkio.h,v 1.3 1993/11/07 17:42:51 wollman Exp $ + * dkio.h,v 1.4 1994/09/08 12:26:07 bde Exp */ #ifndef _MACHINE_DKIO_H_ diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h index f9a2875b4f601..a0534440e731c 100644 --- a/sys/i386/include/endian.h +++ b/sys/i386/include/endian.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $Id: endian.h,v 1.4 1993/12/19 05:14:45 alm Exp $ + * endian.h,v 1.5 1994/09/10 20:03:14 csgr Exp */ #ifndef _MACHINE_ENDIAN_H_ diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h index c08283f7384a6..8ceb444e99b5e 100644 --- a/sys/i386/include/exec.h +++ b/sys/i386/include/exec.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.1 (Berkeley) 6/11/93 - * $Id: exec.h,v 1.4 1994/08/09 14:39:56 jkh Exp $ + * exec.h,v 1.5 1994/09/24 21:36:38 davidg Exp */ #ifndef _EXEC_H_ diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h index fb5967e6eadcb..9c0bec18e7b52 100644 --- a/sys/i386/include/float.h +++ b/sys/i386/include/float.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $Id: float.h,v 1.4 1993/10/16 14:39:16 rgrimes Exp $ + * float.h,v 1.5 1993/11/07 17:42:53 wollman Exp */ #ifndef _MACHINE_FLOAT_H_ diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h index 69cb204c835cd..b0642c7edc290 100644 --- a/sys/i386/include/floatingpoint.h +++ b/sys/i386/include/floatingpoint.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#) floatingpoint.h 1.0 (Berkeley) 9/23/93 - * $Id: floatingpoint.h,v 1.5 1994/08/04 19:16:36 wollman Exp $ + * floatingpoint.h,v 1.6 1994/09/20 22:26:37 bde Exp */ #ifndef _FLOATINGPOINT_H_ diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h index db2993e019fb4..1eb8fba2f455c 100644 --- a/sys/i386/include/frame.h +++ b/sys/i386/include/frame.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 - * $Id: frame.h,v 1.7 1994/01/03 07:55:32 davidg Exp $ + * frame.h,v 1.9 1994/05/25 08:56:02 rgrimes Exp */ #ifndef _MACHINE_FRAME_H_ diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h index d36ede3cbd1e8..6faaa8fbbe52f 100644 --- a/sys/i386/include/ieeefp.h +++ b/sys/i386/include/ieeefp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $Id: ieeefp.h,v 1.1 1994/08/04 19:16:37 wollman Exp $ + * ieeefp.h,v 1.2 1994/08/05 14:36:04 wollman Exp */ /* diff --git a/sys/i386/include/ioctl_ctx.h b/sys/i386/include/ioctl_ctx.h index a7de049f71144..7b0b2466a41d7 100644 --- a/sys/i386/include/ioctl_ctx.h +++ b/sys/i386/include/ioctl_ctx.h @@ -7,7 +7,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use * - * $Id$ + * ioctl_ctx.h,v 1.1 1994/10/01 17:59:38 davidg Exp */ /* diff --git a/sys/i386/include/ioctl_fd.h b/sys/i386/include/ioctl_fd.h index 67329399ad848..e058fc2af0116 100644 --- a/sys/i386/include/ioctl_fd.h +++ b/sys/i386/include/ioctl_fd.h @@ -24,7 +24,7 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $Id: ioctl_fd.h,v 1.6 1994/09/25 18:41:21 joerg Exp $ + * ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp */ #ifndef _IOCTL_FD_H diff --git a/sys/i386/include/ioctl_pc.h b/sys/i386/include/ioctl_pc.h index bc6a255c8bdd9..a8a92ef714f5a 100644 --- a/sys/i386/include/ioctl_pc.h +++ b/sys/i386/include/ioctl_pc.h @@ -54,7 +54,7 @@ * 22-04-93 -hv- unified most CODRV1/CODRV2 codes * 24-04-93 -hv- revised parts of keymap structures * - * $Id$ + * ioctl_pc.h,v 1.1 1993/09/08 19:29:54 rgrimes Exp */ #ifndef _IOCTL_PC_H_ diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h index 773fa9c700c67..5da382fad7a62 100644 --- a/sys/i386/include/ipl.h +++ b/sys/i386/include/ipl.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * ipl.h,v 1.2 1994/08/02 07:38:49 davidg Exp */ #ifndef _ISA_IPL_H_ diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h index 3ae9518597dce..4d32c2400ce84 100644 --- a/sys/i386/include/limits.h +++ b/sys/i386/include/limits.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $Id$ + * limits.h,v 1.8 1994/08/02 07:38:50 davidg Exp */ #ifndef _MACHINE_LIMITS_H_ diff --git a/sys/i386/include/lpt.h b/sys/i386/include/lpt.h index 7e3df42241824..08ae815027ad9 100644 --- a/sys/i386/include/lpt.h +++ b/sys/i386/include/lpt.h @@ -11,7 +11,7 @@ * * Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za> * - * $Id$ + * lpt.h,v 1.2 1994/08/02 07:38:52 davidg Exp */ #ifndef _LPT_PRINTER_H_ diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h index 95a66e474c6dc..c94d67bb111d9 100644 --- a/sys/i386/include/mouse.h +++ b/sys/i386/include/mouse.h @@ -19,7 +19,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mouse.h,v 1.1 1994/05/17 14:05:31 jkh Exp $ + * mouse.h,v 1.1 1994/09/09 11:27:31 dfr Exp */ struct mouseinfo { diff --git a/sys/i386/include/mtpr.h b/sys/i386/include/mtpr.h index e8347e677541c..98a04cb2e233c 100644 --- a/sys/i386/include/mtpr.h +++ b/sys/i386/include/mtpr.h @@ -1,4 +1,4 @@ /* * Unused in 386BSD port - * $Id$ + * mtpr.h,v 1.2 1993/10/16 14:39:21 rgrimes Exp */ diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h index 98a6ea8d1c062..78423c2ff5656 100644 --- a/sys/i386/include/npx.h +++ b/sys/i386/include/npx.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $Id: npx.h,v 1.5 1994/11/04 02:13:15 jkh Exp $ + * npx.h,v 1.6 1994/11/05 22:59:09 bde Exp */ /* diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index fdc550b3fbd2f..5ea2997780052 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.15 1994/05/25 08:56:14 rgrimes Exp $ + * param.h,v 1.16 1994/09/18 22:05:22 bde Exp */ #ifndef _MACHINE_PARAM_H_ diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h index 9e64a3f13307c..245f80f03ef46 100644 --- a/sys/i386/include/pc/display.h +++ b/sys/i386/include/pc/display.h @@ -1,7 +1,7 @@ /* * IBM PC display definitions * - * $Id$ + * display.h,v 1.2 1993/10/16 14:40:55 rgrimes Exp */ /* Color attributes for foreground text */ diff --git a/sys/i386/include/pc/msdos.h b/sys/i386/include/pc/msdos.h index ea221c7954a50..031eb5a64ff16 100644 --- a/sys/i386/include/pc/msdos.h +++ b/sys/i386/include/pc/msdos.h @@ -3,7 +3,7 @@ * [obtained from mtools -wfj] * how to decipher DOS disk structures in coexisting with DOS * - * $Id$ + * msdos.h,v 1.2 1993/10/16 14:40:57 rgrimes Exp */ #define MSECTOR_SIZE 512 /* MSDOS sector size in bytes */ diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h index b347c9676ecdc..d8fb5150cae6a 100644 --- a/sys/i386/include/pcaudioio.h +++ b/sys/i386/include/pcaudioio.h @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcaudioio.h,v 1.2 1994/05/20 12:22:40 sos Exp $ + * pcaudioio.h,v 1.3 1994/09/29 08:31:39 sos Exp */ #ifndef _PCAUDIOIO_H_ diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h index 37b76f85832d0..8911ec5d85477 100644 --- a/sys/i386/include/pcb.h +++ b/sys/i386/include/pcb.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $Id: pcb.h,v 1.6 1994/08/13 03:49:50 wollman Exp $ + * pcb.h,v 1.7 1994/10/08 22:21:33 phk Exp */ #ifndef _I386_PCB_H_ diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h index 32990ee56e535..2cb8528c279a6 100644 --- a/sys/i386/include/pmap.h +++ b/sys/i386/include/pmap.h @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $Id: pmap.h,v 1.17 1994/10/08 22:21:34 phk Exp $ + * pmap.h,v 1.18 1994/11/14 14:12:24 bde Exp */ #ifndef _MACHINE_PMAP_H_ diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h index 92de3af87dcfc..262c60075bb60 100644 --- a/sys/i386/include/proc.h +++ b/sys/i386/include/proc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $Id: proc.h,v 1.2 1993/10/16 14:39:24 rgrimes Exp $ + * proc.h,v 1.4 1994/05/25 08:56:29 rgrimes Exp */ #ifndef _MACHINE_PROC_H_ diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h index 9fe27ec5eda85..ebf1c4af07f12 100644 --- a/sys/i386/include/profile.h +++ b/sys/i386/include/profile.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $Id: profile.h,v 1.3 1994/08/21 04:55:29 paul Exp $ + * profile.h,v 1.4 1994/09/15 16:27:14 paul Exp */ #ifndef _I386_MACHINE_PROFILE_H_ diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h index 906acd411c96b..ae2bd54b72ece 100644 --- a/sys/i386/include/psl.h +++ b/sys/i386/include/psl.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)psl.h 5.2 (Berkeley) 1/18/91 - * $Id: psl.h,v 1.4 1994/02/24 00:21:12 hsu Exp $ + * psl.h,v 1.5 1994/08/10 03:51:18 wollman Exp */ #ifndef _MACHINE_PSL_H_ diff --git a/sys/i386/include/pte.h b/sys/i386/include/pte.h index 5f473d87730ac..a2d01c94d6a15 100644 --- a/sys/i386/include/pte.h +++ b/sys/i386/include/pte.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pte.h 5.5 (Berkeley) 5/9/91 - * $Id: pte.h,v 1.6 1994/05/25 08:56:34 rgrimes Exp $ + * pte.h,v 1.7 1994/09/04 23:10:25 davidg Exp */ #ifndef _MACHINE_PTE_H_ diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h index 0892b83e2606c..d14d415db07ce 100644 --- a/sys/i386/include/ptrace.h +++ b/sys/i386/include/ptrace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 - * $Id$ + * ptrace.h,v 1.2 1994/08/02 07:38:57 davidg Exp */ /* diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h index 5690d43633ff2..975e026d0b1c2 100644 --- a/sys/i386/include/reg.h +++ b/sys/i386/include/reg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $Id: reg.h,v 1.8 1994/05/25 08:56:42 rgrimes Exp $ + * reg.h,v 1.9 1994/10/02 17:31:29 phk Exp */ #ifndef _MACHINE_REG_H_ diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h index 7f9cfad64a27d..069e6805fd558 100644 --- a/sys/i386/include/reloc.h +++ b/sys/i386/include/reloc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)reloc.h 8.1 (Berkeley) 6/10/93 - * $Id: reloc.h,v 1.3 1994/08/09 14:39:57 jkh Exp $ + * reloc.h,v 1.4 1994/08/21 04:55:30 paul Exp */ #ifndef _I386_MACHINE_RELOC_H_ diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h index 0e996e65f31ad..64cad8d89999e 100644 --- a/sys/i386/include/segments.h +++ b/sys/i386/include/segments.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $Id: segments.h,v 1.4 1994/01/31 10:27:13 davidg Exp $ + * segments.h,v 1.5 1994/10/01 02:56:08 davidg Exp */ #ifndef _MACHINE_SEGMENTS_H_ diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h index 093278f1399a0..420517d5258ca 100644 --- a/sys/i386/include/signal.h +++ b/sys/i386/include/signal.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $Id: signal.h,v 1.3 1994/08/02 07:39:01 davidg Exp $ + * signal.h,v 1.4 1994/08/21 04:55:30 paul Exp */ #ifndef _I386_MACHINE_SIGNAL_H_ diff --git a/sys/i386/include/soundcard.h b/sys/i386/include/soundcard.h index cd93d1139a024..4d213a4550e87 100644 --- a/sys/i386/include/soundcard.h +++ b/sys/i386/include/soundcard.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: soundcard.h,v 1.9 1994/10/01 02:32:23 swallace Exp $ + * soundcard.h,v 1.10 1994/11/14 14:13:13 bde Exp */ /* diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h index f097e4807cf85..70827290740f6 100644 --- a/sys/i386/include/speaker.h +++ b/sys/i386/include/speaker.h @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id$ + * speaker.h,v 1.2 1994/08/02 07:39:05 davidg Exp */ #ifndef _SPEAKER_H_ diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h index d791060400c05..659c89a6e03fa 100644 --- a/sys/i386/include/specialreg.h +++ b/sys/i386/include/specialreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $Id: specialreg.h,v 1.4 1994/09/04 19:59:24 pst Exp $ + * specialreg.h,v 1.5 1994/09/04 23:10:27 davidg Exp */ #ifndef _MACHINE_SPECIALREG_H_ diff --git a/sys/i386/include/spl.h b/sys/i386/include/spl.h index 640f24982ef81..cab95ec01b3d2 100644 --- a/sys/i386/include/spl.h +++ b/sys/i386/include/spl.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: spl.h,v 1.4 1994/08/15 03:15:11 wollman Exp $ + * spl.h,v 1.5 1994/09/20 05:07:32 bde Exp */ #ifndef _MACHINE_IPL_H_ diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h index 5880242723b88..0db68f07ecfac 100644 --- a/sys/i386/include/stdarg.h +++ b/sys/i386/include/stdarg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 - * $Id$ + * stdarg.h,v 1.5 1994/08/02 07:39:09 davidg Exp */ #ifndef _STDARG_H_ diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h index 746cef1011fe4..6d8ac6d8c9bd5 100644 --- a/sys/i386/include/sysarch.h +++ b/sys/i386/include/sysarch.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * sysarch.h,v 1.4 1994/08/02 07:39:11 davidg Exp */ /* diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h index aa832ffc322c1..b742372ab77ed 100644 --- a/sys/i386/include/trap.h +++ b/sys/i386/include/trap.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)trap.h 5.4 (Berkeley) 5/9/91 - * $Id: trap.h,v 1.2 1993/10/16 14:39:37 rgrimes Exp $ + * trap.h,v 1.3 1993/11/07 17:43:15 wollman Exp */ #ifndef _MACHINE_TRAP_H_ diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h index 1fada6e7145b9..45e100321afcf 100644 --- a/sys/i386/include/tss.h +++ b/sys/i386/include/tss.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)tss.h 5.4 (Berkeley) 1/18/91 - * $Id: tss.h,v 1.3 1993/11/07 17:43:16 wollman Exp $ + * tss.h,v 1.4 1993/11/17 23:25:04 wollman Exp */ #ifndef _MACHINE_TSS_H_ diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h index 78ce8d568ffcb..6cd21c7ef243e 100644 --- a/sys/i386/include/types.h +++ b/sys/i386/include/types.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $Id$ + * types.h,v 1.4 1994/08/02 07:39:13 davidg Exp */ #ifndef _MACHTYPES_H_ diff --git a/sys/i386/include/ultrasound.h b/sys/i386/include/ultrasound.h index 42d968850c141..4a3770ba0851c 100644 --- a/sys/i386/include/ultrasound.h +++ b/sys/i386/include/ultrasound.h @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * ultrasound.h,v 1.3 1994/08/02 07:39:15 davidg Exp */ /* diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h index fa6c9a7a95410..3bece10143509 100644 --- a/sys/i386/include/varargs.h +++ b/sys/i386/include/varargs.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 - * $Id$ + * varargs.h,v 1.2 1994/08/02 07:39:17 davidg Exp */ #ifndef _VARARGS_H_ diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h index 482ee5b608745..1969d9bc12faf 100644 --- a/sys/i386/include/vmparam.h +++ b/sys/i386/include/vmparam.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $Id: vmparam.h,v 1.15 1994/09/12 11:38:20 davidg Exp $ + * vmparam.h,v 1.16 1994/09/23 07:00:12 davidg Exp */ diff --git a/sys/i386/isa/README.le b/sys/i386/isa/README.le index 32dcc280c77cd..3ad7b9193a710 100644 --- a/sys/i386/isa/README.le +++ b/sys/i386/isa/README.le @@ -1,4 +1,4 @@ -$Id: README.le,v 1.1 1994/10/01 20:15:43 wollman Exp $ +README.le,v 1.2 1994/11/13 21:19:18 nate Exp ---------------- diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index a09b4ee901681..9fbbd2405f18b 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.37 1994/10/19 01:58:50 wollman Exp $ + * aha1542.c,v 1.38 1994/10/23 21:27:04 wollman Exp */ /* diff --git a/sys/i386/isa/aha1742.c b/sys/i386/isa/aha1742.c index aaf11c799e667..b81f5cec9115e 100644 --- a/sys/i386/isa/aha1742.c +++ b/sys/i386/isa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.25 1994/11/15 14:53:09 bde Exp $ + * aha1742.c,v 1.26 1994/11/16 02:45:35 bde Exp */ #include <sys/types.h> diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c index 47004a49137c8..fbf0a8c201e7c 100644 --- a/sys/i386/isa/aic6360.c +++ b/sys/i386/isa/aic6360.c @@ -31,7 +31,7 @@ */ /* - * $Id: aic6360.c,v 1.4 1994/11/15 14:54:13 bde Exp $ + * aic6360.c,v 1.5 1994/11/16 02:45:36 bde Exp * * Acknowledgements: Many of the algorithms used in this driver are * inspired by the work of Julian Elischer (julian@tfs.com) and diff --git a/sys/i386/isa/aic7770.c b/sys/i386/isa/aic7770.c index 58e07318b7024..ec142e1934030 100644 --- a/sys/i386/isa/aic7770.c +++ b/sys/i386/isa/aic7770.c @@ -18,7 +18,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aic7770.c,v 1.4 1994/11/18 09:14:14 gibbs Exp $ + * aic7770.c,v 1.5 1994/11/18 20:34:30 gibbs Exp */ /* * TODO: diff --git a/sys/i386/isa/bt742a.c b/sys/i386/isa/bt742a.c index bf8b97e32ec02..d97026ec37722 100644 --- a/sys/i386/isa/bt742a.c +++ b/sys/i386/isa/bt742a.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: bt742a.c,v 1.29 1994/10/23 21:27:10 wollman Exp $ + * bt742a.c,v 1.30 1994/11/08 02:53:42 jkh Exp */ /* diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index e4a8a44c66959..7b87795cd1a8d 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.27 1994/11/10 12:53:13 ache Exp $ + * clock.c,v 1.28 1994/11/12 16:24:54 ache Exp */ /* diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c index 9d0f6218a9bfd..cb1226be341a1 100644 --- a/sys/i386/isa/ctx.c +++ b/sys/i386/isa/ctx.c @@ -8,7 +8,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: ctx.c,v 1.3 1994/10/21 01:19:05 wollman Exp $ + * ctx.c,v 1.4 1994/10/23 21:27:11 wollman Exp */ /* diff --git a/sys/i386/isa/ctxreg.h b/sys/i386/isa/ctxreg.h index 28b644ad4db93..2ef5d50dc7c5f 100644 --- a/sys/i386/isa/ctxreg.h +++ b/sys/i386/isa/ctxreg.h @@ -7,7 +7,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use * - * $Id$ + * ctxreg.h,v 1.1 1994/10/01 17:59:42 davidg Exp */ /* diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c index 61516bf690a46..ab1f11c1ea313 100644 --- a/sys/i386/isa/elink.c +++ b/sys/i386/isa/elink.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: elink.c,v 1.2 1994/09/16 13:33:35 davidg Exp $ + * elink.c,v 1.3 1994/09/17 16:51:47 se Exp */ /* diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h index 93a5dac6f5cea..86322bc002afe 100644 --- a/sys/i386/isa/elink.h +++ b/sys/i386/isa/elink.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: elink.h,v 1.1 1994/05/25 20:06:43 ats Exp $ + * elink.h,v 1.1 1994/08/24 22:32:42 ats Exp */ #define ELINK_ID_PORT 0x100 diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 045d02ecbdfbf..1ed41e0218ece 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -40,7 +40,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.42 1994/11/08 06:34:04 ache Exp $ + * fd.c,v 1.43 1994/11/18 10:18:36 phk Exp * */ diff --git a/sys/i386/isa/fdc.h b/sys/i386/isa/fdc.h index 950ef2346e9fa..ab04e7615f82f 100644 --- a/sys/i386/isa/fdc.h +++ b/sys/i386/isa/fdc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fdc.h,v 1.3 1994/09/17 16:56:07 davidg Exp $ + * fdc.h,v 1.4 1994/10/10 01:12:26 phk Exp * */ diff --git a/sys/i386/isa/fdreg.h b/sys/i386/isa/fdreg.h index aef83574199a8..16d3904622c79 100644 --- a/sys/i386/isa/fdreg.h +++ b/sys/i386/isa/fdreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: fdreg.h,v 1.7 1994/09/25 18:42:23 joerg Exp $ + * fdreg.h,v 1.8 1994/09/25 23:37:38 phk Exp */ /* diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c index 2ab4a77840bbb..d6e79dae85965 100644 --- a/sys/i386/isa/ft.c +++ b/sys/i386/isa/ft.c @@ -17,7 +17,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * ft.c - QIC-40/80 floppy tape driver - * $Id: ft.c,v 1.13 1994/10/23 21:27:14 wollman Exp $ + * ft.c,v 1.14 1994/11/15 14:34:42 bde Exp * * 06/07/94 v0.9 ++sg * Tape stuck on segment problem should be gone. Re-wrote buffering diff --git a/sys/i386/isa/ic/i8042.h b/sys/i386/isa/ic/i8042.h index 84ee90f08e625..f94c0e19b7fd3 100644 --- a/sys/i386/isa/ic/i8042.h +++ b/sys/i386/isa/ic/i8042.h @@ -1,5 +1,5 @@ /* - * $Id$ + * i8042.h,v 1.2 1993/10/16 13:48:47 rgrimes Exp */ #define KBSTATP 0x64 /* kbd controller status port (I) */ diff --git a/sys/i386/isa/ic/i8237.h b/sys/i386/isa/ic/i8237.h index 722194c5a65d1..df27ce8cb3c8b 100644 --- a/sys/i386/isa/ic/i8237.h +++ b/sys/i386/isa/ic/i8237.h @@ -1,7 +1,7 @@ /* * Intel 8237 DMA Controller * - * $Id: i8237.h,v 1.2 1993/10/16 13:48:48 rgrimes Exp $ + * i8237.h,v 1.3 1994/11/01 17:26:47 ache Exp */ #define DMA37MD_SINGLE 0x40 /* single pass mode */ diff --git a/sys/i386/isa/ic/i82586.h b/sys/i386/isa/ic/i82586.h index 577313d81e5a2..1b077d2069344 100644 --- a/sys/i386/isa/ic/i82586.h +++ b/sys/i386/isa/ic/i82586.h @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * i82586.h,v 1.1 1993/10/12 06:53:10 rgrimes Exp */ /* diff --git a/sys/i386/isa/ic/lemac.h b/sys/i386/isa/ic/lemac.h index 2c919d8189089..4b22794d48de8 100644 --- a/sys/i386/isa/ic/lemac.h +++ b/sys/i386/isa/ic/lemac.h @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: lemac.h,v 1.1 1994/08/01 16:03:42 thomas Exp $ + * lemac.h,v 1.1 1994/08/12 06:51:12 davidg Exp */ #ifndef _LEMAC_H_ #define _LEMAC_H_ diff --git a/sys/i386/isa/ic/ncr_5380.h b/sys/i386/isa/ic/ncr_5380.h index 0a05bff2ff2ee..aa3bef8b98fa5 100644 --- a/sys/i386/isa/ic/ncr_5380.h +++ b/sys/i386/isa/ic/ncr_5380.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id$ + * ncr_5380.h,v 1.2 1994/09/11 20:29:18 phk Exp * * Definitions for 5380 SCSI-controller chip. * diff --git a/sys/i386/isa/ic/nec765.h b/sys/i386/isa/ic/nec765.h index 9f93b705efe4f..21dc8fcd12cda 100644 --- a/sys/i386/isa/ic/nec765.h +++ b/sys/i386/isa/ic/nec765.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)nec765.h 7.1 (Berkeley) 5/9/91 - * $Id: nec765.h,v 1.2 1993/10/16 13:48:50 rgrimes Exp $ + * nec765.h,v 1.3 1994/09/17 16:56:10 davidg Exp */ /* diff --git a/sys/i386/isa/ic/ns16450.h b/sys/i386/isa/ic/ns16450.h index aa6280df57d15..d5245ca35fb40 100644 --- a/sys/i386/isa/ic/ns16450.h +++ b/sys/i386/isa/ic/ns16450.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ns16450.h 7.1 (Berkeley) 5/9/91 - * $Id$ + * ns16450.h,v 1.2 1993/10/16 13:48:51 rgrimes Exp */ /* diff --git a/sys/i386/isa/ic/ns16550.h b/sys/i386/isa/ic/ns16550.h index ff59757a5f73a..372672e2e172b 100644 --- a/sys/i386/isa/ic/ns16550.h +++ b/sys/i386/isa/ic/ns16550.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ns16550.h 7.1 (Berkeley) 5/9/91 - * $Id$ + * ns16550.h,v 1.2 1993/10/16 13:48:52 rgrimes Exp */ /* diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h index a68269b0801ab..bc24d15f80a9e 100644 --- a/sys/i386/isa/icu.h +++ b/sys/i386/isa/icu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $Id: icu.h,v 1.6 1994/09/18 23:18:32 bde Exp $ + * icu.h,v 1.7 1994/10/01 02:56:11 davidg Exp */ /* diff --git a/sys/i386/isa/icu.s b/sys/i386/isa/icu.s index bd0d014c49185..276089d035f08 100644 --- a/sys/i386/isa/icu.s +++ b/sys/i386/isa/icu.s @@ -36,7 +36,7 @@ * * @(#)icu.s 7.2 (Berkeley) 5/21/91 * - * $Id: icu.s,v 1.14 1994/09/19 22:24:31 wollman Exp $ + * icu.s,v 1.15 1994/09/20 21:35:47 bde Exp */ /* diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index f67d134bcd49a..cc192e86d8d54 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -13,7 +13,7 @@ * the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000, * and a variety of similar clones. * - * $Id: if_ed.c,v 1.55 1994/11/13 07:17:46 davidg Exp $ + * if_ed.c,v 1.56 1994/11/17 14:42:27 davidg Exp */ #include "ed.h" diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h index 1d56fdc006e35..886d2846bcc0b 100644 --- a/sys/i386/isa/if_edreg.h +++ b/sys/i386/isa/if_edreg.h @@ -6,7 +6,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: if_edreg.h,v 1.15 1994/08/02 07:39:30 davidg Exp $ + * if_edreg.h,v 1.16 1994/08/04 17:42:35 davidg Exp */ /* * National Semiconductor DS8390 NIC register definitions diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index afc51d76896cb..a61bf100f1948 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -6,7 +6,7 @@ * * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * - * $Id: if_el.c,v 1.7 1994/10/21 01:19:06 wollman Exp $ + * if_el.c,v 1.8 1994/10/23 21:27:17 wollman Exp */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h index 4d7859dd71c6f..822239d3054c8 100644 --- a/sys/i386/isa/if_elreg.h +++ b/sys/i386/isa/if_elreg.h @@ -4,7 +4,7 @@ * of the software, derivative works or modified versions, and any * portions thereof. * - * $Id$ + * if_elreg.h,v 1.2 1994/08/02 07:39:34 davidg Exp */ /* 3COM Etherlink 3C501 Register Definitions */ diff --git a/sys/i386/isa/if_epreg.h b/sys/i386/isa/if_epreg.h index 2dc7a984fa773..f3e5eb9142a06 100644 --- a/sys/i386/isa/if_epreg.h +++ b/sys/i386/isa/if_epreg.h @@ -19,7 +19,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_epreg.h,v 1.2 1994/01/10 19:13:50 ats Exp $ Modified by: + * if_epreg.h,v 1.4 1994/11/13 10:12:37 gibbs Exp Modified by: * October 2, 1994 diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c index 6e3fdedef128d..5cd2918ee53f6 100644 --- a/sys/i386/isa/if_ie.c +++ b/sys/i386/isa/if_ie.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.17 1994/10/23 21:27:20 wollman Exp $ + * if_ie.c,v 1.18 1994/10/26 00:16:17 phk Exp */ /* diff --git a/sys/i386/isa/if_ie507.h b/sys/i386/isa/if_ie507.h index 4bf87fcbb5974..f861dc1760e52 100644 --- a/sys/i386/isa/if_ie507.h +++ b/sys/i386/isa/if_ie507.h @@ -1,5 +1,5 @@ /* - * $Id: if_ie507.h,v 1.1 1994/05/25 20:06:49 ats Exp $ + * if_ie507.h,v 1.1 1994/08/24 22:32:44 ats Exp * Definitions for 3C507 */ diff --git a/sys/i386/isa/if_iereg.h b/sys/i386/isa/if_iereg.h index 3588b84140580..9a83a889645e3 100644 --- a/sys/i386/isa/if_iereg.h +++ b/sys/i386/isa/if_iereg.h @@ -1,5 +1,5 @@ /* - * $Id$ + * if_iereg.h,v 1.1 1993/10/12 06:52:34 rgrimes Exp * definitions for AT&T StarLAN 10 etc... */ diff --git a/sys/i386/isa/if_is.c b/sys/i386/isa/if_is.c index 1ad368b802570..98ac15abaa09f 100644 --- a/sys/i386/isa/if_is.c +++ b/sys/i386/isa/if_is.c @@ -11,7 +11,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: if_is.c,v 1.30 1994/10/26 00:16:19 phk Exp $ + * if_is.c,v 1.31 1994/10/29 10:19:32 phk Exp */ /* TODO diff --git a/sys/i386/isa/if_isreg.h b/sys/i386/isa/if_isreg.h index b4b4ece23ab4f..34aa6c3dc5092 100644 --- a/sys/i386/isa/if_isreg.h +++ b/sys/i386/isa/if_isreg.h @@ -11,7 +11,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: if_isreg.h,v 1.3 1993/10/24 04:27:00 paul Exp $ + * if_isreg.h,v 1.4 1994/01/31 16:00:53 paul Exp */ /* diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c index d3ab8cf3ab776..6d410994e539a 100644 --- a/sys/i386/isa/if_le.c +++ b/sys/i386/isa/if_le.c @@ -21,9 +21,22 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_le.c,v 1.8 1994/10/19 01:59:03 wollman Exp $ + * if_le.c,v 1.9 1994/10/23 21:27:22 wollman Exp + * + * if_le.c,v + * Revision 1.9 1994/10/23 21:27:22 wollman + * Finished device configuration database work for all ISA devices (except `ze') + * and all SCSI devices (except that it's not done quite the way I want). New + * information added includes: + * + * - A text description of the device + * - A ``state''---unknown, unconfigured, idle, or busy + * - A generic parent device (with support in the m.i. code) + * - An interrupt mask type field (which will hopefully go away) so that + * . ``doconfig'' can be written + * + * This requires a new version of the `lsdev' program as well (next commit). * - * $Log: if_le.c,v $ * Revision 1.8 1994/10/19 01:59:03 wollman * Add support for devconf to a large number of device drivers, and do * the right thing in dev_goawayall() when kdc_goaway is null. diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c index 31835cc4ff7d8..faa3aac939017 100644 --- a/sys/i386/isa/if_ze.c +++ b/sys/i386/isa/if_ze.c @@ -47,7 +47,7 @@ */ /* - * $Id$ + * if_ze.c,v 1.8 1994/10/23 21:27:25 wollman Exp */ #include "ze.h" diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 2246826567b76..8a05f9388ef62 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.35 1994/11/01 17:26:29 ache Exp $ + * isa.c,v 1.36 1994/11/03 04:15:03 jkh Exp */ /* diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h index cec13f6b5d976..d84361cdc467b 100644 --- a/sys/i386/isa/isa.h +++ b/sys/i386/isa/isa.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $Id: isa.h,v 1.10 1994/11/19 18:47:57 phk Exp $ + * isa.h,v 1.11 1994/11/19 18:59:04 phk Exp */ #ifndef _I386_ISA_ISA_H_ diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index 08a49d0d38e6c..cd8d80ba059d6 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $Id: isa_device.h,v 1.16 1994/10/25 23:06:16 se Exp $ + * isa_device.h,v 1.17 1994/11/03 04:15:04 jkh Exp */ #ifndef _I386_ISA_ISA_DEVICE_H_ diff --git a/sys/i386/isa/iso8859.font b/sys/i386/isa/iso8859.font index 0553a6bc2104c..ffbe4f8d5a940 100644 --- a/sys/i386/isa/iso8859.font +++ b/sys/i386/isa/iso8859.font @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * iso8859.font,v 1.6 1994/09/29 08:29:19 sos Exp */ char font_8x8[256*8] = { diff --git a/sys/i386/isa/kbd.h b/sys/i386/isa/kbd.h index b7b600989d12f..7ec74653b1eef 100644 --- a/sys/i386/isa/kbd.h +++ b/sys/i386/isa/kbd.h @@ -1,7 +1,7 @@ /* * Keyboard definitions * from: unknown origin, 386BSD 0.1 - * $Id: kbd.h,v 1.2 1993/10/16 13:46:04 rgrimes Exp $ + * kbd.h,v 1.3 1993/11/07 17:44:33 wollman Exp */ #ifndef _I386_ISA_KBD_H_ diff --git a/sys/i386/isa/kbdtables.h b/sys/i386/isa/kbdtables.h index 094d01b860420..9fe2a202bd06f 100644 --- a/sys/i386/isa/kbdtables.h +++ b/sys/i386/isa/kbdtables.h @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: kbdtables.h,v 1.17 1994/11/19 22:58:56 ache Exp $ + * kbdtables.h,v 1.18 1994/11/19 23:17:46 ache Exp */ #define SET8 0x80 /* eight bit for emacs SET8-key */ diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c index 863514406e960..d68ee6bd5d6c1 100644 --- a/sys/i386/isa/lpt.c +++ b/sys/i386/isa/lpt.c @@ -46,7 +46,7 @@ * SUCH DAMAGE. * * from: unknown origin, 386BSD 0.1 - * $Id: lpt.c,v 1.23 1994/11/13 21:14:30 nate Exp $ + * lpt.c,v 1.24 1994/11/16 06:09:29 phk Exp */ /* diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h index 9e10ba91a5107..c929714607608 100644 --- a/sys/i386/isa/lptreg.h +++ b/sys/i386/isa/lptreg.h @@ -6,7 +6,7 @@ * William Jolitz. * * form: @(#)lptreg.h 1.1 (Berkeley) 12/19/90 - * $Id$ + * lptreg.h,v 1.2 1993/10/16 13:46:12 rgrimes Exp */ /* diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 93552c53a800a..2ef0d86305a19 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.31 1994/11/14 19:25:43 ache Exp $ + * mcd.c,v 1.32 1994/11/14 19:32:11 ache Exp */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; diff --git a/sys/i386/isa/mcdreg.h b/sys/i386/isa/mcdreg.h index de5ab819aadec..2560716d82aab 100644 --- a/sys/i386/isa/mcdreg.h +++ b/sys/i386/isa/mcdreg.h @@ -41,7 +41,7 @@ * the manufacturer or anyone else might provide better documentation, * so this file (and the driver) will then have a better quality. * - * $Id: mcdreg.h,v 1.4 1994/09/03 16:48:13 ache Exp $ + * mcdreg.h,v 1.5 1994/11/12 13:26:13 ache Exp */ #ifndef MCD_H diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index f8e7cc0a824de..9629d85d0346e 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.8 1994/10/23 21:27:31 wollman Exp $ + * mse.c,v 1.9 1994/11/08 05:41:34 jkh Exp */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 35b3af67ef0fb..c7c68a57e04e2 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.15 1994/10/23 21:27:32 wollman Exp $ + * npx.c,v 1.16 1994/11/06 00:58:06 bde Exp */ #include "npx.h" diff --git a/sys/i386/isa/pas.c b/sys/i386/isa/pas.c index 2bd8718109690..d5efa809ac865 100644 --- a/sys/i386/isa/pas.c +++ b/sys/i386/isa/pas.c @@ -14,7 +14,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: pas.c,v 1.5 1994/10/18 03:53:12 phk Exp $ + * pas.c,v 1.6 1994/10/23 21:27:33 wollman Exp * * This is a driver for the one particular kind of the "ProAudioSpectrum" * card from MediaVision. To find out if your card is supported, you can diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index 368c2790a0213..b5b0ce18c6e17 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcaudio.c,v 1.10 1994/10/27 08:03:12 sos Exp $ + * pcaudio.c,v 1.11 1994/11/06 00:46:21 bde Exp */ #include "pca.h" diff --git a/sys/i386/isa/readMBR.c b/sys/i386/isa/readMBR.c index b6edfcf9bca0b..a98e440107a3a 100644 --- a/sys/i386/isa/readMBR.c +++ b/sys/i386/isa/readMBR.c @@ -15,7 +15,7 @@ * written by julian elischer (julian@tfs.com) * * @(#)readMBR.c 8.5 (tfs) 1/21/94 - * $Id: readMBR.c,v 1.3 1994/11/08 10:35:52 phk Exp $ + * readMBR.c,v 1.4 1994/11/14 13:22:41 bde Exp */ #include <sys/param.h> diff --git a/sys/i386/isa/rtc.h b/sys/i386/isa/rtc.h index d374a823d7c27..5144dc0fbdb6b 100644 --- a/sys/i386/isa/rtc.h +++ b/sys/i386/isa/rtc.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)rtc.h 7.1 (Berkeley) 5/12/91 - * $Id: rtc.h,v 1.5 1994/08/15 03:15:20 wollman Exp $ + * rtc.h,v 1.6 1994/09/20 00:31:07 ache Exp */ #ifndef _I386_ISA_RTC_H_ diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c index cc497478f87e3..2321220ee0806 100644 --- a/sys/i386/isa/seagate.c +++ b/sys/i386/isa/seagate.c @@ -41,7 +41,7 @@ * rknier 940331 Added fast transfer code * rknier 940407 Added assembler coded data transfers * - * $Id: seagate.c,v 1.2 1994/10/27 05:23:09 phk Exp $ + * seagate.c,v 1.3 1994/10/27 08:03:15 sos Exp */ /* diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 13db8749eedc2..754403dba517e 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.59 1994/11/01 23:09:29 bde Exp $ + * sio.c,v 1.60 1994/11/06 00:23:45 bde Exp */ #include "sio.h" diff --git a/sys/i386/isa/sioreg.h b/sys/i386/isa/sioreg.h index 4b0f1b6fa5de7..60571f219eac1 100644 --- a/sys/i386/isa/sioreg.h +++ b/sys/i386/isa/sioreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)comreg.h 7.2 (Berkeley) 5/9/91 - * $Id$ + * sioreg.h,v 1.2 1993/10/16 19:17:18 rgrimes Exp */ diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c index 4ee4dfa4a0801..89582472bf632 100644 --- a/sys/i386/isa/sound/ad1848.c +++ b/sys/i386/isa/sound/ad1848.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ad1848.c,v 1.2 1994/10/01 02:16:28 swallace Exp $ + * ad1848.c,v 1.3 1994/10/01 05:46:01 davidg Exp */ #define DEB(x) diff --git a/sys/i386/isa/sound/adlib_card.c b/sys/i386/isa/sound/adlib_card.c index 36c2f5ea2c941..4fd8a719d3597 100644 --- a/sys/i386/isa/sound/adlib_card.c +++ b/sys/i386/isa/sound/adlib_card.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * adlib_card.c,v 1.5 1994/08/02 07:39:42 davidg Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/audio.c b/sys/i386/isa/sound/audio.c index 0453bececa279..d6c716f31313e 100644 --- a/sys/i386/isa/sound/audio.c +++ b/sys/i386/isa/sound/audio.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: audio.c,v 1.5 1994/08/02 07:39:44 davidg Exp $ + * audio.c,v 1.6 1994/10/01 02:16:29 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/dev_table.c b/sys/i386/isa/sound/dev_table.c index f313b8cc3ca86..7f0f987de9b21 100644 --- a/sys/i386/isa/sound/dev_table.c +++ b/sys/i386/isa/sound/dev_table.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dev_table.c,v 1.5 1994/08/02 07:39:46 davidg Exp $ + * dev_table.c,v 1.6 1994/10/01 02:16:31 swallace Exp */ #define _DEV_TABLE_C_ diff --git a/sys/i386/isa/sound/dev_table.h b/sys/i386/isa/sound/dev_table.h index c17aa853f51c3..30f27c6dfbc28 100644 --- a/sys/i386/isa/sound/dev_table.h +++ b/sys/i386/isa/sound/dev_table.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dev_table.h,v 1.7 1994/09/27 17:58:15 davidg Exp $ + * dev_table.h,v 1.8 1994/10/01 02:16:33 swallace Exp */ #ifndef _DEV_TABLE_H_ diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c index aefeaf4d87aed..9e9d3363a6133 100644 --- a/sys/i386/isa/sound/dmabuf.c +++ b/sys/i386/isa/sound/dmabuf.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dmabuf.c,v 1.9 1994/10/01 02:16:35 swallace Exp $ + * dmabuf.c,v 1.10 1994/11/01 17:26:49 ache Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/finetune.h b/sys/i386/isa/sound/finetune.h index 59e76fea943f5..6c17d74def9c9 100644 --- a/sys/i386/isa/sound/finetune.h +++ b/sys/i386/isa/sound/finetune.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * finetune.h,v 1.3 1994/08/02 07:39:51 davidg Exp */ unsigned short finetune_table[128] = diff --git a/sys/i386/isa/sound/gus_card.c b/sys/i386/isa/sound/gus_card.c index 62df65bb57dfb..bdb8357b12555 100644 --- a/sys/i386/isa/sound/gus_card.c +++ b/sys/i386/isa/sound/gus_card.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: gus_card.c,v 1.10 1994/10/14 09:01:20 jkh Exp $ + * gus_card.c,v 1.11 1994/10/14 09:04:19 jkh Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/gus_hw.h b/sys/i386/isa/sound/gus_hw.h index b3dc32f73a5c2..e0932e669cbac 100644 --- a/sys/i386/isa/sound/gus_hw.h +++ b/sys/i386/isa/sound/gus_hw.h @@ -1,5 +1,5 @@ /* - * $Id$ + * gus_hw.h,v 1.3 1994/08/02 07:39:54 davidg Exp */ /* * I/O addresses diff --git a/sys/i386/isa/sound/gus_linearvol.h b/sys/i386/isa/sound/gus_linearvol.h index 6e41f092d75c8..f6c4f313824e8 100644 --- a/sys/i386/isa/sound/gus_linearvol.h +++ b/sys/i386/isa/sound/gus_linearvol.h @@ -1,5 +1,5 @@ /* - * $Id$ + * gus_linearvol.h,v 1.2 1994/08/02 07:39:57 davidg Exp */ static unsigned short gus_linearvol[128] = { 0x0000, 0x08ff, 0x09ff, 0x0a80, 0x0aff, 0x0b40, 0x0b80, 0x0bc0, diff --git a/sys/i386/isa/sound/gus_midi.c b/sys/i386/isa/sound/gus_midi.c index 94a856fdf1b33..c10c4ca499244 100644 --- a/sys/i386/isa/sound/gus_midi.c +++ b/sys/i386/isa/sound/gus_midi.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: gus_midi.c,v 1.5 1994/08/02 07:39:58 davidg Exp $ + * gus_midi.c,v 1.6 1994/10/01 02:16:39 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/gus_vol.c b/sys/i386/isa/sound/gus_vol.c index 07c2c6ee523ac..e2a09fdcb6bb2 100644 --- a/sys/i386/isa/sound/gus_vol.c +++ b/sys/i386/isa/sound/gus_vol.c @@ -3,7 +3,7 @@ * * Greg Lee 1993. * - * $Id: gus_vol.c,v 1.4 1994/08/02 07:39:59 davidg Exp $ + * gus_vol.c,v 1.5 1994/10/01 02:16:40 swallace Exp */ #include "sound_config.h" #ifndef EXCLUDE_GUS diff --git a/sys/i386/isa/sound/gus_wave.c b/sys/i386/isa/sound/gus_wave.c index dddb527d9d3bf..daf16ab7533c6 100644 --- a/sys/i386/isa/sound/gus_wave.c +++ b/sys/i386/isa/sound/gus_wave.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: gus_wave.c,v 1.9 1994/08/02 07:40:02 davidg Exp $ + * gus_wave.c,v 1.10 1994/10/01 02:16:42 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/ics2101.c b/sys/i386/isa/sound/ics2101.c index 899c94eb3642e..310e826bfbb11 100644 --- a/sys/i386/isa/sound/ics2101.c +++ b/sys/i386/isa/sound/ics2101.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ics2101.c,v 1.3 1994/08/02 07:40:05 davidg Exp $ + * ics2101.c,v 1.4 1994/10/01 02:16:43 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h index b7fba6d9ad928..f8f4459674803 100644 --- a/sys/i386/isa/sound/local.h +++ b/sys/i386/isa/sound/local.h @@ -1,6 +1,6 @@ /* for FreeBSD */ /* - * $Id: local.h,v 1.10 1994/10/01 02:16:44 swallace Exp $ + * local.h,v 1.11 1994/11/01 17:26:50 ache Exp */ #include "snd.h" diff --git a/sys/i386/isa/sound/midi_ctrl.h b/sys/i386/isa/sound/midi_ctrl.h index c7fdd0bfb249f..75b6fd83c13cc 100644 --- a/sys/i386/isa/sound/midi_ctrl.h +++ b/sys/i386/isa/sound/midi_ctrl.h @@ -1,5 +1,5 @@ /* - * $Id: midi_ctrl.c,v 1.7 1994/09/27 17:58:24 davidg Exp $ + * midi_ctrl.h,v 1.2 1994/10/01 02:16:45 swallace Exp */ static unsigned char ctrl_def_values[128] = { diff --git a/sys/i386/isa/sound/midi_synth.c b/sys/i386/isa/sound/midi_synth.c index 98f2672c090f5..d63e1ab366895 100644 --- a/sys/i386/isa/sound/midi_synth.c +++ b/sys/i386/isa/sound/midi_synth.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: $ + * midi_synth.c,v 1.2 1994/10/01 02:16:46 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/midi_synth.h b/sys/i386/isa/sound/midi_synth.h index e22bd5e577f06..373cd01c1a70a 100644 --- a/sys/i386/isa/sound/midi_synth.h +++ b/sys/i386/isa/sound/midi_synth.h @@ -1,5 +1,5 @@ /* - * $Id: $ + * midi_synth.h,v 1.2 1994/10/01 02:16:47 swallace Exp */ int midi_synth_ioctl (int dev, unsigned int cmd, unsigned int arg); diff --git a/sys/i386/isa/sound/midibuf.c b/sys/i386/isa/sound/midibuf.c index 74067b6d277dc..d7f4d3c833e0d 100644 --- a/sys/i386/isa/sound/midibuf.c +++ b/sys/i386/isa/sound/midibuf.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: midibuf.c,v 1.5 1994/08/02 07:40:10 davidg Exp $ + * midibuf.c,v 1.6 1994/10/01 02:16:48 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/mpu401.c b/sys/i386/isa/sound/mpu401.c index 3728de5f4cd65..3932b3100cbb6 100644 --- a/sys/i386/isa/sound/mpu401.c +++ b/sys/i386/isa/sound/mpu401.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mpu401.c,v 1.8 1994/08/02 07:40:12 davidg Exp $ + * mpu401.c,v 1.9 1994/10/01 02:16:49 swallace Exp */ #define USE_SEQ_MACROS diff --git a/sys/i386/isa/sound/opl3.c b/sys/i386/isa/sound/opl3.c index 00c27f2e1b92a..8c943a2470642 100644 --- a/sys/i386/isa/sound/opl3.c +++ b/sys/i386/isa/sound/opl3.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: opl3.c,v 1.6 1994/08/02 07:40:13 davidg Exp $ + * opl3.c,v 1.7 1994/10/01 02:16:50 swallace Exp */ /* diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h index 005b3c201d6a9..d35c7f56c0aab 100644 --- a/sys/i386/isa/sound/os.h +++ b/sys/i386/isa/sound/os.h @@ -37,7 +37,7 @@ * before making the changes. It's possible that I have already made the * change. * - * $Id: os.h,v 1.12 1994/09/27 17:58:21 davidg Exp $ + * os.h,v 1.13 1994/10/01 02:16:53 swallace Exp */ /* diff --git a/sys/i386/isa/sound/pas.h b/sys/i386/isa/sound/pas.h index 415c2bfd173dd..e2e98200428b5 100644 --- a/sys/i386/isa/sound/pas.h +++ b/sys/i386/isa/sound/pas.h @@ -1,5 +1,5 @@ /* - * $Id: pas.h,v 1.5 1994/10/01 02:16:54 swallace Exp $ + * pas.h,v 1.6 1994/10/01 12:42:17 ache Exp */ /* */ /* Port addresses and bit fields for the Media Vision Pro AudioSpectrum second generation sound cards. */ diff --git a/sys/i386/isa/sound/pas2_card.c b/sys/i386/isa/sound/pas2_card.c index 96bf58d53b9a9..b846d63ba28b9 100644 --- a/sys/i386/isa/sound/pas2_card.c +++ b/sys/i386/isa/sound/pas2_card.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pas2_card.c,v 1.10 1994/10/01 02:16:55 swallace Exp $ + * pas2_card.c,v 1.11 1994/10/01 12:42:17 ache Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/pas2_midi.c b/sys/i386/isa/sound/pas2_midi.c index 817e7d1412f08..7a2e238c96334 100644 --- a/sys/i386/isa/sound/pas2_midi.c +++ b/sys/i386/isa/sound/pas2_midi.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pas2_midi.c,v 1.5 1994/08/02 07:40:22 davidg Exp $ + * pas2_midi.c,v 1.6 1994/10/01 02:16:55 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/pas2_mixer.c b/sys/i386/isa/sound/pas2_mixer.c index 7a4ccbd4f4187..90f17cc2371fa 100644 --- a/sys/i386/isa/sound/pas2_mixer.c +++ b/sys/i386/isa/sound/pas2_mixer.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pas2_mixer.c,v 1.6 1994/08/02 07:40:24 davidg Exp $ + * pas2_mixer.c,v 1.7 1994/10/01 02:16:56 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/pas2_pcm.c b/sys/i386/isa/sound/pas2_pcm.c index e286215e9e98b..3a218c8ff7aaf 100644 --- a/sys/i386/isa/sound/pas2_pcm.c +++ b/sys/i386/isa/sound/pas2_pcm.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pas2_pcm.c,v 1.6 1994/08/02 07:40:28 davidg Exp $ + * pas2_pcm.c,v 1.7 1994/10/01 02:16:57 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/patmgr.c b/sys/i386/isa/sound/patmgr.c index 43d0950d41c9c..9547c50584614 100644 --- a/sys/i386/isa/sound/patmgr.c +++ b/sys/i386/isa/sound/patmgr.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: patmgr.c,v 1.6 1994/09/27 17:58:22 davidg Exp $ + * patmgr.c,v 1.7 1994/10/01 02:16:58 swallace Exp */ #define PATMGR_C diff --git a/sys/i386/isa/sound/pss.c b/sys/i386/isa/sound/pss.c index 3d7a62060c5f8..3649ebdca4dcd 100644 --- a/sys/i386/isa/sound/pss.c +++ b/sys/i386/isa/sound/pss.c @@ -44,7 +44,7 @@ marc.hoffman@analog.com - * $Id: $ + * pss.c,v 1.2 1994/10/01 02:17:00 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/pss.h b/sys/i386/isa/sound/pss.h index 4676756c172e0..2230ea1ccc347 100644 --- a/sys/i386/isa/sound/pss.h +++ b/sys/i386/isa/sound/pss.h @@ -8,7 +8,7 @@ ******************************************************************************/ /* - * $Id: $ + * pss.h,v 1.2 1994/10/01 02:17:01 swallace Exp */ /* Port offsets from base port for Sound Blaster DSP */ #define DSP_PORT_CMSD0 0x00 /* C/MS music voice 1-6 data port, write only */ diff --git a/sys/i386/isa/sound/sb.h b/sys/i386/isa/sound/sb.h index c701bc183ac51..0a7dd93e72989 100644 --- a/sys/i386/isa/sound/sb.h +++ b/sys/i386/isa/sound/sb.h @@ -1,5 +1,5 @@ /* - * $Id$ + * sb.h,v 1.2 1994/08/02 07:40:34 davidg Exp */ #define DSP_RESET (sbc_base + 0x6) #define DSP_READ (sbc_base + 0xA) diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c index a5586ef0855c8..f1d74c4869b44 100644 --- a/sys/i386/isa/sound/sb16_dsp.c +++ b/sys/i386/isa/sound/sb16_dsp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sb16_dsp.c,v 1.7 1994/09/27 17:58:24 davidg Exp $ + * sb16_dsp.c,v 1.8 1994/10/01 02:17:02 swallace Exp */ #define DEB(x) diff --git a/sys/i386/isa/sound/sb16_midi.c b/sys/i386/isa/sound/sb16_midi.c index 7b23b4b813dde..892fa938b5d37 100644 --- a/sys/i386/isa/sound/sb16_midi.c +++ b/sys/i386/isa/sound/sb16_midi.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sb16_midi.c,v 1.3 1994/08/02 07:40:38 davidg Exp $ + * sb16_midi.c,v 1.4 1994/10/01 02:17:03 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/sb_card.c b/sys/i386/isa/sound/sb_card.c index e56ebd3f3f731..19a34d7c7c853 100644 --- a/sys/i386/isa/sound/sb_card.c +++ b/sys/i386/isa/sound/sb_card.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * sb_card.c,v 1.5 1994/08/02 07:40:39 davidg Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c index 82087a0e3bd22..4b53278e74d84 100644 --- a/sys/i386/isa/sound/sb_dsp.c +++ b/sys/i386/isa/sound/sb_dsp.c @@ -29,7 +29,7 @@ * Hunyue Yau Jan 6 1994 * Added code to support Sound Galaxy NX Pro * - * $Id: sb_dsp.c,v 1.20 1994/09/27 17:58:26 davidg Exp $ + * sb_dsp.c,v 1.21 1994/10/01 02:17:04 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/sb_midi.c b/sys/i386/isa/sound/sb_midi.c index 6431cd76743a3..26bf6c5f53299 100644 --- a/sys/i386/isa/sound/sb_midi.c +++ b/sys/i386/isa/sound/sb_midi.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sb_midi.c,v 1.3 1994/08/02 07:40:43 davidg Exp $ + * sb_midi.c,v 1.4 1994/10/01 02:17:05 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/sb_mixer.c b/sys/i386/isa/sound/sb_mixer.c index d9bcb1ed320dd..40a4b03606d81 100644 --- a/sys/i386/isa/sound/sb_mixer.c +++ b/sys/i386/isa/sound/sb_mixer.c @@ -30,7 +30,7 @@ * Hunyue Yau Jan 6 1994 * Added code to support the Sound Galaxy NX Pro mixer. * - * $Id: sb_mixer.c,v 1.3 1994/08/02 07:40:46 davidg Exp $ + * sb_mixer.c,v 1.4 1994/10/01 02:17:07 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/sb_mixer.h b/sys/i386/isa/sound/sb_mixer.h index c7d5ca1bf78c4..495b040cf9ebe 100644 --- a/sys/i386/isa/sound/sb_mixer.h +++ b/sys/i386/isa/sound/sb_mixer.h @@ -29,7 +29,7 @@ * Hunyue Yau Jan 6 1994 * Added defines for the Sound Galaxy NX Pro mixer. * - * $Id: sb_mixer.h,v 1.3 1994/08/02 07:40:48 davidg Exp $ + * sb_mixer.h,v 1.4 1994/10/01 02:17:08 swallace Exp */ #define SBPRO_RECORDING_DEVICES (SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD) diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c index 39ab789c0b2e8..dcdc4c4bf8a94 100644 --- a/sys/i386/isa/sound/sequencer.c +++ b/sys/i386/isa/sound/sequencer.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sequencer.c,v 1.6 1994/08/02 07:40:49 davidg Exp $ + * sequencer.c,v 1.7 1994/10/01 02:17:09 swallace Exp */ #define SEQUENCER_C diff --git a/sys/i386/isa/sound/sound_calls.h b/sys/i386/isa/sound/sound_calls.h index f67ea05611eeb..a504c6b1ceffb 100644 --- a/sys/i386/isa/sound/sound_calls.h +++ b/sys/i386/isa/sound/sound_calls.h @@ -1,7 +1,7 @@ /* * DMA buffer calls * - * $Id: sound_calls.h,v 1.6 1994/09/27 17:58:28 davidg Exp $ + * sound_calls.h,v 1.7 1994/10/01 02:17:10 swallace Exp */ #ifndef _MACHINE_ISA_SOUND_H_ diff --git a/sys/i386/isa/sound/sound_config.h b/sys/i386/isa/sound/sound_config.h index 19386212fd17e..42c10202119c4 100644 --- a/sys/i386/isa/sound/sound_config.h +++ b/sys/i386/isa/sound/sound_config.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sound_config.h,v 1.5 1994/08/02 07:40:53 davidg Exp $ + * sound_config.h,v 1.6 1994/10/01 02:17:11 swallace Exp */ #include "local.h" diff --git a/sys/i386/isa/sound/sound_switch.c b/sys/i386/isa/sound/sound_switch.c index de35b0d1f293b..129ee39342734 100644 --- a/sys/i386/isa/sound/sound_switch.c +++ b/sys/i386/isa/sound/sound_switch.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sound_switch.c,v 1.3 1994/08/02 07:40:55 davidg Exp $ + * sound_switch.c,v 1.4 1994/10/01 02:17:12 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/sound_timer.c b/sys/i386/isa/sound/sound_timer.c index 79a3ff1d30dac..91a9f41efa6e9 100644 --- a/sys/i386/isa/sound/sound_timer.c +++ b/sys/i386/isa/sound/sound_timer.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sb16_dsp.c,v 1.7 1994/09/27 17:58:24 davidg Exp $ + * sound_timer.c,v 1.2 1994/10/01 02:17:13 swallace Exp */ #define SEQUENCER_C diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c index aab352d6efbe2..891731cb411e9 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: soundcard.c,v 1.19 1994/09/27 17:58:30 davidg Exp $ + * soundcard.c,v 1.20 1994/10/01 02:17:14 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/sound/sys_timer.c b/sys/i386/isa/sound/sys_timer.c index 383fe3c73e06c..27a333e87c7aa 100644 --- a/sys/i386/isa/sound/sys_timer.c +++ b/sys/i386/isa/sound/sys_timer.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sys_timer.c,v 1.7 1994/09/27 17:58:24 davidg Exp $ + * sys_timer.c,v 1.2 1994/10/01 02:17:16 swallace Exp */ #define SEQUENCER_C diff --git a/sys/i386/isa/sound/tuning.h b/sys/i386/isa/sound/tuning.h index 23086af15c916..936ff6a5af86b 100644 --- a/sys/i386/isa/sound/tuning.h +++ b/sys/i386/isa/sound/tuning.h @@ -1,5 +1,5 @@ /* - * $Id$ + * tuning.h,v 1.2 1994/08/02 07:41:00 davidg Exp */ #ifdef SEQUENCER_C diff --git a/sys/i386/isa/sound/uart6850.c b/sys/i386/isa/sound/uart6850.c index f8e23a061d7cc..95d88a31f5be6 100644 --- a/sys/i386/isa/sound/uart6850.c +++ b/sys/i386/isa/sound/uart6850.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: uart6850.c,v 1.7 1994/09/27 17:58:24 davidg Exp $ + * uart6850.c,v 1.2 1994/10/01 02:17:17 swallace Exp */ #include "sound_config.h" diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index aff70522ab4bc..dc96e09b16514 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.9 1994/08/13 03:50:14 wollman Exp $ + * spkr.c,v 1.10 1994/10/14 16:37:58 ache Exp */ #include "speaker.h" diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 898c8e1d5a2df..baa41937fa14c 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscons.c,v 1.79 1994/11/21 14:36:02 ache Exp $ + * syscons.c,v 1.80 1994/11/21 17:59:29 ache Exp */ #include "sc.h" diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h index 5742f6601493e..b596bbb14dbbd 100644 --- a/sys/i386/isa/timerreg.h +++ b/sys/i386/isa/timerreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp - * $Id$ + * timerreg.h,v 1.2 1993/10/16 13:46:26 rgrimes Exp */ /* diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c index 9c8b98a5d1c8a..8e869191b7656 100644 --- a/sys/i386/isa/ultra14f.c +++ b/sys/i386/isa/ultra14f.c @@ -22,7 +22,7 @@ * today: Fri Jun 2 17:21:03 EST 1994 * added 24F support ++sg * - * $Id: ultra14f.c,v 1.25 1994/09/16 13:33:50 davidg Exp $ + * ultra14f.c,v 1.26 1994/10/23 21:27:38 wollman Exp */ #include <sys/types.h> diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s index 1bc2324f62d92..5f9a84b3b0c74 100644 --- a/sys/i386/isa/vector.s +++ b/sys/i386/isa/vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.9 1994/09/20 21:35:49 bde Exp $ + * vector.s,v 1.10 1994/11/01 23:29:50 bde Exp */ #include <i386/isa/icu.h> diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index bc7dc66ec8e8f..9045c7e86f294 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -37,7 +37,7 @@ static int wdtest = 0; * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.60 1994/11/04 05:21:17 phk Exp $ + * wd.c,v 1.61 1994/11/18 11:27:41 phk Exp */ /* TODO: diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h index 2694bedf4571b..68950910bb69e 100644 --- a/sys/i386/isa/wdreg.h +++ b/sys/i386/isa/wdreg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: wxreg.h,v 1.1 1993/10/26 22:26:39 nate Exp $ + * wdreg.h,v 1.6 1994/01/04 20:05:26 nate Exp */ /* diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index 91010868c1efa..b0241166494b9 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -19,7 +19,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id: wt.c,v 1.12 1994/10/23 21:27:42 wollman Exp $ + * wt.c,v 1.13 1994/10/25 08:57:39 swallace Exp * */ diff --git a/sys/i386/isa/wtreg.h b/sys/i386/isa/wtreg.h index e45e51401bca7..69da5199ed7aa 100644 --- a/sys/i386/isa/wtreg.h +++ b/sys/i386/isa/wtreg.h @@ -19,7 +19,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id$ + * wtreg.h,v 1.4 1993/12/13 18:38:44 alm Exp * */ diff --git a/sys/i386/pci/README.de b/sys/i386/pci/README.de index fb81945c4d73d..a53ee16c9ac12 100644 --- a/sys/i386/pci/README.de +++ b/sys/i386/pci/README.de @@ -1,4 +1,4 @@ -$Id: README.de,v 1.3 1994/10/12 11:19:36 se Exp $ +README.de,v 1.4 1994/10/29 13:13:39 jkh Exp ---------------- diff --git a/sys/i386/pci/README.de-le b/sys/i386/pci/README.de-le index 60cd2e2750e03..2c35928a810c8 100644 --- a/sys/i386/pci/README.de-le +++ b/sys/i386/pci/README.de-le @@ -1,4 +1,4 @@ -$Id: README.de-le,v 1.1 1994/10/01 20:16:44 wollman Exp $ +README.de-le,v 1.2 1994/10/29 13:13:40 jkh Exp ---------------- diff --git a/sys/i386/pci/dc21040.h b/sys/i386/pci/dc21040.h index 4afa274188656..83cdf58be5422 100644 --- a/sys/i386/pci/dc21040.h +++ b/sys/i386/pci/dc21040.h @@ -21,9 +21,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: dc21040.h,v 1.2 1994/08/15 20:42:25 thomas Exp thomas $ + * dc21040.h,v 1.1 1994/10/01 20:16:45 wollman Exp + * + * dc21040.h,v + * Revision 1.1 1994/10/01 20:16:45 wollman + * Add Matt Thomas's DC21040 PCI Ethernet driver. (This is turning out + * to be quite a popular chip, so expect to see a number of products + * based on it.) * - * $Log: dc21040.h,v $ * Revision 1.2 1994/08/15 20:42:25 thomas * misc additions * diff --git a/sys/i386/pci/if_de.c b/sys/i386/pci/if_de.c index 9e6a26b56ea78..15fb4f9dfe768 100644 --- a/sys/i386/pci/if_de.c +++ b/sys/i386/pci/if_de.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_de.c,v 1.6 1994/11/13 12:39:38 davidg Exp $ + * if_de.c,v 1.7 1994/11/22 09:47:31 davidg Exp * */ diff --git a/sys/i386/pci/ncr.c b/sys/i386/pci/ncr.c index 80c8a3dae7bc6..b9009c9cab40e 100644 --- a/sys/i386/pci/ncr.c +++ b/sys/i386/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.11 1994/10/27 20:12:46 se Exp $ +** ncr.c,v 1.12 1994/10/30 00:30:27 ats Exp ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** @@ -1222,7 +1222,7 @@ static void ncr_attach (pcici_t tag, int unit); static char ident[] = - "\n$Id: ncr.c,v 1.11 1994/10/27 20:12:46 se Exp $\n"; + "\nncr.c,v 1.12 1994/10/30 00:30:27 ats Exp\n"; u_long ncr_version = NCR_VERSION + (u_long) sizeof (struct ncb) @@ -3327,7 +3327,7 @@ static void ncr_attach (pcici_t config_id, int unit) ncr_name (np)); DELAY (1000000); #endif - printf ("%s scanning for targets 0..%d ($Revision: 1.11 $)\n", + printf ("%s scanning for targets 0..%d (1.12)\n", ncr_name (np), MAX_TARGET-1); /* diff --git a/sys/i386/pci/ncrreg.h b/sys/i386/pci/ncrreg.h index 1a22aee38d24f..c7eaf59da5173 100644 --- a/sys/i386/pci/ncrreg.h +++ b/sys/i386/pci/ncrreg.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncrreg.h,v 2.3 94/10/09 21:10:34 wolf Oct11 $ +** ncrreg.h,v 1.1 1994/10/12 02:21:56 se Exp ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** diff --git a/sys/i386/pci/pci.c b/sys/i386/pci/pci.c index 6ef71637bf566..40b512a218789 100644 --- a/sys/i386/pci/pci.c +++ b/sys/i386/pci/pci.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pci.c,v 1.8 1994/10/25 23:09:08 se Exp $ +** pci.c,v 1.9 1994/11/02 23:47:13 se Exp ** ** General subroutines for the PCI bus on 80*86 systems. ** pci_configure () diff --git a/sys/i386/pci/pci_config.c b/sys/i386/pci/pci_config.c index 0f2259b033cea..47d6537894c7e 100644 --- a/sys/i386/pci/pci_config.c +++ b/sys/i386/pci/pci_config.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pci_config.c,v 1.8 1994/10/12 11:06:49 se Exp $ +** pci_config.c,v 1.9 1994/10/13 01:12:30 se Exp ** ** @PCI@ this should be part of "ioconf.c". ** diff --git a/sys/i386/pci/pcibios.c b/sys/i386/pci/pcibios.c index 2069387a594cc..0cea79edda27c 100644 --- a/sys/i386/pci/pcibios.c +++ b/sys/i386/pci/pcibios.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibios.c,v 2.6 94/10/11 19:01:25 wolf Oct11 $ +** pcibios.c,v 1.5 1994/10/12 02:33:21 se Exp ** ** #define for pci-bus bios functions. ** diff --git a/sys/i386/pci/pcireg.h b/sys/i386/pci/pcireg.h index dd1f1ccf3280e..c96e1a7134edc 100644 --- a/sys/i386/pci/pcireg.h +++ b/sys/i386/pci/pcireg.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcireg.h,v 1.1 1994/10/12 02:25:03 se Exp $ +** pcireg.h,v 1.2 1994/11/02 23:47:14 se Exp ** ** Declarations for pci bus drivers. ** diff --git a/sys/i386/pci/pcisupport.c b/sys/i386/pci/pcisupport.c index 6b8a9fec38f6a..a05be07bf4f97 100644 --- a/sys/i386/pci/pcisupport.c +++ b/sys/i386/pci/pcisupport.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcisupport.c,v 1.4 1994/10/17 21:11:31 phk Exp $ +** pcisupport.c,v 1.5 1994/10/25 18:45:19 se Exp ** ** Device driver for INTEL PCI chipsets. ** diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c deleted file mode 100644 index 58e07318b7024..0000000000000 --- a/sys/i386/scsi/aic7xxx.c +++ /dev/null @@ -1,1731 +0,0 @@ -/* - * Driver for the 27/284X series adaptec SCSI controllers written by - * Justin T. Gibbs. Much of this driver was taken from Julian Elischer's - * 1742 driver, so it bears his copyright. - * - * Written by Julian Elischer (julian@tfs.com) - * for TRW Financial Systems for use under the MACH(2.5) operating system. - * - * TRW Financial Systems, in accordance with their agreement with Carnegie - * Mellon University, makes this software available to CMU to distribute - * or use in any manner that they see fit as long as this message is kept with - * the software. For this reason TFS also grants any other persons or - * organisations permission to use or modify this software. - * - * TFS supplies this software to be publicly redistributed - * on the understanding that TFS is not responsible for the correct - * functioning of this software in any circumstances. - * - * commenced: Sun Sep 27 18:14:01 PDT 1992 - * - * $Id: aic7770.c,v 1.4 1994/11/18 09:14:14 gibbs Exp $ - */ -/* - * TODO: - * Add support for dual and wide busses - * Implement Target Mode - * Implement Tagged Queuing - * Add target reset capabilities - * Test the check SCSI sense code - * Write a message abort procedure for use in ahc_timeout - * Add support for the 294X series cards - * - * This driver is very stable, and seems to offer performance - * comprable to the 1742 FreeBSD driver. The only timeouts - * I have ever experienced were due to critical driver bugs - * where an abort wouldn't have helped me anyway. So I haven't - * written code to actually search the QINFIFO and/or kill an - * active command. Same goes for target reset. - */ - -#define AHC_SCB_MAX 16 /* - * Up to 16 SCBs on some types of aic7xxx based - * boards. The aic7770 family only have 4 - */ - -#include "ahc.h" /* for NAHC from config */ - -#include <sys/param.h> -#include <sys/systm.h> - -#include <sys/malloc.h> -#include <sys/buf.h> -#include <sys/proc.h> -#include <sys/user.h> -#include <i386/isa/isa.h> -#include <i386/isa/isa_device.h> -#include <machine/cpufunc.h> -#include <scsi/scsi_all.h> -#include <scsi/scsiconf.h> -#include <sys/devconf.h> - -#define AHC_NSEG 256 /* number of dma segments supported */ -#define PAGESIZ 4096 - -/* #define AHCDEBUG */ - -typedef unsigned long int physaddr; - -#include <sys/kernel.h> -#define KVTOPHYS(x) vtophys(x) - -typedef enum { - AHC_274, /* Single Channel */ - AHC_274T, /* Twin Channel */ - AHC_274W, /* Wide Channel */ - AHC_284, /* VL Single Channel */ - AHC_284T, /* VL Twin Channel */ - AHC_284W, /* VL Wide Channel - Do these exist?? */ -}ahc_type; - -int ahcprobe(); -int ahcprobe1 __P((struct isa_device *dev, ahc_type type)); -int ahc_attach(); -int ahc_init __P((int unit)); -void ahc_loadseq __P((int port)); -int ahcintr(); -int32 ahc_scsi_cmd(); -timeout_t ahc_timeout; -void ahc_done(); -struct scb *ahc_get_scb __P((int unit, int flags)); -void ahc_free_scb(); -void ahcminphys(); -struct scb *ahc_scb_phys_kv(); -u_int32 ahc_adapter_info(); - -#define MAX_SLOTS 8 /* XXX should this be 16?? Need EISA spec */ -static ahc_slot = 0; /* slot last board was found in */ -static ahc_unit = 0; - -/* Different debugging levels - only one so-far */ -#define AHC_SHOWMISC 0x0001 -int ahc_debug = AHC_SHOWMISC; -/* - * Standard EISA Host ID regs (Offset from slot base) - */ - -#define HID0 0xC80 /* 0,1: msb of ID2, 2-7: ID1 */ -#define HID1 0xC81 /* 0-4: ID3, 5-7: LSB ID2 */ -#define HID2 0xC82 /* product, 0=174[20] 1 = 1744 */ -#define HID3 0xC83 /* firmware revision */ - -/**** bit definitions for SCSIDEF ****/ -#define HSCSIID 0x07 /* our SCSI ID */ - -typedef struct -{ - ahc_type type; - unsigned char id; /* The Last EISA Host ID reg */ -} ahc_sig; - -#define CHAR1(B1,B2) (((B1>>2) & 0x1F) | '@') -#define CHAR2(B1,B2) (((B1<<3) & 0x18) | ((B2>>5) & 0x7)|'@') -#define CHAR3(B1,B2) ((B2 & 0x1F) | '@') - -struct isa_driver ahcdriver = {ahcprobe, ahc_attach, "ahc"}; - -struct scsi_adapter ahc_switch = -{ - ahc_scsi_cmd, - ahcminphys, - 0, - 0, - ahc_adapter_info, - "ahc", - { 0, 0 } -}; - -/* the below structure is so we have a default dev struct for our link struct */ -struct scsi_device ahc_dev = -{ - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ - "ahc", - 0, - { 0, 0 } -}; - -static struct kern_devconf kdc_ahc[NAHC] = { { - 0, 0, 0, /* filled in by dev_attach */ - "ahc", 0, { MDDT_ISA, 0, "bio" }, - isa_generic_externalize, 0, 0, ISA_EXTERNALLEN, - &kdc_isa0, /* parent */ - 0, /* parentdata */ - DC_BUSY, /* host adapters are always ``in use'' */ - "Adaptec aic7770 based SCSI host adapter" -} }; - -static inline void -ahc_registerdev(struct isa_device *id) -{ - if(id->id_unit) - kdc_ahc[id->id_unit] = kdc_ahc[0]; - kdc_ahc[id->id_unit].kdc_unit = id->id_unit; - kdc_ahc[id->id_unit].kdc_parentdata = id; - dev_attach(&kdc_ahc[id->id_unit]); -} - - -/* - * All of these should be in a separate header file shared by the sequencer - * code and the kernel level driver. The only catch is that we would need to - * add an additional 0xc00 offset when using them in the kernel driver. The - * aic7770 assembler must be modified to allow include files as well. All - * page numbers refer to the Adaptec AIC-7770 Data Book availible from - * Adaptec's Technical Documents Department 1-800-634-2766 - */ - -/* -------------------- AIC-7770 offset definitions ----------------------- */ - -/* - * SCSI Sequence Control (p. 3-11). - * Each bit, when set starts a specific SCSI sequence on the bus - */ -#define SCSISEQ 0xc00 -#define TEMODEO 0x80 -#define ENSELO 0x40 -#define ENSELI 0x20 -#define ENRSELI 0x10 -#define ENAUTOATNO 0x08 -#define ENAUTOATNI 0x04 -#define ENAUTOATNP 0x02 -#define SCSIRSTO 0x01 - -/* - * SCSI Control Signal Read Register (p. 3-15). - * Reads the actual state of the SCSI bus pins - */ -#define SCSISIGI 0xc03 -#define CDI 0x80 -#define IOI 0x40 -#define MSGI 0x20 -#define ATNI 0x10 -#define SELI 0x08 -#define BSYI 0x04 -#define REQI 0x02 -#define ACKI 0x01 - -/* - * SCSI Contol Signal Write Register (p. 3-16). - * Writing to this register modifies the control signals on the bus. Only - * those signals that are allowed in the current mode (Initiator/Target) are - * asserted. - */ -#define SCSISIGO 0xc03 -#define CDO 0x80 -#define IOO 0x40 -#define MSGO 0x20 -#define ATNO 0x10 -#define SELO 0x08 -#define BSYO 0x04 -#define REQO 0x02 -#define ACKO 0x01 - -/* - * SCSI ID (p. 3-18). - * Contains the ID of the board and the current target on the - * selected channel - */ -#define SCSIID 0xc05 -#define TID 0xf0 /* Target ID mask */ -#define OID 0x0f /* Our ID mask */ - -/* - * SCSI Status 0 (p. 3-21) - * Contains one set of SCSI Interrupt codes - * These are most likely of interest to the sequencer - */ -#define SSTAT0 0xc0b -#define TARGET 0x80 /* Board is a target */ -#define SELDO 0x40 /* Selection Done */ -#define SELDI 0x20 /* Board has been selected */ -#define SELINGO 0x10 /* Selection In Progress */ -#define SWRAP 0x08 /* 24bit counter wrap */ -#define SDONE 0x04 /* STCNT = 0x000000 */ -#define SPIORDY 0x02 /* SCSI PIO Ready */ -#define DMADONE 0x01 /* DMA transfer completed */ - -/* - * Clear SCSI Interrupt 1 (p. 3-23) - * Writing a 1 to a bit clears the associated SCSI Interrupt in SSTAT1. - */ -#define CLRSINT1 0xc0c -#define CLRSELTIMEO 0x80 -#define CLRATNO 0x40 -#define CLRSCSIRSTI 0x20 -/* UNUSED 0x10 */ -#define CLRBUSFREE 0x08 -#define CLRSCSIPERR 0x04 -#define CLRPHASECHG 0x02 -#define CLRREQINIT 0x01 - -/* - * SCSI Status 1 (p. 3-24) - * These interrupt bits are of interest to the kernel driver - */ -#define SSTAT1 0xc0c -#define SELTO 0x80 -#define ATNTARG 0x40 -#define SCSIRSTI 0x20 -#define PHASEMIS 0x10 -#define BUSFREE 0x08 -#define SCSIPERR 0x04 -#define PHASECHG 0x02 -#define REQINIT 0x01 - -/* - * Selection/Reselection ID (p. 3-31) - * Upper four bits are the device id. The ONEBIT is set when the re/selecting - * device did not set its own ID. - */ -#define SELID 0xc19 -#define SELID_MASK 0xf0 -#define ONEBIT 0x08 -/* UNUSED 0x07 */ - -/* - * SCSI Block Control (p. 3-32) - * Controls Bus type and channel selection. In a twin channel configuration - * addresses 0x00-0x1e are gated to the appropriate channel based on this - * register. SELWIDE allows for the coexistence of 8bit and 16bit devices - * on a wide bus. - */ -#define SBLKCTL 0xc1f -/* UNUSED 0xc0 */ -#define AUTOFLUSHDIS 0x20 -/* UNUSED 0x10 */ -#define SELBUSB 0x08 -/* UNUSED 0x04 */ -#define SELWIDE 0x02 -/* UNUSED 0x01 */ - -/* - * Sequencer Control (p. 3-33) - * Error detection mode and speed configuration - */ -#define SEQCTL 0xc60 -#define PERRORDIS 0x80 -#define PAUSEDIS 0x40 -#define FAILDIS 0x20 -#define FASTMODE 0x10 -#define BRKADRINTEN 0x08 -#define STEP 0x04 -#define SEQRESET 0x02 -#define LOADRAM 0x01 - -/* - * Sequencer RAM Data (p. 3-34) - * Single byte window into the Scratch Ram area starting at the address - * specified by SEQADDR0 and SEQADDR1. To write a full word, simply write - * four bytes in sucessesion. The SEQADDRs will increment after the most - * significant byte is written - */ -#define SEQRAM 0xc61 - -/* - * Sequencer Address Registers (p. 3-35) - * Only the first bit of SEQADDR1 holds addressing information - */ -#define SEQADDR0 0xc62 -#define SEQADDR1 0xc63 -#define SEQADDR1_MASK 0x01 - -/* - * Accumulator - * We cheat by passing arguments in the Accumulator up to the kernel driver - */ -#define ACCUM 0xc64 - -/* - * Board Control (p. 3-43) - */ -#define BCTL 0xc84 -/* RSVD 0xf0 */ -#define ACE 0x08 /* Support for external processors */ -/* RSVD 0x06 */ -#define ENABLE 0x01 - -/* - * Host Control (p. 3-47) R/W - * Overal host control of the device. - */ -#define HCNTRL 0xc87 -/* UNUSED 0x80 */ -#define POWRDN 0x40 -/* UNUSED 0x20 */ -#define SWINT 0x10 -#define IRQMS 0x08 -#define PAUSE 0x04 -#define INTEN 0x02 -#define CHIPRST 0x01 -#define REQ_PAUSE IRQMS | PAUSE | INTEN -#define UNPAUSE_274X IRQMS | INTEN -#define UNPAUSE_284X INTEN - -/* - * SCB Pointer (p. 3-49) - * Gate one of the four SCBs into the SCBARRAY window. - */ -#define SCBPTR 0xc90 - -/* - * Interrupt Status (p. 3-50) - * Status for system interrupts - */ -#define INTSTAT 0xc91 -#define SEQINT_MASK 0xf0 /* SEQINT Status Codes */ -#define BAD_PHASE 0x00 -#define MSG_REJECT 0x10 -#define NO_IDENT 0x20 -#define NO_MATCH 0x30 -#define TRANS_RATE 0x40 -#define BAD_STATUS 0x50 -#define BRKADRINT 0x08 -#define SCSIINT 0x04 -#define CMDCMPLT 0x02 -#define SEQINT 0x01 -#define INT_PEND SEQINT | SCSIINT | CMDCMPLT /* For polling */ - -/* - * Hard Error (p. 3-53) - * Reporting of catastrophic errors. You usually cannot recover from - * these without a full board reset. - */ -#define ERROR 0xc92 -/* UNUSED 0xf0 */ -#define PARERR 0x08 -#define ILLOPCODE 0x04 -#define ILLSADDR 0x02 -#define ILLHADDR 0x01 - -/* - * Clear Interrupt Status (p. 3-52) - */ -#define CLRINT 0xc92 -#define CLRBRKADRINT 0x08 -#define CLRINTSTAT 0x04 /* UNDOCUMENTED - must be unpaused */ -#define CLRCMDINT 0x02 -#define CLRSEQINT 0x01 - -/* - * SCB Auto Increment (p. 3-59) - * Byte offset into the SCB Array and an optional bit to allow auto - * incrementing of the address during download and upload operations - */ -#define SCBCNT 0xc9a -#define SCBAUTO 0x80 -#define SCBCNT_MASK 0x1f - -/* - * Queue In FIFO (p. 3-60) - * Input queue for queued SCBs (commands that the seqencer has yet to start) - */ -#define QINFIFO 0xc9b - -/* - * Queue In Count (p. 3-60) - * Number of queued SCBs - */ -#define QINCNT 0xc9c - -/* - * Queue Out FIFO (p. 3-61) - * Queue of SCBs that have completed and await the host - */ -#define QOUTFIFO 0xc9d - -/* - * Queue Out Count (p. 3-61) - * Number of queued SCBs in the Out FIFO - */ -#define QOUTCNT 0xc9e - -#define SCBARRAY 0xca0 - -/* ---------------- END AIC-7770 Register Definitions ----------------- */ - -/* ---------------------- Scratch RAM Offsets ------------------------- */ -/* These offsets are either to values that are initialized by the board's - * BIOS or are specified by the Linux sequencer code. If I can figure out - * how to read the EISA configuration info at probe time, the cards could - * be run without BIOS support installed - */ - -/* - * The sequencer will stick the frist byte of any rejected message here so - * we can see what is getting thrown away. - */ -#define HA_REJBYTE 0xc31 - -/* - * Pending message flag - */ -#define HA_MSG_FLAGS 0xc35 - -/* - * Length of pending message - */ -#define HA_MSG_LEN 0xc36 - -/* - * message body - */ -#define HA_MSG_START 0xc37 /* outgoing message body */ - -/* - * These are offsets into the card's scratch ram. Some of the values are - * specified in the AHA2742 technical reference manual and are initialized - * by the BIOS at boot time. - */ -#define HA_ARG_1 0xc4c -#define HA_ARG_2 0xc4d -#define HA_RETURN_1 0xc4c - -#define HA_SIGSTATE 0xc4e -#define HA_NEEDSDTR 0xc4f - -#define HA_SCSICONF 0xc5a -#define INTDEF 0xc5c -#define HA_HOSTCONF 0xc5d -#define HA_SCBCOUNT 0xc56 -#define ACTIVE_A 0xc57 -#define MSG_ABORT 0x06 - -/* - * Since the sequencer can disable pausing in a critical section, we - * must loop until it actually stops. - * XXX Should add a timeout in here!! - */ -#define PAUSE_SEQUENCER(ahc) \ - outb(HCNTRL + ahc->baseport, REQ_PAUSE); \ - \ - while ((inb(HCNTRL + ahc->baseport) & PAUSE) == 0) \ - ; - -#define UNPAUSE_SEQUENCER(ahc) \ - outb( HCNTRL + ahc->baseport, ahc->unpause ) - -/* - * Restart the sequencer program from address zero - */ -#define RESTART_SEQUENCER(ahc) \ - do { \ - outb( SEQCTL + ahc->baseport, SEQRESET ); \ - } while (inw(SEQADDR0 + ahc->baseport) != 0); \ - \ - UNPAUSE_SEQUENCER(ahc); - - -struct ahc_dma_seg { - physaddr addr; - long len; -}; - -/* - * The driver keeps up to four scb structures per card in memory. Only the - * first 26 bytes of the structure are valid for the hardware, the rest used - * for driver level bookeeping. The "__attribute ((packed))" tags ensure that - * gcc does not attempt to pad the long ints in the structure to word - * boundaries since the first 26 bytes of this structure must have the correct - * offsets for the hardware to find them. The driver should be further - * optimized so that we only have to download the first 14 bytes since as long - * as we always use S/G, the last fields should be zero anyway. Its mostly a - * matter of looking through the sequencer code and ensuring that those fields - * are cleared or loaded with a valid value before being read. - */ -struct scb { -/* ------------ Begin hardware supported fields ---------------- */ -/*1*/ u_char control; -#define SCB_REJ_MDP 0x80 /* Reject MDP message */ -#define SCB_DCE 0x40 /* Disconnect enable */ -#define SCB_TE 0x20 /* Tag enable */ -#define SCB_WAITING 0x06 -#define SCB_DIS 0x04 -#define SCB_TAG_TYPE 0x3 -#define SIMPLE_QUEUE 0x0 -#define HEAD_QUEUE 0x1 -#define OR_QUEUE 0x2 -/*2*/ u_char target_channel_lun; /* 4/1/3 bits */ -/*3*/ u_char SG_segment_count; -/*7*/ physaddr SG_list_pointer __attribute__ ((packed)); -/*11*/ physaddr cmdpointer __attribute__ ((packed)); -/*12*/ u_char cmdlen; -/*14*/ u_char RESERVED[2]; /* must be zero */ -/*15*/ u_char target_status; -/*18*/ u_char residual_data_count[3]; -/*19*/ u_char residual_SG_segment_count; -/*23*/ physaddr data __attribute__ ((packed)); -/*26*/ u_char datalen[3]; -#define SCB_SIZE 26 /* amount to actually download */ -#if 0 - /* - * No real point in transferring this to the - * SCB registers. - */ - unsigned char RESERVED[6]; -#endif - /*-----------------end of hardware supported fields----------------*/ - struct scb *next; /* in free list */ - struct scsi_xfer *xs; /* the scsi_xfer for this cmd */ - int flags; - int position; /* Position in scbarray */ -#define SCB_FREE 0 -#define SCB_ACTIVE 1 -#define SCB_ABORTED 2 -#define SCB_IMMED 4 -#define SCB_IMMED_FAIL 8 -#define SCB_SENSE 16 - struct ahc_dma_seg ahc_dma[AHC_NSEG] __attribute__ ((packed)); - struct scsi_sense sense_cmd; /* SCSI command block */ -}; - -struct ahc_data { - ahc_type type; - int flags; -#define AHC_INIT 0x01; - int baseport; - struct scb *scbarray[AHC_SCB_MAX]; /* Mirror boards scbarray */ - struct scb *free_scb; - int our_id; /* our scsi id */ - int vect; - struct scb *immed_ecb; /* an outstanding immediete command */ - struct scsi_link sc_link; - int numscbs; - u_char maxscbs; - int unpause; -} *ahcdata[NAHC]; - -#ifdef AHCDEBUG -void -ahc_print_scb(scb) - struct scb *scb; -{ - printf("scb:%x control:%x tcl:%x cmdlen:%d cmdpointer:%x\n" - ,scb - ,scb->control - ,scb->target_channel_lun - ,scb->cmdlen - ,scb->cmdpointer ); - printf(" datlen:%d data:%x res:%x segs:%x segp:%x\n" - ,scb->datalen[2] << 16 | scb->datalen[1] << 8 | scb->datalen[0] - ,scb->data - ,scb->RESERVED[1] << 8 | scb->RESERVED[0] - ,scb->SG_segment_count - ,scb->SG_list_pointer); - printf(" sg_addr:%x sg_len:%d\n" - ,scb->ahc_dma[0].addr - ,scb->ahc_dma[0].len); - printf(" size:%d\n" - ,(int)&(scb->next) - (int)scb); -} - -void -ahc_print_active_scb(ahc) - struct ahc_data *ahc; -{ - int cur_scb_offset; - int port = ahc->baseport; - PAUSE_SEQUENCER(ahc); - cur_scb_offset = inb(SCBPTR + port); - UNPAUSE_SEQUENCER(ahc); - ahc_print_scb(ahc->scbarray[cur_scb_offset]); -} - -#define PARERR 0x08 -#define ILLOPCODE 0x04 -#define ILLSADDR 0x02 -#define ILLHADDR 0x01 - -#endif - -static struct { - u_char errno; - char *errmesg; -} hard_error[] = { - ILLHADDR, "Illegal Host Access", - ILLSADDR, "Illegal Sequencer Address referrenced", - ILLOPCODE, "Illegal Opcode in sequencer program", - PARERR, "Sequencer Ram Parity Error", -}; - - -/* - * Valid SCSIRATE values. (p. 3-17) - * Provides a mapping of tranfer periods in ns to the proper value to - * stick in the scsiscfr reg to use that transfer rate. - */ -static struct { - short sxfr; - short period; /* in ns */ - char *rate; -} ahc_syncrates[] = { - 0x00, 100, "10.0", - 0x10, 125, "8.0", - 0x20, 150, "6.67", - 0x30, 175, "5.7", - 0x40, 200, "5.0", - 0x50, 225, "4.4", - 0x60, 250, "4.0", - 0x70, 275, "3.6" -}; - -static int ahc_num_syncrates = - sizeof(ahc_syncrates) / sizeof(ahc_syncrates[0]); - -int -ahcprobe(struct isa_device *dev) -{ - int port; - int i; - u_char sig_id[4]; - - ahc_sig valid_ids[] = { - /* Entries of other tested adaptors should be added here */ - AHC_274, 0x71, /*274x, Card*/ - AHC_274, 0x70, /*274x, Motherboard*/ - AHC_284, 0x56, /*284x, BIOS enabled*/ - AHC_284, 0x57, /*284x, BIOS disabled*/ - }; - - - ahc_slot++; - while (ahc_slot <= MAX_SLOTS) { - port = 0x1000 * ahc_slot; - for( i = 0; i < sizeof(sig_id); i++ ) - { - /* - * An outb is required to prime these registers on - * VL cards - */ - outb( port + HID0, HID0 + i ); - sig_id[i] = inb(port + HID0 + i); - } - if (sig_id[0] == 0xff) { - ahc_slot++; - continue; - } - /* Check manufacturer's ID. */ - if ((CHAR1(sig_id[0], sig_id[1]) == 'A') - && (CHAR2(sig_id[0], sig_id[1]) == 'D') - && (CHAR3(sig_id[0], sig_id[1]) == 'P') - && (sig_id[2] == 0x77)) { - for( i = 0; i < sizeof(valid_ids)/sizeof(ahc_sig); i++) - if ( sig_id[3] == valid_ids[i].id ) { - dev->id_iobase = port; - return ahcprobe1(dev, valid_ids[i].type); - } - } - ahc_slot++; - } - return 0; -} - -/* - * Check if the device can be found at the port given - * and if so, determine configuration and set it up for further work. - * As an argument, takes the isa_device structure from - * autoconf.c. - */ - -int -ahcprobe1(dev, type) - struct isa_device *dev; - ahc_type type; -{ - - /* - * find unit and check we have that many defined - */ - - int unit = dev->id_unit; - struct ahc_data *ahc; - - if (unit >= NAHC) { - printf("ahc: unit number (%d) too high\n", unit); - return 0; - } - - /* - * Allocate a storage area for us - */ - - if (ahcdata[unit]) { - printf("ahc%d: memory already allocated\n", unit); - return 0; - } - ahc = malloc(sizeof(struct ahc_data), M_TEMP, M_NOWAIT); - if (!ahc) { - printf("ahc%d: cannot malloc!\n", unit); - return 0; - } - bzero(ahc, sizeof(struct ahc_data)); - ahcdata[unit] = ahc; - ahc->baseport = dev->id_iobase; - ahc->type = type; - - /* - * Try to initialize a unit at this location - * reset the AIC-7770, read its registers, - * and fill in the dev structure accordingly - */ - - if (ahc_init(unit) != 0) { - ahcdata[unit] = NULL; - free(ahc, M_TEMP); - return (0); - } - - /* - * If it's there, put in it's interrupt vectors - */ - - dev->id_irq = (1 << ahc->vect); - dev->id_drq = -1; /* use EISA dma */ - - ahc_unit++; - return IO_EISASIZE; -} - - -/* - * Look up the valid period to SCSIRATE conversion in our table. - */ -static -void ahc_scsirate(scsirate, period, offset, unit, target ) - u_char *scsirate; - u_char period, offset; - int unit, target; -{ - int i; - - for (i = 0; i < ahc_num_syncrates; i++) { - - if ((ahc_syncrates[i].period - period) >= 0) { - *scsirate = (ahc_syncrates[i].sxfr) | (offset & 0x0f); -#ifdef AHCDEBUG - printf("ahc%d: target %d synchronous at %sMb/s\n", - unit, target, ahc_syncrates[i].rate ); -#endif /* AHCDEBUG */ - return; - } - } - /* Default to asyncronous transfer */ - *scsirate = 0; -#ifdef AHCDEBUG - printf("ahc%d: target %d using asyncronous transfers\n", - unit, target ); -#endif /* AHCDEBUG */ - -} - - -/* - * Attach all the sub-devices we can find - */ -int -ahc_attach(dev) - struct isa_device *dev; -{ - int unit = dev->id_unit; - struct ahc_data *ahc = ahcdata[unit]; - - /* - * fill in the prototype scsi_link. - */ - ahc->sc_link.adapter_unit = unit; - ahc->sc_link.adapter_targ = ahc->our_id; - ahc->sc_link.adapter = &ahc_switch; - ahc->sc_link.device = &ahc_dev; - ahc->sc_link.flags = DEBUGLEVEL; - - /* - * Here, we should really fill in up to two different sc_links, - * making use of the extra fields in the sc_link structure so - * we can know which channel any requests are for. Then its just - * a matter of doing a scsi_attachdevs to both instead of the one. - * This should be done when we get or write sequencer code that - * supports more than one channel. XXX - */ - - ahc_registerdev(dev); - - /* - * ask the adapter what subunits are present - */ - scsi_attachdevs(&(ahc->sc_link)); - - return 1; -} - -void -ahc_send_scb( ahc, scb ) - struct ahc_data *ahc; - struct scb *scb; -{ - int old_scbptr; - int base = ahc->baseport; - - PAUSE_SEQUENCER(ahc); - - old_scbptr = inb(SCBPTR + base); - outb(SCBPTR + base, scb->position); - - outb(SCBCNT + base, SCBAUTO); - - outsb(SCBARRAY + base, scb, SCB_SIZE); - - outb(SCBCNT + base, 0); - - outb(QINFIFO + base, scb->position); - outb(SCBPTR + base, old_scbptr); - - UNPAUSE_SEQUENCER(ahc); -} - -static -void ahc_getscb(base, scb) - int base; - struct scb *scb; -{ - outb(SCBCNT + base, 0x80); /* SCBAUTO */ - - insb(SCBARRAY + base, scb, SCB_SIZE); - - outb(SCBCNT + base, 0); -} - -/* - * Catch an interrupt from the adaptor - */ -int -ahcintr(unit) - int unit; -{ - int intstat; - u_char status; - struct ahc_data *ahc = ahcdata[unit]; - int port = ahc->baseport; - struct scb *scb = NULL; - struct scsi_xfer *xs = NULL; - - intstat = inb(INTSTAT + port); - - if (intstat & BRKADRINT) { - /* We upset the sequencer :-( */ - - /* Lookup the error message */ - int i, error = inb(ERROR + port); - int num_errors = sizeof(hard_error)/sizeof(hard_error[0]); - for(i = 0; error != 1 && i < num_errors; i++) - error >>= 1; - panic("ahc%d: brkadrint, %s at seqaddr = 0x%x\n", - unit, hard_error[i].errmesg, inw(SEQADDR0 + port)); - } - if (intstat & SEQINT) { - unsigned char transfer, offset, rate; - - switch (intstat & SEQINT_MASK) { - case BAD_PHASE: - panic("ahc%d: unknown scsi bus phase. " - "Attempting to continue\n", unit); - break; - case MSG_REJECT: - printf("ahc%d: Warning - " - "message reject, message type: 0x%x\n", unit, - inb(HA_REJBYTE + port)); - break; - case NO_IDENT: - panic("ahc%d: No IDENTIFY message from reconnecting " - "target %d\n", - unit, (inb(SELID + port) >> 4) & 0xf); - break; - case NO_MATCH: - { - u_char active; - int target = (inb(SELID + port) >> 4) & 0x4; - printf("ahc%d: no active SCB for reconnecting " - "target %d - issuing ABORT\n", - unit, target); - active = inb(HA_SCBCOUNT + port); - DELAY(10000); - active = inb(ACTIVE_A + port); - active &= ~(0x01 << target); - outb(ACTIVE_A + port, active); - outb(CLRSINT1 + port, CLRSELTIMEO); - RESTART_SEQUENCER(ahc); - break; - } - case TRANS_RATE: - /* - * Help the sequencer to translate the negotiated - * transfer rate. Transfer is 1/4 the period - * in ns as is returned by the sync negotiation - * message. So, we must multiply by four - */ - transfer = inb(HA_ARG_1 + port) << 2; - /* The bottom half of SCSIXFER*/ - offset = inb(HA_ARG_2 + port); - ahc_scsirate(&rate, transfer, offset, unit, - inb(SCSIID + port) >> 0x4); - outb(HA_RETURN_1 + port, rate); - break; - case BAD_STATUS: - { - int scb_index, saved_scb_index; - - /* The sequencer will notify us when a command - * has an error that would be of interest to - * the kernel. This allows us to leave the sequencer - * running in the common case of command completes - * without error. - */ - - scb_index = inb(SCBPTR + port); - scb = ahc->scbarray[scb_index]; - if (!scb || !(scb->flags & SCB_ACTIVE)) { - printf("ahc%d: ahcintr - referenced scb not " - "valid during seqint 0x%x scb(%d)\n", - unit, intstat, scb_index); - goto clear; - } - - xs = scb->xs; - - ahc_getscb(port, scb); - -#ifdef AHCDEBUG - if(xs->sc_link->target == DEBUGTARG) - ahc_print_scb(scb); -#endif - xs->status = scb->target_status; - xs->resid = ((scb->residual_data_count[2] << 16) | - (scb->residual_data_count[1] << 8) | - scb->residual_data_count[0]); - switch(scb->target_status){ - case SCSI_OK: - printf("ahc%d: Interrupted for staus of " - "0???\n", unit); - break; - case SCSI_CHECK: -#ifdef AHCDEBUG - printf("ahc%d: SCSI Check requested\n", unit); -#endif - /*Priliminary code for requesting Sense */ - /* Enable at your own risk */ -#if STILL_NEEDS_TESTING - if((xs->error == XS_NOERROR) && - !(scb->flags & SCB_SENSE)) - { - struct ahc_dma_seg *sg = scb->ahc_dma; - struct scsi_sense *sc = &(scb->sense_cmd); - int scbsave[AHC_SCB_MAX], i; - int queued = inb(QINCNT + port); -#ifdef AHCDEBUG - printf("SENDING SENSE.\n"); -#endif - bzero(scb, SCB_SIZE); - scb->flags |= SCB_SENSE; - xs->error = XS_SENSE; - sc->op_code = REQUEST_SENSE; - sc->byte2 = xs->sc_link->lun << 5; - sc->length = sizeof(struct scsi_sense_data); - scb->cmdlen = sizeof(*sc); - scb->cmdpointer = KVTOPHYS(sc); - scb->SG_segment_count = 1; - scb->SG_list_pointer = KVTOPHYS(sg); - sg->addr = KVTOPHYS(&xs->sense); - sg->len = sizeof(struct scsi_sense_data); - /* - * Reinsert us at head of - * queue - */ - outb(SCBCNT + port, 0x80); - outsb(SCBARRAY + port, scb, SCB_SIZE); - outb(SCBCNT + port, 0); - - for (i = 0; i < queued; i++) - scbsave[i] = inb(QINFIFO + port); - - outb(QINFIFO + port, scb->position); - - for (i = 0; i < queued; i++) - outb(QINFIFO + port, scbsave[i]); - - /* New lease on life */ - untimeout(ahc_timeout, (caddr_t)scb); - timeout(ahc_timeout, (caddr_t)scb, - (xs->timeout * hz) / 1000); - - goto clear; - } -#endif - xs->error = XS_DRIVER_STUFFUP; - break; - case SCSI_BUSY: - xs->error = XS_BUSY; - printf("ahc%d: Target Busy\n", unit); - break; - default: -#ifdef AHCDEBUG - if (ahc_debug & AHC_SHOWMISC) - { - printf("unexpected targ_status: %x\n", - scb->target_status); - } -#endif /*AHCDEBUG */ - xs->error = XS_DRIVER_STUFFUP; - break; - } - untimeout(ahc_timeout, (caddr_t)scb); - ahc_done(unit, scb); - break; - } - default: - printf("ahc: seqint, " - "intstat = 0x%x, scsisigi = 0x%x\n", - intstat, inb(SCSISIGI + port)); - break; - } - - /* - * Clear the upper byte that holds SEQINT status - * codes and clear the SEQINT bit. - */ -clear: - outb(CLRINT + port, CLRSEQINT); - - /* - * The sequencer is paused immediately on - * a SEQINT, so we should restart it when - * we leave this section. - */ - UNPAUSE_SEQUENCER(ahc); - } - - - if (intstat & SCSIINT) { - - int scb_index = inb(SCBPTR + port); - status = inb(SSTAT1 + port); - - scb = ahc->scbarray[scb_index]; - if (!scb || scb->flags != SCB_ACTIVE) { - printf("ahc%d: ahcintr - referenced scb not " - "valid during scsiint 0x%x scb(%d)\n", - unit, status, scb_index); - outb(CLRSINT1 + port, status); - UNPAUSE_SEQUENCER(ahc); - outb(CLRINT + port, CLRINTSTAT); - scb = NULL; - goto cmdcomplete; - } - xs = scb->xs; - - if (status & SELTO) { - u_char active; - outb(SCSISEQ + port, 0); - xs->error = XS_TIMEOUT; - /* - * Clear any pending messages for the timed out - * target, and mark the target as free - */ - outb(HA_MSG_FLAGS + port, 0); - active = inb(ACTIVE_A + port); - active &= ~(0x01 << xs->sc_link->target); - outb(ACTIVE_A + port, active); - - outb(CLRSINT1 + port, CLRSELTIMEO); - RESTART_SEQUENCER(ahc); - - outb(CLRINT + port, CLRINTSTAT); - } - - if (status & SCSIPERR) { - printf("ahc%d: parity error on channel A " - "target %d, lun %d\n", - unit, - xs->sc_link->target, - xs->sc_link->lun); - xs->error = XS_DRIVER_STUFFUP; - - outb(CLRSINT1 + port, CLRSCSIPERR); - UNPAUSE_SEQUENCER(ahc); - - outb(CLRINT + port, CLRINTSTAT); - scb = NULL; - } - if (status & BUSFREE) { -#if 0 - /* - * Has seen busfree since selection, i.e. - * a "spurious" selection. Shouldn't happen. - */ - printf("ahc: unexpected busfree\n"); - xs->error = XS_DRIVER_STUFFUP; - outb(CLRSINT1 + port, BUSFREE); /* CLRBUSFREE */ -#endif - } - - else { - printf("ahc%d: Unknown SCSIINT. Status = 0x%x\n", - unit, status); - outb(CLRSINT1 + port, status); - UNPAUSE_SEQUENCER(ahc); - outb(CLRINT + port, CLRINTSTAT); - scb = NULL; - } - if(scb != NULL) { - /* We want to process the command */ - untimeout(ahc_timeout, (caddr_t)scb); - ahc_done(unit, scb); - } - } -cmdcomplete: - if (intstat & CMDCMPLT) { - int scb_index, saved_scb_index; - - do { - scb_index = inb(QOUTFIFO + port); - scb = ahc->scbarray[scb_index]; - if (!scb || !(scb->flags & SCB_ACTIVE)) { - printf("ahc%d: WARNING " - "no command for scb %d (cmdcmplt)\n", - unit, scb_index); - outb(CLRINT + port, CLRCMDINT); - continue; - } - - outb(CLRINT+ port, CLRCMDINT); - untimeout(ahc_timeout, (caddr_t)scb); - ahc_done(unit, scb); - - } while (inb(QOUTCNT + port)); - } - - return 1; -} - -/* - * We have a scb which has been processed by the - * adaptor, now we look to see how the operation - * went. - */ -void -ahc_done(unit, scb) - int unit; - struct scb *scb; -{ - struct scsi_xfer *xs = scb->xs; - - SC_DEBUG(xs->sc_link, SDEV_DB2, ("ahc_done\n")); - /* - * Put the results of the operation - * into the xfer and call whoever started it - */ - if ((xs->flags & SCSI_ERR_OK) && !(xs->error == XS_SENSE)) { - /* All went correctly OR errors expected */ - xs->error = 0; - } - xs->flags |= ITSDONE; - ahc_free_scb(unit, scb, xs->flags); - scsi_done(xs); -} - -/* - * Start the board, ready for normal operation - */ -int -ahc_init(unit) - int unit; -{ - struct ahc_data *ahc = ahcdata[unit]; - int port = ahc->baseport; - int intdef; - - /* - * Assume we have a board at this stage - * Find out the configured interupt and the card type. - */ - -#ifdef AHCDEBUG - printf("ahc%d: scb %d bytes; SCB_SIZE %d bytes, ahc_dma %d bytes\n", - unit, sizeof(struct scb), SCB_SIZE, sizeof(struct ahc_dma_seg)); -#endif /* AHCDEBUG */ - printf("ahc%d: reading board settings\n", unit); - - outb(HCNTRL + port, CHIPRST); - switch( ahc->type ) { - case AHC_274: - printf("ahc%d: 274x", unit); - ahc->unpause = UNPAUSE_274X; - ahc->maxscbs = 0x4; - break; - case AHC_284: - printf("ahc%d: 284x", unit); - ahc->unpause = UNPAUSE_284X; - ahc->maxscbs = 0x4; - break; - default: - }; - - /* Determine channel configuration. */ - switch ( inb(SBLKCTL + port) ) { - case 0: - printf(" Single Channel, "); - break; - case 2: - printf(" Wide SCSI configuration - Unsupported\n"); - ahc->type += 2; - return(-1); - break; - case 8: - printf(" Twin Channel - ignoring channel B, "); - ahc->type += 1; - break; - default: - printf(" Unsupported adapter type. Ignoring\n"); - return(-1); - } - - /* Number of SCBs that will be used. Supposedly some newer rev - * aic7770s have more than four so maybe we can detect this in - * the future. - */ - printf("%d SCBs, ", ahc->maxscbs); - - intdef = inb(INTDEF + port); - switch (intdef & 0xf) { - case 9: - ahc->vect = 9; - break; - case 10: - ahc->vect = 10; - break; - case 11: - ahc->vect = 11; - break; - case 12: - ahc->vect = 12; - break; - case 14: - ahc->vect = 14; - break; - case 15: - ahc->vect = 15; - break; - default: - printf("illegal irq setting\n"); - return (EIO); - } - printf("int=%d, ", ahc->vect); - - /* who are we on the scsi bus? */ - ahc->our_id = (inb(HA_SCSICONF + port) & HSCSIID); - printf("SCSI Id=%d\n", ahc->our_id); - - /* - * Load the Sequencer program and Enable the adapter - */ - - printf("ahc%d: Downloading Sequencer Program\n", unit); - ahc_loadseq(port); - outb(BCTL + port, ENABLE); - - /* Reset the SCSI bus. Is this necessary? */ - outb(SCSISEQ + port, SCSIRSTO); - DELAY(500); - outb(SCSISEQ + port, 0); - - /* - * Attempt syncronous negotiation for all targets. - * Clear the pending messages flag - */ - outb( HA_NEEDSDTR + port, 0xff ); - outb( HA_MSG_FLAGS + port, 0); - outb(HA_SCBCOUNT + port, ahc->maxscbs); - outb( ACTIVE_A + port, 0 ); - - UNPAUSE_SEQUENCER(ahc); - - /* - * Note that we are going and return (to probe) - */ - ahc->flags |= AHC_INIT; - return (0); -} - -void -ahcminphys(bp) - struct buf *bp; -{ -/* Even though the card can transfer up to 16megs per command - * we are limited by the number of segments in the dma segment - * list that we can hold. The worst case is that all pages are - * discontinuous physically, hense the "page per segment" limit - * enforced here. - */ - if (bp->b_bcount > ((AHC_NSEG - 1) * PAGESIZ)) { - bp->b_bcount = ((AHC_NSEG - 1) * PAGESIZ); - } -} - -/* - * start a scsi operation given the command and - * the data address, target, and lun all of which - * are stored in the scsi_xfer struct - */ -int32 -ahc_scsi_cmd(xs) - struct scsi_xfer *xs; -{ - struct scb *scb = NULL; - struct ahc_dma_seg *sg; - int seg; /* scatter gather seg being worked on */ - int thiskv; - physaddr thisphys, nextphys; - int unit = xs->sc_link->adapter_unit; - int bytes_this_seg, bytes_this_page, datalen, flags; - struct ahc_data *ahc = ahcdata[unit]; - int s; - - SC_DEBUG(xs->sc_link, SDEV_DB2, ("ahc_scsi_cmd\n")); - /* - * get an scb to use. If the transfer - * is from a buf (possibly from interrupt time) - * then we can't allow it to sleep - */ - flags = xs->flags; - if (xs->bp) - flags |= (SCSI_NOSLEEP); /* just to be sure */ - if (flags & ITSDONE) { - printf("ahc%d: Already done?", unit); - xs->flags &= ~ITSDONE; - } - if (!(flags & INUSE)) { - printf("ahc%d: Not in use?", unit); - xs->flags |= INUSE; - } - if (!(scb = ahc_get_scb(unit, flags))) { - xs->error = XS_DRIVER_STUFFUP; - return (TRY_AGAIN_LATER); - } - SC_DEBUG(xs->sc_link, SDEV_DB3, ("start scb(%x)\n", scb)); - scb->xs = xs; - - if (flags & SCSI_RESET) { - /* AR: Needs Implementation */ - printf("ahc0: SCSI_RESET called.\n"); - } - /* - * Put all the arguments for the xfer in the scb - */ - - /* Note, Linux sequencer code does not support extra channels */ - scb->target_channel_lun = ((xs->sc_link->target << 4) & 0xF0) | - xs->sc_link->lun & 0x7; - scb->cmdlen = xs->cmdlen; - scb->cmdpointer = KVTOPHYS(xs->cmd); - if (xs->datalen) { /* should use S/G only if not zero length */ - scb->SG_list_pointer = KVTOPHYS(scb->ahc_dma); - sg = scb->ahc_dma; - seg = 0; - { - /* - * Set up the scatter gather block - */ - SC_DEBUG(xs->sc_link, SDEV_DB4, - ("%d @0x%x:- ", xs->datalen, xs->data)); - datalen = xs->datalen; - thiskv = (int) xs->data; - thisphys = KVTOPHYS(thiskv); - - while ((datalen) && (seg < AHC_NSEG)) { - bytes_this_seg = 0; - - /* put in the base address */ - sg->addr = thisphys; - - SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%x", thisphys)); - - /* do it at least once */ - nextphys = thisphys; - while ((datalen) && (thisphys == nextphys)) { - /* - * This page is contiguous (physically) - * with the the last, just extend the - * length - */ - /* how far to the end of the page */ - nextphys = (thisphys & (~(PAGESIZ - 1))) - + PAGESIZ; - bytes_this_page = nextphys - thisphys; - /**** or the data ****/ - bytes_this_page = min(bytes_this_page - ,datalen); - bytes_this_seg += bytes_this_page; - datalen -= bytes_this_page; - - /* get more ready for the next page */ - thiskv = (thiskv & (~(PAGESIZ - 1))) - + PAGESIZ; - if (datalen) - thisphys = KVTOPHYS(thiskv); - } - /* - * next page isn't contiguous, finish the seg - */ - SC_DEBUGN(xs->sc_link, SDEV_DB4, - ("(0x%x)", bytes_this_seg)); - sg->len = bytes_this_seg; - sg++; - seg++; - } - } /*end of iov/kv decision */ - scb->SG_segment_count = seg; - SC_DEBUGN(xs->sc_link, SDEV_DB4, ("\n")); - if (datalen) { /* there's still data, must have run out of segs! */ - printf("ahc_scsi_cmd%d: more than %d DMA segs\n", - unit, AHC_NSEG); - xs->error = XS_DRIVER_STUFFUP; - ahc_free_scb(unit, scb, flags); - return (HAD_ERROR); - } - } - /* else No data xfer, use non S/G values - * the SG_segment_count and SG_list_pointer are pre-zeroed, so - * we don't have to do anything - */ - - /* - * Usually return SUCCESSFULLY QUEUED - */ -#ifdef AHCDEBUG - if(xs->sc_link->target == DEBUGTARG) - ahc_print_scb(scb); -#endif - if (!(flags & SCSI_NOMASK)) { - s = splbio(); - ahc_send_scb(ahc, scb); - timeout(ahc_timeout, (caddr_t)scb, (xs->timeout * hz) / 1000); - splx(s); - SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_sent\n")); - return (SUCCESSFULLY_QUEUED); - } - /* - * If we can't use interrupts, poll on completion - */ - ahc_send_scb(ahc, scb); - SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_wait\n")); - do { - if (ahc_poll(unit, xs->timeout)) { - if (!(xs->flags & SCSI_SILENT)) - printf("cmd fail\n"); - printf("cmd fail\n"); - printf("Abort called. Someone implement me please!\n"); - xs->error = XS_DRIVER_STUFFUP; - return (HAD_ERROR); - } - } while (!(xs->flags & ITSDONE)); /* something (?) else finished */ - if (xs->error) { - return (HAD_ERROR); - } - return (COMPLETE); -} - - -/* - * Return some information to the caller about - * the adapter and it's capabilities. - */ -u_int32 -ahc_adapter_info(unit) - int unit; -{ - return (2); /* 2 outstanding requests at a time per device */ -} - -/* - * A scb (and hence an scb entry on the board is put onto the - * free list. - */ -void -ahc_free_scb(unit, scb, flags) - int unit, flags; - struct scb *scb; -{ - unsigned int opri = 0; - struct ahc_data *ahc = ahcdata[unit]; - - if (!(flags & SCSI_NOMASK)) - opri = splbio(); - - scb->next = ahc->free_scb; - ahc->free_scb = scb; - scb->flags = SCB_FREE; - /* - * If there were none, wake abybody waiting for - * one to come free, starting with queued entries - */ - if (!scb->next) { - wakeup((caddr_t)&ahc->free_scb); - } - if (!(flags & SCSI_NOMASK)) - splx(opri); -} - -/* - * Get a free scb - * If there are none, see if we can allocate a - * new one. Otherwise either return an error or sleep - */ -struct scb * -ahc_get_scb(unit, flags) - int unit, flags; -{ - struct ahc_data *ahc = ahcdata[unit]; - unsigned opri = 0; - struct scb *scbp; - int position; - - if (!(flags & SCSI_NOMASK)) - opri = splbio(); - /* - * If we can and have to, sleep waiting for one to come free - * but only if we can't allocate a new one. - */ - while (!(scbp = ahc->free_scb)) { - if (ahc->numscbs < ahc->maxscbs) { - scbp = (struct scb *) malloc(sizeof(struct scb), - M_TEMP, M_NOWAIT); - if (scbp) { - bzero(scbp, sizeof(struct scb)); - scbp->position = ahc->numscbs; - ahc->numscbs++; - scbp->flags = SCB_ACTIVE; - /* - * Place in the scbarray - * Never is removed. Position - * in ahc->scbarray is the scbarray - * position on the board we will - * load it into. - */ - ahc->scbarray[scbp->position] = scbp; - } else { - printf("ahc%d: Can't malloc SCB\n", unit); - } goto gottit; - } else { - if (!(flags & SCSI_NOSLEEP)) { - tsleep((caddr_t)&ahc->free_scb, PRIBIO, - "ahcscb", 0); - } - } - } if (scbp) { - /* Get SCB from from free list */ - ahc->free_scb = scbp->next; - /* preserve the position */ - position = scbp->position; - bzero(scbp, sizeof(struct scb)); - scbp->flags = SCB_ACTIVE; - scbp->position = position; - } -gottit: if (!(flags & SCSI_NOMASK)) - splx(opri); - - return (scbp); -} - -void ahc_loadseq(port) - int port; -{ - static unsigned char seqprog[] = { -# include "../../sys/gnu/misc/aic7770/aic7770_seq.h" - }; - - outb(SEQCTL + port, PERRORDIS|SEQRESET|LOADRAM); - - outsb(SEQRAM + port, seqprog, sizeof(seqprog)); - - outb(SEQCTL + port, 0); - do { - /* XXX Need a timer here? */ - outb(SEQCTL + port, SEQRESET); - - } while (inw(SEQADDR0 + port) != 0); -} - -/* - * Function to poll for command completion when in poll mode - */ -int -ahc_poll(int unit, int wait) -{ /* in msec */ - struct ahc_data *ahc = ahcdata[unit]; - int port = ahc->baseport; - int stport = INTSTAT + port; - - retry: - while (--wait) { - if (inb(stport) & INT_PEND) - break; - DELAY(1000); - } if (wait == 0) { - printf("ahc%d: board not responding\n", unit); - return (EIO); - } - ahcintr(unit); - return (0); -} - -void -ahc_timeout(void *arg1) -{ - struct scb *scb = (struct scb *)arg1; - int unit, cur_scb_offset, port; - struct ahc_data *ahc; - int s = splbio(); - - unit = scb->xs->sc_link->adapter_unit; - ahc = ahcdata[unit]; - port = ahc->baseport; - printf("ahc%d: target %d, lun %d (%s%d) timed out ", unit - ,scb->xs->sc_link->target - ,scb->xs->sc_link->lun - ,scb->xs->sc_link->device->name - ,scb->xs->sc_link->dev_unit); -#if 0 -#ifdef AHCDEBUG - if (ahc_debug & AHC_SHOWMISC) - ahc_print_active_scb(unit); -#endif /*AHCDEBUG */ -#endif - - /* - * If it's immediate, don't try abort it - */ - if (scb->flags & SCB_IMMED) { - scb->xs->retries = 0; /* I MEAN IT ! */ - scb->flags |= SCB_IMMED_FAIL; - ahc_done(unit, scb); - splx(s); - return; - } - /* - * If it has been through before, then - * a previous abort has failed, don't - * try abort again - */ - if (scb->flags == SCB_ABORTED) { - /* - * abort timed out - */ - printf("AGAIN"); - scb->xs->retries = 0; /* I MEAN IT ! */ - ahc_done(unit, scb); - } else { /* abort the operation that has timed out */ - printf("Abort unsupported!!!\n"); - } - splx(s); -} - diff --git a/sys/isofs/cd9660/TODO b/sys/isofs/cd9660/TODO index 555d26ad7d117..efbb3267b1669 100644 --- a/sys/isofs/cd9660/TODO +++ b/sys/isofs/cd9660/TODO @@ -1,4 +1,4 @@ -# $Id: TODO,v 1.4 1993/09/07 15:40:51 ws Exp $ +# TODO,v 1.1.1.1 1994/05/24 10:04:12 rgrimes Exp 1) should understand "older", original High Sierra ("CDROM001") type diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c index 32439ce96abfc..edcb8abd3bcd0 100644 --- a/sys/isofs/cd9660/cd9660_bmap.c +++ b/sys/isofs/cd9660/cd9660_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_bmap.c 8.3 (Berkeley) 1/23/94 - * $Id$ + * cd9660_bmap.c,v 1.2 1994/08/02 07:41:15 davidg Exp */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c index 800a9da8be3e8..14765f32df030 100644 --- a/sys/isofs/cd9660/cd9660_lookup.c +++ b/sys/isofs/cd9660/cd9660_lookup.c @@ -38,7 +38,7 @@ * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91 * * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_lookup.c,v 1.4 1994/09/15 19:45:58 bde Exp $ + * cd9660_lookup.c,v 1.5 1994/09/26 00:32:54 gpalmer Exp */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index 9fc8bff5ce99f..ab0b04a4bec3a 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_node.c,v 1.6 1994/09/26 00:32:56 gpalmer Exp $ + * cd9660_node.c,v 1.7 1994/10/06 21:06:17 davidg Exp */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h index d1839ef429321..81633ece8f543 100644 --- a/sys/isofs/cd9660/cd9660_node.h +++ b/sys/isofs/cd9660/cd9660_node.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_node.h 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_node.h,v 1.2 1994/08/02 07:41:22 davidg Exp $ + * cd9660_node.h,v 1.3 1994/09/15 19:46:00 bde Exp */ /* diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c index 2659b0dc8deec..a741246d5d3c2 100644 --- a/sys/isofs/cd9660/cd9660_rrip.c +++ b/sys/isofs/cd9660/cd9660_rrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_rrip.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_rrip.c,v 1.4 1994/09/15 19:46:01 bde Exp $ + * cd9660_rrip.c,v 1.5 1994/09/26 00:32:57 gpalmer Exp */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_rrip.h b/sys/isofs/cd9660/cd9660_rrip.h index 8a140febb39bd..ad16a9725e45b 100644 --- a/sys/isofs/cd9660/cd9660_rrip.h +++ b/sys/isofs/cd9660/cd9660_rrip.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_rrip.h 8.1 (Berkeley) 1/21/94 - * $Id$ + * cd9660_rrip.h,v 1.2 1994/08/02 07:41:30 davidg Exp */ typedef struct { diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c index 52a80d75ce42f..774a2c0943cf1 100644 --- a/sys/isofs/cd9660/cd9660_util.c +++ b/sys/isofs/cd9660/cd9660_util.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_util.c 8.1 (Berkeley) 1/21/94 - * $Id$ + * cd9660_util.c,v 1.3 1994/08/02 07:41:31 davidg Exp */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index b1302b121522d..90e5ab4389972 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.3 (Berkeley) 1/31/94 - * $Id: cd9660_vfsops.c,v 1.8 1994/09/26 00:32:58 gpalmer Exp $ + * cd9660_vfsops.c,v 1.9 1994/11/14 07:01:58 bde Exp */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 280f5f55b6c2c..22cdf6f9d3cf1 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vnops.c 8.3 (Berkeley) 1/23/94 - * $Id: cd9660_vnops.c,v 1.9 1994/09/26 00:32:59 gpalmer Exp $ + * cd9660_vnops.c,v 1.10 1994/09/28 16:44:59 dfr Exp */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h index 04b9accd1705d..b147747bf84cf 100644 --- a/sys/isofs/cd9660/iso.h +++ b/sys/isofs/cd9660/iso.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)iso.h 8.2 (Berkeley) 1/23/94 - * $Id: iso.h,v 1.2 1994/08/02 07:41:38 davidg Exp $ + * iso.h,v 1.3 1994/09/09 11:11:01 dfr Exp */ #define ISODCL(from, to) (to - from + 1) diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h index 031aaa37358bf..b6799e076eb0c 100644 --- a/sys/isofs/cd9660/iso_rrip.h +++ b/sys/isofs/cd9660/iso_rrip.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)iso_rrip.h 8.2 (Berkeley) 1/23/94 - * $Id$ + * iso_rrip.h,v 1.2 1994/08/02 07:41:40 davidg Exp */ diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc index a09e4848a08d6..00dfd2cbc2a45 100644 --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -1,5 +1,5 @@ # @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93 -# $Id$ +# Make.tags.inc,v 1.2 1994/08/02 07:41:47 davidg Exp # Common files for "make tags". # Included by the Makefile for each architecture. diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index c700c261fda4e..5c81feafc6313 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_aout.c,v 1.8 1994/09/24 21:36:50 davidg Exp $ + * imgact_aout.c,v 1.9 1994/09/25 19:33:31 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c index 87de99578adb9..9d9dc56211f74 100644 --- a/sys/kern/imgact_gzip.c +++ b/sys/kern/imgact_gzip.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: imgact_gzip.c,v 1.9 1994/10/22 11:40:27 phk Exp $ + * imgact_gzip.c,v 1.10 1994/10/22 11:55:16 phk Exp * * This module handles execution of a.out files which have been run through * "gzip". This saves diskspace, but wastes cpu-cycles and VM. diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c index 8340221b0355e..ddcaaa5136fed 100644 --- a/sys/kern/imgact_shell.c +++ b/sys/kern/imgact_shell.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_shell.c,v 1.5 1994/08/18 22:34:56 wollman Exp $ + * imgact_shell.c,v 1.6 1994/09/25 19:33:32 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c index a15c3472d313b..652ca73348c75 100644 --- a/sys/kern/inflate.c +++ b/sys/kern/inflate.c @@ -7,7 +7,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: inflate.c,v 1.3 1994/10/11 11:29:11 csgr Exp $ + * inflate.c,v 1.4 1994/10/22 11:40:28 phk Exp * * */ diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index f42f00ab77c6f..5c56eada22a25 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $Id: init_main.c,v 1.15 1994/10/26 03:34:20 phk Exp $ + * init_main.c,v 1.16 1994/11/06 05:01:58 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 9353297e48832..46969295c980f 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: syscalls.master,v 1.11 1994/10/02 04:45:52 davidg Exp $ + * created from init_sysent.c,v 1.16 1994/11/10 23:59:17 ats Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index 46ed69730c4b0..ba64d1e64e703 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_acct.c 8.1 (Berkeley) 6/14/93 - * $Id: kern_acct.c,v 1.5 1994/09/26 21:09:00 davidg Exp $ + * kern_acct.c,v 1.6 1994/10/02 17:35:09 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 35e119be4085c..f9e365c16cf1b 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.9 1994/10/02 17:35:10 phk Exp $ + * kern_clock.c,v 1.10 1994/10/16 03:52:12 wollman Exp */ /* Portions of this software are covered by the following: */ diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index b18eab8979d8d..1f1a99a2ae2ea 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.5 1994/09/25 19:33:35 phk Exp $ + * kern_descrip.c,v 1.6 1994/10/02 17:35:11 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_devconf.c b/sys/kern/kern_devconf.c index 21c18f388964a..19da4d925fa30 100644 --- a/sys/kern/kern_devconf.c +++ b/sys/kern/kern_devconf.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_devconf.c,v 1.4 1994/10/23 21:27:46 wollman Exp $ + * kern_devconf.c,v 1.5 1994/10/23 23:01:03 wollman Exp */ /* diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index ffd78da0a84be..d058869bdbcb8 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_exec.c,v 1.9 1994/09/25 19:33:36 phk Exp $ + * kern_exec.c,v 1.10 1994/10/02 17:35:13 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 61eb9840c1187..22e77641aa809 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $Id: kern_exit.c,v 1.11 1994/10/11 20:42:01 sos Exp $ + * kern_exit.c,v 1.12 1994/10/27 05:21:39 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index b151b8459df95..25baa614d28d8 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $Id: kern_fork.c,v 1.8 1994/10/09 07:34:55 davidg Exp $ + * kern_fork.c,v 1.9 1994/10/10 01:00:43 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 2bba4bb9ba9c2..0680b3b2d559b 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $Id: kern_ktrace.c,v 1.4 1994/08/18 22:35:01 wollman Exp $ + * kern_ktrace.c,v 1.5 1994/10/02 17:35:15 phk Exp */ #ifdef KTRACE diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index aebcbf296b597..b752a500ce007 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)ufs_lockf.c 8.3 (Berkeley) 1/6/94 - * $Id: kern_lockf.c,v 1.2 1994/09/25 19:33:37 phk Exp $ + * kern_lockf.c,v 1.3 1994/10/25 11:27:51 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index f70cbfb741589..313c310809c59 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $Id: kern_malloc.c,v 1.4 1994/10/02 17:35:17 phk Exp $ + * kern_malloc.c,v 1.5 1994/10/09 07:34:56 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index 4a33c462cbc79..ac5dfd799fd52 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: kern_physio.c,v 1.7 1994/08/18 22:35:02 wollman Exp $ + * kern_physio.c,v 1.8 1994/09/25 19:33:40 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 527d53b963d96..ca0703371c7c8 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.4 (Berkeley) 1/4/94 - * $Id: kern_proc.c,v 1.8 1994/10/09 07:34:57 davidg Exp $ + * kern_proc.c,v 1.9 1994/10/10 01:00:45 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index a5ea8b49521af..c4db37683b2c4 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $Id: kern_prot.c,v 1.4 1994/09/25 19:33:41 phk Exp $ + * kern_prot.c,v 1.5 1994/10/13 20:59:49 sos Exp */ /* diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 17392399a5638..8ff8f8f7d9506 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_resource.c,v 1.6 1994/10/02 04:45:49 davidg Exp $ + * kern_resource.c,v 1.7 1994/10/10 01:00:46 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index e644649256b92..f0ab86b63c7d2 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $Id: kern_sig.c,v 1.7 1994/10/10 01:00:47 phk Exp $ + * kern_sig.c,v 1.8 1994/11/06 11:13:02 ache Exp */ #define SIGPROP /* include signal properties table */ diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 8df444c58d43f..3954b1dcd00e2 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $Id$ + * kern_subr.c,v 1.3 1994/08/02 07:42:14 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 72b710fdbd964..84bcf07984d9c 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.6 (Berkeley) 1/21/94 - * $Id: kern_synch.c,v 1.7 1994/10/02 17:35:18 phk Exp $ + * kern_synch.c,v 1.8 1994/10/18 06:55:39 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index f206decd86135..4836b0859a5a4 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $Id: kern_sysctl.c,v 1.18 1994/10/16 03:52:14 wollman Exp $ + * kern_sysctl.c,v 1.19 1994/11/14 13:58:30 bde Exp */ /* diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index f3581b1a9a770..1ebc9978d4c72 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_time.c 8.1 (Berkeley) 6/10/93 - * $Id: kern_time.c,v 1.4 1994/09/25 19:33:45 phk Exp $ + * kern_time.c,v 1.5 1994/10/02 17:35:20 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 337ff4f736483..4ee0638cf2aeb 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_xxx.c 8.2 (Berkeley) 11/14/93 - * $Id: kern_xxx.c,v 1.7 1994/09/25 19:33:46 phk Exp $ + * kern_xxx.c,v 1.8 1994/10/02 17:35:21 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh index 50de7d206fbcd..3ff74a0c13356 100644 --- a/sys/kern/makesyscalls.sh +++ b/sys/kern/makesyscalls.sh @@ -1,6 +1,6 @@ #! /bin/sh - # @(#)makesyscalls.sh 8.1 (Berkeley) 6/10/93 -# $Id: makesyscalls.sh,v 1.9 1994/10/09 22:07:37 sos Exp $ +# makesyscalls.sh,v 1.10 1994/11/06 21:57:16 ats Exp set -e diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index f48ce99f0a37c..278e63db8058c 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -41,7 +41,7 @@ * * @(#)subr_autoconf.c 8.1 (Berkeley) 6/10/93 * - * $Id$ + * subr_autoconf.c,v 1.2 1994/08/02 07:42:26 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index e0beafa1a065e..fc0c7ed34c166 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 - * $Id: subr_log.c,v 1.4 1994/09/25 19:33:47 phk Exp $ + * subr_log.c,v 1.5 1994/10/02 17:35:22 phk Exp */ /* diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index cc492d107b4ea..2d4299d72f8a3 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 - * $Id: subr_prf.c,v 1.6 1994/09/28 19:22:32 phk Exp $ + * subr_prf.c,v 1.7 1994/10/02 17:35:23 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index e7e15d21ca7f5..ad9115517aad5 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 - * $Id: subr_prof.c,v 1.3 1994/08/02 07:42:32 davidg Exp $ + * subr_prof.c,v 1.4 1994/09/21 21:58:39 bde Exp */ #include <sys/param.h> diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c index ae4b0124e22b2..e6e5dcc30c885 100644 --- a/sys/kern/subr_rlist.c +++ b/sys/kern/subr_rlist.c @@ -45,7 +45,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: subr_rlist.c,v 1.6 1994/08/13 03:50:24 wollman Exp $ + * subr_rlist.c,v 1.7 1994/10/02 17:35:23 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c index e866b8aaf9089..3160bc1c05a81 100644 --- a/sys/kern/subr_xxx.c +++ b/sys/kern/subr_xxx.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_xxx.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * subr_xxx.c,v 1.3 1994/08/02 07:42:36 davidg Exp */ /* diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 2f021a18cba7a..5b3f7807b6aab 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $Id: sys_generic.c,v 1.9 1994/10/13 21:01:47 sos Exp $ + * sys_generic.c,v 1.10 1994/10/13 21:41:36 sos Exp */ #include <sys/param.h> diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 63537bdbeb20a..1786476f22350 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sys_process.c,v 1.6 1994/08/18 22:35:05 wollman Exp $ + * sys_process.c,v 1.7 1994/09/25 19:33:49 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index f7ced539ba030..3ffd26a0e89be 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)sys_socket.c 8.1 (Berkeley) 6/10/93 - * $Id: sys_socket.c,v 1.3 1994/08/02 07:42:42 davidg Exp $ + * sys_socket.c,v 1.4 1994/10/02 17:35:25 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 247b9286e677b..110d1b1f4f784 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: syscalls.master,v 1.11 1994/10/02 04:45:52 davidg Exp $ + * created from syscalls.c,v 1.13 1994/11/10 23:59:19 ats Exp */ char *syscallnames[] = { diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 0e7c986a3099f..5db6b43a43574 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,4 @@ - $Id: syscalls.master,v 1.10 1994/09/28 22:44:47 wollman Exp $ + syscalls.master,v 1.11 1994/10/02 04:45:52 davidg Exp ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index f0e907b903d98..2317d46ac6482 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* sysv_ipc.c,v 1.1 1994/09/13 14:46:55 dfr Exp */ /* $NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $ */ /* diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 4ef4bf70d3d95..a155710c085d3 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -1,4 +1,4 @@ -/* $Id: sysv_msg.c,v 1.2 1994/09/17 13:24:16 davidg Exp $ */ +/* sysv_msg.c,v 1.3 1994/10/02 17:35:26 phk Exp */ /* * Implementation of SVID messages diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 9bafdfff52d5e..124e8f0dd88ff 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1,4 +1,4 @@ -/* $Id: sysv_sem.c,v 1.3 1994/10/02 17:35:27 phk Exp $ */ +/* sysv_sem.c,v 1.4 1994/10/06 21:06:32 davidg Exp */ /* * Implementation of SVID semaphores diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index cb1a664583fda..d6bb34b4fd89e 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $Id: sysv_shm.c,v 1.2 1994/09/16 17:43:22 dfr Exp $ */ +/* sysv_shm.c,v 1.3 1994/10/02 17:35:28 phk Exp */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ /* diff --git a/sys/kern/tty.c b/sys/kern/tty.c index c9c29f79f0d5f..2aaf16fededf1 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.12 1994/10/23 06:18:13 davidg Exp $ + * tty.c,v 1.13 1994/11/01 22:23:29 bde Exp */ #include <sys/param.h> diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c index 8a4384487936e..78604c7984541 100644 --- a/sys/kern/tty_compat.c +++ b/sys/kern/tty_compat.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_compat.c 8.1 (Berkeley) 6/10/93 - * $Id: tty_compat.c,v 1.6 1994/10/11 20:04:49 ache Exp $ + * tty_compat.c,v 1.7 1994/10/11 20:29:42 ache Exp */ /* diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index 6b9bf4ff0ca40..33bc71d4ea041 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty_conf.c 8.4 (Berkeley) 1/21/94 - * $Id: tty_conf.c,v 1.3 1994/08/02 07:42:50 davidg Exp $ + * tty_conf.c,v 1.4 1994/10/05 21:22:24 wollman Exp */ #include <sys/param.h> diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 31a06733b0fa6..f5dbbff1dc2f2 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.2 (Berkeley) 9/23/93 - * $Id: tty_pty.c,v 1.5 1994/10/02 17:35:30 phk Exp $ + * tty_pty.c,v 1.6 1994/10/29 23:59:48 ache Exp */ /* diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index 46a8f1efbd139..35f25a26efd79 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -6,7 +6,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: tty_subr.c,v 1.7 1994/09/25 19:33:50 phk Exp $ + * tty_subr.c,v 1.8 1994/10/30 19:43:49 bde Exp */ /* diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c index 8f4c84c66383c..d270ecf384baa 100644 --- a/sys/kern/tty_tb.c +++ b/sys/kern/tty_tb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tb.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tty_tb.c,v 1.2 1994/08/02 07:42:55 davidg Exp */ #include "tb.h" diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index b710d5b2d47b6..adf3d48656a66 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tty.c 8.2 (Berkeley) 9/23/93 - * $Id$ + * tty_tty.c,v 1.3 1994/08/02 07:42:57 davidg Exp */ /* diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index e1f76dee1e8c8..93cf17239ee0a 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 - * $Id$ + * uipc_domain.c,v 1.3 1994/08/02 07:43:00 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index a20dd4cfb8515..195122b3e053e 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: uipc_mbuf.c,v 1.5 1994/10/04 06:50:01 phk Exp $ + * uipc_mbuf.c,v 1.6 1994/10/09 07:34:59 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c index b484737e54594..37eddd0e47d25 100644 --- a/sys/kern/uipc_proto.c +++ b/sys/kern/uipc_proto.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_proto.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * uipc_proto.c,v 1.2 1994/08/02 07:43:04 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 91c33560d3645..f469f01894bb3 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $Id: uipc_socket.c,v 1.4 1994/08/02 07:43:06 davidg Exp $ + * uipc_socket.c,v 1.5 1994/10/02 17:35:32 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 2da76430d8a69..cd742057fc1a1 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.3 1994/08/02 07:43:08 davidg Exp $ + * uipc_socket2.c,v 1.4 1994/10/02 17:35:33 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index e2ad45a73fe5c..000e4a6bf6d6b 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $Id: uipc_syscalls.c,v 1.3 1994/08/02 07:43:10 davidg Exp $ + * uipc_syscalls.c,v 1.4 1994/10/02 17:35:35 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 18b1dfedd4dfe..13e585d431645 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $Id: uipc_usrreq.c,v 1.4 1994/09/28 19:55:10 phk Exp $ + * uipc_usrreq.c,v 1.5 1994/10/02 17:35:36 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index c705741bec426..9f2d05ddb5e99 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.15 1994/10/18 06:55:40 davidg Exp $ + * vfs_bio.c,v 1.16 1994/10/23 20:52:11 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 369e73fecdc34..813ffc39748aa 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vfs_cache.c 8.1 (Berkeley) 6/10/93 - * $Id: vfs_cache.c,v 1.3 1994/08/02 07:43:15 davidg Exp $ + * vfs_cache.c,v 1.4 1994/10/02 17:35:37 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 005da05c8700a..cc601a2135fda 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $Id: vfs_cluster.c,v 1.5 1994/09/24 18:31:45 davidg Exp $ + * vfs_cluster.c,v 1.6 1994/10/08 22:33:41 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 251d704e176cd..849313742a68d 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 - * $Id: vfs_conf.c,v 1.5 1994/09/21 03:46:47 wollman Exp $ + * vfs_conf.c,v 1.6 1994/11/12 01:47:43 phk Exp */ #include <sys/param.h> diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 508e23f4d529f..3df16f65f6ed5 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 - * $Id: vfs_init.c,v 1.8 1994/10/08 22:33:42 phk Exp $ + * vfs_init.c,v 1.9 1994/10/20 00:48:28 wollman Exp */ diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 8936e2efdfab8..40c21e6fc7104 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_lookup.c 8.4 (Berkeley) 2/16/94 - * $Id: vfs_lookup.c,v 1.5 1994/09/27 20:33:30 phk Exp $ + * vfs_lookup.c,v 1.6 1994/10/06 21:06:36 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 6713c73af2359..2affd0c8ca478 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.13 (Berkeley) 4/18/94 - * $Id: vfs_subr.c,v 1.11 1994/10/05 09:48:22 davidg Exp $ + * vfs_subr.c,v 1.12 1994/10/06 21:06:37 davidg Exp */ /* diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index e5c52188c8544..92b1b0d82e4bf 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.15 1994/10/21 01:19:15 wollman Exp $ + * vfs_syscalls.c,v 1.16 1994/11/04 14:41:34 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 79b92cbd40efe..919a9c35e31d8 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $Id: vfs_vnops.c,v 1.5 1994/10/02 17:35:40 phk Exp $ + * vfs_vnops.c,v 1.6 1994/10/05 09:48:26 davidg Exp */ #include <sys/param.h> diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh index 339e658943715..73335e1816be3 100644 --- a/sys/kern/vnode_if.sh +++ b/sys/kern/vnode_if.sh @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.sh 8.1 (Berkeley) 6/10/93 -# $Id$ +# vnode_if.sh,v 1.2 1994/08/02 07:43:34 davidg Exp # # Script to produce VFS front-end sugar. diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 4e36675e58844..9bf7309991890 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -31,7 +31,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.3 (Berkeley) 2/3/94 -# $Id: vnode_if.src,v 1.2 1994/08/02 07:43:37 davidg Exp $ +# vnode_if.src,v 1.3 1994/09/28 16:45:12 dfr Exp # vop_lookup { IN struct vnode *dvp; diff --git a/sys/libkern/Makefile b/sys/libkern/Makefile index 4b9347ccba09c..fbb2e69654719 100644 --- a/sys/libkern/Makefile +++ b/sys/libkern/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 7.9 (Berkeley) 6/1/93 -# $Id: Makefile,v 1.4 1994/10/25 14:57:56 jkh Exp $ +# Makefile,v 1.5 1994/10/26 11:14:21 jkh Exp LIB= kern CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -DKERNEL diff --git a/sys/libkern/adddi3.c b/sys/libkern/adddi3.c index 38b9df95e66b7..6fa1692178eb5 100644 --- a/sys/libkern/adddi3.c +++ b/sys/libkern/adddi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * adddi3.c,v 1.2 1994/08/02 07:43:42 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/anddi3.c b/sys/libkern/anddi3.c index 9f92718ea6708..92aedded076d7 100644 --- a/sys/libkern/anddi3.c +++ b/sys/libkern/anddi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * anddi3.c,v 1.2 1994/08/02 07:43:44 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c index 74fa0fdcdbced..d670d2bd3d4a9 100644 --- a/sys/libkern/ashldi3.c +++ b/sys/libkern/ashldi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * ashldi3.c,v 1.2 1994/08/02 07:43:46 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c index 51b9da5fefdf8..1087120d31bf9 100644 --- a/sys/libkern/ashrdi3.c +++ b/sys/libkern/ashrdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * ashrdi3.c,v 1.2 1994/08/02 07:43:48 davidg Exp */ #if defined(LIBC_SCCS) && !defined(lint) diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c index de9449b467177..300ac908088a4 100644 --- a/sys/libkern/bcmp.c +++ b/sys/libkern/bcmp.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * bcmp.c,v 1.2 1994/08/02 07:43:50 davidg Exp */ #include <string.h> diff --git a/sys/libkern/cmpdi2.c b/sys/libkern/cmpdi2.c index 238bd4eb743ef..f9b4632e6c3da 100644 --- a/sys/libkern/cmpdi2.c +++ b/sys/libkern/cmpdi2.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * cmpdi2.c,v 1.2 1994/08/02 07:43:53 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c index f6687f9c9601e..d4e4d8e0f351f 100644 --- a/sys/libkern/divdi3.c +++ b/sys/libkern/divdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * divdi3.c,v 1.2 1994/08/02 07:43:54 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c index 74e24502caeee..f4c17e9d191f7 100644 --- a/sys/libkern/ffs.c +++ b/sys/libkern/ffs.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * ffs.c,v 1.2 1994/08/02 07:43:57 davidg Exp */ #include <string.h> diff --git a/sys/libkern/iordi3.c b/sys/libkern/iordi3.c index 2819cf8e5a0ae..8473c31c8bde5 100644 --- a/sys/libkern/iordi3.c +++ b/sys/libkern/iordi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * iordi3.c,v 1.2 1994/08/02 07:44:00 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/libkern.h b/sys/libkern/libkern.h index 80d9e545582c4..21259df2108f9 100644 --- a/sys/libkern/libkern.h +++ b/sys/libkern/libkern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)libkern.h 8.1 (Berkeley) 6/10/93 - * $Id: libkern.h,v 1.3 1994/08/30 18:19:47 davidg Exp $ + * libkern.h,v 1.4 1994/09/18 23:04:25 bde Exp */ #include <sys/types.h> diff --git a/sys/libkern/locc.c b/sys/libkern/locc.c index 8a67e0f740f8c..9d245998a4ec7 100644 --- a/sys/libkern/locc.c +++ b/sys/libkern/locc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)locc.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * locc.c,v 1.2 1994/08/02 07:44:04 davidg Exp */ #include <libkern/libkern.h> diff --git a/sys/libkern/lshldi3.c b/sys/libkern/lshldi3.c index 0aba85e008137..5733c29a135c5 100644 --- a/sys/libkern/lshldi3.c +++ b/sys/libkern/lshldi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * lshldi3.c,v 1.2 1994/08/02 07:44:06 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c index b93de210cec7e..ef742701eb7a3 100644 --- a/sys/libkern/lshrdi3.c +++ b/sys/libkern/lshrdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * lshrdi3.c,v 1.2 1994/08/02 07:44:08 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c index f9942e84fe435..970b4c3a4c6e5 100644 --- a/sys/libkern/mcount.c +++ b/sys/libkern/mcount.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mcount.c,v 1.2 1994/08/02 07:44:09 davidg Exp $ + * mcount.c,v 1.3 1994/09/15 15:41:48 paul Exp */ #include <sys/param.h> diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c index efb6f92a5387a..1232f4353fcb5 100644 --- a/sys/libkern/moddi3.c +++ b/sys/libkern/moddi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * moddi3.c,v 1.2 1994/08/02 07:44:11 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/muldi3.c b/sys/libkern/muldi3.c index 49adc513a8f3c..68cf4e304b1ab 100644 --- a/sys/libkern/muldi3.c +++ b/sys/libkern/muldi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * muldi3.c,v 1.2 1994/08/02 07:44:13 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/negdi2.c b/sys/libkern/negdi2.c index c4065e218d036..6ba40ff86932a 100644 --- a/sys/libkern/negdi2.c +++ b/sys/libkern/negdi2.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * negdi2.c,v 1.2 1994/08/02 07:44:15 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/notdi2.c b/sys/libkern/notdi2.c index f451088c35001..e84abf51c44e3 100644 --- a/sys/libkern/notdi2.c +++ b/sys/libkern/notdi2.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * notdi2.c,v 1.2 1994/08/02 07:44:17 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c index caf4d7c7512f9..3ecb5733a63e3 100644 --- a/sys/libkern/qdivrem.c +++ b/sys/libkern/qdivrem.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * qdivrem.c,v 1.2 1994/08/02 07:44:19 davidg Exp */ /* diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h index dadd02c8a0f9d..09ae669c88f7e 100644 --- a/sys/libkern/quad.h +++ b/sys/libkern/quad.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)quad.h 8.1 (Berkeley) 6/4/93 - * $Id$ + * quad.h,v 1.2 1994/08/02 07:44:21 davidg Exp */ /* diff --git a/sys/libkern/random.c b/sys/libkern/random.c index 7cdfd32f33e46..d97d01fe85cba 100644 --- a/sys/libkern/random.c +++ b/sys/libkern/random.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)random.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * random.c,v 1.2 1994/08/02 07:44:23 davidg Exp */ #include <libkern/libkern.h> diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c index bd661fbeb0653..8f9506d30ed33 100644 --- a/sys/libkern/rindex.c +++ b/sys/libkern/rindex.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * rindex.c,v 1.2 1994/08/02 07:44:25 davidg Exp */ #include <stddef.h> diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c index 88bc3ffebc6ab..17705634f8b8a 100644 --- a/sys/libkern/scanc.c +++ b/sys/libkern/scanc.c @@ -32,7 +32,7 @@ * * @(#)scanc.c 8.1 (Berkeley) 6/10/93 * - * $Id$ + * scanc.c,v 1.2 1994/08/02 07:44:27 davidg Exp */ #include <libkern/libkern.h> diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c index 43894ef2d5133..47bed6eb5a224 100644 --- a/sys/libkern/skpc.c +++ b/sys/libkern/skpc.c @@ -32,7 +32,7 @@ * * @(#)skpc.c 8.1 (Berkeley) 6/10/93 * - * $Id$ + * skpc.c,v 1.2 1994/08/02 07:44:29 davidg Exp */ #include <libkern/libkern.h> diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c index 07e79231ddb5f..824ac2b3fe3d9 100644 --- a/sys/libkern/strcat.c +++ b/sys/libkern/strcat.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * strcat.c,v 1.2 1994/08/02 07:44:31 davidg Exp */ #include <string.h> diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c index c9c397b57124d..f53f8e0c6b368 100644 --- a/sys/libkern/strcmp.c +++ b/sys/libkern/strcmp.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * strcmp.c,v 1.2 1994/08/02 07:44:33 davidg Exp */ #include <sys/cdefs.h> diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c index 2715720e3d23e..57d539a3494ae 100644 --- a/sys/libkern/strcpy.c +++ b/sys/libkern/strcpy.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * strcpy.c,v 1.2 1994/08/02 07:44:36 davidg Exp */ #include <sys/cdefs.h> diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c index 1d1352c09e6b0..96fbc9a4f3695 100644 --- a/sys/libkern/strlen.c +++ b/sys/libkern/strlen.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * strlen.c,v 1.2 1994/08/02 07:44:38 davidg Exp */ #include <sys/cdefs.h> diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c index 8aea6908849d7..5bc0581592120 100644 --- a/sys/libkern/strncpy.c +++ b/sys/libkern/strncpy.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * strncpy.c,v 1.2 1994/08/02 07:44:39 davidg Exp */ #include <sys/cdefs.h> diff --git a/sys/libkern/subdi3.c b/sys/libkern/subdi3.c index cb54477a4d45c..0605d461d8b23 100644 --- a/sys/libkern/subdi3.c +++ b/sys/libkern/subdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * subdi3.c,v 1.2 1994/08/02 07:44:41 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c index 4aa3e50637dd7..1d94e4ecff9c2 100644 --- a/sys/libkern/ucmpdi2.c +++ b/sys/libkern/ucmpdi2.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * ucmpdi2.c,v 1.2 1994/08/02 07:44:43 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c index f9a77ec432c72..fe5b83ab3029b 100644 --- a/sys/libkern/udivdi3.c +++ b/sys/libkern/udivdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * udivdi3.c,v 1.2 1994/08/02 07:44:44 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c index ccd457d0adce7..7ad65b9d4f7b2 100644 --- a/sys/libkern/umoddi3.c +++ b/sys/libkern/umoddi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * umoddi3.c,v 1.2 1994/08/02 07:44:46 davidg Exp */ #include "quad.h" diff --git a/sys/libkern/xordi3.c b/sys/libkern/xordi3.c index e49190902a22b..9f798fe4dfad4 100644 --- a/sys/libkern/xordi3.c +++ b/sys/libkern/xordi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * xordi3.c,v 1.2 1994/08/02 07:44:48 davidg Exp */ #include "quad.h" diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index d701c33152d83..5d761426e160e 100644 --- a/sys/miscfs/deadfs/dead_vnops.c +++ b/sys/miscfs/deadfs/dead_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93 - * $Id: dead_vnops.c,v 1.5 1994/10/06 21:06:40 davidg Exp $ + * dead_vnops.c,v 1.6 1994/10/08 22:37:00 phk Exp */ #include <sys/param.h> diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h index 4c682e7bd370c..185e126b3a994 100644 --- a/sys/miscfs/fdesc/fdesc.h +++ b/sys/miscfs/fdesc/fdesc.h @@ -35,7 +35,7 @@ * * @(#)fdesc.h 8.5 (Berkeley) 1/21/94 * - * $Id: fdesc.h,v 1.8 1993/04/06 15:28:33 jsp Exp $ + * fdesc.h,v 1.1.1.1 1994/05/24 10:04:59 rgrimes Exp */ #ifdef KERNEL diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c index d82f14d209afc..d664921630b9b 100644 --- a/sys/miscfs/fdesc/fdesc_vfsops.c +++ b/sys/miscfs/fdesc/fdesc_vfsops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $Id: fdesc_vfsops.c,v 1.1.1.1 1994/05/24 10:04:59 rgrimes Exp $ + * fdesc_vfsops.c,v 1.2 1994/09/21 03:46:55 wollman Exp */ /* diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c index 5232de14d3346..49d5fd703df99 100644 --- a/sys/miscfs/fdesc/fdesc_vnops.c +++ b/sys/miscfs/fdesc/fdesc_vnops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $Id: fdesc_vnops.c,v 1.6 1994/10/02 17:47:51 phk Exp $ + * fdesc_vnops.c,v 1.7 1994/10/06 21:06:42 davidg Exp */ /* diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h index 4074b9ef80e1c..6fc689c89d99c 100644 --- a/sys/miscfs/fifofs/fifo.h +++ b/sys/miscfs/fifofs/fifo.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo.h 8.2 (Berkeley) 2/2/94 - * $Id: fifo.h,v 1.2 1994/08/02 07:44:54 davidg Exp $ + * fifo.h,v 1.3 1994/09/22 19:38:05 wollman Exp */ /* diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index bd250deece5e5..2406a4f1e1bdc 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.2 (Berkeley) 1/4/94 - * $Id: fifo_vnops.c,v 1.5 1994/09/22 19:38:07 wollman Exp $ + * fifo_vnops.c,v 1.6 1994/10/02 17:48:00 phk Exp */ #include <sys/param.h> diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h index 2def608e55fc9..338fd4bf7d6ef 100644 --- a/sys/miscfs/kernfs/kernfs.h +++ b/sys/miscfs/kernfs/kernfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs.h 8.4 (Berkeley) 1/21/94 - * $Id$ + * kernfs.h,v 1.2 1994/08/02 07:44:59 davidg Exp */ #define _PATH_KERNFS "/kern" /* Default mountpoint */ diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c index eee76e7f5d848..35d9486bf83d4 100644 --- a/sys/miscfs/kernfs/kernfs_vfsops.c +++ b/sys/miscfs/kernfs/kernfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs_vfsops.c 8.4 (Berkeley) 1/21/94 - * $Id: kernfs_vfsops.c,v 1.5 1994/09/22 19:38:11 wollman Exp $ + * kernfs_vfsops.c,v 1.6 1994/10/02 17:48:08 phk Exp */ /* diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c index b38fc5e2b7439..801e2558f38af 100644 --- a/sys/miscfs/kernfs/kernfs_vnops.c +++ b/sys/miscfs/kernfs/kernfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs_vnops.c 8.6 (Berkeley) 2/10/94 - * $Id: kernfs_vnops.c,v 1.6 1994/10/02 17:48:09 phk Exp $ + * kernfs_vnops.c,v 1.7 1994/11/15 20:30:56 jkh Exp */ /* diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h index 14286ffeee0c7..cc7e3d97abcf6 100644 --- a/sys/miscfs/nullfs/null.h +++ b/sys/miscfs/nullfs/null.h @@ -35,7 +35,7 @@ * * @(#)null.h 8.2 (Berkeley) 1/21/94 * - * $Id: lofs.h,v 1.8 1992/05/30 10:05:43 jsp Exp jsp $ + * null.h,v 1.1.1.1 1994/05/24 10:05:04 rgrimes Exp */ struct null_args { diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c index 8d18ffdc9e71e..44587490fc403 100644 --- a/sys/miscfs/nullfs/null_subr.c +++ b/sys/miscfs/nullfs/null_subr.c @@ -35,7 +35,7 @@ * * @(#)null_subr.c 8.4 (Berkeley) 1/21/94 * - * $Id: null_subr.c,v 1.2 1994/05/25 09:08:00 rgrimes Exp $ + * null_subr.c,v 1.3 1994/10/02 17:48:14 phk Exp */ #include <sys/param.h> diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c index 4e13fb28e5784..0a85e9f9942f8 100644 --- a/sys/miscfs/nullfs/null_vfsops.c +++ b/sys/miscfs/nullfs/null_vfsops.c @@ -36,7 +36,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $Id: null_vfsops.c,v 1.3 1994/09/22 19:38:14 wollman Exp $ + * null_vfsops.c,v 1.4 1994/10/10 07:55:28 phk Exp */ /* diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c index 4f51452fe6192..34aed70917135 100644 --- a/sys/miscfs/nullfs/null_vnops.c +++ b/sys/miscfs/nullfs/null_vnops.c @@ -35,7 +35,7 @@ * * @(#)null_vnops.c 8.1 (Berkeley) 6/10/93 * - * $Id: null_vnops.c,v 1.5 1994/09/21 23:22:41 wollman Exp $ + * null_vnops.c,v 1.6 1994/10/10 07:55:29 phk Exp */ /* diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h index 38d7ee0cdd279..1133844bcc2a1 100644 --- a/sys/miscfs/portal/portal.h +++ b/sys/miscfs/portal/portal.h @@ -35,7 +35,7 @@ * * @(#)portal.h 8.4 (Berkeley) 1/21/94 * - * $Id: portal.h,v 1.3 1992/05/30 10:05:24 jsp Exp jsp $ + * portal.h,v 1.1.1.1 1994/05/24 10:05:06 rgrimes Exp */ struct portal_args { diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c index 39d54c225136e..37b049fdc5b7e 100644 --- a/sys/miscfs/portal/portal_vfsops.c +++ b/sys/miscfs/portal/portal_vfsops.c @@ -35,7 +35,7 @@ * * @(#)portal_vfsops.c 8.6 (Berkeley) 1/21/94 * - * $Id: portal_vfsops.c,v 1.4 1994/09/23 11:01:58 davidg Exp $ + * portal_vfsops.c,v 1.5 1994/10/10 07:55:35 phk Exp */ /* diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index b25b5434712fd..a00d867172a6c 100644 --- a/sys/miscfs/portal/portal_vnops.c +++ b/sys/miscfs/portal/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94 * - * $Id: portal_vnops.c,v 1.3 1994/08/20 03:48:52 davidg Exp $ + * portal_vnops.c,v 1.4 1994/09/21 03:47:05 wollman Exp */ /* diff --git a/sys/miscfs/procfs/README b/sys/miscfs/procfs/README index 38811b3f6e3a3..6234870f02cee 100644 --- a/sys/miscfs/procfs/README +++ b/sys/miscfs/procfs/README @@ -110,4 +110,4 @@ the debugger, the debugger should fork and the child should stop itself "attach". as before, the child will hit a breakpoint on the first instruction in any newly exec'd image. -$Id: README,v 3.1 1993/12/15 09:40:17 jsp Exp $ +README,v 1.1.1.1 1994/05/24 10:05:10 rgrimes Exp diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h index 7a1bbb81214b8..6643ce1ceee5a 100644 --- a/sys/miscfs/procfs/procfs.h +++ b/sys/miscfs/procfs/procfs.h @@ -36,7 +36,7 @@ * * @(#)procfs.h 8.6 (Berkeley) 2/3/94 * - * $Id: procfs.h,v 1.1.1.1 1994/05/24 10:05:07 rgrimes Exp $ + * procfs.h,v 1.2 1994/08/02 07:45:08 davidg Exp */ /* diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c index 44ee3fd4bb1d1..04cccddc53af7 100644 --- a/sys/miscfs/procfs/procfs_ctl.c +++ b/sys/miscfs/procfs/procfs_ctl.c @@ -36,7 +36,7 @@ * * @(#)procfs_ctl.c 8.3 (Berkeley) 1/21/94 * - * $Id: procfs_ctl.c,v 1.1.1.1 1994/05/24 10:05:10 rgrimes Exp $ + * procfs_ctl.c,v 1.2 1994/08/02 07:45:10 davidg Exp */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c index 331a671279e26..8f562204867a9 100644 --- a/sys/miscfs/procfs/procfs_fpregs.c +++ b/sys/miscfs/procfs/procfs_fpregs.c @@ -36,7 +36,7 @@ * * @(#)procfs_fpregs.c 8.1 (Berkeley) 1/27/94 * - * $Id: procfs_fpregs.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $ + * procfs_fpregs.c,v 1.2 1994/08/02 07:45:12 davidg Exp */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c index 3b94a99075340..35cb49f667d72 100644 --- a/sys/miscfs/procfs/procfs_mem.c +++ b/sys/miscfs/procfs/procfs_mem.c @@ -37,7 +37,7 @@ * * @(#)procfs_mem.c 8.4 (Berkeley) 1/21/94 * - * $Id: procfs_mem.c,v 1.4 1994/10/18 04:26:53 davidg Exp $ + * procfs_mem.c,v 1.5 1994/10/18 04:40:41 davidg Exp */ /* diff --git a/sys/miscfs/procfs/procfs_note.c b/sys/miscfs/procfs/procfs_note.c index a7699f29e123c..48d3ff8bf9c36 100644 --- a/sys/miscfs/procfs/procfs_note.c +++ b/sys/miscfs/procfs/procfs_note.c @@ -36,7 +36,7 @@ * * @(#)procfs_note.c 8.2 (Berkeley) 1/21/94 * - * $Id: procfs_note.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $ + * procfs_note.c,v 1.2 1994/08/02 07:45:16 davidg Exp */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_regs.c b/sys/miscfs/procfs/procfs_regs.c index 8b0600a480d00..e15eba8379d30 100644 --- a/sys/miscfs/procfs/procfs_regs.c +++ b/sys/miscfs/procfs/procfs_regs.c @@ -36,7 +36,7 @@ * * @(#)procfs_regs.c 8.3 (Berkeley) 1/27/94 * - * $Id: procfs_regs.c,v 1.1.1.1 1994/05/24 10:05:08 rgrimes Exp $ + * procfs_regs.c,v 1.2 1994/08/02 07:45:18 davidg Exp */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c index c74cde9c8f655..24f4ca1eb0704 100644 --- a/sys/miscfs/procfs/procfs_status.c +++ b/sys/miscfs/procfs/procfs_status.c @@ -36,7 +36,7 @@ * * @(#)procfs_status.c 8.3 (Berkeley) 2/17/94 * - * $Id: procfs_status.c,v 1.2 1994/08/02 07:45:20 davidg Exp $ + * procfs_status.c,v 1.3 1994/10/10 07:55:38 phk Exp */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c index 4d255adc52d0a..3c23170d7b3b0 100644 --- a/sys/miscfs/procfs/procfs_subr.c +++ b/sys/miscfs/procfs/procfs_subr.c @@ -36,7 +36,7 @@ * * @(#)procfs_subr.c 8.4 (Berkeley) 1/27/94 * - * $Id: procfs_subr.c,v 1.2 1994/08/02 07:45:21 davidg Exp $ + * procfs_subr.c,v 1.3 1994/10/06 21:06:44 davidg Exp */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c index b9250ac088e6a..2ff92d4a891e5 100644 --- a/sys/miscfs/procfs/procfs_vfsops.c +++ b/sys/miscfs/procfs/procfs_vfsops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $Id: procfs_vfsops.c,v 1.5 1994/09/21 03:47:06 wollman Exp $ + * procfs_vfsops.c,v 1.6 1994/10/10 07:55:39 phk Exp */ /* diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 6edfe8f214960..a67d90710d9f2 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vnops.c 8.6 (Berkeley) 2/7/94 * - * $Id: procfs_vnops.c,v 1.6 1994/09/24 17:01:05 davidg Exp $ + * procfs_vnops.c,v 1.7 1994/10/10 07:55:40 phk Exp */ /* diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index fba9392c30c9e..c3878a56874ee 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.6 (Berkeley) 4/9/94 - * $Id: spec_vnops.c,v 1.8 1994/10/28 12:41:59 jkh Exp $ + * spec_vnops.c,v 1.9 1994/11/14 13:22:52 bde Exp */ #include <sys/param.h> diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h index bc26f9d59d127..547d5f3912954 100644 --- a/sys/miscfs/specfs/specdev.h +++ b/sys/miscfs/specfs/specdev.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)specdev.h 8.2 (Berkeley) 2/2/94 - * $Id$ + * specdev.h,v 1.2 1994/08/02 07:45:30 davidg Exp */ /* diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h index 5903d30e3fa10..2d4f1418e4938 100644 --- a/sys/miscfs/umapfs/umap.h +++ b/sys/miscfs/umapfs/umap.h @@ -35,7 +35,7 @@ * * @(#)umap.h 8.3 (Berkeley) 1/21/94 * - * $Id$ + * umap.h,v 1.2 1994/08/02 07:45:33 davidg Exp */ #define MAPFILEENTRIES 64 diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c index 4b2aad4ba01ad..6adec00672f6e 100644 --- a/sys/miscfs/umapfs/umap_subr.c +++ b/sys/miscfs/umapfs/umap_subr.c @@ -35,7 +35,7 @@ * * @(#)umap_subr.c 8.6 (Berkeley) 1/26/94 * - * $Id: umap_subr.c,v 1.2 1994/05/25 09:09:07 rgrimes Exp $ + * umap_subr.c,v 1.3 1994/10/10 07:55:43 phk Exp */ #include <sys/param.h> diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c index e0baf463a59bf..33c256e61d886 100644 --- a/sys/miscfs/umapfs/umap_vfsops.c +++ b/sys/miscfs/umapfs/umap_vfsops.c @@ -35,7 +35,7 @@ * * @(#)umap_vfsops.c 8.3 (Berkeley) 1/21/94 * - * $Id: umap_vfsops.c,v 1.4 1994/09/22 19:38:19 wollman Exp $ + * umap_vfsops.c,v 1.5 1994/10/10 07:55:43 phk Exp */ /* diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c index ddbe4995cdb88..2b579d7f46216 100644 --- a/sys/miscfs/umapfs/umap_vnops.c +++ b/sys/miscfs/umapfs/umap_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.3 (Berkeley) 1/5/94 - * $Id: umap_vnops.c,v 1.6 1994/09/21 23:22:43 wollman Exp $ + * umap_vnops.c,v 1.7 1994/10/10 07:55:44 phk Exp */ /* diff --git a/sys/miscfs/union/libc.opendir.c b/sys/miscfs/union/libc.opendir.c index 15e3a0ce76376..e069addf1d7be 100644 --- a/sys/miscfs/union/libc.opendir.c +++ b/sys/miscfs/union/libc.opendir.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * libc.opendir.c,v 1.2 1994/08/02 07:45:40 davidg Exp */ #include <sys/param.h> diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h index b66e17caa8265..a287c84678178 100644 --- a/sys/miscfs/union/union.h +++ b/sys/miscfs/union/union.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union.h 8.2 (Berkeley) 2/17/94 - * $Id$ + * union.h,v 1.2 1994/08/02 07:45:42 davidg Exp */ struct union_args { diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c index 02f7a1068e9b0..ed50900c67f65 100644 --- a/sys/miscfs/union/union_subr.c +++ b/sys/miscfs/union/union_subr.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.4 (Berkeley) 2/17/94 - * $Id: union_subr.c,v 1.4 1994/10/06 21:06:48 davidg Exp $ + * union_subr.c,v 1.5 1994/10/10 07:55:46 phk Exp */ #include <sys/param.h> diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c index 393fe9d1dfe3c..6f411f4bb8edc 100644 --- a/sys/miscfs/union/union_vfsops.c +++ b/sys/miscfs/union/union_vfsops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.7 (Berkeley) 3/5/94 - * $Id: union_vfsops.c,v 1.6 1994/10/10 07:55:47 phk Exp $ + * union_vfsops.c,v 1.7 1994/11/04 14:41:43 davidg Exp */ /* diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index df1935b1651ed..100ca735db674 100644 --- a/sys/miscfs/union/union_vnops.c +++ b/sys/miscfs/union/union_vnops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.6 (Berkeley) 2/17/94 - * $Id: union_vnops.c,v 1.7 1994/10/10 07:55:48 phk Exp $ + * union_vnops.c,v 1.8 1994/11/04 14:41:46 davidg Exp */ #include <sys/param.h> diff --git a/sys/msdosfs/bootsect.h b/sys/msdosfs/bootsect.h index 099b15f661f99..8535efc12311a 100644 --- a/sys/msdosfs/bootsect.h +++ b/sys/msdosfs/bootsect.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* bootsect.h,v 1.1 1994/09/19 15:41:36 dfr Exp */ /* $NetBSD: bootsect.h,v 1.4 1994/06/29 06:35:28 cgd Exp $ */ /* diff --git a/sys/msdosfs/bpb.h b/sys/msdosfs/bpb.h index 70e4de201a0f8..84858688bf600 100644 --- a/sys/msdosfs/bpb.h +++ b/sys/msdosfs/bpb.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* bpb.h,v 1.1 1994/09/19 15:41:37 dfr Exp */ /* $NetBSD: bpb.h,v 1.3 1994/06/29 06:35:29 cgd Exp $ */ /* diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h index 8df3e4cfba64c..a1eb531640778 100644 --- a/sys/msdosfs/denode.h +++ b/sys/msdosfs/denode.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* denode.h,v 1.1 1994/09/19 15:41:38 dfr Exp */ /* $NetBSD: denode.h,v 1.8 1994/08/21 18:43:49 ws Exp $ */ /*- diff --git a/sys/msdosfs/direntry.h b/sys/msdosfs/direntry.h index d2ec0190e44b3..625f4e4ca781e 100644 --- a/sys/msdosfs/direntry.h +++ b/sys/msdosfs/direntry.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* direntry.h,v 1.1 1994/09/19 15:41:39 dfr Exp */ /* $NetBSD: direntry.h,v 1.7 1994/08/21 18:43:54 ws Exp $ */ /*- diff --git a/sys/msdosfs/fat.h b/sys/msdosfs/fat.h index b5f223f46db30..73bdee4b6e4bb 100644 --- a/sys/msdosfs/fat.h +++ b/sys/msdosfs/fat.h @@ -1,4 +1,4 @@ -/* $Id: fat.h,v 1.1 1994/09/19 15:41:40 dfr Exp $ */ +/* fat.h,v 1.2 1994/09/27 20:42:41 phk Exp */ /* $NetBSD: fat.h,v 1.4 1994/08/21 18:43:57 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_conv.c b/sys/msdosfs/msdosfs_conv.c index 035eb0552aa40..c75dc055beca4 100644 --- a/sys/msdosfs/msdosfs_conv.c +++ b/sys/msdosfs/msdosfs_conv.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_conv.c,v 1.1 1994/09/19 15:41:40 dfr Exp $ */ +/* msdosfs_conv.c,v 1.2 1994/09/27 20:42:42 phk Exp */ /* $NetBSD: msdosfs_conv.c,v 1.6.2.1 1994/08/30 02:27:57 cgd Exp $ */ /* diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c index 0a62d84cead9e..553e903ba7e4c 100644 --- a/sys/msdosfs/msdosfs_denode.c +++ b/sys/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_denode.c,v 1.3 1994/10/06 21:06:51 davidg Exp $ */ +/* msdosfs_denode.c,v 1.4 1994/10/10 07:57:32 phk Exp */ /* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c index 2e3829600e3db..b75893412de0b 100644 --- a/sys/msdosfs/msdosfs_fat.c +++ b/sys/msdosfs/msdosfs_fat.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_fat.c,v 1.2 1994/09/27 20:42:46 phk Exp $ */ +/* msdosfs_fat.c,v 1.3 1994/10/10 07:57:33 phk Exp */ /* $NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c index 269184269737f..f16049ed596ef 100644 --- a/sys/msdosfs/msdosfs_lookup.c +++ b/sys/msdosfs/msdosfs_lookup.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_lookup.c,v 1.1 1994/09/19 15:41:44 dfr Exp $ */ +/* msdosfs_lookup.c,v 1.2 1994/09/27 20:42:51 phk Exp */ /* $NetBSD: msdosfs_lookup.c,v 1.14 1994/08/21 18:44:07 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c index 8f270762aac8c..25658c4b7f516 100644 --- a/sys/msdosfs/msdosfs_vfsops.c +++ b/sys/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vfsops.c,v 1.4 1994/09/27 20:42:54 phk Exp $ */ +/* msdosfs_vfsops.c,v 1.5 1994/10/02 17:48:21 phk Exp */ /* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index 73ee0a157308d..c25375048afa5 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vnops.c,v 1.7 1994/10/27 18:44:31 pst Exp $ */ +/* msdosfs_vnops.c,v 1.8 1994/11/01 21:14:45 jkh Exp */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h index 270b5b4b4d5ba..cc2b0fa84f498 100644 --- a/sys/msdosfs/msdosfsmount.h +++ b/sys/msdosfs/msdosfsmount.h @@ -1,4 +1,4 @@ -/* $Id: msdosfsmount.h,v 1.1 1994/09/19 15:41:48 dfr Exp $ */ +/* msdosfsmount.h,v 1.2 1994/09/27 20:42:59 phk Exp */ /* $NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $ */ /*- diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 5ad17a188c2ed..23e45f23c43fa 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -37,7 +37,7 @@ * * @(#)bpf.c 8.2 (Berkeley) 3/28/94 * - * $Id: bpf.c,v 1.3 1994/08/20 03:48:55 davidg Exp $ + * bpf.c,v 1.4 1994/10/09 07:35:03 davidg Exp */ #include "bpfilter.h" diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 4714ffb5a0bc3..c2a45596c147f 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -37,7 +37,7 @@ * * @(#)bpf.h 8.1 (Berkeley) 6/10/93 * - * $Id: bpf.h,v 1.2 1994/08/02 07:45:54 davidg Exp $ + * bpf.h,v 1.3 1994/08/21 05:11:38 paul Exp */ #ifndef _NET_BPF_H_ diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h index 44dab52e0c9d7..d18ce4ce81e1e 100644 --- a/sys/net/bpf_compat.h +++ b/sys/net/bpf_compat.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)bpf_compat.h 8.1 (Berkeley) 6/10/93 - * $Id: bpf_compat.h,v 1.2 1994/08/02 07:45:56 davidg Exp $ + * bpf_compat.h,v 1.3 1994/08/21 05:11:39 paul Exp */ #ifndef _NET_BPF_COMPAT_H_ diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c index 8265410b37fde..2e85fcb94b9eb 100644 --- a/sys/net/bpf_filter.c +++ b/sys/net/bpf_filter.c @@ -37,7 +37,7 @@ * * @(#)bpf_filter.c 8.1 (Berkeley) 6/10/93 * - * $Id$ + * bpf_filter.c,v 1.3 1994/08/02 07:45:58 davidg Exp */ #include <sys/param.h> diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h index 598ce9e2337c3..b475297f4ba1c 100644 --- a/sys/net/bpfdesc.h +++ b/sys/net/bpfdesc.h @@ -37,7 +37,7 @@ * * @(#)bpfdesc.h 8.1 (Berkeley) 6/10/93 * - * $Id: bpfdesc.h,v 1.3 1994/08/02 07:46:00 davidg Exp $ + * bpfdesc.h,v 1.4 1994/08/21 05:11:39 paul Exp */ #ifndef _NET_BPFDESC_H_ diff --git a/sys/net/if.c b/sys/net/if.c index 5412b216b46cb..6090da104cccb 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.3 (Berkeley) 1/4/94 - * $Id: if.c,v 1.9 1994/10/08 01:40:20 phk Exp $ + * if.c,v 1.10 1994/11/10 18:49:23 guido Exp */ #include <sys/param.h> diff --git a/sys/net/if.h b/sys/net/if.h index 5873dffaf80f1..f477ac0402716 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $Id: if.h,v 1.9 1994/11/15 14:41:34 bde Exp $ + * if.h,v 1.10 1994/11/16 02:16:18 phk Exp */ #ifndef _NET_IF_H_ diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 1515110943015..e8aa856062679 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_arp.h 8.1 (Berkeley) 6/10/93 - * $Id: if_arp.h,v 1.4 1994/11/15 14:41:38 bde Exp $ + * if_arp.h,v 1.5 1994/11/16 02:15:05 phk Exp */ #ifndef _NET_IF_ARP_H_ diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index f3db94a0eb2b5..6e54eaee23bcd 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_dl.h 8.1 (Berkeley) 6/10/93 - * $Id: if_dl.h,v 1.2 1994/08/02 07:46:12 davidg Exp $ + * if_dl.h,v 1.3 1994/08/21 05:11:41 paul Exp */ #ifndef _NET_IF_DL_H_ diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 3929fa3236e60..aab2acb8d9b02 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ethersubr.c,v 1.2 1994/08/02 07:46:14 davidg Exp $ + * if_ethersubr.c,v 1.3 1994/10/11 23:16:24 wollman Exp */ #include <sys/param.h> diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h index da89ee7126f73..033bdbbecdbbf 100644 --- a/sys/net/if_llc.h +++ b/sys/net/if_llc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_llc.h 8.1 (Berkeley) 6/10/93 - * $Id: if_llc.h,v 1.2 1994/08/02 07:46:16 davidg Exp $ + * if_llc.h,v 1.3 1994/08/21 05:11:42 paul Exp */ #ifndef _NET_IF_LLC_H_ diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 871202c07a3e9..c3f6be73fd6bb 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 - * $Id: if_loop.c,v 1.5 1994/08/02 07:46:17 davidg Exp $ + * if_loop.c,v 1.6 1994/08/08 12:07:25 davidg Exp */ /* diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 5ba077a65b265..5989006edc1b7 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -69,7 +69,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id: if_ppp.c,v 1.5 1994/11/01 09:03:16 pst Exp $ */ +/* if_ppp.c,v 1.6 1994/11/01 22:18:34 wollman Exp */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ #include "ppp.h" diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h index 9f70af092353b..2cd422a52236a 100644 --- a/sys/net/if_ppp.h +++ b/sys/net/if_ppp.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: if_ppp.h,v 1.5 1994/01/25 05:56:08 deraadt Exp $ + * if_ppp.h,v 1.2 1994/09/23 00:13:20 wollman Exp */ #ifndef _IF_PPP_H_ diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index 61b2be263cebd..f58bde0339972 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_sl.c 8.6 (Berkeley) 2/1/94 - * $Id: if_sl.c,v 1.8 1994/10/05 21:22:45 wollman Exp $ + * if_sl.c,v 1.9 1994/10/08 01:40:22 phk Exp */ /* diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h index f94ec40713c67..cdb6dd67cac79 100644 --- a/sys/net/if_slvar.h +++ b/sys/net/if_slvar.h @@ -32,7 +32,7 @@ * * @(#)if_slvar.h 8.3 (Berkeley) 2/1/94 * - * $Id: if_slvar.h,v 1.3 1994/08/21 05:11:43 paul Exp $ + * if_slvar.h,v 1.4 1994/10/08 01:40:23 phk Exp */ #ifndef _NET_IF_SLVAR_H_ diff --git a/sys/net/if_types.h b/sys/net/if_types.h index cb0dff1b3f41f..ee216a7d4dc2e 100644 --- a/sys/net/if_types.h +++ b/sys/net/if_types.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_types.h 8.2 (Berkeley) 4/20/94 - * $Id: if_types.h,v 1.2 1994/08/02 07:46:26 davidg Exp $ + * if_types.h,v 1.3 1994/08/21 05:11:43 paul Exp */ #ifndef _NET_IF_TYPES_H_ diff --git a/sys/net/netisr.h b/sys/net/netisr.h index 1a4b3f4824228..4acd377e7c334 100644 --- a/sys/net/netisr.h +++ b/sys/net/netisr.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)netisr.h 8.1 (Berkeley) 6/10/93 - * $Id: netisr.h,v 1.3 1994/08/02 07:46:27 davidg Exp $ + * netisr.h,v 1.4 1994/08/21 05:11:44 paul Exp */ #ifndef _NET_NETISR_H_ diff --git a/sys/net/pppcompress.c b/sys/net/pppcompress.c index 8c7abdb03e382..e693f7e7863cc 100644 --- a/sys/net/pppcompress.c +++ b/sys/net/pppcompress.c @@ -44,7 +44,7 @@ * so that the entire packet being decompressed doesn't have * to be in contiguous memory (just the compressed header). * - * $Id: pppcompress.c,v 1.2 1994/09/23 00:13:21 wollman Exp $ + * pppcompress.c,v 1.3 1994/11/01 09:03:20 pst Exp */ #include <sys/types.h> diff --git a/sys/net/pppcompress.h b/sys/net/pppcompress.h index ed30971913989..3cd1864d89302 100644 --- a/sys/net/pppcompress.h +++ b/sys/net/pppcompress.h @@ -39,7 +39,7 @@ * - added sl_uncompress_tcp_part. * * From: slcompress.h 7.4 90/06/28 - * $Id: slcompress.h,v 1.5 1994/01/15 20:13:16 deraadt Exp $ + * pppcompress.h,v 1.2 1994/09/23 00:13:22 wollman Exp */ #ifndef _NET_PPPCOMPRESS_H_ diff --git a/sys/net/radix.c b/sys/net/radix.c index d8da6e2d32c03..920e4663116b3 100644 --- a/sys/net/radix.c +++ b/sys/net/radix.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)radix.c 8.2 (Berkeley) 1/4/94 - * $Id: radix.c,v 1.4 1994/10/08 22:38:23 phk Exp $ + * radix.c,v 1.5 1994/10/15 21:33:17 phk Exp */ /* diff --git a/sys/net/radix.h b/sys/net/radix.h index b389596ee956c..c67057168eb20 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)radix.h 8.1 (Berkeley) 6/10/93 - * $Id: radix.h,v 1.4 1994/11/02 04:41:23 wollman Exp $ + * radix.h,v 1.5 1994/11/14 14:06:06 bde Exp */ #ifndef _NET_RADIX_H_ diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index 05723785accc3..fb05ebb7c44c8 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_cb.c 8.1 (Berkeley) 6/10/93 - * $Id: raw_cb.c,v 1.2 1994/08/02 07:46:34 davidg Exp $ + * raw_cb.c,v 1.3 1994/10/08 22:38:24 phk Exp */ #include <sys/param.h> diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h index e975432e21807..83de81e38f044 100644 --- a/sys/net/raw_cb.h +++ b/sys/net/raw_cb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_cb.h 8.1 (Berkeley) 6/10/93 - * $Id: raw_cb.h,v 1.2 1994/08/02 07:46:36 davidg Exp $ + * raw_cb.h,v 1.3 1994/08/21 05:11:46 paul Exp */ #ifndef _NET_RAW_CB_H_ diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index f6bc1cb4e5ac3..5fa2c44e872c0 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: raw_usrreq.c,v 1.3 1994/08/18 22:35:21 wollman Exp $ + * raw_usrreq.c,v 1.4 1994/10/08 22:38:25 phk Exp */ #include <sys/param.h> diff --git a/sys/net/route.c b/sys/net/route.c index 7e9cffbca35ad..fa10ead6522e8 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.c 8.2 (Berkeley) 11/15/93 - * $Id: route.c,v 1.10 1994/11/02 04:41:25 wollman Exp $ + * route.c,v 1.11 1994/11/03 01:04:30 wollman Exp */ #include <sys/param.h> diff --git a/sys/net/route.h b/sys/net/route.h index 03ac9a5e3ffb2..5739f0ff94ae6 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.h 8.3 (Berkeley) 4/19/94 - * $Id: route.h,v 1.4 1994/08/21 05:11:46 paul Exp $ + * route.h,v 1.5 1994/11/03 01:04:32 wollman Exp */ #ifndef _NET_ROUTE_H_ diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index d482a9796ee01..ebbf004b6e281 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.3 (Berkeley) 1/4/94 - * $Id: rtsock.c,v 1.6 1994/10/08 22:38:26 phk Exp $ + * rtsock.c,v 1.7 1994/10/11 23:16:29 wollman Exp */ #include <sys/param.h> diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c index 42106d5cac358..5a6e738c064f1 100644 --- a/sys/net/slcompress.c +++ b/sys/net/slcompress.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)slcompress.c 8.2 (Berkeley) 4/16/94 - * $Id: slcompress.c,v 1.3 1994/08/18 22:35:22 wollman Exp $ + * slcompress.c,v 1.4 1994/10/08 22:38:27 phk Exp */ /* diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h index 75e3a58eef191..7ab1814c784c6 100644 --- a/sys/net/slcompress.h +++ b/sys/net/slcompress.h @@ -35,7 +35,7 @@ * * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989: * - Initial distribution. - * $Id: slcompress.h,v 1.4 1994/08/21 19:06:48 paul Exp $ + * slcompress.h,v 1.5 1994/08/22 14:16:36 bde Exp */ #ifndef _NET_SLCOMPRESS_H_ diff --git a/sys/net/slip.h b/sys/net/slip.h index 1c9ffca906774..ed314ff537f63 100644 --- a/sys/net/slip.h +++ b/sys/net/slip.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)slip.h 8.1 (Berkeley) 2/12/94 - * $Id: slip.h,v 1.2 1994/08/02 07:46:50 davidg Exp $ + * slip.h,v 1.3 1994/08/21 05:11:48 paul Exp */ #ifndef _NET_SLIP_H_ diff --git a/sys/netccitt/ccitt_proto.c b/sys/netccitt/ccitt_proto.c index 6204dcd89c304..3d28bd7ced1e5 100644 --- a/sys/netccitt/ccitt_proto.c +++ b/sys/netccitt/ccitt_proto.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ccitt_proto.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * ccitt_proto.c,v 1.2 1994/08/02 07:46:54 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/dll.h b/sys/netccitt/dll.h index c283918741606..37268a637f811 100644 --- a/sys/netccitt/dll.h +++ b/sys/netccitt/dll.h @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)dll.h 8.1 (Berkeley) 6/10/93 - * $Id: dll.h,v 1.2 1994/08/02 07:46:56 davidg Exp $ + * dll.h,v 1.3 1994/08/21 05:44:06 paul Exp */ #ifndef _NETCCITT_DLL_H_ diff --git a/sys/netccitt/hd_debug.c b/sys/netccitt/hd_debug.c index 058a21caaff73..409f60c4b17b4 100644 --- a/sys/netccitt/hd_debug.c +++ b/sys/netccitt/hd_debug.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_debug.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * hd_debug.c,v 1.2 1994/08/02 07:46:59 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/hd_input.c b/sys/netccitt/hd_input.c index 9bdab0b72f946..0de2045e335e3 100644 --- a/sys/netccitt/hd_input.c +++ b/sys/netccitt/hd_input.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_input.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * hd_input.c,v 1.2 1994/08/02 07:47:01 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/hd_output.c b/sys/netccitt/hd_output.c index c1db5f08a15d2..1aed965e4fe84 100644 --- a/sys/netccitt/hd_output.c +++ b/sys/netccitt/hd_output.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_output.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * hd_output.c,v 1.2 1994/08/02 07:47:05 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/hd_subr.c b/sys/netccitt/hd_subr.c index 7d051274a37a9..b41d48608e492 100644 --- a/sys/netccitt/hd_subr.c +++ b/sys/netccitt/hd_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_subr.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * hd_subr.c,v 1.2 1994/08/02 07:47:07 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/hd_timer.c b/sys/netccitt/hd_timer.c index 8b2ede482c78e..78ce97a5399ca 100644 --- a/sys/netccitt/hd_timer.c +++ b/sys/netccitt/hd_timer.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_timer.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * hd_timer.c,v 1.2 1994/08/02 07:47:09 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/hd_var.h b/sys/netccitt/hd_var.h index 24679ac32f77f..b96bf99415d14 100644 --- a/sys/netccitt/hd_var.h +++ b/sys/netccitt/hd_var.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_var.h 8.1 (Berkeley) 6/10/93 - * $Id: hd_var.h,v 1.2 1994/08/02 07:47:10 davidg Exp $ + * hd_var.h,v 1.3 1994/08/21 05:44:06 paul Exp */ #ifndef _NETCCITT_HD_VAR_H_ diff --git a/sys/netccitt/hdlc.h b/sys/netccitt/hdlc.h index f7fd79359b205..ba3847afe92fa 100644 --- a/sys/netccitt/hdlc.h +++ b/sys/netccitt/hdlc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hdlc.h 8.1 (Berkeley) 6/10/93 - * $Id: hdlc.h,v 1.2 1994/08/02 07:47:12 davidg Exp $ + * hdlc.h,v 1.3 1994/08/21 05:44:07 paul Exp */ #ifndef _NETCCITT_HDLC_H_ diff --git a/sys/netccitt/if_x25subr.c b/sys/netccitt/if_x25subr.c index 68812f4303c43..98bfb4aeae8db 100644 --- a/sys/netccitt/if_x25subr.c +++ b/sys/netccitt/if_x25subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_x25subr.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * if_x25subr.c,v 1.2 1994/08/02 07:47:14 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/llc_input.c b/sys/netccitt/llc_input.c index 94400c18285ca..8b758d110389d 100644 --- a/sys/netccitt/llc_input.c +++ b/sys/netccitt/llc_input.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_input.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * llc_input.c,v 1.2 1994/08/02 07:47:16 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/llc_output.c b/sys/netccitt/llc_output.c index aacba3d0c09bb..db68a08987bdc 100644 --- a/sys/netccitt/llc_output.c +++ b/sys/netccitt/llc_output.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_output.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * llc_output.c,v 1.2 1994/08/02 07:47:18 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/llc_subr.c b/sys/netccitt/llc_subr.c index dd604a378f920..659718bf63188 100644 --- a/sys/netccitt/llc_subr.c +++ b/sys/netccitt/llc_subr.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_subr.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * llc_subr.c,v 1.2 1994/08/02 07:47:20 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/llc_timer.c b/sys/netccitt/llc_timer.c index 06d3cf3c3f3d4..1a2ba78785000 100644 --- a/sys/netccitt/llc_timer.c +++ b/sys/netccitt/llc_timer.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_timer.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * llc_timer.c,v 1.2 1994/08/02 07:47:23 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/llc_var.h b/sys/netccitt/llc_var.h index f5452c1e9c821..35207dce46c3e 100644 --- a/sys/netccitt/llc_var.h +++ b/sys/netccitt/llc_var.h @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_var.h 8.1 (Berkeley) 6/10/93 - * $Id: llc_var.h,v 1.2 1994/08/02 07:47:25 davidg Exp $ + * llc_var.h,v 1.3 1994/08/21 05:44:08 paul Exp */ #ifndef _NETCCITT_LLC_VAR_H_ diff --git a/sys/netccitt/pk.h b/sys/netccitt/pk.h index a1f8ebb5e8b4f..d3c07a4978f73 100644 --- a/sys/netccitt/pk.h +++ b/sys/netccitt/pk.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)pk.h 8.1 (Berkeley) 6/10/93 - * $Id: pk.h,v 1.2 1994/08/02 07:47:27 davidg Exp $ + * pk.h,v 1.3 1994/08/21 05:44:09 paul Exp */ #ifndef _NETCCITT_PK_H_ diff --git a/sys/netccitt/pk_acct.c b/sys/netccitt/pk_acct.c index e05cf69878556..7131142e96043 100644 --- a/sys/netccitt/pk_acct.c +++ b/sys/netccitt/pk_acct.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)pk_acct.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * pk_acct.c,v 1.2 1994/08/02 07:47:29 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/pk_debug.c b/sys/netccitt/pk_debug.c index 338d167b37f02..d70e8d5151609 100644 --- a/sys/netccitt/pk_debug.c +++ b/sys/netccitt/pk_debug.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)pk_debug.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * pk_debug.c,v 1.2 1994/08/02 07:47:31 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/pk_input.c b/sys/netccitt/pk_input.c index 0438b84259d10..9d8e8434f244f 100644 --- a/sys/netccitt/pk_input.c +++ b/sys/netccitt/pk_input.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_input.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * pk_input.c,v 1.2 1994/08/02 07:47:35 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/pk_llcsubr.c b/sys/netccitt/pk_llcsubr.c index 7269fb29f220c..3cd858ae5bd00 100644 --- a/sys/netccitt/pk_llcsubr.c +++ b/sys/netccitt/pk_llcsubr.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)pk_llcsubr.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * pk_llcsubr.c,v 1.2 1994/08/02 07:47:36 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/pk_output.c b/sys/netccitt/pk_output.c index 95b6026c0f8ca..6b49b41283b4f 100644 --- a/sys/netccitt/pk_output.c +++ b/sys/netccitt/pk_output.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_output.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * pk_output.c,v 1.2 1994/08/02 07:47:38 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/pk_subr.c b/sys/netccitt/pk_subr.c index ffbc8576b0bf8..471db244190ce 100644 --- a/sys/netccitt/pk_subr.c +++ b/sys/netccitt/pk_subr.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_subr.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * pk_subr.c,v 1.2 1994/08/02 07:47:41 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/pk_timer.c b/sys/netccitt/pk_timer.c index 4b7db0a41de31..8f3f12b1c9c66 100644 --- a/sys/netccitt/pk_timer.c +++ b/sys/netccitt/pk_timer.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_timer.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * pk_timer.c,v 1.2 1994/08/02 07:47:44 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/pk_usrreq.c b/sys/netccitt/pk_usrreq.c index 1d1c0e70a1fc5..1ad48e7fac39a 100644 --- a/sys/netccitt/pk_usrreq.c +++ b/sys/netccitt/pk_usrreq.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * pk_usrreq.c,v 1.2 1994/08/02 07:47:46 davidg Exp */ #include <sys/param.h> diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h index 1690d2af0a39b..fd028de57b752 100644 --- a/sys/netccitt/pk_var.h +++ b/sys/netccitt/pk_var.h @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_var.h 8.1 (Berkeley) 6/10/93 - * $Id: pk_var.h,v 1.2 1994/08/02 07:47:48 davidg Exp $ + * pk_var.h,v 1.3 1994/08/21 05:44:10 paul Exp */ #ifndef _NETCCITT_PK_VAR_H_ diff --git a/sys/netccitt/x25.h b/sys/netccitt/x25.h index 2d4a4f6c3b79a..0628a76739468 100644 --- a/sys/netccitt/x25.h +++ b/sys/netccitt/x25.h @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)x25.h 8.1 (Berkeley) 6/10/93 - * $Id: x25.h,v 1.2 1994/08/02 07:47:50 davidg Exp $ + * x25.h,v 1.3 1994/08/21 05:44:11 paul Exp */ #ifndef _NETCCITT_X25_H_ diff --git a/sys/netccitt/x25acct.h b/sys/netccitt/x25acct.h index a5ecdd21a91b8..d788f44d71006 100644 --- a/sys/netccitt/x25acct.h +++ b/sys/netccitt/x25acct.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)x25acct.h 8.1 (Berkeley) 6/10/93 - * $Id: x25acct.h,v 1.2 1994/08/02 07:47:52 davidg Exp $ + * x25acct.h,v 1.3 1994/08/21 05:44:11 paul Exp */ #ifndef _NETCCITT_X25ACCT_H_ diff --git a/sys/netccitt/x25err.h b/sys/netccitt/x25err.h index 1ee8e69f6684d..389f0f6536e65 100644 --- a/sys/netccitt/x25err.h +++ b/sys/netccitt/x25err.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)x25err.h 8.1 (Berkeley) 6/10/93 - * $Id: x25err.h,v 1.2 1994/08/02 07:47:53 davidg Exp $ + * x25err.h,v 1.3 1994/08/21 05:44:12 paul Exp */ #ifndef _NETCCITT_X25ERR_H_ diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h index 151c36ca4bd37..515276ee717d5 100644 --- a/sys/netinet/icmp_var.h +++ b/sys/netinet/icmp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)icmp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: icmp_var.h,v 1.2 1994/08/02 07:47:56 davidg Exp $ + * icmp_var.h,v 1.3 1994/08/21 05:27:23 paul Exp */ #ifndef _NETINET_ICMP_VAR_H_ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 64de2cd967d22..c887921a7d02c 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ether.c,v 1.6 1994/10/11 23:16:37 wollman Exp $ + * if_ether.c,v 1.7 1994/11/02 00:58:29 wollman Exp */ /* diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index 147bee6844882..7c3f01c4e7c8d 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.h 8.1 (Berkeley) 6/10/93 - * $Id: if_ether.h,v 1.4 1994/08/21 05:27:24 paul Exp $ + * if_ether.h,v 1.5 1994/10/11 23:16:38 wollman Exp */ #ifndef _NETINET_IF_ETHER_H_ diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 659e7b67a8888..57e3861f2ca68 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)igmp.c 8.1 (Berkeley) 7/19/93 - * $Id: igmp.c,v 1.5 1994/09/14 03:10:07 wollman Exp $ + * igmp.c,v 1.6 1994/10/31 06:36:47 pst Exp */ /* diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h index 1e082c4e570de..9fe93674915ec 100644 --- a/sys/netinet/igmp.h +++ b/sys/netinet/igmp.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)igmp.h 8.1 (Berkeley) 6/10/93 - * $Id: igmp.h,v 1.3 1994/08/21 05:27:25 paul Exp $ + * igmp.h,v 1.4 1994/09/06 22:42:17 wollman Exp */ #ifndef _NETINET_IGMP_H_ diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h index 403a9115b4c19..e11dd05ad1727 100644 --- a/sys/netinet/igmp_var.h +++ b/sys/netinet/igmp_var.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)igmp_var.h 8.1 (Berkeley) 7/19/93 - * $Id: igmp_var.h,v 1.3 1994/08/21 05:27:26 paul Exp $ + * igmp_var.h,v 1.4 1994/09/06 22:42:17 wollman Exp */ #ifndef _NETINET_IGMP_VAR_H_ diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 534348512f596..98a399af039c8 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.2 (Berkeley) 11/15/93 - * $Id: in.c,v 1.6 1994/10/02 17:48:37 phk Exp $ + * in.c,v 1.7 1994/11/03 21:04:21 wollman Exp */ #include <sys/param.h> diff --git a/sys/netinet/in.h b/sys/netinet/in.h index c04336eda1b1b..4543d6ebe76ab 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $Id: in.h,v 1.3 1994/08/21 05:27:27 paul Exp $ + * in.h,v 1.4 1994/09/06 22:42:18 wollman Exp */ #ifndef _NETINET_IN_H_ diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c index daac129037614..8c4ea161f89a6 100644 --- a/sys/netinet/in_cksum.c +++ b/sys/netinet/in_cksum.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * in_cksum.c,v 1.2 1994/08/02 07:48:16 davidg Exp */ #include <sys/param.h> diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index f4a3287cecd46..8336c12555794 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.2 (Berkeley) 1/4/94 - * $Id$ + * in_pcb.c,v 1.3 1994/08/02 07:48:18 davidg Exp */ #include <sys/param.h> diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index ff4c71b66cb94..373a22ded651b 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: in_pcb.h,v 1.3 1994/08/02 07:48:20 davidg Exp $ + * in_pcb.h,v 1.4 1994/08/21 05:27:28 paul Exp */ #ifndef _NETINET_IN_PCB_H_ diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index d397b64021c6e..30524ec96f6b1 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_proto.c 8.1 (Berkeley) 6/10/93 - * $Id: in_proto.c,v 1.6 1994/09/15 10:36:52 davidg Exp $ + * in_proto.c,v 1.7 1994/11/02 04:41:39 wollman Exp */ #include <sys/param.h> diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index a1a6a5e515538..95d20c1554867 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -4,7 +4,7 @@ * You may copy this file verbatim until I find the official * Institute boilerplate. * - * $Id: in_rmx.c,v 1.1 1994/11/02 04:42:14 wollman Exp $ + * in_rmx.c,v 1.2 1994/11/03 01:05:34 wollman Exp */ /* diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h index f35ab2ff1685d..b5a92caf7fcbf 100644 --- a/sys/netinet/in_systm.h +++ b/sys/netinet/in_systm.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_systm.h 8.1 (Berkeley) 6/10/93 - * $Id: in_systm.h,v 1.2 1994/08/02 07:48:25 davidg Exp $ + * in_systm.h,v 1.3 1994/08/21 05:27:29 paul Exp */ #ifndef _NETINET_IN_SYSTM_H_ diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index ddf307c1ac467..dde03f6dc82e3 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_var.h 8.1 (Berkeley) 6/10/93 - * $Id: in_var.h,v 1.6 1994/09/06 22:42:20 wollman Exp $ + * in_var.h,v 1.7 1994/10/25 22:13:32 swallace Exp */ #ifndef _NETINET_IN_VAR_H_ diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h index 1ecb4483d2b7c..10185bea4c736 100644 --- a/sys/netinet/ip.h +++ b/sys/netinet/ip.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip.h 8.1 (Berkeley) 6/10/93 - * $Id: ip.h,v 1.2 1994/08/02 07:48:30 davidg Exp $ + * ip.h,v 1.3 1994/08/21 05:27:30 paul Exp */ #ifndef _NETINET_IP_H_ diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 376c5cb4c61eb..7e3b2b94e4436 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $Id: ip_icmp.c,v 1.3 1994/10/02 17:48:38 phk Exp $ + * ip_icmp.c,v 1.4 1994/10/08 22:39:56 phk Exp */ #include <sys/param.h> diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h index 1a73e0dc55ea1..0723c5e9af1fe 100644 --- a/sys/netinet/ip_icmp.h +++ b/sys/netinet/ip_icmp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93 - * $Id: ip_icmp.h,v 1.2 1994/08/02 07:48:35 davidg Exp $ + * ip_icmp.h,v 1.3 1994/08/21 05:27:31 paul Exp */ #ifndef _NETINET_IP_ICMP_H_ diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 085d0ff2d7af7..f965c677d36eb 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $Id: ip_input.c,v 1.10 1994/11/08 12:47:29 jkh Exp $ + * ip_input.c,v 1.11 1994/11/16 10:17:08 jkh Exp */ #include <sys/param.h> diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index 2d6540eacb2b4..1b41a54df758a 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)ip_mroute.h 8.1 (Berkeley) 6/10/93 - * $Id: ip_mroute.h,v 1.4 1994/09/06 22:42:23 wollman Exp $ + * ip_mroute.h,v 1.5 1994/09/14 03:10:12 wollman Exp */ #ifndef _NETINET_IP_MROUTE_H_ diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index a734c4261c395..dbc4d13295de3 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $Id: ip_output.c,v 1.8 1994/09/14 03:10:13 wollman Exp $ + * ip_output.c,v 1.9 1994/11/16 10:17:10 jkh Exp */ #include <sys/param.h> diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 0dd2fd9abb993..751d870b0b667 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.1 (Berkeley) 6/10/93 - * $Id: ip_var.h,v 1.5 1994/09/06 22:42:25 wollman Exp $ + * ip_var.h,v 1.6 1994/09/14 03:10:14 wollman Exp */ #ifndef _NETINET_IP_VAR_H_ diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 4b33614db72c4..2c84cb7224f0f 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.2 (Berkeley) 1/4/94 - * $Id: raw_ip.c,v 1.6 1994/10/28 15:09:49 jkh Exp $ + * raw_ip.c,v 1.8 1994/11/16 10:17:11 jkh Exp */ #include <sys/param.h> diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 03b8e537a5aba..ce94c7b28d931 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp.h,v 1.2 1994/08/02 07:48:52 davidg Exp $ + * tcp.h,v 1.3 1994/08/21 05:27:34 paul Exp */ #ifndef _NETINET_TCP_H_ diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c index c759626b3183b..af7d47f3b3a8c 100644 --- a/sys/netinet/tcp_debug.c +++ b/sys/netinet/tcp_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_debug.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tcp_debug.c,v 1.2 1994/08/02 07:48:54 davidg Exp */ #ifdef TCPDEBUG diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h index 159b798108098..b7a03b2ec2fee 100644 --- a/sys/netinet/tcp_debug.h +++ b/sys/netinet/tcp_debug.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_debug.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp_debug.h,v 1.2 1994/08/02 07:48:56 davidg Exp $ + * tcp_debug.h,v 1.3 1994/08/21 05:27:35 paul Exp */ #ifndef _NETINET_TCP_DEBUG_H_ diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h index cbd07c5e0f184..8d4f089a37b96 100644 --- a/sys/netinet/tcp_fsm.h +++ b/sys/netinet/tcp_fsm.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_fsm.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp_fsm.h,v 1.3 1994/08/21 05:27:36 paul Exp $ + * tcp_fsm.h,v 1.4 1994/08/26 22:27:14 wollman Exp */ #ifndef _NETINET_TCP_FSM_H_ diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 961e02ab9e45f..e493b022b927d 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.5 (Berkeley) 4/10/94 - * $Id: tcp_input.c,v 1.9 1994/10/02 17:48:43 phk Exp $ + * tcp_input.c,v 1.10 1994/10/13 18:36:32 wollman Exp */ #ifndef TUBA_INCLUDE diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 797a49692554c..9af724430d592 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_output.c 8.3 (Berkeley) 12/30/93 - * $Id: tcp_output.c,v 1.2 1994/08/02 07:49:03 davidg Exp $ + * tcp_output.c,v 1.3 1994/09/15 10:36:55 davidg Exp */ #include <sys/param.h> diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h index d6dc919f6e442..6a4891928d214 100644 --- a/sys/netinet/tcp_seq.h +++ b/sys/netinet/tcp_seq.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_seq.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp_seq.h,v 1.2 1994/08/02 07:49:06 davidg Exp $ + * tcp_seq.h,v 1.3 1994/08/21 05:27:37 paul Exp */ #ifndef _NETINET_TCP_SEQ_H_ diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 10e83ab31d762..eae06e59ac1bb 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.1 (Berkeley) 6/10/93 - * $Id: tcp_subr.c,v 1.4 1994/10/02 17:48:44 phk Exp $ + * tcp_subr.c,v 1.5 1994/10/08 22:39:58 phk Exp */ #include <sys/param.h> diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 3c7fb1fe9326a..a5f73a1d03f3f 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_timer.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tcp_timer.c,v 1.2 1994/08/02 07:49:10 davidg Exp */ #ifndef TUBA_INCLUDE diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index d96ddc4a51077..e2b98db9ae084 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_timer.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp_timer.h,v 1.3 1994/08/02 07:49:12 davidg Exp $ + * tcp_timer.h,v 1.4 1994/08/21 05:27:38 paul Exp */ #ifndef _NETINET_TCP_TIMER_H_ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index a8a9b6dd5a128..fecb84629211e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 - * $Id: tcp_usrreq.c,v 1.4 1994/08/02 07:49:15 davidg Exp $ + * tcp_usrreq.c,v 1.5 1994/09/15 10:36:56 davidg Exp */ #include <sys/param.h> diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 7e4192e3923df..ea55ba5a484f0 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.3 (Berkeley) 4/10/94 - * $Id: tcp_var.h,v 1.2 1994/08/02 07:49:17 davidg Exp $ + * tcp_var.h,v 1.3 1994/08/21 05:27:39 paul Exp */ #ifndef _NETINET_TCP_VAR_H_ diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h index a8a876c041cc9..a06305f957bba 100644 --- a/sys/netinet/tcpip.h +++ b/sys/netinet/tcpip.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcpip.h 8.1 (Berkeley) 6/10/93 - * $Id: tcpip.h,v 1.2 1994/08/02 07:49:19 davidg Exp $ + * tcpip.h,v 1.3 1994/08/21 05:27:40 paul Exp */ #ifndef _NETINET_TCPIP_H_ diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h index d47ea918a4589..ba603a7503b7a 100644 --- a/sys/netinet/udp.h +++ b/sys/netinet/udp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp.h 8.1 (Berkeley) 6/10/93 - * $Id: udp.h,v 1.2 1994/08/02 07:49:22 davidg Exp $ + * udp.h,v 1.3 1994/08/21 05:27:41 paul Exp */ #ifndef _NETINET_UDP_H_ diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 8d7048473ac71..9f9cda5acca58 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.4 (Berkeley) 1/21/94 - * $Id: udp_usrreq.c,v 1.3 1994/08/02 07:49:24 davidg Exp $ + * udp_usrreq.c,v 1.4 1994/10/02 17:48:45 phk Exp */ #include <sys/param.h> diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index c047c938b59ef..7e92c66890100 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: udp_var.h,v 1.2 1994/08/02 07:49:26 davidg Exp $ + * udp_var.h,v 1.3 1994/08/21 05:27:42 paul Exp */ #ifndef _NETINET_UDP_VAR_H_ diff --git a/sys/netiso/argo_debug.h b/sys/netiso/argo_debug.h index 6adcd5230f64d..51e08347113db 100644 --- a/sys/netiso/argo_debug.h +++ b/sys/netiso/argo_debug.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)argo_debug.h 8.1 (Berkeley) 6/10/93 - * $Id: argo_debug.h,v 1.2 1994/08/02 07:49:31 davidg Exp $ + * argo_debug.h,v 1.3 1994/08/21 06:14:11 paul Exp */ #ifndef _NETISO_ARGO_DEBUG_H_ @@ -64,8 +64,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /home/ncvs/src/sys/netiso/argo_debug.h,v 1.2 1994/08/02 07:49:31 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/argo_debug.h,v $ + * /home/ncvs/src/sys/netiso/argo_debug.h,v 1.3 1994/08/21 06:14:11 paul Exp + * /home/ncvs/src/sys/netiso/argo_debug.h,v */ diff --git a/sys/netiso/clnl.h b/sys/netiso/clnl.h index 2bc739e3bd352..e88cdb4f33f6b 100644 --- a/sys/netiso/clnl.h +++ b/sys/netiso/clnl.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnl.h 8.1 (Berkeley) 6/10/93 - * $Id: clnl.h,v 1.2 1994/08/02 07:49:33 davidg Exp $ + * clnl.h,v 1.3 1994/08/21 06:14:12 paul Exp */ #ifndef _NETISO_CLNL_H_ diff --git a/sys/netiso/clnp.h b/sys/netiso/clnp.h index be162f36741cf..ac5effc3bbcfd 100644 --- a/sys/netiso/clnp.h +++ b/sys/netiso/clnp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp.h 8.2 (Berkeley) 4/16/94 - * $Id: clnp.h,v 1.2 1994/08/02 07:49:34 davidg Exp $ + * clnp.h,v 1.3 1994/08/21 06:14:13 paul Exp */ #ifndef _NETISO_CLNP_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp.h,v 1.2 1994/08/02 07:49:34 davidg Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp.h,v $ */ +/* /home/ncvs/src/sys/netiso/clnp.h,v 1.3 1994/08/21 06:14:13 paul Exp */ +/* /home/ncvs/src/sys/netiso/clnp.h,v */ /* should be config option but cpp breaks with too many #defines */ #define DECBIT diff --git a/sys/netiso/clnp_debug.c b/sys/netiso/clnp_debug.c index d3898349a3c52..68fc0df4fc568 100644 --- a/sys/netiso/clnp_debug.c +++ b/sys/netiso/clnp_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_debug.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * clnp_debug.c,v 1.2 1994/08/02 07:49:35 davidg Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_debug.c,v 1.1.1.1 1994/05/24 10:07:26 rgrimes Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_debug.c,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_debug.c,v 1.2 1994/08/02 07:49:35 davidg Exp */ +/* /home/ncvs/src/sys/netiso/clnp_debug.c,v */ #include <sys/param.h> #include <sys/mbuf.h> diff --git a/sys/netiso/clnp_er.c b/sys/netiso/clnp_er.c index 8d70c48141768..0cc35917adf3c 100644 --- a/sys/netiso/clnp_er.c +++ b/sys/netiso/clnp_er.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_er.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_er.c,v 1.2 1994/08/02 07:49:36 davidg Exp $ + * clnp_er.c,v 1.3 1994/11/15 14:26:10 bde Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_er.c,v 1.2 1994/08/02 07:49:36 davidg Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_er.c,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_er.c,v 1.3 1994/11/15 14:26:10 bde Exp */ +/* /home/ncvs/src/sys/netiso/clnp_er.c,v */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/clnp_frag.c b/sys/netiso/clnp_frag.c index 50e13d413a5fb..5ed3f711158f5 100644 --- a/sys/netiso/clnp_frag.c +++ b/sys/netiso/clnp_frag.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_frag.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * clnp_frag.c,v 1.2 1994/08/02 07:49:37 davidg Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_frag.c,v 1.1.1.1 1994/05/24 10:07:25 rgrimes Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_frag.c,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_frag.c,v 1.2 1994/08/02 07:49:37 davidg Exp */ +/* /home/ncvs/src/sys/netiso/clnp_frag.c,v */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/clnp_input.c b/sys/netiso/clnp_input.c index 8ee40aead2cdf..575e921de2b6f 100644 --- a/sys/netiso/clnp_input.c +++ b/sys/netiso/clnp_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_input.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_input.c,v 1.2 1994/08/02 07:49:39 davidg Exp $ + * clnp_input.c,v 1.3 1994/11/15 14:26:11 bde Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_input.c,v 1.2 1994/08/02 07:49:39 davidg Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_input.c,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_input.c,v 1.3 1994/11/15 14:26:11 bde Exp */ +/* /home/ncvs/src/sys/netiso/clnp_input.c,v */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/clnp_options.c b/sys/netiso/clnp_options.c index de44ff0ffb6ba..5f13284f569f3 100644 --- a/sys/netiso/clnp_options.c +++ b/sys/netiso/clnp_options.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_options.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * clnp_options.c,v 1.2 1994/08/02 07:49:40 davidg Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_options.c,v 1.1.1.1 1994/05/24 10:07:23 rgrimes Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_options.c,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_options.c,v 1.2 1994/08/02 07:49:40 davidg Exp */ +/* /home/ncvs/src/sys/netiso/clnp_options.c,v */ #ifdef ISO diff --git a/sys/netiso/clnp_output.c b/sys/netiso/clnp_output.c index aa18f8946471c..b74f7b096218f 100644 --- a/sys/netiso/clnp_output.c +++ b/sys/netiso/clnp_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_output.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_output.c,v 1.2 1994/08/02 07:49:42 davidg Exp $ + * clnp_output.c,v 1.3 1994/11/15 14:26:12 bde Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_output.c,v 1.2 1994/08/02 07:49:42 davidg Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_output.c,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_output.c,v 1.3 1994/11/15 14:26:12 bde Exp */ +/* /home/ncvs/src/sys/netiso/clnp_output.c,v */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/clnp_raw.c b/sys/netiso/clnp_raw.c index df6878c65e3c6..669482c92406f 100644 --- a/sys/netiso/clnp_raw.c +++ b/sys/netiso/clnp_raw.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_raw.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * clnp_raw.c,v 1.2 1994/08/02 07:49:44 davidg Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_raw.c,v 1.1.1.1 1994/05/24 10:07:22 rgrimes Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_raw.c,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_raw.c,v 1.2 1994/08/02 07:49:44 davidg Exp */ +/* /home/ncvs/src/sys/netiso/clnp_raw.c,v */ #include <sys/param.h> #include <sys/mbuf.h> diff --git a/sys/netiso/clnp_stat.h b/sys/netiso/clnp_stat.h index 3361342141587..7751318b8fd22 100644 --- a/sys/netiso/clnp_stat.h +++ b/sys/netiso/clnp_stat.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_stat.h 8.1 (Berkeley) 6/10/93 - * $Id: clnp_stat.h,v 1.2 1994/08/02 07:49:47 davidg Exp $ + * clnp_stat.h,v 1.3 1994/08/21 06:14:13 paul Exp */ #ifndef _NETISO_CLNP_STAT_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_stat.h,v 1.2 1994/08/02 07:49:47 davidg Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_stat.h,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_stat.h,v 1.3 1994/08/21 06:14:13 paul Exp */ +/* /home/ncvs/src/sys/netiso/clnp_stat.h,v */ struct clnp_stat { int cns_total; /* total pkts received */ diff --git a/sys/netiso/clnp_subr.c b/sys/netiso/clnp_subr.c index 29a2ab1492170..f6be13f17d169 100644 --- a/sys/netiso/clnp_subr.c +++ b/sys/netiso/clnp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_subr.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * clnp_subr.c,v 1.2 1994/08/02 07:49:50 davidg Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_subr.c,v 1.1.1.1 1994/05/24 10:07:20 rgrimes Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_subr.c,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_subr.c,v 1.2 1994/08/02 07:49:50 davidg Exp */ +/* /home/ncvs/src/sys/netiso/clnp_subr.c,v */ #ifdef ISO diff --git a/sys/netiso/clnp_timer.c b/sys/netiso/clnp_timer.c index f104f5281d7de..ba1f9cc624650 100644 --- a/sys/netiso/clnp_timer.c +++ b/sys/netiso/clnp_timer.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_timer.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_timer.c,v 1.2 1994/08/02 07:49:52 davidg Exp $ + * clnp_timer.c,v 1.3 1994/11/15 14:26:13 bde Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/clnp_timer.c,v 1.2 1994/08/02 07:49:52 davidg Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/clnp_timer.c,v $ */ +/* /home/ncvs/src/sys/netiso/clnp_timer.c,v 1.3 1994/11/15 14:26:13 bde Exp */ +/* /home/ncvs/src/sys/netiso/clnp_timer.c,v */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/cltp_usrreq.c b/sys/netiso/cltp_usrreq.c index ef4c703d2977e..5357f8a5d4bae 100644 --- a/sys/netiso/cltp_usrreq.c +++ b/sys/netiso/cltp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cltp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: cltp_usrreq.c,v 1.2 1994/08/02 07:49:55 davidg Exp $ + * cltp_usrreq.c,v 1.3 1994/11/15 14:26:14 bde Exp */ #ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */ diff --git a/sys/netiso/cltp_var.h b/sys/netiso/cltp_var.h index 122a272b3dd7e..ac5879a7efae0 100644 --- a/sys/netiso/cltp_var.h +++ b/sys/netiso/cltp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cltp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: cltp_var.h,v 1.2 1994/08/02 07:49:58 davidg Exp $ + * cltp_var.h,v 1.3 1994/08/21 06:14:14 paul Exp */ #ifndef _NETISO_CLTP_VAR_H_ diff --git a/sys/netiso/cons.h b/sys/netiso/cons.h index 60b49963a80aa..4bed5a9fcf272 100644 --- a/sys/netiso/cons.h +++ b/sys/netiso/cons.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cons.h 8.1 (Berkeley) 6/10/93 - * $Id: cons.h,v 1.2 1994/08/02 07:50:00 davidg Exp $ + * cons.h,v 1.3 1994/08/21 06:14:15 paul Exp */ #ifndef _NETISO_CONS_H_ @@ -64,8 +64,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /home/ncvs/src/sys/netiso/cons.h,v 1.2 1994/08/02 07:50:00 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/cons.h,v $ + * /home/ncvs/src/sys/netiso/cons.h,v 1.3 1994/08/21 06:14:15 paul Exp + * /home/ncvs/src/sys/netiso/cons.h,v * * interface between TP and CONS */ diff --git a/sys/netiso/cons_pcb.h b/sys/netiso/cons_pcb.h index 95ac89fc41a8f..8955714c55419 100644 --- a/sys/netiso/cons_pcb.h +++ b/sys/netiso/cons_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cons_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: cons_pcb.h,v 1.2 1994/08/02 07:50:03 davidg Exp $ + * cons_pcb.h,v 1.3 1994/08/21 06:14:16 paul Exp */ #ifndef _NETISO_CONS_PCB_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/cons_pcb.h,v 1.2 1994/08/02 07:50:03 davidg Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/cons_pcb.h,v $ */ +/* /home/ncvs/src/sys/netiso/cons_pcb.h,v 1.3 1994/08/21 06:14:16 paul Exp */ +/* /home/ncvs/src/sys/netiso/cons_pcb.h,v */ /* * protocol control block for the connection oriented network service diff --git a/sys/netiso/eonvar.h b/sys/netiso/eonvar.h index edbc46df1333e..716470f804701 100644 --- a/sys/netiso/eonvar.h +++ b/sys/netiso/eonvar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)eonvar.h 8.1 (Berkeley) 6/10/93 - * $Id: eonvar.h,v 1.2 1994/08/02 07:50:06 davidg Exp $ + * eonvar.h,v 1.3 1994/08/21 06:14:17 paul Exp */ #ifndef _NETISO_EONVAR_H_ diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c index 03ecedca5a062..7bd5db37d5155 100644 --- a/sys/netiso/esis.c +++ b/sys/netiso/esis.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)esis.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * esis.c,v 1.2 1994/08/02 07:50:09 davidg Exp */ /*********************************************************** diff --git a/sys/netiso/esis.h b/sys/netiso/esis.h index 1b864c96196a7..a0ebccb0ecc1a 100644 --- a/sys/netiso/esis.h +++ b/sys/netiso/esis.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)esis.h 8.1 (Berkeley) 6/10/93 - * $Id: esis.h,v 1.2 1994/08/02 07:50:11 davidg Exp $ + * esis.h,v 1.3 1994/08/21 06:14:18 paul Exp */ #ifndef _NETISO_ESIS_H_ @@ -64,8 +64,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /home/ncvs/src/sys/netiso/esis.h,v 1.2 1994/08/02 07:50:11 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/esis.h,v $ + * /home/ncvs/src/sys/netiso/esis.h,v 1.3 1994/08/21 06:14:18 paul Exp + * /home/ncvs/src/sys/netiso/esis.h,v */ #ifndef BYTE_ORDER diff --git a/sys/netiso/idrp_usrreq.c b/sys/netiso/idrp_usrreq.c index b5512312c3d0c..9265c39e2b04b 100644 --- a/sys/netiso/idrp_usrreq.c +++ b/sys/netiso/idrp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)idrp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * idrp_usrreq.c,v 1.2 1994/08/02 07:50:16 davidg Exp */ #include <sys/param.h> diff --git a/sys/netiso/if_cons.c b/sys/netiso/if_cons.c index 4878365197d4f..b9a52dbc54210 100644 --- a/sys/netiso/if_cons.c +++ b/sys/netiso/if_cons.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_cons.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * if_cons.c,v 1.2 1994/08/02 07:50:20 davidg Exp */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /home/ncvs/src/sys/netiso/if_cons.c,v 1.1.1.1 1994/05/24 10:07:14 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/if_cons.c,v $ + * /home/ncvs/src/sys/netiso/if_cons.c,v 1.2 1994/08/02 07:50:20 davidg Exp + * /home/ncvs/src/sys/netiso/if_cons.c,v * * cons.c - Connection Oriented Network Service: * including support for a) user transport-level service, diff --git a/sys/netiso/if_eon.c b/sys/netiso/if_eon.c index 75e926482977c..438e0586ebe75 100644 --- a/sys/netiso/if_eon.c +++ b/sys/netiso/if_eon.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_eon.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * if_eon.c,v 1.2 1994/08/02 07:50:23 davidg Exp */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /home/ncvs/src/sys/netiso/if_eon.c,v 1.1.1.1 1994/05/24 10:07:13 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/if_eon.c,v $ + * /home/ncvs/src/sys/netiso/if_eon.c,v 1.2 1994/08/02 07:50:23 davidg Exp + * /home/ncvs/src/sys/netiso/if_eon.c,v * * EON rfc * Layer between IP and CLNL diff --git a/sys/netiso/iso.c b/sys/netiso/iso.c index 922947fc59e09..71ba309357fc1 100644 --- a/sys/netiso/iso.c +++ b/sys/netiso/iso.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso.c 8.2 (Berkeley) 11/15/93 - * $Id$ + * iso.c,v 1.2 1994/08/02 07:50:26 davidg Exp */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /home/ncvs/src/sys/netiso/iso.c,v 1.1.1.1 1994/05/24 10:07:13 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/iso.c,v $ + * /home/ncvs/src/sys/netiso/iso.c,v 1.2 1994/08/02 07:50:26 davidg Exp + * /home/ncvs/src/sys/netiso/iso.c,v * * iso.c: miscellaneous routines to support the iso address family */ diff --git a/sys/netiso/iso.h b/sys/netiso/iso.h index 089d85e59b5f1..f7f04dd0ea091 100644 --- a/sys/netiso/iso.h +++ b/sys/netiso/iso.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso.h 8.1 (Berkeley) 6/10/93 - * $Id: iso.h,v 1.2 1994/08/02 07:50:28 davidg Exp $ + * iso.h,v 1.3 1994/08/21 06:14:19 paul Exp */ #ifndef _NETISO_ISO_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/iso.h,v 1.2 1994/08/02 07:50:28 davidg Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/iso.h,v $ */ +/* /home/ncvs/src/sys/netiso/iso.h,v 1.3 1994/08/21 06:14:19 paul Exp */ +/* /home/ncvs/src/sys/netiso/iso.h,v */ /* * Return true if this is a multicast address diff --git a/sys/netiso/iso_chksum.c b/sys/netiso/iso_chksum.c index c95a9b7fed428..19663bd20a1ae 100644 --- a/sys/netiso/iso_chksum.c +++ b/sys/netiso/iso_chksum.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_chksum.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * iso_chksum.c,v 1.2 1994/08/02 07:50:31 davidg Exp */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /home/ncvs/src/sys/netiso/iso_chksum.c,v 1.1.1.1 1994/05/24 10:07:12 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/iso_chksum.c,v $ + * /home/ncvs/src/sys/netiso/iso_chksum.c,v 1.2 1994/08/02 07:50:31 davidg Exp + * /home/ncvs/src/sys/netiso/iso_chksum.c,v * * ISO CHECKSUM * diff --git a/sys/netiso/iso_errno.h b/sys/netiso/iso_errno.h index 184fd2cb1090a..dcb6cfaa24363 100644 --- a/sys/netiso/iso_errno.h +++ b/sys/netiso/iso_errno.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_errno.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_errno.h,v 1.2 1994/08/02 07:50:34 davidg Exp $ + * iso_errno.h,v 1.3 1994/08/21 06:14:20 paul Exp */ #ifndef _NETISO_ISO_ERRNO_H_ diff --git a/sys/netiso/iso_pcb.c b/sys/netiso/iso_pcb.c index ad91ff41f7c04..dc2cc42de8485 100644 --- a/sys/netiso/iso_pcb.c +++ b/sys/netiso/iso_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_pcb.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * iso_pcb.c,v 1.2 1994/08/02 07:50:37 davidg Exp */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /home/ncvs/src/sys/netiso/iso_pcb.c,v 1.1.1.1 1994/05/24 10:07:10 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/iso_pcb.c,v $ + * /home/ncvs/src/sys/netiso/iso_pcb.c,v 1.2 1994/08/02 07:50:37 davidg Exp + * /home/ncvs/src/sys/netiso/iso_pcb.c,v * * Iso address family net-layer(s) pcb stuff. NEH 1/29/87 */ diff --git a/sys/netiso/iso_pcb.h b/sys/netiso/iso_pcb.h index 1431363c542de..9e066e5fea885 100644 --- a/sys/netiso/iso_pcb.h +++ b/sys/netiso/iso_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_pcb.h,v 1.2 1994/08/02 07:50:40 davidg Exp $ + * iso_pcb.h,v 1.3 1994/08/21 06:14:20 paul Exp */ #ifndef _NETISO_ISO_PCB_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/iso_pcb.h,v 1.2 1994/08/02 07:50:40 davidg Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/iso_pcb.h,v $ */ +/* /home/ncvs/src/sys/netiso/iso_pcb.h,v 1.3 1994/08/21 06:14:20 paul Exp */ +/* /home/ncvs/src/sys/netiso/iso_pcb.h,v */ #define MAXX25CRUDLEN 16 /* 16 bytes of call request user data */ diff --git a/sys/netiso/iso_proto.c b/sys/netiso/iso_proto.c index 6706e570a652b..b6351d1c97dfe 100644 --- a/sys/netiso/iso_proto.c +++ b/sys/netiso/iso_proto.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_proto.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * iso_proto.c,v 1.2 1994/08/02 07:50:42 davidg Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/iso_proto.c,v 1.1.1.1 1994/05/24 10:07:09 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/iso_proto.c,v $ +/* /home/ncvs/src/sys/netiso/iso_proto.c,v 1.2 1994/08/02 07:50:42 davidg Exp + * /home/ncvs/src/sys/netiso/iso_proto.c,v * * iso_proto.c : protocol switch tables in the ISO domain * diff --git a/sys/netiso/iso_snpac.c b/sys/netiso/iso_snpac.c index 5ade7aea8e40a..9188bbd38f40e 100644 --- a/sys/netiso/iso_snpac.c +++ b/sys/netiso/iso_snpac.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_snpac.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * iso_snpac.c,v 1.2 1994/08/02 07:50:44 davidg Exp */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/iso_snpac.c,v 1.1.1.1 1994/05/24 10:07:07 rgrimes Exp $ */ -/* $Source: /home/ncvs/src/sys/netiso/iso_snpac.c,v $ */ +/* /home/ncvs/src/sys/netiso/iso_snpac.c,v 1.2 1994/08/02 07:50:44 davidg Exp */ +/* /home/ncvs/src/sys/netiso/iso_snpac.c,v */ #ifdef ISO diff --git a/sys/netiso/iso_snpac.h b/sys/netiso/iso_snpac.h index 180a4382053ca..1d865d82385a0 100644 --- a/sys/netiso/iso_snpac.h +++ b/sys/netiso/iso_snpac.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_snpac.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_snpac.h,v 1.2 1994/08/02 07:50:47 davidg Exp $ + * iso_snpac.h,v 1.3 1994/08/21 06:14:21 paul Exp */ #ifndef _NETISO_ISO_SNPAC_H_ diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h index d260de5426da3..8e98534bf89b5 100644 --- a/sys/netiso/iso_var.h +++ b/sys/netiso/iso_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_var.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_var.h,v 1.2 1994/08/02 07:50:49 davidg Exp $ + * iso_var.h,v 1.3 1994/08/21 06:14:22 paul Exp */ #ifndef _NETISO_ISO_VAR_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.2 1994/08/02 07:50:49 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/iso_var.h,v $ +/* /home/ncvs/src/sys/netiso/iso_var.h,v 1.3 1994/08/21 06:14:22 paul Exp + * /home/ncvs/src/sys/netiso/iso_var.h,v */ /* diff --git a/sys/netiso/tp.trans b/sys/netiso/tp.trans index edefc769b816c..b985d8bfa9e6b 100644 --- a/sys/netiso/tp.trans +++ b/sys/netiso/tp.trans @@ -60,7 +60,7 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: tp.trans,v 5.1 88/10/12 12:22:07 root Exp $ +/* /home/ncvs/src/sys/netiso/tp.trans,v 1.1.1.1 1994/05/24 10:07:31 rgrimes Exp * * Transition file for TP. * diff --git a/sys/netiso/tp_astring.c b/sys/netiso/tp_astring.c index 5bfa711151026..d285e5b149efb 100644 --- a/sys/netiso/tp_astring.c +++ b/sys/netiso/tp_astring.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_astring.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_astring.c,v 1.2 1994/08/02 07:50:51 davidg Exp */ char *tp_sstring[] = { diff --git a/sys/netiso/tp_clnp.h b/sys/netiso/tp_clnp.h index 528e3f0f994fc..146c3b53f424f 100644 --- a/sys/netiso/tp_clnp.h +++ b/sys/netiso/tp_clnp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_clnp.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_clnp.h,v 1.2 1994/08/02 07:50:54 davidg Exp $ + * tp_clnp.h,v 1.3 1994/08/21 06:14:23 paul Exp */ #ifndef _NETISO_TP_CLNP_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_clnp.h,v 1.2 1994/08/02 07:50:54 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_clnp.h,v $ + * /home/ncvs/src/sys/netiso/tp_clnp.h,v 1.3 1994/08/21 06:14:23 paul Exp + * /home/ncvs/src/sys/netiso/tp_clnp.h,v * * AF_ISO net-dependent structures and include files * diff --git a/sys/netiso/tp_cons.c b/sys/netiso/tp_cons.c index 76e5775238b5e..a7ce7e5015d04 100644 --- a/sys/netiso/tp_cons.c +++ b/sys/netiso/tp_cons.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_cons.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_cons.c,v 1.2 1994/08/02 07:50:56 davidg Exp $ + * tp_cons.c,v 1.3 1994/11/15 14:26:15 bde Exp */ /*********************************************************** @@ -62,8 +62,8 @@ SOFTWARE. */ /* * ARGO TP - * $Header: /home/ncvs/src/sys/netiso/tp_cons.c,v 1.2 1994/08/02 07:50:56 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_cons.c,v $ + * /home/ncvs/src/sys/netiso/tp_cons.c,v 1.3 1994/11/15 14:26:15 bde Exp + * /home/ncvs/src/sys/netiso/tp_cons.c,v * * Here is where you find the iso- and cons-dependent code. We've tried * keep all net-level and (primarily) address-family-dependent stuff diff --git a/sys/netiso/tp_driver.c b/sys/netiso/tp_driver.c index ead2c892906ae..991d83039b407 100644 --- a/sys/netiso/tp_driver.c +++ b/sys/netiso/tp_driver.c @@ -1,5 +1,5 @@ /* - * $Id$ + * tp_driver.c,v 1.2 1994/08/02 07:50:59 davidg Exp */ #define _XEBEC_PG static diff --git a/sys/netiso/tp_emit.c b/sys/netiso/tp_emit.c index 0c9a831ed58be..080a171115759 100644 --- a/sys/netiso/tp_emit.c +++ b/sys/netiso/tp_emit.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_emit.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_emit.c,v 1.2 1994/08/02 07:51:02 davidg Exp */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_emit.c,v 1.1.1.1 1994/05/24 10:06:56 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_emit.c,v $ + * /home/ncvs/src/sys/netiso/tp_emit.c,v 1.2 1994/08/02 07:51:02 davidg Exp + * /home/ncvs/src/sys/netiso/tp_emit.c,v * * This file contains tp_emit() and tp_error_emit(), which * form TPDUs and hand them to ip. diff --git a/sys/netiso/tp_events.h b/sys/netiso/tp_events.h index 16d622bc7473a..e7682a61adf3d 100644 --- a/sys/netiso/tp_events.h +++ b/sys/netiso/tp_events.h @@ -1,5 +1,5 @@ /* - * $Id: tp_events.h,v 1.2 1994/08/02 07:51:05 davidg Exp $ + * tp_events.h,v 1.3 1994/08/21 06:14:24 paul Exp */ #ifndef _NETISO_TP_EVENTS_H_ diff --git a/sys/netiso/tp_inet.c b/sys/netiso/tp_inet.c index b4f774b9f28fb..9818fad7aeee6 100644 --- a/sys/netiso/tp_inet.c +++ b/sys/netiso/tp_inet.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_inet.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_inet.c,v 1.2 1994/08/02 07:51:08 davidg Exp $ + * tp_inet.c,v 1.3 1994/11/15 14:26:16 bde Exp */ /*********************************************************** @@ -62,8 +62,8 @@ SOFTWARE. */ /* * ARGO TP - * $Header: /home/ncvs/src/sys/netiso/tp_inet.c,v 1.2 1994/08/02 07:51:08 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_inet.c,v $ + * /home/ncvs/src/sys/netiso/tp_inet.c,v 1.3 1994/11/15 14:26:16 bde Exp + * /home/ncvs/src/sys/netiso/tp_inet.c,v * * Here is where you find the inet-dependent code. We've tried * keep all net-level and (primarily) address-family-dependent stuff diff --git a/sys/netiso/tp_input.c b/sys/netiso/tp_input.c index 1eac4061b3279..7d52f550f7637 100644 --- a/sys/netiso/tp_input.c +++ b/sys/netiso/tp_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_input.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_input.c,v 1.2 1994/08/02 07:51:11 davidg Exp */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_input.c,v 1.1.1.1 1994/05/24 10:06:54 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_input.c,v $ + * /home/ncvs/src/sys/netiso/tp_input.c,v 1.2 1994/08/02 07:51:11 davidg Exp + * /home/ncvs/src/sys/netiso/tp_input.c,v * * tp_input() gets an mbuf chain from ip. Actually, not directly * from ip, because ip calls a net-level routine that strips off diff --git a/sys/netiso/tp_ip.h b/sys/netiso/tp_ip.h index 0849813b16678..0ba2f9e2b7cf5 100644 --- a/sys/netiso/tp_ip.h +++ b/sys/netiso/tp_ip.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_ip.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_ip.h,v 1.2 1994/08/02 07:51:13 davidg Exp $ + * tp_ip.h,v 1.3 1994/08/21 06:14:24 paul Exp */ #ifndef _NETISO_TP_IP_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_ip.h,v 1.2 1994/08/02 07:51:13 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_ip.h,v $ + * /home/ncvs/src/sys/netiso/tp_ip.h,v 1.3 1994/08/21 06:14:24 paul Exp + * /home/ncvs/src/sys/netiso/tp_ip.h,v * * internet IP-dependent structures and include files * diff --git a/sys/netiso/tp_iso.c b/sys/netiso/tp_iso.c index 21f3f7db3138c..93610ff90f272 100644 --- a/sys/netiso/tp_iso.c +++ b/sys/netiso/tp_iso.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_iso.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_iso.c,v 1.2 1994/08/02 07:51:14 davidg Exp */ /*********************************************************** @@ -62,8 +62,8 @@ SOFTWARE. */ /* * ARGO TP - * $Header: /home/ncvs/src/sys/netiso/tp_iso.c,v 1.1.1.1 1994/05/24 10:06:52 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_iso.c,v $ + * /home/ncvs/src/sys/netiso/tp_iso.c,v 1.2 1994/08/02 07:51:14 davidg Exp + * /home/ncvs/src/sys/netiso/tp_iso.c,v * * Here is where you find the iso-dependent code. We've tried * keep all net-level and (primarily) address-family-dependent stuff diff --git a/sys/netiso/tp_meas.c b/sys/netiso/tp_meas.c index 460403e0eab4c..4c4084f1a0281 100644 --- a/sys/netiso/tp_meas.c +++ b/sys/netiso/tp_meas.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_meas.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_meas.c,v 1.2 1994/08/02 07:51:15 davidg Exp */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /home/ncvs/src/sys/netiso/tp_meas.c,v 1.1.1.1 1994/05/24 10:06:52 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_meas.c,v $ + * /home/ncvs/src/sys/netiso/tp_meas.c,v 1.2 1994/08/02 07:51:15 davidg Exp + * /home/ncvs/src/sys/netiso/tp_meas.c,v * * tp_meas.c : create a performance measurement event * in the circular buffer tp_Meas[] diff --git a/sys/netiso/tp_meas.h b/sys/netiso/tp_meas.h index 5613db5c4b191..b76fe4cf226eb 100644 --- a/sys/netiso/tp_meas.h +++ b/sys/netiso/tp_meas.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_meas.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_meas.h,v 1.2 1994/08/02 07:51:16 davidg Exp $ + * tp_meas.h,v 1.3 1994/08/21 06:14:25 paul Exp */ #ifndef _NETISO_TP_MEAS_H_ diff --git a/sys/netiso/tp_output.c b/sys/netiso/tp_output.c index 35ba0bed1decf..4a52281324359 100644 --- a/sys/netiso/tp_output.c +++ b/sys/netiso/tp_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_output.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_output.c,v 1.2 1994/08/02 07:51:17 davidg Exp */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_output.c,v 1.1.1.1 1994/05/24 10:06:50 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_output.c,v $ + * /home/ncvs/src/sys/netiso/tp_output.c,v 1.2 1994/08/02 07:51:17 davidg Exp + * /home/ncvs/src/sys/netiso/tp_output.c,v * * In here is tp_ctloutput(), the guy called by [sg]etsockopt(), */ diff --git a/sys/netiso/tp_param.h b/sys/netiso/tp_param.h index a9c0ff2dca563..34c5d78f8b3d3 100644 --- a/sys/netiso/tp_param.h +++ b/sys/netiso/tp_param.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_param.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_param.h,v 1.2 1994/08/02 07:51:19 davidg Exp $ + * tp_param.h,v 1.3 1994/08/21 06:14:26 paul Exp */ #ifndef _NETISO_TP_PARAM_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_param.h,v 1.2 1994/08/02 07:51:19 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_param.h,v $ + * /home/ncvs/src/sys/netiso/tp_param.h,v 1.3 1994/08/21 06:14:26 paul Exp + * /home/ncvs/src/sys/netiso/tp_param.h,v * */ diff --git a/sys/netiso/tp_pcb.c b/sys/netiso/tp_pcb.c index 41d84c9f2c985..7462d3366ba27 100644 --- a/sys/netiso/tp_pcb.c +++ b/sys/netiso/tp_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_pcb.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_pcb.c,v 1.2 1994/08/02 07:51:20 davidg Exp $ + * tp_pcb.c,v 1.3 1994/11/15 14:23:06 bde Exp */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_pcb.c,v 1.2 1994/08/02 07:51:20 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_pcb.c,v $ + * /home/ncvs/src/sys/netiso/tp_pcb.c,v 1.3 1994/11/15 14:23:06 bde Exp + * /home/ncvs/src/sys/netiso/tp_pcb.c,v * * * This is the initialization and cleanup stuff - diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h index bfdc134632b4e..a5b2a67d20016 100644 --- a/sys/netiso/tp_pcb.h +++ b/sys/netiso/tp_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_pcb.h,v 1.2 1994/08/02 07:51:21 davidg Exp $ + * tp_pcb.h,v 1.3 1994/08/21 06:14:27 paul Exp */ #ifndef _NETISO_TP_PCB_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_pcb.h,v 1.2 1994/08/02 07:51:21 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_pcb.h,v $ + * /home/ncvs/src/sys/netiso/tp_pcb.h,v 1.3 1994/08/21 06:14:27 paul Exp + * /home/ncvs/src/sys/netiso/tp_pcb.h,v * * * This file defines the transport protocol control block (tpcb). diff --git a/sys/netiso/tp_seq.h b/sys/netiso/tp_seq.h index 2441e6ab5f879..0b8d3a2e55b46 100644 --- a/sys/netiso/tp_seq.h +++ b/sys/netiso/tp_seq.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_seq.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_seq.h,v 1.2 1994/08/02 07:51:22 davidg Exp $ + * tp_seq.h,v 1.3 1994/08/21 06:14:28 paul Exp */ #ifndef _NETISO_TP_SEQ_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_seq.h,v 1.2 1994/08/02 07:51:22 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_seq.h,v $ + * /home/ncvs/src/sys/netiso/tp_seq.h,v 1.3 1994/08/21 06:14:28 paul Exp + * /home/ncvs/src/sys/netiso/tp_seq.h,v * * These macros perform sequence number arithmetic modulo (2**7 or 2**31). * The relevant fields in the tpcb are: diff --git a/sys/netiso/tp_stat.h b/sys/netiso/tp_stat.h index c5a3f3fa77b7e..f686cc9540faf 100644 --- a/sys/netiso/tp_stat.h +++ b/sys/netiso/tp_stat.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_stat.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_stat.h,v 1.2 1994/08/02 07:51:23 davidg Exp $ + * tp_stat.h,v 1.3 1994/08/21 06:14:28 paul Exp */ #ifndef _NETISO_TP_STAT_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_stat.h,v 1.2 1994/08/02 07:51:23 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_stat.h,v $ + * /home/ncvs/src/sys/netiso/tp_stat.h,v 1.3 1994/08/21 06:14:28 paul Exp + * /home/ncvs/src/sys/netiso/tp_stat.h,v * * Here are the data structures in which the global * statistics(counters) are gathered. diff --git a/sys/netiso/tp_states.h b/sys/netiso/tp_states.h index aff73fe78d275..3c1ff265d33d3 100644 --- a/sys/netiso/tp_states.h +++ b/sys/netiso/tp_states.h @@ -1,5 +1,5 @@ /* - * $Id: tp_states.h,v 1.3 1994/08/05 12:33:30 davidg Exp $ + * tp_states.h,v 1.4 1994/08/21 06:14:29 paul Exp */ #ifndef _NETISO_TP_STATES_H_ diff --git a/sys/netiso/tp_states.init b/sys/netiso/tp_states.init index 89e53453866a6..1009fbe93924c 100644 --- a/sys/netiso/tp_states.init +++ b/sys/netiso/tp_states.init @@ -1,5 +1,5 @@ -/* $Header$ */ -/* $Source$ */ +/* /home/ncvs/src/sys/netiso/tp_states.init,v 1.1.1.1 1994/05/24 10:07:29 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/tp_states.init,v */ {0x3,0x0}, {0x6,0x1}, {0x6,0x2}, diff --git a/sys/netiso/tp_subr.c b/sys/netiso/tp_subr.c index 7b92db74e5317..e07d5aaa4ccfa 100644 --- a/sys/netiso/tp_subr.c +++ b/sys/netiso/tp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_subr.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_subr.c,v 1.2 1994/08/02 07:51:25 davidg Exp */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_subr.c,v 1.1.1.1 1994/05/24 10:06:46 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_subr.c,v $ + * /home/ncvs/src/sys/netiso/tp_subr.c,v 1.2 1994/08/02 07:51:25 davidg Exp + * /home/ncvs/src/sys/netiso/tp_subr.c,v * * The main work of data transfer is done here. * These routines are called from tp.trans. diff --git a/sys/netiso/tp_subr2.c b/sys/netiso/tp_subr2.c index a0c59dcec7073..7b9269c0b867e 100644 --- a/sys/netiso/tp_subr2.c +++ b/sys/netiso/tp_subr2.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_subr2.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_subr2.c,v 1.2 1994/08/02 07:51:26 davidg Exp */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_subr2.c,v 1.1.1.1 1994/05/24 10:06:45 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_subr2.c,v $ + * /home/ncvs/src/sys/netiso/tp_subr2.c,v 1.2 1994/08/02 07:51:26 davidg Exp + * /home/ncvs/src/sys/netiso/tp_subr2.c,v * * Some auxiliary routines: * tp_protocol_error: required by xebec- called when a combo of state, diff --git a/sys/netiso/tp_timer.c b/sys/netiso/tp_timer.c index 34fa0cc3b7f37..a7277c91ab131 100644 --- a/sys/netiso/tp_timer.c +++ b/sys/netiso/tp_timer.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_timer.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_timer.c,v 1.2 1994/08/02 07:51:27 davidg Exp */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_timer.c,v 1.1.1.1 1994/05/24 10:06:44 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_timer.c,v $ + * /home/ncvs/src/sys/netiso/tp_timer.c,v 1.2 1994/08/02 07:51:27 davidg Exp + * /home/ncvs/src/sys/netiso/tp_timer.c,v * */ diff --git a/sys/netiso/tp_timer.h b/sys/netiso/tp_timer.h index 0ee6182a2abee..ba102a79fdc9d 100644 --- a/sys/netiso/tp_timer.h +++ b/sys/netiso/tp_timer.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_timer.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_timer.h,v 1.2 1994/08/02 07:51:28 davidg Exp $ + * tp_timer.h,v 1.3 1994/08/21 06:14:30 paul Exp */ #ifndef _NETISO_TP_TIMER_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_timer.h,v 1.2 1994/08/02 07:51:28 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_timer.h,v $ + * /home/ncvs/src/sys/netiso/tp_timer.h,v 1.3 1994/08/21 06:14:30 paul Exp + * /home/ncvs/src/sys/netiso/tp_timer.h,v * * ARGO TP * The callout structures used by the tp timers. diff --git a/sys/netiso/tp_tpdu.h b/sys/netiso/tp_tpdu.h index c281ecf581f13..3449e6bbf4ebd 100644 --- a/sys/netiso/tp_tpdu.h +++ b/sys/netiso/tp_tpdu.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_tpdu.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_tpdu.h,v 1.2 1994/08/02 07:51:29 davidg Exp $ + * tp_tpdu.h,v 1.3 1994/08/21 06:14:31 paul Exp */ #ifndef _NETISO_TP_TPDU_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_tpdu.h,v 1.2 1994/08/02 07:51:29 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_tpdu.h,v $ + * /home/ncvs/src/sys/netiso/tp_tpdu.h,v 1.3 1994/08/21 06:14:31 paul Exp + * /home/ncvs/src/sys/netiso/tp_tpdu.h,v * * This ghastly set of macros makes it possible to * refer to tpdu structures without going mad. diff --git a/sys/netiso/tp_trace.c b/sys/netiso/tp_trace.c index 1f80e84f84132..c0db5ac494f6e 100644 --- a/sys/netiso/tp_trace.c +++ b/sys/netiso/tp_trace.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_trace.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_trace.c,v 1.2 1994/08/02 07:51:30 davidg Exp */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_trace.c,v 1.1.1.1 1994/05/24 10:06:42 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_trace.c,v $ + * /home/ncvs/src/sys/netiso/tp_trace.c,v 1.2 1994/08/02 07:51:30 davidg Exp + * /home/ncvs/src/sys/netiso/tp_trace.c,v * * The whole protocol trace module. * We keep a circular buffer of trace structures, which are big diff --git a/sys/netiso/tp_trace.h b/sys/netiso/tp_trace.h index fb5365f4b6c30..268bb1cb10261 100644 --- a/sys/netiso/tp_trace.h +++ b/sys/netiso/tp_trace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_trace.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_trace.h,v 1.2 1994/08/02 07:51:31 davidg Exp $ + * tp_trace.h,v 1.3 1994/08/21 06:14:32 paul Exp */ #ifndef _NETISO_TP_TRACE_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_trace.h,v 1.2 1994/08/02 07:51:31 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_trace.h,v $ + * /home/ncvs/src/sys/netiso/tp_trace.h,v 1.3 1994/08/21 06:14:32 paul Exp + * /home/ncvs/src/sys/netiso/tp_trace.h,v * * * Definitions needed for the protocol trace mechanism. diff --git a/sys/netiso/tp_user.h b/sys/netiso/tp_user.h index 3916865faebd8..5964a29ca43e5 100644 --- a/sys/netiso/tp_user.h +++ b/sys/netiso/tp_user.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_user.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_user.h,v 1.2 1994/08/02 07:51:32 davidg Exp $ + * tp_user.h,v 1.3 1994/08/21 06:14:32 paul Exp */ #ifndef _NETISO_TP_USER_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_user.h,v 1.2 1994/08/02 07:51:32 davidg Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_user.h,v $ + * /home/ncvs/src/sys/netiso/tp_user.h,v 1.3 1994/08/21 06:14:32 paul Exp + * /home/ncvs/src/sys/netiso/tp_user.h,v * * These are the values a real-live user ;-) needs. */ diff --git a/sys/netiso/tp_usrreq.c b/sys/netiso/tp_usrreq.c index 898b3606c5361..306e9d23c3f03 100644 --- a/sys/netiso/tp_usrreq.c +++ b/sys/netiso/tp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tp_usrreq.c,v 1.2 1994/08/02 07:51:33 davidg Exp */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /home/ncvs/src/sys/netiso/tp_usrreq.c,v 1.1.1.1 1994/05/24 10:06:40 rgrimes Exp $ - * $Source: /home/ncvs/src/sys/netiso/tp_usrreq.c,v $ + * /home/ncvs/src/sys/netiso/tp_usrreq.c,v 1.2 1994/08/02 07:51:33 davidg Exp + * /home/ncvs/src/sys/netiso/tp_usrreq.c,v * * tp_usrreq(), the fellow that gets called from most of the socket code. * Pretty straighforward. diff --git a/sys/netiso/tuba_subr.c b/sys/netiso/tuba_subr.c index b7131ad3e2cbf..d1f996ce8eeeb 100644 --- a/sys/netiso/tuba_subr.c +++ b/sys/netiso/tuba_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tuba_subr.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tuba_subr.c,v 1.2 1994/08/02 07:51:34 davidg Exp */ #include <sys/param.h> diff --git a/sys/netiso/tuba_table.c b/sys/netiso/tuba_table.c index 0b0a977bf5a06..985da061aea4d 100644 --- a/sys/netiso/tuba_table.c +++ b/sys/netiso/tuba_table.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tuba_table.c 8.2 (Berkeley) 11/15/93 - * $Id$ + * tuba_table.c,v 1.2 1994/08/02 07:51:35 davidg Exp */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/tuba_table.h b/sys/netiso/tuba_table.h index 5d2b2fd7701fe..e5bed536e9727 100644 --- a/sys/netiso/tuba_table.h +++ b/sys/netiso/tuba_table.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tuba_table.h 8.1 (Berkeley) 6/10/93 - * $Id: tuba_table.h,v 1.2 1994/08/02 07:51:37 davidg Exp $ + * tuba_table.h,v 1.3 1994/08/21 06:14:33 paul Exp */ #ifndef _NETISO_TUBA_TABLE_H_ diff --git a/sys/netiso/tuba_usrreq.c b/sys/netiso/tuba_usrreq.c index e1e922ab65268..e0a2475c0d59b 100644 --- a/sys/netiso/tuba_usrreq.c +++ b/sys/netiso/tuba_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tuba_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * tuba_usrreq.c,v 1.2 1994/08/02 07:51:38 davidg Exp */ #include <sys/param.h> diff --git a/sys/netiso/xebec/debug.h b/sys/netiso/xebec/debug.h index 2e3f16794d6b4..6cb14a7c9d3be 100644 --- a/sys/netiso/xebec/debug.h +++ b/sys/netiso/xebec/debug.h @@ -1,5 +1,5 @@ -/* $Header: debug.h,v 2.1 88/09/19 12:56:16 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/debug.h,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/debug.h,v 1.1.1.1 1994/05/24 10:07:51 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/debug.h,v */ #define OUT stdout diff --git a/sys/netiso/xebec/llparse.c b/sys/netiso/xebec/llparse.c index fee7a9f7e47d3..352714f4aa1ad 100644 --- a/sys/netiso/xebec/llparse.c +++ b/sys/netiso/xebec/llparse.c @@ -1,5 +1,5 @@ -/* $Header: llparse.c,v 2.2 88/09/19 12:54:59 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/llparse.c,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/llparse.c,v 1.1.1.1 1994/05/24 10:07:51 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/llparse.c,v */ /* * ************************* NOTICE ******************************* * This code is in the public domain. It cannot be copyrighted. diff --git a/sys/netiso/xebec/llparse.h b/sys/netiso/xebec/llparse.h index 1b6133b1b7bbc..6a1b1705d0b15 100644 --- a/sys/netiso/xebec/llparse.h +++ b/sys/netiso/xebec/llparse.h @@ -1,5 +1,5 @@ -/* $Header: llparse.h,v 2.1 88/09/19 12:56:20 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/llparse.h,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/llparse.h,v 1.1.1.1 1994/05/24 10:07:50 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/llparse.h,v */ /************************************************************ attributes stack garbage diff --git a/sys/netiso/xebec/llscan.c b/sys/netiso/xebec/llscan.c index ffdb9a92a60a3..d3a3abb8d09fe 100644 --- a/sys/netiso/xebec/llscan.c +++ b/sys/netiso/xebec/llscan.c @@ -1,5 +1,5 @@ -/* $Header: llscan.c,v 2.2 88/09/19 12:55:06 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/llscan.c,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/llscan.c,v 1.1.1.1 1994/05/24 10:07:50 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/llscan.c,v */ /* * ************************* NOTICE ******************************* * This code is in the public domain. It cannot be copyrighted. diff --git a/sys/netiso/xebec/main.c b/sys/netiso/xebec/main.c index a0b4842f30cab..424acef911844 100644 --- a/sys/netiso/xebec/main.c +++ b/sys/netiso/xebec/main.c @@ -1,5 +1,5 @@ -/* $Header: main.c,v 2.4 88/09/19 12:55:13 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/main.c,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/main.c,v 1.1.1.1 1994/05/24 10:07:49 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/main.c,v */ /* * TODO: * rewrite the command line stuff altogether - it's kludged beyond diff --git a/sys/netiso/xebec/main.h b/sys/netiso/xebec/main.h index cb5bd74f31e44..5c0c6a4592313 100644 --- a/sys/netiso/xebec/main.h +++ b/sys/netiso/xebec/main.h @@ -1,5 +1,5 @@ -/* $Header: main.h,v 2.1 88/09/19 12:56:24 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/main.h,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/main.h,v 1.1.1.1 1994/05/24 10:07:49 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/main.h,v */ #define TRUE 1 #define FALSE 0 diff --git a/sys/netiso/xebec/malloc.c b/sys/netiso/xebec/malloc.c index 5cdfc147a7039..1f04112839ac2 100644 --- a/sys/netiso/xebec/malloc.c +++ b/sys/netiso/xebec/malloc.c @@ -1,5 +1,5 @@ -/* $Header: malloc.c,v 2.2 88/09/19 12:55:18 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/malloc.c,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/malloc.c,v 1.1.1.1 1994/05/24 10:07:48 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/malloc.c,v */ /* * This code is such a kludge that I don't want to put my name on it. * It was a ridiculously fast hack and needs rewriting. diff --git a/sys/netiso/xebec/malloc.h b/sys/netiso/xebec/malloc.h index 53d865bf47b53..c74d0eba0521c 100644 --- a/sys/netiso/xebec/malloc.h +++ b/sys/netiso/xebec/malloc.h @@ -1,4 +1,4 @@ -/* $Header: malloc.h,v 2.1 88/09/19 12:56:27 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/malloc.h,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/malloc.h,v 1.1.1.1 1994/05/24 10:07:47 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/malloc.h,v */ char *Malloc(); diff --git a/sys/netiso/xebec/procs.c b/sys/netiso/xebec/procs.c index 49d862ac5b9e2..112bf05d39162 100644 --- a/sys/netiso/xebec/procs.c +++ b/sys/netiso/xebec/procs.c @@ -1,5 +1,5 @@ -/* $Header: procs.c,v 2.3 88/09/19 12:55:22 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/procs.c,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/procs.c,v 1.1.1.1 1994/05/24 10:07:46 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/procs.c,v */ /* * This code is such a kludge that I don't want to put my name on it. * It was a ridiculously fast hack and needs rewriting. diff --git a/sys/netiso/xebec/procs.h b/sys/netiso/xebec/procs.h index e41ae75995cea..c9f0c647fc0a4 100644 --- a/sys/netiso/xebec/procs.h +++ b/sys/netiso/xebec/procs.h @@ -1,5 +1,5 @@ -/* $Header: procs.h,v 2.1 88/09/19 12:56:30 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/procs.h,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/procs.h,v 1.1.1.1 1994/05/24 10:07:46 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/procs.h,v */ extern char *stash(); extern struct Object *SameState; diff --git a/sys/netiso/xebec/putdriver.c b/sys/netiso/xebec/putdriver.c index 996ac643d10c9..473f9ebe518ca 100644 --- a/sys/netiso/xebec/putdriver.c +++ b/sys/netiso/xebec/putdriver.c @@ -1,5 +1,5 @@ -/* $Header: putdriver.c,v 2.2 88/09/19 12:55:27 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/putdriver.c,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/putdriver.c,v 1.1.1.1 1994/05/24 10:07:46 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/putdriver.c,v */ /* * This code is such a kludge that I don't want to put my name on it. diff --git a/sys/netiso/xebec/sets.c b/sys/netiso/xebec/sets.c index 3bb74ed8d2914..d6024dbb83ae1 100644 --- a/sys/netiso/xebec/sets.c +++ b/sys/netiso/xebec/sets.c @@ -1,5 +1,5 @@ -/* $Header: sets.c,v 2.3 88/09/19 12:55:30 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/sets.c,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/sets.c,v 1.1.1.1 1994/05/24 10:07:45 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/sets.c,v */ /* * This code is such a kludge that I don't want to put my name on it. * It was a ridiculously fast hack and needs rewriting. diff --git a/sys/netiso/xebec/sets.h b/sys/netiso/xebec/sets.h index 96eb791edc2dc..4c264cf492d00 100644 --- a/sys/netiso/xebec/sets.h +++ b/sys/netiso/xebec/sets.h @@ -1,5 +1,5 @@ -/* $Header: sets.h,v 2.1 88/09/19 12:56:33 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/sets.h,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/sets.h,v 1.1.1.1 1994/05/24 10:07:44 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/sets.h,v */ #define MAXEVENTS 200 #define MAXSTATES 200 diff --git a/sys/netiso/xebec/test.trans b/sys/netiso/xebec/test.trans index 49db361099433..00604c2b4843e 100644 --- a/sys/netiso/xebec/test.trans +++ b/sys/netiso/xebec/test.trans @@ -1,4 +1,4 @@ -/* $Header: test.trans,v 0.2 88/09/19 12:58:29 nhall Exp $ +/* /home/ncvs/src/sys/netiso/xebec/test.trans,v 1.1.1.1 1994/05/24 10:07:51 rgrimes Exp */ *PROTOCOL test diff --git a/sys/netiso/xebec/xebec.c b/sys/netiso/xebec/xebec.c index 132bcb8487a3a..1b207ba90a3c0 100644 --- a/sys/netiso/xebec/xebec.c +++ b/sys/netiso/xebec/xebec.c @@ -1,5 +1,5 @@ -/* $Header: xebec.c,v 2.2 88/09/19 12:55:37 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/xebec.c,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/xebec.c,v 1.1.1.1 1994/05/24 10:07:43 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/xebec.c,v */ #include "xebec.h" #include "llparse.h" diff --git a/sys/netiso/xebec/xebec.h b/sys/netiso/xebec/xebec.h index 168bb77b249d8..9f37747230ae1 100644 --- a/sys/netiso/xebec/xebec.h +++ b/sys/netiso/xebec/xebec.h @@ -1,5 +1,5 @@ -/* $Header: xebec.h,v 2.1 88/09/19 12:56:35 nhall Exp $ */ -/* $Source: /var/home/tadl/src/argo/xebec/RCS/xebec.h,v $ */ +/* /home/ncvs/src/sys/netiso/xebec/xebec.h,v 1.1.1.1 1994/05/24 10:07:40 rgrimes Exp */ +/* /home/ncvs/src/sys/netiso/xebec/xebec.h,v */ union llattrib { struct { diff --git a/sys/netns/idp.h b/sys/netns/idp.h index 96b8694d2fc77..dc8d763def8e4 100644 --- a/sys/netns/idp.h +++ b/sys/netns/idp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)idp.h 8.1 (Berkeley) 6/10/93 - * $Id: idp.h,v 1.2 1994/08/02 07:51:40 davidg Exp $ + * idp.h,v 1.3 1994/08/21 06:22:05 paul Exp */ #ifndef _NETNS_IDP_H_ diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c index 12d56a6036555..2bbb17c71ce4f 100644 --- a/sys/netns/idp_usrreq.c +++ b/sys/netns/idp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)idp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: idp_usrreq.c,v 1.2 1994/08/02 07:51:41 davidg Exp $ + * idp_usrreq.c,v 1.3 1994/11/15 14:26:30 bde Exp */ #include <sys/param.h> diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h index 7ff3823a70fe1..da634eb8a3d2d 100644 --- a/sys/netns/idp_var.h +++ b/sys/netns/idp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)idp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: idp_var.h,v 1.2 1994/08/02 07:51:42 davidg Exp $ + * idp_var.h,v 1.3 1994/08/21 06:22:06 paul Exp */ #ifndef _NETNS_IDP_VAR_H_ diff --git a/sys/netns/ns.c b/sys/netns/ns.c index 972fc3b3ed9f3..50a88db747fd8 100644 --- a/sys/netns/ns.c +++ b/sys/netns/ns.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns.c 8.2 (Berkeley) 11/15/93 - * $Id: ns.c,v 1.2 1994/08/02 07:51:43 davidg Exp $ + * ns.c,v 1.3 1994/11/15 14:26:31 bde Exp */ #include <sys/param.h> diff --git a/sys/netns/ns.h b/sys/netns/ns.h index 527c6950c9f93..aa08820a83af9 100644 --- a/sys/netns/ns.h +++ b/sys/netns/ns.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns.h 8.1 (Berkeley) 6/10/93 - * $Id: ns.h,v 1.2 1994/08/02 07:51:44 davidg Exp $ + * ns.h,v 1.3 1994/08/21 06:22:07 paul Exp */ #ifndef _NETNS_NS_H_ diff --git a/sys/netns/ns_cksum.c b/sys/netns/ns_cksum.c index 617fb2c0f2eb3..74c99ab6784e7 100644 --- a/sys/netns/ns_cksum.c +++ b/sys/netns/ns_cksum.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_cksum.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * ns_cksum.c,v 1.2 1994/08/02 07:51:45 davidg Exp */ #include <sys/param.h> diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c index 5626166093428..b8e4ae979a441 100644 --- a/sys/netns/ns_error.c +++ b/sys/netns/ns_error.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_error.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * ns_error.c,v 1.2 1994/08/02 07:51:46 davidg Exp */ #include <sys/param.h> diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h index 5e88b2c8e8ee9..ff7a7ec163bed 100644 --- a/sys/netns/ns_error.h +++ b/sys/netns/ns_error.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_error.h 8.1 (Berkeley) 6/10/93 - * $Id: ns_error.h,v 1.2 1994/08/02 07:51:47 davidg Exp $ + * ns_error.h,v 1.3 1994/08/21 06:22:07 paul Exp */ #ifndef _NETNS_NS_ERROR_H_ diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h index 3032a39be9907..24f37e314fb14 100644 --- a/sys/netns/ns_if.h +++ b/sys/netns/ns_if.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_if.h 8.1 (Berkeley) 6/10/93 - * $Id: ns_if.h,v 1.2 1994/08/02 07:51:48 davidg Exp $ + * ns_if.h,v 1.3 1994/08/21 06:22:08 paul Exp */ #ifndef _NETNS_NS_IF_H_ diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c index 91a5b31c9f191..3ce3a3cfb0401 100644 --- a/sys/netns/ns_input.c +++ b/sys/netns/ns_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_input.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * ns_input.c,v 1.2 1994/08/02 07:51:49 davidg Exp */ #include <sys/param.h> diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c index c10af1f142b5b..b55c95b339dfa 100644 --- a/sys/netns/ns_ip.c +++ b/sys/netns/ns_ip.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_ip.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * ns_ip.c,v 1.2 1994/08/02 07:51:50 davidg Exp */ /* diff --git a/sys/netns/ns_output.c b/sys/netns/ns_output.c index 8b044896d4ea3..5313362f21a98 100644 --- a/sys/netns/ns_output.c +++ b/sys/netns/ns_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_output.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * ns_output.c,v 1.2 1994/08/02 07:51:51 davidg Exp */ #include <sys/param.h> diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c index 155d6ba1734a9..b56e51f33b283 100644 --- a/sys/netns/ns_pcb.c +++ b/sys/netns/ns_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_pcb.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * ns_pcb.c,v 1.2 1994/08/02 07:51:52 davidg Exp */ #include <sys/param.h> diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h index 69bd331f12a9c..4c8162d713d49 100644 --- a/sys/netns/ns_pcb.h +++ b/sys/netns/ns_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: ns_pcb.h,v 1.2 1994/08/02 07:51:53 davidg Exp $ + * ns_pcb.h,v 1.3 1994/08/21 06:22:09 paul Exp */ #ifndef _NETNS_NS_PCB_H_ diff --git a/sys/netns/ns_proto.c b/sys/netns/ns_proto.c index a19e8cbc42029..71a26e50cadee 100644 --- a/sys/netns/ns_proto.c +++ b/sys/netns/ns_proto.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_proto.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * ns_proto.c,v 1.2 1994/08/02 07:51:54 davidg Exp */ #include <sys/param.h> diff --git a/sys/netns/sp.h b/sys/netns/sp.h index 78b9134035425..53ccb48961959 100644 --- a/sys/netns/sp.h +++ b/sys/netns/sp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)sp.h 8.1 (Berkeley) 6/10/93 - * $Id: sp.h,v 1.2 1994/08/02 07:51:55 davidg Exp $ + * sp.h,v 1.3 1994/08/21 06:22:09 paul Exp */ #ifndef _NETNS_SP_H_ diff --git a/sys/netns/spidp.h b/sys/netns/spidp.h index 5642f4a6b1373..d79853a30092e 100644 --- a/sys/netns/spidp.h +++ b/sys/netns/spidp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spidp.h 8.1 (Berkeley) 6/10/93 - * $Id: spidp.h,v 1.2 1994/08/02 07:51:56 davidg Exp $ + * spidp.h,v 1.3 1994/08/21 06:22:10 paul Exp */ #ifndef _NETNS_SPIDP_H_ diff --git a/sys/netns/spp_debug.c b/sys/netns/spp_debug.c index f979a1ec9b89a..4607ad37a5d7c 100644 --- a/sys/netns/spp_debug.c +++ b/sys/netns/spp_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_debug.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * spp_debug.c,v 1.2 1994/08/02 07:51:57 davidg Exp */ #include <sys/param.h> diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h index 51132e513eada..1749ac177d8a5 100644 --- a/sys/netns/spp_debug.h +++ b/sys/netns/spp_debug.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_debug.h 8.1 (Berkeley) 6/10/93 - * $Id: spp_debug.h,v 1.2 1994/08/02 07:51:58 davidg Exp $ + * spp_debug.h,v 1.3 1994/08/21 06:22:11 paul Exp */ #ifndef _NETNS_SPP_DEBUG_H_ diff --git a/sys/netns/spp_timer.h b/sys/netns/spp_timer.h index d480f20701e58..006dadb656420 100644 --- a/sys/netns/spp_timer.h +++ b/sys/netns/spp_timer.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_timer.h 8.1 (Berkeley) 6/10/93 - * $Id: spp_timer.h,v 1.2 1994/08/02 07:51:59 davidg Exp $ + * spp_timer.h,v 1.3 1994/08/21 06:22:11 paul Exp */ #ifndef _NETNS_SPP_TIMER_H_ diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c index 08aee83d626e1..35f29496c6a93 100644 --- a/sys/netns/spp_usrreq.c +++ b/sys/netns/spp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * spp_usrreq.c,v 1.2 1994/08/02 07:52:00 davidg Exp */ #include <sys/param.h> diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h index 98141671e02de..553ea9f606f73 100644 --- a/sys/netns/spp_var.h +++ b/sys/netns/spp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: spp_var.h,v 1.2 1994/08/02 07:52:01 davidg Exp $ + * spp_var.h,v 1.3 1994/08/21 06:22:12 paul Exp */ #ifndef _NETNS_SPP_VAR_H_ diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index 2f3aa57c0dedd..f6e1ffa4baa27 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nfs.h,v 1.7 1994/10/23 23:26:15 wollman Exp $ + * nfs.h,v 1.8 1994/11/02 00:11:00 wollman Exp */ #ifndef _NFS_NFS_H_ diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 4d75cf84a96dd..4a9fe49cf2677 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94 - * $Id: nfs_bio.c,v 1.6 1994/10/02 17:26:55 phk Exp $ + * nfs_bio.c,v 1.7 1994/10/17 17:47:32 phk Exp */ #include <sys/param.h> diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c index 909f9e0f1f162..2bd7c2dd44780 100644 --- a/sys/nfs/nfs_node.c +++ b/sys/nfs/nfs_node.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_node.c 8.2 (Berkeley) 12/30/93 - * $Id: nfs_node.c,v 1.6 1994/10/06 21:06:56 davidg Exp $ + * nfs_node.c,v 1.7 1994/10/17 17:47:33 phk Exp */ #include <sys/param.h> diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c index 19467641a32e1..b1257d1039294 100644 --- a/sys/nfs/nfs_nqlease.c +++ b/sys/nfs/nfs_nqlease.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_nqlease.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_nqlease.c,v 1.6 1994/10/02 17:26:57 phk Exp $ + * nfs_nqlease.c,v 1.7 1994/10/17 17:47:34 phk Exp */ /* diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index b6e601420d4ee..1f44851194ce0 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.6 1994/09/28 16:45:18 dfr Exp $ + * nfs_serv.c,v 1.7 1994/10/02 17:26:58 phk Exp */ /* diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index 27c4561789239..e8dbde1701709 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_socket.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_socket.c,v 1.4 1994/10/02 17:26:59 phk Exp $ + * nfs_socket.c,v 1.5 1994/10/17 17:47:35 phk Exp */ /* diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c index 0f31ae08a4aea..af08c5a86db23 100644 --- a/sys/nfs/nfs_srvcache.c +++ b/sys/nfs/nfs_srvcache.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_srvcache.c 8.1 (Berkeley) 6/10/93 - * $Id: nfs_srvcache.c,v 1.4 1994/10/02 17:27:00 phk Exp $ + * nfs_srvcache.c,v 1.5 1994/10/17 17:47:36 phk Exp */ /* diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 9b2ef800780cb..70636ca1e6853 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.6 1994/10/02 17:27:01 phk Exp $ + * nfs_subs.c,v 1.7 1994/10/17 17:47:37 phk Exp */ /* diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index 8cdbfe7c5f74e..38792979dd092 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_syscalls.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_syscalls.c,v 1.4 1994/10/02 17:27:02 phk Exp $ + * nfs_syscalls.c,v 1.5 1994/10/17 17:47:38 phk Exp */ #include <sys/param.h> diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 5d7d9c4da652e..c39a1cde9818e 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_vfsops.c,v 1.7 1994/10/22 17:52:59 phk Exp $ + * nfs_vfsops.c,v 1.8 1994/10/23 23:26:18 wollman Exp */ #include <sys/param.h> diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 7032a5a0aa9a4..f38439b1d2b5c 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.5 (Berkeley) 2/13/94 - * $Id: nfs_vnops.c,v 1.9 1994/10/09 07:35:06 davidg Exp $ + * nfs_vnops.c,v 1.10 1994/10/17 17:47:41 phk Exp */ /* diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h index 5df85e0f65923..cfd3b6394330c 100644 --- a/sys/nfs/nfsdiskless.h +++ b/sys/nfs/nfsdiskless.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsdiskless.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsdiskless.h,v 1.3 1994/08/05 09:28:49 davidg Exp $ + * nfsdiskless.h,v 1.4 1994/08/21 06:50:09 paul Exp */ #ifndef _NFS_NFSDISKLESS_H_ diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h index 994c0b6720eb3..0171a80345dcc 100644 --- a/sys/nfs/nfsm_subs.h +++ b/sys/nfs/nfsm_subs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsm_subs.h 8.1 (Berkeley) 6/16/93 - * $Id: nfsm_subs.h,v 1.4 1994/10/02 17:27:05 phk Exp $ + * nfsm_subs.h,v 1.5 1994/10/17 17:47:42 phk Exp */ #ifndef _NFS_NFSM_SUBS_H_ diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h index 99a1b48795f4a..e8ba26d23ef71 100644 --- a/sys/nfs/nfsmount.h +++ b/sys/nfs/nfsmount.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsmount.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsmount.h,v 1.3 1994/08/21 06:50:10 paul Exp $ + * nfsmount.h,v 1.4 1994/10/17 17:47:43 phk Exp */ #ifndef _NFS_NFSMOUNT_H_ diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h index 01d096982673f..05eaa254e8e5c 100644 --- a/sys/nfs/nfsnode.h +++ b/sys/nfs/nfsnode.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsnode.h 8.4 (Berkeley) 2/13/94 - * $Id: nfsnode.h,v 1.7 1994/10/02 17:27:06 phk Exp $ + * nfsnode.h,v 1.8 1994/10/17 17:47:44 phk Exp */ #ifndef _NFS_NFSNODE_H_ diff --git a/sys/nfs/nfsrtt.h b/sys/nfs/nfsrtt.h index 4463f621645d0..60b3aa41c26d6 100644 --- a/sys/nfs/nfsrtt.h +++ b/sys/nfs/nfsrtt.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsrtt.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsrtt.h,v 1.2 1994/08/02 07:52:24 davidg Exp $ + * nfsrtt.h,v 1.3 1994/08/21 06:50:12 paul Exp */ #ifndef _NFS_NFSRTT_H_ diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h index b367b9f4a2c9f..4df2ba47c90b7 100644 --- a/sys/nfs/nfsrvcache.h +++ b/sys/nfs/nfsrvcache.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsrvcache.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsrvcache.h,v 1.3 1994/08/21 06:50:13 paul Exp $ + * nfsrvcache.h,v 1.4 1994/10/17 17:47:44 phk Exp */ #ifndef _NFS_NFSRVCACHE_H_ diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h index 62ba33899be10..4b2c384d3a1fd 100644 --- a/sys/nfs/nfsv2.h +++ b/sys/nfs/nfsv2.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsv2.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsv2.h,v 1.3 1994/08/18 22:35:37 wollman Exp $ + * nfsv2.h,v 1.4 1994/08/21 06:50:13 paul Exp */ #ifndef _NFS_NFSV2_H_ diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h index 0f8f12b238dcc..1d5e52dfb8d67 100644 --- a/sys/nfs/nqnfs.h +++ b/sys/nfs/nqnfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nqnfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nqnfs.h,v 1.5 1994/10/02 17:27:07 phk Exp $ + * nqnfs.h,v 1.6 1994/10/17 17:47:45 phk Exp */ #ifndef _NFS_NQNFS_H_ diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h index 2360cdc3c40aa..186b085a78fcd 100644 --- a/sys/nfs/rpcv2.h +++ b/sys/nfs/rpcv2.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)rpcv2.h 8.1 (Berkeley) 6/10/93 - * $Id: rpcv2.h,v 1.2 1994/08/02 07:52:29 davidg Exp $ + * rpcv2.h,v 1.3 1994/08/21 06:50:15 paul Exp */ #ifndef _NFS_RPCV2_H_ diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h index b081b111fcb7c..e1c0d58213188 100644 --- a/sys/nfs/xdr_subs.h +++ b/sys/nfs/xdr_subs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)xdr_subs.h 8.1 (Berkeley) 6/10/93 - * $Id: xdr_subs.h,v 1.2 1994/08/02 07:52:30 davidg Exp $ + * xdr_subs.h,v 1.3 1994/08/21 06:50:16 paul Exp */ #ifndef _NFS_XDR_SUBS_H_ diff --git a/sys/pci/README.de b/sys/pci/README.de deleted file mode 100644 index fb81945c4d73d..0000000000000 --- a/sys/pci/README.de +++ /dev/null @@ -1,48 +0,0 @@ -$Id: README.de,v 1.3 1994/10/12 11:19:36 se Exp $ - ----------------- - -The enclosed driver should be considered as beta-test software. It -has run on exactly one machine. Therefore testing has been limited. -This driver is in no way supported by Digital Equipment. See the -disclaimers in the sources for more. - -This driver the DEC DE435 PCI NIC. It should also work with other PCI -boards that use the DC21040-AA chip (also known as TULIP). This -driver requires the DC21040-AA to be pass 2.3 or later. If you are -using a eariler pass chip, you may encounter undetected transmit -corruptions. This driver also requires that DC21040-AA use a serial -Ethernet address ROM as described in the DC21040 specification. - -The DEC DE425 EISA NIC based on the DC21040-AA is not support at -this time. A future update will include support for it. - -The driver includes full support for both BPF and IP Multicast. -If the autosensing of the driver fails, you can use ifconfig(8) to -switch the driver to the correct port. - - ifconfig de0 altphys Thinwire/AUI port - ifconfig de0 -altphys 10baseT/UTP port - -To enable this driver, you first need to add the following lines to -your config file (in i386/conf): - - controller pci0 - device de0 - -The PCI support code will automatically determine and enable the -correct IRQ. - -Now you are ready to rebuild your kernel, reboot, and see if the -driver can configure your board. When the system boots, you will -hopefully something close to: - - de0 <digital dc21040 ethernet> int a irq 9 on pci0:7 - reg20: virtual=0xf290a000 physical=0xc0001000 - de0: enabling Thinwire/AUI port - de0: DC21040 [10Mb/s] pass 2.3 ethernet address 08:00:2b:e2:1e:09 - bpf: de0 attached - -in the startup log. If so, the board configured properly and -should be ready to use. - diff --git a/sys/pci/README.de-le b/sys/pci/README.de-le deleted file mode 100644 index 60cd2e2750e03..0000000000000 --- a/sys/pci/README.de-le +++ /dev/null @@ -1,33 +0,0 @@ -$Id: README.de-le,v 1.1 1994/10/01 20:16:44 wollman Exp $ - ----------------- - -The enclosed drivers should be considered beta-test software. These -drivers are in no way supported by Digital Equipment. See the -disclaimers in the sources for more information. Please be aware that -Digital does not employee me to write drivers for FreeBSD. - -This kit contains one driver: - - de DEC DE435 PCI NIC or compatible - -See README.de for information and installation instruction specific to this -driver. - -Could you please send me the startup messages in the boot -long along with the type of your PC once the driver configures? - -If you have any problems, comments, suggestions, rant or raves, don't -hesitate to send me mail @ thomas@lkg.dec.com. - -Lastly, if you change or modify the code, I want context diffs of your -changes. I want this to the canonical DEC EtherWORKS driver kit for -FreeBSD, NetBSD, BSD/386, and any other BSD based O/S. Please make -sure your diffs are approriate conditionalized. - -Thanks, -Matt Thomas --- -Mail: thomas@lkg.dec.com -URL: http://ftp.digital.com/~thomas/ - diff --git a/sys/pci/dc21040.h b/sys/pci/dc21040.h deleted file mode 100644 index 4afa274188656..0000000000000 --- a/sys/pci/dc21040.h +++ /dev/null @@ -1,214 +0,0 @@ -/*- - * Copyright (c) 1994 Matt Thomas (thomas@lkg.dec.com) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id: dc21040.h,v 1.2 1994/08/15 20:42:25 thomas Exp thomas $ - * - * $Log: dc21040.h,v $ - * Revision 1.2 1994/08/15 20:42:25 thomas - * misc additions - * - * Revision 1.1 1994/08/12 21:02:46 thomas - * Initial revision - * - * Revision 1.8 1994/08/05 20:20:54 thomas - * Enable change log - * - * Revision 1.7 1994/08/05 20:20:14 thomas - * *** empty log message *** - * - */ - -#if !defined(_DC21040_H) -#define _DC21040_H - -typedef signed int tulip_sint32_t; -typedef unsigned int tulip_uint32_t; - -#if defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN -#define TULIP_BITFIELD2(a, b) b, a -#define TULIP_BITFIELD3(a, b, c) c, b, a -#define TULIP_BITFIELD4(a, b, c, d) d, c, b, a -#else -#define TULIP_BITFIELD2(a, b) a, b -#define TULIP_BITFIELD3(a, b, c) a, b, c -#define TULIP_BITFIELD4(a, b, c, d) a, b, c, d -#endif - -typedef struct { - tulip_uint32_t d_status; - tulip_uint32_t TULIP_BITFIELD3(d_length1 : 11, - d_length2 : 11, - d_flag : 10); - tulip_uint32_t d_addr1; - tulip_uint32_t d_addr2; -} tulip_desc_t; - -#define TULIP_DSTS_OWNER 0x80000000 /* Owner (1 = DC21040) */ -#define TULIP_DSTS_ERRSUM 0x00008000 /* Error Summary */ -/* - * Transmit Status - */ -#define TULIP_DSTS_TxBABBLE 0x00004000 /* Transmitter Babbled */ -#define TULIP_DSTS_TxCARRLOSS 0x00000800 /* Carrier Loss */ -#define TULIP_DSTS_TxNOCARR 0x00000400 /* No Carrier */ -#define TULIP_DSTS_TxLATECOLL 0x00000200 /* Late Collision */ -#define TULIP_DSTS_TxEXCCOLL 0x00000100 /* Excessive Collisions */ -#define TULIP_DSTS_TxNOHRTBT 0x00000080 /* No Heartbeat */ -#define TULIP_DSTS_TxCOLLMASK 0x00000078 /* Collision Count (mask) */ -#define TULIP_DSTS_V_TxCOLLCNT 0x00000003 /* Collision Count (bit) */ -#define TULIP_DSTS_TxLINKFAIL 0x00000004 /* Link Failure */ -#define TULIP_DSTS_TxUNDERFLOW 0x00000002 /* Underflow Error */ -#define TULIP_DSTS_TxDEFERRED 0x00000001 /* Initially Deferred */ -/* - * Receive Status - */ -#define TULIP_DSTS_RxBADLENGTH 0x00004000 /* Length Error */ -#define TULIP_DSTS_RxDATATYPE 0x00003000 /* Data Type */ -#define TULIP_DSTS_RxRUNT 0x00000800 /* Runt Frame */ -#define TULIP_DSTS_RxMULTICAST 0x00000400 /* Multicast Frame */ -#define TULIP_DSTS_RxFIRSTDESC 0x00000200 /* First Descriptor */ -#define TULIP_DSTS_RxLASTDESC 0x00000100 /* Last Descriptor */ -#define TULIP_DSTS_RxTOOLONG 0x00000080 /* Frame Too Long */ -#define TULIP_DSTS_RxCOLLSEEN 0x00000040 /* Collision Seen */ -#define TULIP_DSTS_RxFRAMETYPE 0x00000020 /* Frame Type */ -#define TULIP_DSTS_RxWATCHDOG 0x00000010 /* Receive Watchdog */ -#define TULIP_DSTS_RxDRBBLBIT 0x00000004 /* Dribble Bit */ -#define TULIP_DSTS_RxBADCRC 0x00000002 /* CRC Error */ -#define TULIP_DSTS_RxOVERFLOW 0x00000001 /* Overflow */ - - -#define TULIP_DFLAG_ENDRING 0x0008 /* End of Transmit Ring */ -#define TULIP_DFLAG_CHAIN 0x0004 /* Chain using d_addr2 */ - -#define TULIP_DFLAG_TxWANTINTR 0x0200 /* Signal Interrupt on Completion */ -#define TULIP_DFLAG_TxLASTSEG 0x0100 /* Last Segment */ -#define TULIP_DFLAG_TxFIRSTSEG 0x0080 /* First Segment */ -#define TULIP_DFLAG_TxINVRSFILT 0x0040 /* Inverse Filtering */ -#define TULIP_DFLAG_TxSETUPPKT 0x0020 /* Setup Packet */ -#define TULIP_DFLAG_TxHASCRC 0x0010 /* Don't Append the CRC */ -#define TULIP_DFLAG_TxNOPADDING 0x0002 /* Don't AutoPad */ -#define TULIP_DFLAG_TxHASHFILT 0x0001 /* Hash/Perfect Filtering */ - -/* - * The DC21040 Registers (IO Space Addresses) - */ -#define TULIP_REG_BUSMODE 0x00 /* CSR0 -- Bus Mode */ -#define TULIP_REG_TXPOLL 0x08 /* CSR1 -- Transmit Poll Demand */ -#define TULIP_REG_RXPOLL 0x10 /* CSR2 -- Receive Poll Demand */ -#define TULIP_REG_RXLIST 0x18 /* CSR3 -- Receive List Base Addr */ -#define TULIP_REG_TXLIST 0x20 /* CSR4 -- Transmit List Base Addr */ -#define TULIP_REG_STATUS 0x28 /* CSR5 -- Status */ -#define TULIP_REG_CMD 0x30 /* CSR6 -- Command */ -#define TULIP_REG_INTR 0x38 /* CSR7 -- Interrupt Control */ -#define TULIP_REG_MISSES 0x40 /* CSR8 -- Missed Frame Counter */ -#define TULIP_REG_ADDRROM 0x48 /* CSR9 -- ENET ROM Register */ -#define TULIP_REG_RSRVD 0x50 /* CSR10 -- Reserved */ -#define TULIP_REG_FULL_DUPLEX 0x58 /* CSR11 -- Full Duplex */ -#define TULIP_REG_SIA_STATUS 0x60 /* CSR12 -- SIA Status */ -#define TULIP_REG_SIA_CONN 0x68 /* CSR13 -- SIA Connectivity */ -#define TULIP_REG_SIA_TXRX 0x70 /* CSR14 -- SIA Tx Rx */ -#define TULIP_REG_SIA_GEN 0x78 /* CSR15 -- SIA General */ - -/* - * CSR5 -- Status Register - * CSR7 -- Interrupt Control - */ -#define TULIP_STS_ERRORMASK 0x03800000L /* ( R) Error Bits (Valid when SYSERROR is set) */ -#define TULIP_STS_ERR_PARITY 0x00000000L /* 000 - Parity Error (Perform Reset) */ -#define TULIP_STS_ERR_MASTER 0x00800000L /* 001 - Master Abort */ -#define TULIP_STS_ERR_TARGET 0x01000000L /* 010 - Target Abort */ -#define TULIP_STS_TXSTATEMASK 0x00700000L /* ( R) Transmission Process State */ -#define TULIP_STS_TXS_RESET 0x00000000L /* 000 - Rset or transmit jabber expired */ -#define TULIP_STS_TXS_FETCH 0x00100000L /* 001 - Fetching transmit descriptor */ -#define TULIP_STS_TXS_WAITEND 0x00200000L /* 010 - Wait for end of transmission */ -#define TULIP_STS_TXS_READING 0x00300000L /* 011 - Read buffer and enqueue data */ -#define TULIP_STS_TXS_RSRVD 0x00400000L /* 100 - Reserved */ -#define TULIP_STS_TXS_SETUP 0x00500000L /* 101 - Setup Packet */ -#define TULIP_STS_TXS_SUSPEND 0x00600000L /* 110 - Transmit FIFO underflow or an - unavailable transmit descriptor */ -#define TULIP_STS_TXS_CLOSE 0x00700000L /* 111 - Close transmit descriptor */ -#define TULIP_STS_RXSTATEMASK 0x000E0000L /* ( R) Receive Process State*/ -#define TULIP_STS_RXS_STOPPED 0x00000000L /* 000 - Stopped */ -#define TULIP_STS_RXS_FETCH 0x00020000L /* 001 - Running -- Fetch receive descriptor */ -#define TULIP_STS_RXS_ENDCHECK 0x00040000L /* 010 - Running -- Check for end of receive - packet before prefetch of next descriptor */ -#define TULIP_STS_RXS_WAIT 0x00060000L /* 011 - Running -- Wait for receive packet */ -#define TULIP_STS_RXS_SUSPEND 0x00080000L /* 100 - Suspended -- As a result of - unavailable receive buffers */ -#define TULIP_STS_RXS_CLOSE 0x000A0000L /* 101 - Running -- Close receive descriptor */ -#define TULIP_STS_RXS_FLUSH 0x000C0000L /* 110 - Running -- Flush the current frame - from the receive FIFO as a result of - an unavailable receive buffer */ -#define TULIP_STS_RXS_DEQUEUE 0x000E0000L /* 111 - Running -- Dequeue the receive frame - from the receive FIFO into the receive - buffer. */ -#define TULIP_STS_NORMALINTR 0x00010000L /* (RW) Normal Interrupt */ -#define TULIP_STS_ABNRMLINTR 0x00008000L /* (RW) Abnormal Interrupt */ -#define TULIP_STS_SYSERROR 0x00002000L /* (RW) System Error */ -#define TULIP_STS_LINKFAIL 0x00001000L /* (RW) Link Failure */ -#define TULIP_STS_FULDPLXSHRT 0x00000800L /* (RW) Full Duplex Short Fram Rcvd */ -#define TULIP_STS_AUI 0x00000400L /* (RW) AUI/TP Switch */ -#define TULIP_STS_RXTIMEOUT 0x00000200L /* (RW) Receive Watchbog Timeout */ -#define TULIP_STS_RXSTOPPED 0x00000100L /* (RW) Receive Process Stopped */ -#define TULIP_STS_RXNOBUF 0x00000080L /* (RW) Receive Buffer Unavailable */ -#define TULIP_STS_RXINTR 0x00000040L /* (RW) Receive Interrupt */ -#define TULIP_STS_TXUNDERFLOW 0x00000020L /* (RW) Transmit Underflow */ -#define TULIP_STS_TXBABBLE 0x00000008L /* (RW) Transmit Jabber Timeout */ -#define TULIP_STS_TXNOBUF 0x00000004L /* (RW) Transmit Buffer Unavailable */ -#define TULIP_STS_TXSTOPPED 0x00000002L /* (RW) Transmit Process Stopped */ -#define TULIP_STS_TXINTR 0x00000001L /* (RW) Transmit Interrupt */ - -/* - * CSR6 -- Command (Operation Mode) Register - */ -#define TULIP_CMD_CAPTREFFCT 0x00020000L /* (RW) Capture Effect (!802.3) */ -#define TULIP_CMD_BACKPRESSURE 0x00010000L /* (RW) Back Pressure (!802.3) */ -#define TULIP_CMD_THRESHOLDCTL 0x0000C000L /* (RW) Threshold Control */ -#define TULIP_CMD_THRSHLD72 0x00000000L /* 00 - 72 Bytes */ -#define TULIP_CMD_THRSHLD96 0x00004000L /* 01 - 96 Bytes */ -#define TULIP_CMD_THRSHLD128 0x00008000L /* 10 - 128 bytes */ -#define TULIP_CMD_THRSHLD160 0x0000C000L /* 11 - 160 Bytes */ -#define TULIP_CMD_TXRUN 0x00002000L /* (RW) Start/Stop Transmitter */ -#define TULIP_CMD_FORCECOLL 0x00001000L /* (RW) Force Collisions */ -#define TULIP_CMD_OPERMODE 0x00000C00L /* (RW) Operating Mode */ -#define TULIP_CMD_FULLDULPEX 0x00000200L /* (RW) Full Duplex Mode */ -#define TULIP_CMD_FLAKYOSCDIS 0x00000100L /* (RW) Flakey Oscillator Disable */ -#define TULIP_CMD_ALLMULTI 0x00000080L /* (RW) Pass All Multicasts */ -#define TULIP_CMD_PROMISCUOUS 0x00000040L /* (RW) Promiscuous Mode */ -#define TULIP_CMD_BACKOFFCTR 0x00000020L /* (RW) Start/Stop Backoff Counter (!802.3) */ -#define TULIP_CMD_INVFILTER 0x00000010L /* (R ) Inverse Filtering */ -#define TULIP_CMD_PASSBADPKT 0x00000008L /* (RW) Pass Bad Frames */ -#define TULIP_CMD_HASHONLYFLTR 0x00000004L /* (R ) Hash Only Filtering */ -#define TULIP_CMD_RXRUN 0x00000002L /* (RW) Start/Stop Receive Filtering */ -#define TULIP_CMD_HASHPRFCTFLTR 0x00000001L /* (R ) Hash/Perfect Receive Filtering */ - - -#define TULIP_SIASTS_LINKFAIL 0x00000004L -#define TULIP_SIACONN_RESET 0x00000000L - -#define TULIP_SIACONN_AUI 0x0000000DL -#define TULIP_SIACONN_10BASET 0x00000005L - -#define TULIP_BUSMODE_SWRESET 0x00000001L - -#endif /* !defined(_DC21040_H) */ diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c deleted file mode 100644 index 9e6a26b56ea78..0000000000000 --- a/sys/pci/if_de.c +++ /dev/null @@ -1,1158 +0,0 @@ -/*- - * Copyright (c) 1994 Matt Thomas (thomas@lkg.dec.com) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id: if_de.c,v 1.6 1994/11/13 12:39:38 davidg Exp $ - * - */ - -/* - * DEC DC21040 PCI Ethernet Controller - * - * Written by Matt Thomas - * BPF support code stolen directly from if_ec.c - * - * This driver supports the DEC DE435 or any other PCI - * board which support DC21040. - */ - -#include "de.h" -#if NDE > 0 - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/protosw.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/errno.h> -#include <sys/malloc.h> - -#include <net/if.h> -#include <net/if_types.h> -#include <net/if_dl.h> -#include <net/route.h> - -#include "bpfilter.h" -#if NBPFILTER > 0 -#include <net/bpf.h> -#include <net/bpfdesc.h> -#endif - -#ifdef INET -#include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> -#include <netinet/if_ether.h> -#endif - -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - -#include <vm/vm.h> -#include <vm/vm_kern.h> -#include <vm/vm_param.h> - - -#include <pci.h> -#if NPCI > 0 -#include <i386/pci/pcireg.h> -#endif -#include <i386/isa/icu.h> -#include <i386/pci/dc21040.h> - -/* - * This module supports the DEC DC21040 PCI Ethernet Controller. - */ - -typedef struct { - unsigned long addr; - unsigned long length; -} tulip_addrvec_t; - -typedef struct { - tulip_desc_t *ri_first; - tulip_desc_t *ri_last; - tulip_desc_t *ri_nextin; - tulip_desc_t *ri_nextout; - int ri_max; - int ri_free; -} tulip_ringinfo_t; - -typedef struct { - volatile tulip_uint32_t *csr_busmode; /* CSR0 */ - volatile tulip_uint32_t *csr_txpoll; /* CSR1 */ - volatile tulip_uint32_t *csr_rxpoll; /* CSR2 */ - volatile tulip_uint32_t *csr_rxlist; /* CSR3 */ - volatile tulip_uint32_t *csr_txlist; /* CSR4 */ - volatile tulip_uint32_t *csr_status; /* CSR5 */ - volatile tulip_uint32_t *csr_command; /* CSR6 */ - volatile tulip_uint32_t *csr_intr; /* CSR7 */ - volatile tulip_uint32_t *csr_missed_frame; /* CSR8 */ - volatile tulip_sint32_t *csr_enetrom; /* CSR9 */ - volatile tulip_uint32_t *csr_reserved; /* CSR10 */ - volatile tulip_uint32_t *csr_full_duplex; /* CSR11 */ - volatile tulip_uint32_t *csr_sia_status; /* CSR12 */ - volatile tulip_uint32_t *csr_sia_connectivity; /* CSR13 */ - volatile tulip_uint32_t *csr_sia_tx_rx; /* CSR14 */ - volatile tulip_uint32_t *csr_sia_general; /* CSR15 */ -} tulip_regfile_t; - -/* - * The DC21040 has a stupid restriction in that the receive - * buffers must be longword aligned. But since Ethernet - * headers are not a multiple of longwords in size this forces - * the data to non-longword aligned. Since IP requires the - * data to be longword aligned, we need to copy it after it has - * been DMA'ed in our memory. - * - * Since we have to copy it anyways, we might as well as allocate - * dedicated receive space for the input. This allows to use a - * small receive buffer size and more ring entries to be able to - * better keep with a flood of tiny Ethernet packets. - * - * The receive space MUST ALWAYS be a multiple of the page size. - * And the number of receive descriptors multiplied by the size - * of the receive buffers must equal the recevive space. This - * is so that we can manipulate the page tables so that even if a - * packet wraps around the end of the receive space, we can - * treat it as virtually contiguous. - */ -#define TULIP_RXBUFSIZE 512 -#define TULIP_RXDESCS 128 -#define TULIP_RXSPACE (TULIP_RXBUFSIZE * TULIP_RXDESCS) -#define TULIP_TXDESCS 128 - -typedef struct { - struct arpcom tulip_ac; - tulip_regfile_t tulip_csrs; - vm_offset_t tulip_rxspace; - unsigned tulip_flags; -#define TULIP_WANTSETUP 0x01 -#define TULIP_WANTHASH 0x02 -#define TULIP_DOINGSETUP 0x04 -#define TULIP_ALTPHYS 0x08 /* use AUI */ - unsigned char tulip_rombuf[32]; - tulip_uint32_t tulip_setupbuf[192/sizeof(tulip_uint32_t)]; - tulip_uint32_t tulip_setupdata[192/sizeof(tulip_uint32_t)]; - tulip_uint32_t tulip_intrmask; - tulip_uint32_t tulip_cmdmode; - tulip_uint32_t tulip_revinfo; -#if NBPFILTER > 0 - caddr_t tulip_bpf; /* BPF context */ -#endif - struct ifqueue tulip_txq; - tulip_ringinfo_t tulip_rxinfo; - tulip_ringinfo_t tulip_txinfo; -} tulip_softc_t; - -#ifndef IFF_ALTPHYS -#define IFF_ALTPHYS IFF_LINK0 /* In case it isn't defined */ -#endif -typedef enum { TULIP_DC21040, TULIP_DC21140 } tulip_chipid_t; -const char *tulip_chipdescs[] = { - "DC21040 [10Mb/s]", - "DC21140 [100Mb/s]", -}; - -tulip_softc_t *tulips[NDE]; -tulip_chipid_t tulip_chipids[NDE]; - -#define tulip_if tulip_ac.ac_if -#define tulip_unit tulip_ac.ac_if.if_unit -#define tulip_name tulip_ac.ac_if.if_name -#define tulip_hwaddr tulip_ac.ac_enaddr - -#define TULIP_CRC32_POLY 0xEDB88320UL /* CRC-32 Poly -- Little Endian */ -#define TULIP_CHECK_RXCRC 0 -#define TULIP_MAX_TXSEG 30 - -#define TULIP_ADDREQUAL(a1, a2) \ - (((u_short *)a1)[0] == ((u_short *)a2)[0] \ - && ((u_short *)a1)[1] == ((u_short *)a2)[1] \ - && ((u_short *)a1)[2] == ((u_short *)a2)[2]) -#define TULIP_ADDRBRDCST(a1) \ - (((u_short *)a1)[0] == 0xFFFFU \ - && ((u_short *)a1)[1] == 0xFFFFU \ - && ((u_short *)a1)[2] == 0xFFFFU) - -static void tulip_start(struct ifnet *ifp); -static void tulip_addr_filter(tulip_softc_t *sc); - -#if __FreeBSD__ > 1 -#define TULIP_IFRESET_ARGS int unit -#define TULIP_RESET(sc) tulip_reset((sc)->tulip_unit) -#else -#define TULIP_IFRESET_ARGS int unit, int uban -#define TULIP_RESET(sc) tulip_reset((sc)->tulip_unit, 0) -#endif - -static void -tulip_reset( - TULIP_IFRESET_ARGS) -{ - tulip_softc_t *sc = tulips[unit]; - tulip_ringinfo_t *ri; - tulip_desc_t *di; - vm_offset_t vmoff; - - *sc->tulip_csrs.csr_busmode = TULIP_BUSMODE_SWRESET; - DELAY(10); /* Wait 10 microsends (actually 50 PCI cycles but at - 33MHz that comes to two microseconds but wait a - bit longer anyways) */ - - /* - * Use the - */ - *sc->tulip_csrs.csr_sia_connectivity = TULIP_SIACONN_RESET; - if (sc->tulip_if.if_flags & IFF_ALTPHYS) { - if ((sc->tulip_flags & TULIP_ALTPHYS) == 0) - printf("%s%d: enabling Thinwire/AUI port\n", - sc->tulip_if.if_name, sc->tulip_if.if_unit); - *sc->tulip_csrs.csr_sia_connectivity = TULIP_SIACONN_AUI; - sc->tulip_flags |= TULIP_ALTPHYS; - } else { - if (sc->tulip_flags & TULIP_ALTPHYS) - printf("%s%d: enabling 10baseT/UTP port\n", - sc->tulip_if.if_name, sc->tulip_if.if_unit); - *sc->tulip_csrs.csr_sia_connectivity = TULIP_SIACONN_10BASET; - sc->tulip_flags &= ~TULIP_ALTPHYS; - } - *sc->tulip_csrs.csr_txlist = vtophys(&sc->tulip_txinfo.ri_first[0]); - *sc->tulip_csrs.csr_rxlist = vtophys(&sc->tulip_rxinfo.ri_first[0]); - *sc->tulip_csrs.csr_intr = 0; - *sc->tulip_csrs.csr_busmode = 0x4800; - - sc->tulip_txq.ifq_maxlen = TULIP_TXDESCS; - /* - * Free all the mbufs that were on the transmit ring. - */ - for (;;) { - struct mbuf *m; - IF_DEQUEUE(&sc->tulip_txq, m); - if (m == NULL) - break; - m_freem(m); - } - - ri = &sc->tulip_txinfo; - ri->ri_nextin = ri->ri_nextout = ri->ri_first; - ri->ri_free = ri->ri_max; - for (di = ri->ri_first; di < ri->ri_last; di++) - di->d_status = 0; - - /* - * We need to collect all the mbufs were on the - * receive ring before we reinit it either to put - * them back on or to know if we have to allocate - * more. - */ - ri = &sc->tulip_rxinfo; - ri->ri_nextin = ri->ri_nextout = ri->ri_first; - ri->ri_free = ri->ri_max; - for (vmoff = vtophys(sc->tulip_rxspace), di = ri->ri_first; - di < ri->ri_last; di++, vmoff += TULIP_RXBUFSIZE) { - di->d_status |= TULIP_DSTS_OWNER; - di->d_length1 = TULIP_RXBUFSIZE; di->d_addr1 = vmoff; - di->d_length2 = 0; di->d_addr2 = 0; - } - - sc->tulip_intrmask = TULIP_STS_NORMALINTR|TULIP_STS_RXINTR|TULIP_STS_TXINTR - |TULIP_STS_ABNRMLINTR|TULIP_STS_SYSERROR|TULIP_STS_TXSTOPPED - |TULIP_STS_TXBABBLE|TULIP_STS_LINKFAIL|TULIP_STS_RXSTOPPED; - sc->tulip_flags &= ~(TULIP_DOINGSETUP|TULIP_WANTSETUP); - tulip_addr_filter(sc); -} - -static void -tulip_init( - int unit) -{ - tulip_softc_t *sc = tulips[unit]; - - if (sc->tulip_if.if_flags & IFF_UP) { - sc->tulip_if.if_flags |= IFF_RUNNING; - if (sc->tulip_if.if_flags & IFF_PROMISC) { - sc->tulip_cmdmode |= TULIP_CMD_PROMISCUOUS; - } else { - sc->tulip_cmdmode &= ~TULIP_CMD_PROMISCUOUS; - if (sc->tulip_if.if_flags & IFF_ALLMULTI) { - sc->tulip_cmdmode |= TULIP_CMD_ALLMULTI; - } else { - sc->tulip_cmdmode &= ~TULIP_CMD_ALLMULTI; - } - } - sc->tulip_cmdmode |= TULIP_CMD_TXRUN; - if ((sc->tulip_flags & TULIP_WANTSETUP) == 0) { - sc->tulip_cmdmode |= TULIP_CMD_RXRUN; - sc->tulip_intrmask |= TULIP_STS_RXSTOPPED; - } else { - sc->tulip_intrmask &= ~TULIP_STS_RXSTOPPED; - tulip_start(&sc->tulip_if); - } - sc->tulip_cmdmode |= TULIP_CMD_THRSHLD160; - *sc->tulip_csrs.csr_intr = sc->tulip_intrmask; - *sc->tulip_csrs.csr_command = sc->tulip_cmdmode; - } else { - TULIP_RESET(sc); - sc->tulip_if.if_flags &= ~IFF_RUNNING; - } -} - - -#if TULIP_CHECK_RXCRC -static unsigned -tulip_crc32( - u_char *addr, - int len) -{ - unsigned int crc = 0xFFFFFFFF; - static unsigned int crctbl[256]; - int idx; - static int done; - /* - * initialize the multicast address CRC table - */ - for (idx = 0; !done && idx < 256; idx++) { - unsigned int tmp = idx; - tmp = (tmp >> 1) ^ (tmp & 1 ? TULIP_CRC32_POLY : 0); /* XOR */ - tmp = (tmp >> 1) ^ (tmp & 1 ? TULIP_CRC32_POLY : 0); /* XOR */ - tmp = (tmp >> 1) ^ (tmp & 1 ? TULIP_CRC32_POLY : 0); /* XOR */ - tmp = (tmp >> 1) ^ (tmp & 1 ? TULIP_CRC32_POLY : 0); /* XOR */ - tmp = (tmp >> 1) ^ (tmp & 1 ? TULIP_CRC32_POLY : 0); /* XOR */ - tmp = (tmp >> 1) ^ (tmp & 1 ? TULIP_CRC32_POLY : 0); /* XOR */ - tmp = (tmp >> 1) ^ (tmp & 1 ? TULIP_CRC32_POLY : 0); /* XOR */ - tmp = (tmp >> 1) ^ (tmp & 1 ? TULIP_CRC32_POLY : 0); /* XOR */ - crctbl[idx] = tmp; - } - done = 1; - - while (len-- > 0) - crc = (crc >> 8) ^ crctbl[*addr++] ^ crctbl[crc & 0xFF]; - - return crc; -} -#endif - -static void -tulip_rx_intr( - tulip_softc_t *sc) -{ - tulip_ringinfo_t *ri = &sc->tulip_rxinfo; - struct ifnet *ifp = &sc->tulip_if; - - for (;;) { - tulip_desc_t *eop; - int total_len, ndescs; - caddr_t bufaddr = (caddr_t) sc->tulip_rxspace; - - for (ndescs = 1, eop = ri->ri_nextin;; ndescs++) { - if (((volatile tulip_desc_t *) eop)->d_status & TULIP_DSTS_OWNER) - return; - - if (eop->d_status & TULIP_DSTS_RxLASTDESC) - break; - if (++eop == ri->ri_last) - eop = ri->ri_first; - } - - bufaddr += TULIP_RXBUFSIZE * (ri->ri_nextin - ri->ri_first); - total_len = ((eop->d_status >> 16) & 0x7FF) - 4; - - if ((eop->d_status & TULIP_DSTS_ERRSUM) == 0) { - struct ether_header eh; - struct mbuf *m; - -#if TULIP_CHECK_RXCRC - unsigned crc = tulip_crc32(bufaddr, total_len); - if (~crc != *((unsigned *) &bufaddr[total_len])) { - printf("de0: bad rx crc: %08x [rx] != %08x\n", - *((unsigned *) &bufaddr[total_len]), ~crc); - goto next; - } -#endif - eh = *(struct ether_header *) bufaddr; - eh.ether_type = ntohs(eh.ether_type); -#if NBPFILTER > 0 - if (sc->tulip_bpf != NULL) { - bpf_tap(sc->tulip_bpf, bufaddr, total_len); - if (eh.ether_type != ETHERTYPE_IP && eh.ether_type != ETHERTYPE_ARP) - goto next; - if ((eh.ether_dhost[0] & 1) == 0 && - !TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr)) - goto next; - } else if (!TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr) - && !TULIP_ADDRBRDCST(eh.ether_dhost)) { - goto next; - } -#endif - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m != NULL) { - m->m_pkthdr.rcvif = ifp; - total_len -= sizeof(eh); - if (total_len > MHLEN) { - MCLGET(m, M_DONTWAIT); - if ((m->m_flags & M_EXT) == 0) { - m_freem(m); - ifp->if_ierrors++; - goto next; - } - } - bcopy(bufaddr + sizeof(eh), mtod(m, caddr_t), total_len); - m->m_len = m->m_pkthdr.len = total_len; - ether_input(ifp, &eh, m); - } else { - ifp->if_ierrors++; - } - } else { - ifp->if_ierrors++; - } -next: - ifp->if_ipackets++; - while (ndescs-- > 0) { - ri->ri_nextin->d_status |= TULIP_DSTS_OWNER; - if (++ri->ri_nextin == ri->ri_last) - ri->ri_nextin = ri->ri_first; - } - } -} - -static int -tulip_tx_intr( - tulip_softc_t *sc) -{ - tulip_ringinfo_t *ri = &sc->tulip_txinfo; - struct mbuf *m; - int xmits = 0; - - while (ri->ri_free < ri->ri_max) { - if (((volatile tulip_desc_t *) ri->ri_nextin)->d_status & TULIP_DSTS_OWNER) - break; - - if (ri->ri_nextin->d_flag & TULIP_DFLAG_TxLASTSEG) { - if (ri->ri_nextin->d_flag & TULIP_DFLAG_TxSETUPPKT) { - /* - * We've just finished processing a setup packet. - * Mark that we can finished it. If there's not - * another pending, startup the TULIP receiver. - * Make sure we ack the RXSTOPPED so we won't get - * an abormal interrupt indication. - */ - sc->tulip_flags &= ~TULIP_DOINGSETUP; - if ((sc->tulip_flags & TULIP_WANTSETUP) == 0) { - sc->tulip_cmdmode |= TULIP_CMD_RXRUN; - sc->tulip_intrmask |= TULIP_STS_RXSTOPPED; - *sc->tulip_csrs.csr_status = TULIP_STS_RXSTOPPED; - *sc->tulip_csrs.csr_command = sc->tulip_cmdmode; - *sc->tulip_csrs.csr_intr = sc->tulip_intrmask; - } - } else { - IF_DEQUEUE(&sc->tulip_txq, m); - m_freem(m); - sc->tulip_if.if_collisions += - (ri->ri_nextin->d_status & TULIP_DSTS_TxCOLLMASK) - >> TULIP_DSTS_V_TxCOLLCNT; - if (ri->ri_nextin->d_status & TULIP_DSTS_ERRSUM) - sc->tulip_if.if_oerrors++; - xmits++; - } - } - - if (++ri->ri_nextin == ri->ri_last) - ri->ri_nextin = ri->ri_first; - ri->ri_free++; - sc->tulip_if.if_flags &= ~IFF_OACTIVE; - } - sc->tulip_if.if_opackets += xmits; - return xmits; -} - -static int -tulip_txsegment( - tulip_softc_t *sc, - struct mbuf *m, - tulip_addrvec_t *avp, - size_t maxseg) -{ - int segcnt; - - for (segcnt = 0; m; m = m->m_next) { - int len = m->m_len; - caddr_t addr = mtod(m, caddr_t); - unsigned clsize = CLBYTES - (((u_long) addr) & (CLBYTES-1)); - - while (len > 0) { - unsigned slen = min(len, clsize); - if (segcnt < maxseg) { - avp->addr = vtophys(addr); - avp->length = slen; - } - len -= slen; - addr += slen; - clsize = CLBYTES; - avp++; - segcnt++; - } - } - if (segcnt >= maxseg) { - printf("%s%d: tulip_txsegment: extremely fragmented packet encountered (%d segments)\n", - sc->tulip_name, sc->tulip_unit, segcnt); - return -1; - } - avp->addr = 0; - avp->length = 0; - return segcnt; -} - -static void -tulip_start( - struct ifnet *ifp) -{ - tulip_softc_t *sc = (tulip_softc_t *) ifp; - struct ifqueue *ifq = &ifp->if_snd; - tulip_ringinfo_t *ri = &sc->tulip_txinfo; - tulip_desc_t *sop, *eop; - struct mbuf *m; - tulip_addrvec_t addrvec[TULIP_MAX_TXSEG+1], *avp; - int segcnt; - tulip_uint32_t d_status; - - if ((ifp->if_flags & IFF_RUNNING) == 0) - return; - - for (;;) { - if (sc->tulip_flags & TULIP_WANTSETUP) { - if ((sc->tulip_flags & TULIP_DOINGSETUP) || ri->ri_free == 1) { - ifp->if_flags |= IFF_OACTIVE; - return; - } - bcopy(sc->tulip_setupdata, sc->tulip_setupbuf, - sizeof(sc->tulip_setupbuf)); - sc->tulip_flags &= ~TULIP_WANTSETUP; - sc->tulip_flags |= TULIP_DOINGSETUP; - ri->ri_free--; - ri->ri_nextout->d_flag &= TULIP_DFLAG_ENDRING|TULIP_DFLAG_CHAIN; - ri->ri_nextout->d_flag |= TULIP_DFLAG_TxFIRSTSEG|TULIP_DFLAG_TxLASTSEG - |TULIP_DFLAG_TxSETUPPKT|TULIP_DFLAG_TxWANTINTR; - if (sc->tulip_flags & TULIP_WANTHASH) - ri->ri_nextout->d_flag |= TULIP_DFLAG_TxHASHFILT; - ri->ri_nextout->d_length1 = sizeof(sc->tulip_setupbuf); - ri->ri_nextout->d_addr1 = vtophys(sc->tulip_setupbuf); - ri->ri_nextout->d_length2 = 0; - ri->ri_nextout->d_addr2 = 0; - ri->ri_nextout->d_status = TULIP_DSTS_OWNER; - *sc->tulip_csrs.csr_txpoll = 1; - /* - * Advance the ring for the next transmit packet. - */ - if (++ri->ri_nextout == ri->ri_last) - ri->ri_nextout = ri->ri_first; - } - - IF_DEQUEUE(ifq, m); - if (m == NULL) - break; - - /* - * First find out how many and which different pages - * the mbuf data occupies. Then check to see if we - * have enough descriptor space in our transmit ring - * to actually send it. - */ - segcnt = tulip_txsegment(sc, m, addrvec, - min(ri->ri_max - 1, TULIP_MAX_TXSEG)); - if (segcnt < 0) { - struct mbuf *m0; - MGETHDR(m0, M_DONTWAIT, MT_DATA); - if (m0 != NULL) { - if (m->m_pkthdr.len > MHLEN) { - MCLGET(m0, M_DONTWAIT); - if ((m0->m_flags & M_EXT) == 0) { - m_freem(m); - continue; - } - } - m_copydata(m, 0, m0->m_pkthdr.len, mtod(m0, caddr_t)); - m0->m_pkthdr.len = m0->m_len = m->m_pkthdr.len; - m_freem(m); - IF_PREPEND(ifq, m0); - continue; - } else { - m_freem(m); - continue; - } - } - if (ri->ri_free - 2 <= (segcnt + 1) >> 1) - break; - - ri->ri_free -= (segcnt + 1) >> 1; - /* - * Now we fill in our transmit descriptors. This is - * a bit reminiscent of going on the Ark two by two - * since each descriptor for the TULIP can describe - * two buffers. So we advance through the address - * vector two entries at a time to to fill each - * descriptor. Clear the first and last segment bits - * in each descriptor (actually just clear everything - * but the end-of-ring or chain bits) to make sure - * we don't get messed up by previously sent packets. - */ - sop = ri->ri_nextout; - d_status = 0; - avp = addrvec; - do { - eop = ri->ri_nextout; - eop->d_flag &= TULIP_DFLAG_ENDRING|TULIP_DFLAG_CHAIN; - eop->d_status = d_status; - eop->d_addr1 = avp->addr; eop->d_length1 = avp->length; avp++; - eop->d_addr2 = avp->addr; eop->d_length2 = avp->length; avp++; - d_status = TULIP_DSTS_OWNER; - if (++ri->ri_nextout == ri->ri_last) - ri->ri_nextout = ri->ri_first; - } while ((segcnt -= 2) > 0); -#if NBPFILTER > 0 - if (sc->tulip_bpf != NULL) - bpf_mtap(sc->tulip_bpf, m); -#endif - /* - * The descriptors have been filled in. Mark the first - * and last segments, indicate we want a transmit complete - * interrupt, give the descriptors to the TULIP, and tell - * it to transmit! - */ - - IF_ENQUEUE(&sc->tulip_txq, m); - eop->d_flag |= TULIP_DFLAG_TxLASTSEG|TULIP_DFLAG_TxWANTINTR; - sop->d_flag |= TULIP_DFLAG_TxFIRSTSEG; - sop->d_status = TULIP_DSTS_OWNER; - - *sc->tulip_csrs.csr_txpoll = 1; - } - if (m != NULL) { - ifp->if_flags |= IFF_OACTIVE; - IF_PREPEND(ifq, m); - } -} - -static int -tulip_intr( - tulip_softc_t *sc) -{ - tulip_uint32_t csr; - - while ((csr = *sc->tulip_csrs.csr_status) & (TULIP_STS_NORMALINTR|TULIP_STS_ABNRMLINTR)) { - *sc->tulip_csrs.csr_status = csr & sc->tulip_intrmask; - - if (csr & TULIP_STS_SYSERROR) { - if ((csr & TULIP_STS_ERRORMASK) == TULIP_STS_ERR_PARITY) { - TULIP_RESET(sc); - tulip_init(sc->tulip_unit); - return 1; - } - } - if (csr & TULIP_STS_ABNRMLINTR) { - printf("%s%d: abnormal interrupt: 0x%05x [0x%05x]\n", - sc->tulip_name, sc->tulip_unit, csr, csr & sc->tulip_intrmask); - *sc->tulip_csrs.csr_command = sc->tulip_cmdmode; - } - if (csr & TULIP_STS_RXINTR) - tulip_rx_intr(sc); - if (sc->tulip_txinfo.ri_free < sc->tulip_txinfo.ri_max) { - tulip_tx_intr(sc); - tulip_start(&sc->tulip_if); - } - } - return 1; -} - -/* - * This is the standard method of reading the DEC Address ROMS. - */ -static int -tulip_read_macaddr( - tulip_softc_t *sc) -{ - int cksum, rom_cksum, idx; - tulip_sint32_t csr; - unsigned char tmpbuf[8]; - static u_char testpat[] = { 0xFF, 0, 0x55, 0xAA, 0xFF, 0, 0x55, 0xAA }; - - *sc->tulip_csrs.csr_enetrom = 1; - for (idx = 0; idx < 32; idx++) { - int cnt = 0; - while ((csr = *sc->tulip_csrs.csr_enetrom) < 0 && cnt < 10000) - cnt++; - sc->tulip_rombuf[idx] = csr & 0xFF; - } - - if (bcmp(&sc->tulip_rombuf[0], &sc->tulip_rombuf[16], 8) != 0) { - /* - * Some folks don't use the standard ethernet rom format - * but instead just put the address in the first 6 bytes - * of the rom and let the rest be all 0xffs. (Can we say - * ZNYX???) - */ - for (idx = 6; idx < 32; idx++) { - if (sc->tulip_rombuf[idx] != 0xFF) - return -4; - } - /* - * Make sure the address is not multicast or locally assigned - * that the OUI is not 00-00-00. - */ - if ((sc->tulip_rombuf[0] & 3) != 0) - return -4; - if (sc->tulip_rombuf[0] == 0 && sc->tulip_rombuf[1] == 0 - && sc->tulip_rombuf[2] == 0) - return -4; - bcopy(sc->tulip_rombuf, sc->tulip_hwaddr, 6); - return 0; - } - if (bcmp(&sc->tulip_rombuf[24], testpat, 8) != 0) - return -3; - - tmpbuf[0] = sc->tulip_rombuf[15]; tmpbuf[1] = sc->tulip_rombuf[14]; - tmpbuf[2] = sc->tulip_rombuf[13]; tmpbuf[3] = sc->tulip_rombuf[12]; - tmpbuf[4] = sc->tulip_rombuf[11]; tmpbuf[5] = sc->tulip_rombuf[10]; - tmpbuf[6] = sc->tulip_rombuf[9]; tmpbuf[7] = sc->tulip_rombuf[8]; - if (bcmp(&sc->tulip_rombuf[0], tmpbuf, 8) != 0) - return -2; - - bcopy(sc->tulip_rombuf, sc->tulip_hwaddr, 6); - - cksum = *(u_short *) &sc->tulip_hwaddr[0]; - cksum *= 2; - if (cksum > 65535) cksum -= 65535; - cksum += *(u_short *) &sc->tulip_hwaddr[2]; - if (cksum > 65535) cksum -= 65535; - cksum *= 2; - if (cksum > 65535) cksum -= 65535; - cksum += *(u_short *) &sc->tulip_hwaddr[4]; - if (cksum >= 65535) cksum -= 65535; - - rom_cksum = *(u_short *) &sc->tulip_rombuf[6]; - - if (cksum != rom_cksum) - return -1; - return 0; -} - -static unsigned -tulip_mchash( - unsigned char *mca) -{ - u_int idx, bit, data, crc = 0xFFFFFFFFUL; - -#ifdef __alpha - for (data = *(__unaligned u_long *) mca, bit = 0; bit < 48; bit++, data >>= -1) - crc = (crc >> 1) ^ (((crc ^ data) & 1) ? TULIP_CRC32_POLY : 0); -#else - for (idx = 0; idx < 6; idx++) - for (data = *mca++, bit = 0; bit < 8; bit++, data >>= 1) - crc = (crc >> 1) ^ (((crc ^ data) & 1) ? TULIP_CRC32_POLY : 0); -#endif - return crc & 0x1FF; -} - -static void -tulip_addr_filter( - tulip_softc_t *sc) -{ - tulip_uint32_t *sp = sc->tulip_setupdata; - struct ether_multistep step; - struct ether_multi *enm; - int i; - - sc->tulip_flags &= ~TULIP_WANTHASH; - sc->tulip_flags |= TULIP_WANTSETUP; - sc->tulip_cmdmode &= ~TULIP_CMD_RXRUN; - sc->tulip_intrmask &= ~TULIP_STS_RXSTOPPED; - if (sc->tulip_ac.ac_multicnt > 14) { - unsigned hash; - /* - * If we have more than 14 multicasts, we have - * go into hash perfect mode (512 bit multicast - * hash and one perfect hardware). - */ - - bzero(sc->tulip_setupdata, sizeof(sc->tulip_setupdata)); - hash = tulip_mchash(etherbroadcastaddr); - sp[hash >> 4] |= 1 << (hash & 0xF); - ETHER_FIRST_MULTI(step, &sc->tulip_ac, enm); - while (enm != NULL) { - hash = tulip_mchash(enm->enm_addrlo); - sp[hash >> 4] |= 1 << (hash & 0xF); - ETHER_NEXT_MULTI(step, enm); - } - sc->tulip_cmdmode |= TULIP_WANTHASH; - sp[40] = ((u_short *) sc->tulip_ac.ac_enaddr)[0]; - sp[41] = ((u_short *) sc->tulip_ac.ac_enaddr)[1]; - sp[42] = ((u_short *) sc->tulip_ac.ac_enaddr)[2]; - } else { - /* - * Else can get perfect filtering for 16 addresses. - */ - i = 0; - ETHER_FIRST_MULTI(step, &sc->tulip_ac, enm); - for (; enm != NULL; i++) { - *sp++ = ((u_short *) enm->enm_addrlo)[0]; - *sp++ = ((u_short *) enm->enm_addrlo)[1]; - *sp++ = ((u_short *) enm->enm_addrlo)[2]; - ETHER_NEXT_MULTI(step, enm); - } - /* - * If an IP address is enabled, turn on broadcast - */ - if (sc->tulip_ac.ac_ipaddr.s_addr != 0) { - i++; - *sp++ = 0xFFFF; - *sp++ = 0xFFFF; - *sp++ = 0xFFFF; - } - /* - * Pad the rest with our hardware address - */ - for (; i < 16; i++) { - *sp++ = ((u_short *) sc->tulip_ac.ac_enaddr)[0]; - *sp++ = ((u_short *) sc->tulip_ac.ac_enaddr)[1]; - *sp++ = ((u_short *) sc->tulip_ac.ac_enaddr)[2]; - } - } -} - -static int -tulip_ioctl( - struct ifnet *ifp, - int cmd, - caddr_t data) -{ - tulip_softc_t *sc = tulips[ifp->if_unit]; - struct ifaddr *ifa = (struct ifaddr *)data; - struct ifreq *ifr = (struct ifreq *) data; - int s, error = 0; - - s = splimp(); - - switch (cmd) { - case SIOCSIFADDR: { - - ifp->if_flags |= IFF_UP; - switch(ifa->ifa_addr->sa_family) { -#ifdef INET - case AF_INET: { - ((struct arpcom *)ifp)->ac_ipaddr = IA_SIN(ifa)->sin_addr; - tulip_addr_filter(sc); /* reset multicast filtering */ - (*ifp->if_init)(ifp->if_unit); - arpwhohas((struct arpcom *)ifp, &IA_SIN(ifa)->sin_addr); - break; - } -#endif /* INET */ - -#ifdef NS - /* This magic copied from if_is.c; I don't use XNS, - * so I have no way of telling if this actually - * works or not. - */ - case AF_NS: { - struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr); - if (ns_nullhost(*ina)) { - ina->x_host = *(union ns_host *)(sc->tulip_ac.ac_enaddr); - } else { - ifp->if_flags &= ~IFF_RUNNING; - bcopy((caddr_t)ina->x_host.c_host, - (caddr_t)sc->tulip_ac.ac_enaddr, - sizeof sc->tulip_ac.ac_enaddr); - } - - (*ifp->if_init)(ifp->if_unit); - break; - } -#endif /* NS */ - - default: { - (*ifp->if_init)(ifp->if_unit); - break; - } - } - break; - } - - case SIOCSIFFLAGS: { - /* - * Changing the connection forces a reset. - */ - if (sc->tulip_flags & TULIP_ALTPHYS) { - if ((ifp->if_flags & IFF_ALTPHYS) == 0) - TULIP_RESET(sc); - } else { - if (ifp->if_flags & IFF_ALTPHYS) - TULIP_RESET(sc); - } - (*ifp->if_init)(ifp->if_unit); - break; - } - - case SIOCADDMULTI: - case SIOCDELMULTI: { - /* - * Update multicast listeners - */ - if (cmd == SIOCADDMULTI) - error = ether_addmulti(ifr, &sc->tulip_ac); - else - error = ether_delmulti(ifr, &sc->tulip_ac); - - if (error == ENETRESET) { - tulip_addr_filter(sc); /* reset multicast filtering */ - (*ifp->if_init)(ifp->if_unit); - error = 0; - } - break; - } - case SIOCSIFMTU: - /* - * Set the interface MTU. - */ - if (ifr->ifr_mtu > ETHERMTU) { - error = EINVAL; - } else { - ifp->if_mtu = ifr->ifr_mtu; - } - break; - - default: { - error = EINVAL; - break; - } - } - - splx(s); - return error; -} - -static void -tulip_attach( - tulip_softc_t *sc) -{ - struct ifnet *ifp = &sc->tulip_if; - int cnt; - - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST; - - *sc->tulip_csrs.csr_sia_connectivity = 0; - *sc->tulip_csrs.csr_sia_connectivity = TULIP_SIACONN_10BASET; - for (cnt = 0; cnt < 240000; cnt++) { - if ((*sc->tulip_csrs.csr_sia_status & TULIP_SIASTS_LINKFAIL) == 0) - break; - DELAY(10); - } - if (*sc->tulip_csrs.csr_sia_status & TULIP_SIASTS_LINKFAIL) { - ifp->if_flags |= IFF_ALTPHYS; - } else { - sc->tulip_flags |= TULIP_ALTPHYS; - } - TULIP_RESET(sc); - - ifp->if_init = tulip_init; - ifp->if_ioctl = tulip_ioctl; - ifp->if_output = ether_output; - ifp->if_reset = tulip_reset; - ifp->if_start = tulip_start; - - printf("%s%d: %s pass %d.%d ethernet address %s\n", - sc->tulip_name, sc->tulip_unit, - tulip_chipdescs[tulip_chipids[sc->tulip_unit]], - (sc->tulip_revinfo & 0xF0) >> 4, - sc->tulip_revinfo & 0x0F, - ether_sprintf(sc->tulip_hwaddr)); - - if_attach(ifp); - -#if NBPFILTER > 0 - bpfattach(&sc->tulip_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header)); -#endif -} - -static void -tulip_initcsrs( - tulip_softc_t *sc, - volatile tulip_uint32_t *va_csrs, - size_t csr_size) -{ - sc->tulip_csrs.csr_busmode = va_csrs + 0 * csr_size; - sc->tulip_csrs.csr_txpoll = va_csrs + 1 * csr_size; - sc->tulip_csrs.csr_rxpoll = va_csrs + 2 * csr_size; - sc->tulip_csrs.csr_rxlist = va_csrs + 3 * csr_size; - sc->tulip_csrs.csr_txlist = va_csrs + 4 * csr_size; - sc->tulip_csrs.csr_status = va_csrs + 5 * csr_size; - sc->tulip_csrs.csr_command = va_csrs + 6 * csr_size; - sc->tulip_csrs.csr_intr = va_csrs + 7 * csr_size; - sc->tulip_csrs.csr_missed_frame = va_csrs + 8 * csr_size; - sc->tulip_csrs.csr_enetrom = va_csrs + 9 * csr_size; - sc->tulip_csrs.csr_reserved = va_csrs + 10 * csr_size; - sc->tulip_csrs.csr_full_duplex = va_csrs + 11 * csr_size; - sc->tulip_csrs.csr_sia_status = va_csrs + 12 * csr_size; - sc->tulip_csrs.csr_sia_connectivity = va_csrs + 13 * csr_size; - sc->tulip_csrs.csr_sia_tx_rx = va_csrs + 14 * csr_size; - sc->tulip_csrs.csr_sia_general = va_csrs + 15 * csr_size; -} - -static void -tulip_initring( - tulip_softc_t *sc, - tulip_ringinfo_t *ri, - tulip_desc_t *descs, - int ndescs) -{ - ri->ri_max = ndescs; - ri->ri_first = descs; - ri->ri_last = ri->ri_first + ri->ri_max; - bzero((caddr_t) ri->ri_first, sizeof(ri->ri_first[0]) * ri->ri_max); - ri->ri_last[-1].d_flag = TULIP_DFLAG_ENDRING; -} - -#if NPCI > 0 -/* - * This is the PCI configuration support. Since the DC21040 is available - * on both EISA and PCI boards, one must be careful in how defines the - * DC21040 in the config file. - */ -static char* tulip_pci_probe (pcici_t config_id, pcidi_t device_id); -static void tulip_pci_attach(pcici_t config_id, int unit); -static u_long tulip_count; - -struct pci_driver dedevice = { - tulip_pci_probe, - tulip_pci_attach, - &tulip_count, -}; - -#define PCI_CFID 0x00 /* Configuration ID */ -#define PCI_CFCS 0x04 /* Configurtion Command/Status */ -#define PCI_CFRV 0x08 /* Configuration Revision */ -#define PCI_CFLT 0x0c /* Configuration Latency Timer */ -#define PCI_CBIO 0x10 /* Configuration Base IO Address */ -#define PCI_CBMA 0x14 /* Configuration Base Memory Address */ -#define PCI_CFIT 0x3c /* Configuration Interrupt */ -#define PCI_CFDA 0x40 /* Configuration Driver Area */ - -#define TULIP_PCI_CSRSIZE (8 / sizeof(tulip_uint32_t)) -static char* -tulip_pci_probe( - pcici_t config_id, - pcidi_t device_id) -{ - int idx; - for (idx = 0; idx < NDE; idx++) { - if (tulips[idx] == NULL) { - if (device_id == 0x00021011ul) { - tulip_chipids[idx] = TULIP_DC21040; - return "Digital DC21040 Ethernet"; - } - if (device_id == 0x00091011ul) { - tulip_chipids[idx] = TULIP_DC21140; - return "Digital DC21140 Fast Ethernet"; - } - return NULL; - } - } - return NULL; -} - -static void -tulip_pci_attach( - pcici_t config_id, - int unit) -{ - tulip_softc_t *sc; - int retval, idx; - vm_offset_t va_csrs, pa_csrs; - tulip_desc_t *rxdescs, *txdescs; - - sc = (tulip_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT); - if (sc == NULL) - return; - - rxdescs = (tulip_desc_t *) - malloc(sizeof(tulip_desc_t) * TULIP_RXDESCS, M_DEVBUF, M_NOWAIT); - if (rxdescs == NULL) { - free((caddr_t) sc, M_DEVBUF); - return; - } - - txdescs = (tulip_desc_t *) - malloc(sizeof(tulip_desc_t) * TULIP_TXDESCS, M_DEVBUF, M_NOWAIT); - if (txdescs == NULL) { - free((caddr_t) rxdescs, M_DEVBUF); - free((caddr_t) sc, M_DEVBUF); - return; - } - - bzero(sc, sizeof(sc)); /* Zero out the softc*/ - sc->tulip_rxspace = kmem_alloc(kernel_map, TULIP_RXSPACE + NBPG); - /* - * We've allocated an extra page of receive space so we can double map - * the first page of the receive space into the page after the last page - * of the receive space. This means that even if a receive wraps around - * the end of the receive space, it will still virtually contiguous and - * that greatly simplifies the recevie logic. - */ - pmap_enter(pmap_kernel(), sc->tulip_rxspace + TULIP_RXSPACE, - vtophys(sc->tulip_rxspace), VM_PROT_READ, TRUE); - - sc->tulip_unit = unit; - sc->tulip_name = "de"; - retval = pci_map_mem(config_id, PCI_CBMA, &va_csrs, &pa_csrs); - if (!retval) { - kmem_free(kernel_map, sc->tulip_rxspace, TULIP_RXSPACE + NBPG); - free((caddr_t) txdescs, M_DEVBUF); - free((caddr_t) rxdescs, M_DEVBUF); - free((caddr_t) sc, M_DEVBUF); - return; - } - tulips[unit] = sc; - tulip_initcsrs(sc, (volatile tulip_uint32_t *) va_csrs, TULIP_PCI_CSRSIZE); - tulip_initring(sc, &sc->tulip_rxinfo, rxdescs, TULIP_RXDESCS); - tulip_initring(sc, &sc->tulip_txinfo, txdescs, TULIP_TXDESCS); - sc->tulip_revinfo = pci_conf_read(config_id, PCI_CFRV); - if ((retval = tulip_read_macaddr(sc)) < 0) { - printf("de%d: can't read ENET ROM (why=%d) (", sc->tulip_unit, retval); - for (idx = 0; idx < 32; idx++) - printf("%02x", sc->tulip_rombuf[idx]); - printf("\n"); - printf("%s%d: %s pass %d.%d ethernet address %s\n", - sc->tulip_name, sc->tulip_unit, - tulip_chipdescs[tulip_chipids[sc->tulip_unit]], - (sc->tulip_revinfo & 0xF0) >> 4, sc->tulip_revinfo & 0x0F, - "unknown"); - } else { - TULIP_RESET(sc); - tulip_attach(sc); - pci_map_int (config_id, tulip_intr, (void*) sc, &net_imask); - } -} -#endif /* NPCI > 0 */ -#endif /* NDE > 0 */ diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c deleted file mode 100644 index 80c8a3dae7bc6..0000000000000 --- a/sys/pci/ncr.c +++ /dev/null @@ -1,6499 +0,0 @@ -/************************************************************************** -** -** $Id: ncr.c,v 1.11 1994/10/27 20:12:46 se Exp $ -** -** Device driver for the NCR 53C810 PCI-SCSI-Controller. -** -** 386bsd / FreeBSD / NetBSD -** -**------------------------------------------------------------------------- -** -** Written for 386bsd and FreeBSD by -** Wolfgang Stanglmeier <wolf@dentaro.gun.de> -** Stefan Esser <se@mi.Uni-Koeln.de> -** -** Ported to NetBSD by -** Charles M. Hannum <mycroft@gnu.ai.mit.edu> -** -**------------------------------------------------------------------------- -** -** Copyright (c) 1994 Wolfgang Stanglmeier. All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** 3. The name of the author may not be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -** -*************************************************************************** -*/ - -#define NCR_VERSION (2) -#define MAX_UNITS (16) - - -/*========================================================== -** -** Configuration and Debugging -** -** May be overwritten in <i386/conf/XXXXX> -** -**========================================================== -*/ - -/* -** SCSI address of this device. -** The boot routines should have set it. -** If not, use this. -*/ - -#ifndef SCSI_NCR_MYADDR -#define SCSI_NCR_MYADDR (7) -#endif /* SCSI_NCR_MYADDR */ - -/* -** The maximal synchronous frequency in kHz. -** (0=asynchronous) -*/ - -#ifndef SCSI_NCR_MAX_SYNC -#define SCSI_NCR_MAX_SYNC (10000) -#endif /* SCSI_NCR_MAX_SYNC */ - -/* -** The maximal bus with (in log2 byte) -** (0=8 bit, 1=16 bit) -*/ - -#ifndef SCSI_NCR_MAX_WIDE -#define SCSI_NCR_MAX_WIDE (1) -#endif /* SCSI_NCR_MAX_WIDE */ - -/* -** The maximum number of tags per logic unit. -** Used only for disk devices that support tags. -*/ - -#ifndef SCSI_NCR_MAX_TAGS -#define SCSI_NCR_MAX_TAGS (4) -#endif /* SCSI_NCR_MAX_TAGS */ - -/*========================================================== -** -** Configuration and Debugging -** -**========================================================== -*/ - -/* -** Number of targets supported by the driver. -** n permits target numbers 0..n-1. -** Default is 7, meaning targets #0..#6. -** #7 .. is myself. -*/ - -#define MAX_TARGET (7) - -/* -** Number of logic units supported by the driver. -** n enables logic unit numbers 0..n-1. -** The common SCSI devices require only -** one lun, so take 1 as the default. -*/ - -#define MAX_LUN (1) - -/* -** The maximum number of jobs scheduled for starting. -** There should be one slot per target, and one slot -** for each tag of each target. -*/ - -#define MAX_START (7 * SCSI_NCR_MAX_TAGS) - -/* -** The maximum number of segments a transfer is split into. -*/ - -#define MAX_SCATTER (33) - -/* -** The maximum transfer length (should be >= 64k). -** MUST NOT be greater than (MAX_SCATTER-1) * NBPG. -*/ - -#define MAX_SIZE ((MAX_SCATTER-1) * NBPG) - -/* -** Write disk status information to dkstat ? -*/ - -#define DK 0 - -/*========================================================== -** -** Include files -** -**========================================================== -*/ - -#include <sys/types.h> -#include <sys/param.h> -#include <sys/time.h> -#include <sys/proc.h> - -#ifdef KERNEL -#include <sys/systm.h> -#include <sys/malloc.h> -#include <sys/buf.h> -#include <sys/kernel.h> -#ifdef DK -#include <sys/dkstat.h> -#endif /* DK */ -#include <vm/vm.h> -#endif /* KERNEL */ - -#include <i386/pci/ncrreg.h> - -#ifdef __NetBSD__ -#include <sys/device.h> -#include <i386/pci/pcivar.h> -#endif /* __NetBSD */ -#include <i386/pci/pcireg.h> - -#include <scsi/scsi_all.h> -#include <scsi/scsiconf.h> - - -/*========================================================== -** -** Debugging tags -** -**========================================================== -*/ - -#define DEBUG_ALLOC (0x0001) -#define DEBUG_PHASE (0x0002) -#define DEBUG_POLL (0x0004) -#define DEBUG_QUEUE (0x0008) -#define DEBUG_RESULT (0x0010) -#define DEBUG_SCATTER (0x0020) -#define DEBUG_SCRIPT (0x0040) -#define DEBUG_TINY (0x0080) -#define DEBUG_TIMING (0x0100) -#define DEBUG_NEGO (0x0200) -#define DEBUG_TAGS (0x0400) -#define DEBUG_FREEZE (0x0800) -#define DEBUG_RESTART (0x1000) - -/* -** Enable/Disable debug messages. -** Can be changed at runtime too. -*/ - -#ifdef SCSI_DEBUG_FLAGS - #define DEBUG_FLAGS ncr_debug; -#else /* SCSI_DEBUG_FLAGS */ - #define SCSI_DEBUG_FLAGS 0 - #define DEBUG_FLAGS 0 -#endif /* SCSI_DEBUG_FLAGS */ - - - -/*========================================================== -** -** assert () -** -**========================================================== -** -** modified copy from 386bsd:/usr/include/sys/assert.h -** -**---------------------------------------------------------- -*/ - -#define assert(expression) { \ - if (!(expression)) { \ - (void)printf(\ - "assertion \"%s\" failed: file \"%s\", line %d\n", \ - #expression, \ - __FILE__, __LINE__); \ - } \ -} - -/*========================================================== -** -** Access to the controller chip. -** -**========================================================== -*/ - -#define INB(r) (np->reg->r) -#define INW(r) (np->reg->r) -#define INL(r) (np->reg->r) - -#define OUTB(r, val) np->reg->r = val -#define OUTW(r, val) np->reg->r = val -#define OUTL(r, val) np->reg->r = val - -/*========================================================== -** -** Command control block states. -** -**========================================================== -*/ - -#define HS_IDLE (0) -#define HS_BUSY (1) -#define HS_NEGOTIATE (2) /* sync/wide data transfer*/ -#define HS_DISCONNECT (3) /* Disconnected by target */ - -#define HS_COMPLETE (4) -#define HS_SEL_TIMEOUT (5) /* Selection timeout */ -#define HS_RESET (6) /* SCSI reset */ -#define HS_ABORTED (7) /* Transfer aborted */ -#define HS_TIMEOUT (8) /* Software timeout */ -#define HS_FAIL (9) /* SCSI or PCI bus errors */ -#define HS_UNEXPECTED (10) /* Unexpected disconnect */ - -#define HS_DONEMASK (0xfc) - -/*========================================================== -** -** Software Interrupt Codes -** -**========================================================== -*/ - -#define SIR_SENSE_RESTART (1) -#define SIR_SENSE_FAILED (2) -#define SIR_STALL_RESTART (3) -#define SIR_STALL_QUEUE (4) -#define SIR_NEGO_SYNC (5) -#define SIR_NEGO_WIDE (6) -#define SIR_NEGO_FAILED (7) -#define SIR_NEGO_PROTO (8) -#define SIR_REJECT_RECEIVED (9) -#define SIR_REJECT_SENT (10) -#define SIR_IGN_RESIDUE (11) -#define SIR_MISSING_SAVE (12) -#define SIR_MAX (12) - -/*========================================================== -** -** Extended error codes. -** xerr_status field of struct ccb. -** -**========================================================== -*/ - -#define XE_OK (0) -#define XE_EXTRA_DATA (1) /* unexpected data phase */ -#define XE_BAD_PHASE (2) /* illegal phase (4/5) */ - -/*========================================================== -** -** Negotiation status. -** nego_status field of struct ccb. -** -**========================================================== -*/ - -#define NS_SYNC (1) -#define NS_WIDE (2) - -/*========================================================== -** -** "Special features" of targets. -** quirks field of struct tcb. -** actualquirks field of struct ccb. -** -**========================================================== -*/ - -#define QUIRK_AUTOSAVE (0x01) -#define QUIRK_NOMSG (0x02) -#define QUIRK_UPDATE (0x80) - -/*========================================================== -** -** Capability bits in Inquire response byte 7. -** -**========================================================== -*/ - -#define INQ7_QUEUE (0x02) -#define INQ7_SYNC (0x10) -#define INQ7_WIDE16 (0x20) - -/*========================================================== -** -** Misc. -** -**========================================================== -*/ - -#define CCB_MAGIC (0xf2691ad2) -#define MAX_TAGS (16) /* hard limit */ - -/*========================================================== -** -** OS dependencies. -** -**========================================================== -*/ - -#ifndef __FreeBSD__ -#ifndef __NetBSD__ - #define ANCIENT -#endif /*__NetBSD__*/ -#endif /*__FreeBSD__*/ - -#ifdef ANCIENT -#ifdef KERNEL - extern int splbio(void); - extern void splx(int level); - extern int wakeup(void* channel); - extern int tsleep(); - extern int DELAY(); - extern int scsi_attachdevs(); - extern void timeout(); - extern void untimeout(); -#endif /* KERNEL */ - #define bio_imask biomask - #define LUN lu - #define TARGET targ - #define PRINT_ADDR(xp) printf ("ncr0: targ %d lun %d ",xp->targ,xp->lu) - #define INT32 int - #define U_INT32 long - #define TIMEOUT -#else /* !ANCIENT */ - #define LUN sc_link->lun - #define TARGET sc_link->target - #define PRINT_ADDR(xp) sc_print_addr(xp->sc_link) -#ifdef __NetBSD__ - #define INT32 int - #define U_INT32 u_int - #define TIMEOUT (void*) -#else /*__NetBSD__*/ - #define INT32 int32 - #define U_INT32 u_int32 - #define TIMEOUT (timeout_func_t) -#endif /*__NetBSD__*/ -#endif /* ANCIENT */ - -/*========================================================== -** -** Declaration of structs. -** -**========================================================== -*/ - -struct tcb; -struct lcb; -struct ccb; -struct ncb; -struct script; - -typedef struct ncb * ncb_p; -typedef struct tcb * tcb_p; -typedef struct lcb * lcb_p; -typedef struct ccb * ccb_p; - -struct link { - u_long l_cmd; - u_long l_paddr; -}; - -struct usrcmd { - u_long target; - u_long lun; - u_long data; - u_long cmd; -}; - -#define UC_SETSYNC 10 -#define UC_SETTAGS 11 -#define UC_SETDEBUG 12 -#define UC_SETORDER 13 -#define UC_SETWIDE 14 -#define UC_SETFLAG 15 - -#define UF_TRACE (0x01) - - -/*========================================================== -** -** Access to fields of structs. -** -**========================================================== -*/ - -#define offsetof(type, member) ((size_t)(&((type *)0)->member)) - -/*--------------------------------------- -** -** Timestamps for profiling -** -**--------------------------------------- -*/ - -struct tstamp { - struct timeval start; - struct timeval end; - struct timeval select; - struct timeval command; - struct timeval data; - struct timeval status; - struct timeval disconnect; - struct timeval reselect; -}; - -/* -** profiling data (per device) -*/ - -struct profile { - u_long num_trans; - u_long num_bytes; - u_long num_disc; - u_long num_break; - u_long num_int; - u_long num_fly; - u_long ms_setup; - u_long ms_data; - u_long ms_disc; - u_long ms_post; -}; - -/*========================================================== -** -** Declaration of structs: TARGET control block -** -**========================================================== -*/ - -struct tcb { - /* - ** during reselection the ncr jumps to this point - ** with SFBR set to the encoded TARGET number - ** with bit 7 set. - ** if it's not this target, jump to the next. - ** - ** JUMP IF (SFBR != #TARGET#) - ** @(next tcb) - */ - - struct link jump_tcb; - - /* - ** load the actual values for the sxfer and the scntl3 - ** register (sync/wide mode). - ** - ** SCR_COPY (1); - ** @(sval field of this tcb) - ** @(sxfer register) - ** SCR_COPY (1); - ** @(wval field of this tcb) - ** @(scntl3 register) - */ - - ncrcmd getscr[6]; - - /* - ** if next message is "identify" - ** then load the message to SFBR, - ** else load 0 to SFBR. - ** - ** CALL - ** <RESEL_LUN> - */ - - struct link call_lun; - - /* - ** now look for the right lun. - ** - ** JUMP - ** @(first ccb of this lun) - */ - - struct link jump_lcb; - - /* - ** pointer to interrupted getcc ccb - */ - - ccb_p hold_cp; - - /* - ** statistical data - */ - - u_long transfers; - u_long bytes; - - /* - ** user settable limits for sync transfer - ** and tagged commands. - */ - - u_char usrsync; - u_char usrtags; - u_char usrwide; - u_char usrflag; - - /* - ** negotiation of wide and synch transfer. - ** device quirks. - */ - -/*0*/ u_char minsync; -/*1*/ u_char sval; -/*2*/ u_short period; -/*0*/ u_char maxoffs; - -/*1*/ u_char quirks; - -/*2*/ u_char widedone; -/*3*/ u_char wval; - /* - ** inquire data - */ -#define MAX_INQUIRE 36 - u_char inqdata[MAX_INQUIRE]; - - /* - ** the lcb's of this tcb - */ - - lcb_p lp[MAX_LUN]; -}; - -/*========================================================== -** -** Declaration of structs: LUN control block -** -**========================================================== -*/ - -struct lcb { - /* - ** during reselection the ncr jumps to this point - ** with SFBR set to the "Identify" message. - ** if it's not this lun, jump to the next. - ** - ** JUMP IF (SFBR == #LUN#) - ** @(next lcb of this target) - */ - - struct link jump_lcb; - - /* - ** if next message is "simple tag", - ** then load the tag to SFBR, - ** else load 0 to SFBR. - ** - ** CALL - ** <RESEL_TAG> - */ - - struct link call_tag; - - /* - ** now look for the right ccb. - ** - ** JUMP - ** @(first ccb of this lun) - */ - - struct link jump_ccb; - - /* - ** start of the ccb chain - */ - - ccb_p next_ccb; - - /* - ** Control of tagged queueing - */ - - u_char reqccbs; - u_char actccbs; - u_char reqlink; - u_char actlink; - u_char usetags; - u_char lasttag; -}; - -/*========================================================== -** -** Declaration of structs: COMMAND control block -** -**========================================================== -** -** This substructure is copied from the ccb to a -** global address after selection (or reselection) -** and copied back before disconnect. -** -** These fields are accessible to the script processor. -** -**---------------------------------------------------------- -*/ - -struct head { - /* - ** Execution of a ccb starts at this point. - ** It's a jump to the "SELECT" label - ** of the script. - ** - ** After successful selection the script - ** processor overwrites it with a jump to - ** the IDLE label of the script. - */ - - struct link launch; - - /* - ** Saved data pointer. - ** Points to the position in the script - ** responsible for the actual transfer - ** of data. - ** It's written after reception of a - ** "SAVE_DATA_POINTER" message. - ** The goalpointer points after - ** the last transfer command. - */ - - u_long savep; - u_long lastp; - u_long goalp; - - /* - ** The virtual address of the ccb - ** containing this header. - */ - - ccb_p cp; - - /* - ** space for some timestamps to gather - ** profiling data about devices and this driver. - */ - - struct tstamp stamp; - - /* - ** status fields. - */ - - u_char status[8]; -}; - -/* -** The status bytes are used by the host and the script processor. -** -** The first four byte are copied to the scratchb register -** (declared as scr0..scr3 in ncr_reg.h) just after the select/reselect, -** and copied back just after disconnecting. -** Inside the script the XX_REG are used. -** -** The last four bytes are used inside the script by "COPY" commands. -** Because source and destination must have the same alignment -** in a longword, the fields HAVE to be on the selected offsets. -** xerr_st (4) 0 (0x34) scratcha -** sync_st (5) 1 (0x05) sxfer -** wide_st (7) 3 (0x03) scntl3 -*/ - -/* -** First four bytes (script) -*/ -#define QU_REG scr0 -#define HS_REG scr1 -#define HS_PRT nc_scr1 -#define SS_REG scr2 -#define PS_REG scr3 - -/* -** First four bytes (host) -*/ -#define actualquirks phys.header.status[0] -#define host_status phys.header.status[1] -#define scsi_status phys.header.status[2] -#define parity_status phys.header.status[3] - -/* -** Last four bytes (script) -*/ -#define xerr_st header.status[4] /* MUST be ==0 mod 4 */ -#define sync_st header.status[5] /* MUST be ==1 mod 4 */ -#define nego_st header.status[6] -#define wide_st header.status[7] /* MUST be ==3 mod 4 */ - -/* -** Last four bytes (host) -*/ -#define xerr_status phys.xerr_st -#define sync_status phys.sync_st -#define nego_status phys.nego_st -#define wide_status phys.wide_st - -/*========================================================== -** -** Declaration of structs: Data structure block -** -**========================================================== -** -** During execution of a ccb by the script processor, -** the DSA (data structure address) register points -** to this substructure of the ccb. -** This substructure contains the header with -** the script-processor-changable data and -** data blocks for the indirect move commands. -** -**---------------------------------------------------------- -*/ - -struct dsb { - - /* - ** Header. - ** Has to be the first entry, - ** because it's jumped to by the - ** script processor - */ - - struct head header; - - /* - ** Table data for Script - */ - - struct scr_tblsel select; - struct scr_tblmove smsg ; - struct scr_tblmove smsg2 ; - struct scr_tblmove cmd ; - struct scr_tblmove sense ; - struct scr_tblmove data [MAX_SCATTER]; -}; - -/*========================================================== -** -** Declaration of structs: Command control block. -** -**========================================================== -** -** During execution of a ccb by the script processor, -** the DSA (data structure address) register points -** to this substructure of the ccb. -** This substructure contains the header with -** the script-processor-changable data and then -** data blocks for the indirect move commands. -** -**---------------------------------------------------------- -*/ - - -struct ccb { - /* - ** during reselection the ncr jumps to this point. - ** If a "SIMPLE_TAG" message was received, - ** then SFBR is set to the tag. - ** else SFBR is set to 0 - ** If looking for another tag, jump to the next ccb. - ** - ** JUMP IF (SFBR != #TAG#) - ** @(next ccb of this lun) - */ - - struct link jump_ccb; - - /* - ** After execution of this call, the return address - ** (in the TEMP register) points to the following - ** data structure block. - ** So copy it to the DSA register, and start - ** processing of this data structure. - ** - ** CALL - ** <RESEL_TMP> - */ - - struct link call_tmp; - - /* - ** This is the data structure which is - ** to be executed by the script processor. - */ - - struct dsb phys; - - /* - ** If a data transfer phase is terminated too early - ** (after reception of a message (i.e. DISCONNECT)), - ** we have to prepare a mini script to transfer - ** the rest of the data. - */ - - u_long patch[8]; - - /* - ** The general SCSI driver provides a - ** pointer to a control block. - */ - - struct scsi_xfer *xfer; - -#ifdef ANCIENT - /* - ** We copy the SCSI command, because it - ** may be volatile (on the stack). - ** - */ - struct scsi_generic cmd; -#endif /* ANCIENT */ - - /* - ** We prepare a message to be sent after selection, - ** and a second one to be sent after getcc selection. - ** Contents are IDENTIFY and SIMPLE_TAG. - ** While negotiating sync or wide transfer, - ** a SDTM or WDTM message is appended. - */ - - u_char scsi_smsg [8]; - u_char scsi_smsg2[8]; - - /* - ** Lock this ccb. - ** Flag is used while looking for a free ccb. - */ - - u_long magic; - - /* - ** Completion time out for this job. - ** It's set to time of start + allowed number of seconds. - */ - - u_long tlimit; - - /* - ** All ccbs of one hostadapter are linked. - */ - - ccb_p link_ccb; - - /* - ** All ccbs of one target/lun are linked. - */ - - ccb_p next_ccb; - - /* - ** Tag for this transfer. - ** It's patched into jump_ccb. - ** If it's not zero, a SIMPLE_TAG - ** message is included in smsg. - */ - - u_char tag; -}; - -/*========================================================== -** -** Declaration of structs: NCR device descriptor -** -**========================================================== -*/ - -struct ncb { -#ifdef __NetBSD__ - struct device sc_dev; - struct intrhand sc_ih; -#else /* !__NetBSD__ */ - int unit; -#endif /* __NetBSD__ */ - - /*----------------------------------------------- - ** Scripts .. - **----------------------------------------------- - ** - ** During reselection the ncr jumps to this point. - ** The SFBR register is loaded with the encoded target id. - ** - ** Jump to the first target. - ** - ** JUMP - ** @(next tcb) - */ - struct link jump_tcb; - - /*----------------------------------------------- - ** Configuration .. - **----------------------------------------------- - ** - ** virtual and physical addresses - ** of the 53c810 chip. - */ - vm_offset_t vaddr; - vm_offset_t paddr; - - /* - ** pointer to the chip's registers. - */ - volatile - struct ncr_reg* reg; - - /* - ** A copy of the script, relocated for this ncb. - */ - struct script *script; - u_long p_script; - - /* - ** The SCSI address of the host adapter. - */ - u_char myaddr; - - /* - ** timing parameters - */ - u_char ns_async; - u_char ns_sync; - u_char rv_scntl3; - -#ifndef ANCIENT - /*----------------------------------------------- - ** Link to the generic SCSI driver - **----------------------------------------------- - */ - - struct scsi_link sc_link; -#endif /* ANCIENT */ - - /*----------------------------------------------- - ** Job control - **----------------------------------------------- - ** - ** Commands from user - */ - struct usrcmd user; - u_char order; - - /* - ** Target data - */ - struct tcb target[MAX_TARGET]; - - /* - ** Start queue. - */ - u_long squeue [MAX_START]; - u_short squeueput; - u_short actccbs; - - /* - ** Timeout handler - */ - u_long heartbeat; - u_short ticks; - u_short latetime; - u_long lasttime; - - /*----------------------------------------------- - ** Debug and profiling - **----------------------------------------------- - ** - ** register dump - */ - struct ncr_reg regdump; - struct timeval regtime; - - /* - ** Profiling data - */ - struct profile profile; - u_long disc_phys; - u_long disc_ref; - - /* - ** The global header. - ** Accessible to both the host and the - ** script-processor. - */ - struct head header; - - /* - ** The global control block. - ** It's used only during the configuration phase. - ** A target control block will be created - ** after the first successful transfer. - */ - struct ccb ccb; - - /* - ** message buffers. - ** Should be longword aligned, - ** because they're written with a - ** COPY script command. - */ - u_char msgout[8]; - u_char msgin [8]; - u_long lastmsg; - - /* - ** Buffer for STATUS_IN phase. - */ - u_char scratch; - - /* - ** controller chip dependent maximal transfer width. - */ - u_char maxwide; - - /* - ** lockout of execption handler call while starting command. - */ - u_char lock; -}; - -/*========================================================== -** -** -** Script for NCR-Processor. -** -** Use ncr_script_fill() to create the variable parts. -** Use ncr_script_copy_and_bind() to make a copy and -** bind to physical addresses. -** -** -**========================================================== -** -** We have to know the offsets of all labels before -** we reach them (for forward jumps). -** Therefore we declare a struct here. -** If you make changes inside the script, -** DONT FORGET TO CHANGE THE LENGTHS HERE! -** -**---------------------------------------------------------- -*/ - -struct script { - ncrcmd start [ 7]; - ncrcmd start0 [ 2]; - ncrcmd start1 [ 3]; - ncrcmd startpos [ 1]; - ncrcmd tryloop [MAX_START*5+2]; - ncrcmd trysel [ 8]; - ncrcmd skip [ 8]; - ncrcmd skip2 [ 3]; - ncrcmd idle [ 2]; - ncrcmd select [ 24]; - ncrcmd prepare [ 4]; - ncrcmd loadpos [ 14]; - ncrcmd prepare2 [ 24]; - ncrcmd setmsg [ 5]; - ncrcmd clrack [ 2]; - ncrcmd dispatch [ 31]; - ncrcmd no_data [ 17]; - ncrcmd checkatn [ 10]; - ncrcmd command [ 15]; - ncrcmd status [ 27]; - ncrcmd msg_in [ 26]; - ncrcmd msg_bad [ 6]; - ncrcmd msg_parity [ 6]; - ncrcmd msg_reject [ 8]; - ncrcmd msg_ign_residue [ 32]; - ncrcmd msg_extended [ 18]; - ncrcmd msg_ext_2 [ 18]; - ncrcmd msg_wdtr [ 27]; - ncrcmd msg_ext_3 [ 18]; - ncrcmd msg_sdtr [ 27]; - ncrcmd complete [ 13]; - ncrcmd cleanup [ 12]; - ncrcmd cleanup0 [ 11]; - ncrcmd signal [ 10]; - ncrcmd save_dp [ 5]; - ncrcmd restore_dp [ 5]; - ncrcmd disconnect [ 12]; - ncrcmd disconnect0 [ 5]; - ncrcmd disconnect1 [ 23]; - ncrcmd msg_out [ 9]; - ncrcmd msg_out_done [ 7]; - ncrcmd msg_out_abort [ 10]; - ncrcmd getcc [ 4]; - ncrcmd getcc1 [ 5]; - ncrcmd getcc2 [ 33]; - ncrcmd getcc3 [ 10]; - ncrcmd badgetcc [ 6]; - ncrcmd reselect [ 12]; - ncrcmd reselect2 [ 6]; - ncrcmd resel_tmp [ 5]; - ncrcmd resel_lun [ 18]; - ncrcmd resel_tag [ 24]; - ncrcmd data_in [MAX_SCATTER * 4 + 7]; - ncrcmd data_out [MAX_SCATTER * 4 + 7]; - ncrcmd aborttag [ 4]; - ncrcmd abort [ 20]; - ncrcmd snooptest [ 11]; -}; - -/*========================================================== -** -** -** Function headers. -** -** -**========================================================== -*/ - -#ifdef KERNEL -static void ncr_alloc_ccb (ncb_p np, struct scsi_xfer * xp); -static void ncr_complete (ncb_p np, ccb_p cp); -static int ncr_delta (struct timeval * from, struct timeval * to); -static void ncr_exception (ncb_p np); -static void ncr_free_ccb (ncb_p np, ccb_p cp, int flags); -static void ncr_getclock (ncb_p np); -static ccb_p ncr_get_ccb (ncb_p np, u_long flags, u_long t,u_long l); -static U_INT32 ncr_info (int unit); -static void ncr_init (ncb_p np, char * msg, u_long code); -static int ncr_intr (ncb_p np); -static void ncr_int_ma (ncb_p np); -static void ncr_int_sir (ncb_p np); -static void ncr_int_sto (ncb_p np); -#ifndef NEW_SCSICONF -static u_long ncr_lookup (char* id); -#endif /* NEW_SCSICONF */ -static void ncr_min_phys (struct buf *bp); -static void ncr_negotiate (struct ncb* np, struct tcb* tp); -static void ncr_opennings (ncb_p np, lcb_p lp, struct scsi_xfer * xp); -static void ncb_profile (ncb_p np, ccb_p cp); -static void ncr_script_copy_and_bind - (struct script * script, ncb_p np); -static void ncr_script_fill (struct script * scr); -static int ncr_scatter (struct dsb* phys,u_long vaddr,u_long datalen); -static void ncr_setmaxtags (tcb_p tp, u_long usrtags); -static void ncr_setsync (ncb_p np, ccb_p cp, u_char sxfer); -static void ncr_settags (tcb_p tp, lcb_p lp); -static void ncr_setwide (ncb_p np, ccb_p cp, u_char wide); -static int ncr_show_msg (u_char * msg); -static int ncr_snooptest (ncb_p np); -static INT32 ncr_start (struct scsi_xfer *xp); -static void ncr_timeout (ncb_p np); -static void ncr_usercmd (ncb_p np); -static void ncr_wakeup (ncb_p np, u_long code); - -#ifdef __NetBSD__ -static int ncr_probe (struct device *, struct device *, void *); -static void ncr_attach (struct device *, struct device *, void *); -#else /* !__NetBSD */ -static char* ncr_probe (pcici_t tag, pcidi_t type); -static void ncr_attach (pcici_t tag, int unit); -#endif /* __NetBSD__ */ - -#endif /* KERNEL */ - -/*========================================================== -** -** -** Global static data. -** -** -**========================================================== -*/ - - -static char ident[] = - "\n$Id: ncr.c,v 1.11 1994/10/27 20:12:46 se Exp $\n"; - -u_long ncr_version = NCR_VERSION - + (u_long) sizeof (struct ncb) - * (u_long) sizeof (struct ccb) - * (u_long) sizeof (struct lcb) - * (u_long) sizeof (struct tcb); - -#ifdef KERNEL - -#ifndef __NetBSD__ -u_long nncr=MAX_UNITS; -ncb_p ncrp [MAX_UNITS]; -#endif - -static int ncr_debug = SCSI_DEBUG_FLAGS; - -int ncr_cache; /* to be alligned _NOT_ static */ - -/* -** SCSI cmd to get the SCSI sense data -*/ - -static u_char rs_cmd [6] = - { 0x03, 0, 0, 0, sizeof (struct scsi_sense_data), 0 }; - -/*========================================================== -** -** -** Global static data: auto configure -** -** -**========================================================== -*/ - -#define NCR_810_ID (0x00011000ul) -#define NCR_825_ID (0x00031000ul) - -#ifdef __NetBSD__ - -struct cfdriver ncrcd = { - NULL, "ncr", ncr_probe, ncr_attach, DV_DISK, sizeof(struct ncb) -}; - -#else /* !__NetBSD__ */ - -static u_long ncr_count; - -struct pci_driver ncr_device = { - ncr_probe, - ncr_attach, - &ncr_count -}; - -#endif /* !__NetBSD__ */ - -#ifndef ANCIENT -struct scsi_adapter ncr_switch = -{ - ncr_start, - ncr_min_phys, - 0, - 0, - ncr_info, - "ncr", -}; - -struct scsi_device ncr_dev = -{ - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ - "ncr", -}; -#else /* ANCIENT */ -struct scsi_switch ncr_switch = -{ - ncr_start, - ncr_min_phys, - 0, - 0, - ncr_info, - 0,0,0 -}; -#endif /* ANCIENT */ - -#ifdef __NetBSD__ - -#define ncr_name(np) (np->sc_dev.dv_xname) - -#else /* !__NetBSD__ */ - -static char *ncr_name (ncb_p np) -{ - static char name[10]; - sprintf(name, "ncr%d", np->unit); - return (name); -} -#endif - -/*========================================================== -** -** -** Scripts for NCR-Processor. -** -** Use ncr_script_bind for binding to physical addresses. -** -** -**========================================================== -** -** NADDR generates a reference to a field of the controller data. -** PADDR generates a reference to another part of the script. -** RADDR generates a reference to a script processor register. -** FADDR generates a reference to a script processor register -** with offset. -** -**---------------------------------------------------------- -*/ - -#define RELOC_SOFTC 0x40000000 -#define RELOC_LABEL 0x50000000 -#define RELOC_REGISTER 0x60000000 -#define RELOC_MASK 0xf0000000 - -#define NADDR(label) (RELOC_SOFTC | offsetof(struct ncb, label)) -#define PADDR(label) (RELOC_LABEL | offsetof(struct script, label)) -#define RADDR(label) (RELOC_REGISTER | REG(label)) -#define FADDR(label,ofs)(RELOC_REGISTER | ((REG(label))+(ofs))) - -static struct script script0 = { -/*--------------------------< START >-----------------------*/ { - /* - ** Claim to be still alive ... - */ - SCR_COPY (sizeof (((struct ncb *)0)->heartbeat)), - (ncrcmd) &time.tv_sec, - NADDR (heartbeat), - /* - ** Make data structure address invalid. - ** clear SIGP. - */ - SCR_LOAD_REG (dsa, 0xff), - 0, - SCR_FROM_REG (ctest2), - 0, -}/*-------------------------< START0 >----------------------*/,{ - /* - ** Hook for interrupted GetConditionCode. - ** Will be patched to ... IFTRUE by - ** the interrupt handler. - */ - SCR_INT ^ IFFALSE (0), - SIR_SENSE_RESTART, - -}/*-------------------------< START1 >----------------------*/,{ - /* - ** Hook for stalled start queue. - ** Will be patched to IFTRUE by the interrupt handler. - */ - SCR_INT ^ IFFALSE (0), - SIR_STALL_RESTART, - /* - ** Then jump to a certain point in tryloop. - ** Due to the lack of indirect addressing the code - ** is self modifying here. - */ - SCR_JUMP, -}/*-------------------------< STARTPOS >--------------------*/,{ - PADDR(tryloop), -}/*-------------------------< TRYLOOP >---------------------*/,{ -/* -** Load an entry of the start queue into dsa -** and try to start it by jumping to TRYSEL. -** -** Because the size depends on the -** #define MAX_START parameter, it is filled -** in at runtime. -** -**----------------------------------------------------------- -** -** ##===========< I=0; i<MAX_START >=========== -** || SCR_COPY (4), -** || NADDR (squeue[i]), -** || RADDR (dsa), -** || SCR_CALL, -** || PADDR (trysel), -** ##========================================== -** -** SCR_JUMP, -** PADDR(tryloop), -** -**----------------------------------------------------------- -*/ -0 - -}/*-------------------------< TRYSEL >----------------------*/,{ - /* - ** Now: - ** DSA: Address of a Data Structure - ** or Address of the IDLE-Label. - ** - ** TEMP: Address of a script, which tries to - ** start the NEXT entry. - ** - ** Save the TEMP register into the SCRATCHA register. - ** Then copy the DSA to TEMP and RETURN. - ** This is kind of an indirect jump. - ** (The script processor has NO stack, so the - ** CALL is actually a jump and link, and the - ** RETURN is an indirect jump.) - ** - ** If the slot was empty, DSA contains the address - ** of the IDLE part of this script. The processor - ** jumps to IDLE and waits for a reselect. - ** It will wake up and try the same slot again - ** after the SIGP bit becomes set by the host. - ** - ** If the slot was not empty, DSA contains - ** the address of the phys-part of a ccb. - ** The processor jumps to this address. - ** phys starts with head, - ** head starts with launch, - ** so actually the processor jumps to - ** the lauch part. - ** If the entry is scheduled to be executed, - ** then launch contains a jump to SELECT. - ** If it's not scheduled, it contains a jump to IDLE. - */ - SCR_COPY (4), - RADDR (temp), - RADDR (scratcha), - SCR_COPY (4), - RADDR (dsa), - RADDR (temp), - SCR_RETURN, - 0 - -}/*-------------------------< SKIP >------------------------*/,{ - /* - ** This entry has been canceled. - ** Next time use the next slot. - */ - SCR_COPY (4), - RADDR (scratcha), - PADDR (startpos), - /* - ** patch the launch field. - ** should look like an idle process. - */ - SCR_COPY (4), - RADDR (dsa), - PADDR (skip2), - SCR_COPY (8), - PADDR (idle), -}/*-------------------------< SKIP2 >-----------------------*/,{ - 0, - SCR_JUMP, - PADDR(start), -}/*-------------------------< IDLE >------------------------*/,{ - /* - ** Nothing to do? - ** Wait for reselect. - */ - SCR_JUMP, - PADDR(reselect), - -}/*-------------------------< SELECT >----------------------*/,{ - /* - ** DSA contains the address of a scheduled - ** data structure. - ** - ** SCRATCHA contains the address of the script, - ** which starts the next entry. - ** - ** Set Initiator mode. - ** - ** (Target mode is left as an exercise for the student) - */ - - SCR_CLR (SCR_TRG), - 0, - SCR_LOAD_REG (HS_REG, 0xff), - 0, - - /* - ** And try to select this target. - */ - SCR_SEL_TBL_ATN ^ offsetof (struct dsb, select), - PADDR (reselect), - - /* - ** Now there are 4 possibilities: - ** - ** (1) The ncr looses arbitration. - ** This is ok, because it will try again, - ** when the bus becomes idle. - ** (But beware of the timeout function!) - ** - ** (2) The ncr is reselected. - ** Then the script processor takes the jump - ** to the RESELECT label. - ** - ** (3) The ncr completes the selection. - ** Then it will execute the next statement. - ** - ** (4) There is a selection timeout. - ** Then the ncr should interrupt the host and stop. - ** Unfortunately, it seems to continue execution - ** of the script. But it will fail with an - ** IID-interrupt on the next WHEN. - */ - - SCR_JUMPR ^ IFTRUE (WHEN (SCR_MSG_IN)), - 0, - - /* - ** Save target id to ctest0 register - */ - - SCR_FROM_REG (sdid), - 0, - SCR_TO_REG (ctest0), - 0, - /* - ** Send the IDENTIFY and SIMPLE_TAG messages - ** (and the M_X_SYNC_REQ message) - */ - SCR_MOVE_TBL ^ SCR_MSG_OUT, - offsetof (struct dsb, smsg), - SCR_JUMPR ^ IFTRUE (WHEN (SCR_MSG_OUT)), - -16, - SCR_CLR (SCR_ATN), - 0, - SCR_COPY (1), - RADDR (sfbr), - NADDR (lastmsg), - /* - ** Selection complete. - ** Next time use the next slot. - */ - SCR_COPY (4), - RADDR (scratcha), - PADDR (startpos), -}/*-------------------------< PREPARE >----------------------*/,{ - /* - ** The ncr doesn't have an indirect load - ** or store command. So we have to - ** copy part of the control block to a - ** fixed place, where we can access it. - ** - ** We patch the address part of a - ** COPY command with the DSA-register. - */ - SCR_COPY (4), - RADDR (dsa), - PADDR (loadpos), - /* - ** then we do the actual copy. - */ - SCR_COPY (sizeof (struct head)), - /* - ** continued after the next label ... - */ - -}/*-------------------------< LOADPOS >---------------------*/,{ - 0, - NADDR (header), - /* - ** Mark this ccb as not scheduled. - */ - SCR_COPY (8), - PADDR (idle), - NADDR (header.launch), - /* - ** Set a time stamp for this selection - */ - SCR_COPY (sizeof (struct timeval)), - (ncrcmd) &time, - NADDR (header.stamp.select), - /* - ** load the savep (saved pointer) into - ** the TEMP register (actual pointer) - */ - SCR_COPY (4), - NADDR (header.savep), - RADDR (temp), - /* - ** Initialize the status registers - */ - SCR_COPY (4), - NADDR (header.status), - RADDR (scr0), - -}/*-------------------------< PREPARE2 >---------------------*/,{ - /* - ** Load the synchronous mode register - */ - SCR_COPY (1), - NADDR (sync_st), - RADDR (sxfer), - /* - ** Load the wide mode and timing register - */ - SCR_COPY (1), - NADDR (wide_st), - RADDR (scntl3), - /* - ** Initialize the msgout buffer with a NOOP message. - */ - SCR_LOAD_REG (scratcha, M_NOOP), - 0, - SCR_COPY (1), - RADDR (scratcha), - NADDR (msgout), - SCR_COPY (1), - RADDR (scratcha), - NADDR (msgin), - /* - ** Message in phase ? - */ - SCR_JUMP ^ IFFALSE (WHEN (SCR_MSG_IN)), - PADDR (dispatch), - /* - ** Extended or reject message ? - */ - SCR_FROM_REG (sbdl), - 0, - SCR_JUMP ^ IFTRUE (DATA (M_EXTENDED)), - PADDR (msg_in), - SCR_JUMP ^ IFTRUE (DATA (M_REJECT)), - PADDR (msg_reject), - /* - ** normal processing - */ - SCR_JUMP, - PADDR (dispatch), -}/*-------------------------< SETMSG >----------------------*/,{ - SCR_COPY (1), - RADDR (scratcha), - NADDR (msgout), - SCR_SET (SCR_ATN), - 0, -}/*-------------------------< CLRACK >----------------------*/,{ - /* - ** Terminate possible pending message phase. - */ - SCR_CLR (SCR_ACK), - 0, - -}/*-----------------------< DISPATCH >----------------------*/,{ - SCR_FROM_REG (HS_REG), - 0, - SCR_INT ^ IFTRUE (DATA (HS_NEGOTIATE)), - SIR_NEGO_FAILED, - SCR_RETURN ^ IFTRUE (WHEN (SCR_DATA_OUT)), - 0, - SCR_RETURN ^ IFTRUE (IF (SCR_DATA_IN)), - 0, - SCR_JUMP ^ IFTRUE (IF (SCR_MSG_OUT)), - PADDR (msg_out), - SCR_JUMP ^ IFTRUE (IF (SCR_MSG_IN)), - PADDR (msg_in), - SCR_JUMP ^ IFTRUE (IF (SCR_COMMAND)), - PADDR (command), - SCR_JUMP ^ IFTRUE (IF (SCR_STATUS)), - PADDR (status), - /* - ** Discard one illegal phase byte, if required. - */ - SCR_LOAD_REG (scratcha, XE_BAD_PHASE), - 0, - SCR_COPY (1), - RADDR (scratcha), - NADDR (xerr_st), - SCR_JUMPR ^ IFFALSE (IF (SCR_ILG_OUT)), - 8, - SCR_MOVE_ABS (1) ^ SCR_ILG_OUT, - NADDR (scratch), - SCR_JUMPR ^ IFFALSE (IF (SCR_ILG_IN)), - 8, - SCR_MOVE_ABS (1) ^ SCR_ILG_IN, - NADDR (scratch), - SCR_JUMP, - PADDR (dispatch), - -}/*-------------------------< NO_DATA >--------------------*/,{ - /* - ** The target wants to tranfer too much data - ** or in the wrong direction. - ** Remember that in extended error. - */ - SCR_LOAD_REG (scratcha, XE_EXTRA_DATA), - 0, - SCR_COPY (1), - RADDR (scratcha), - NADDR (xerr_st), - /* - ** Discard one data byte, if required. - */ - SCR_JUMPR ^ IFFALSE (WHEN (SCR_DATA_OUT)), - 8, - SCR_MOVE_ABS (1) ^ SCR_DATA_OUT, - NADDR (scratch), - SCR_JUMPR ^ IFFALSE (IF (SCR_DATA_IN)), - 8, - SCR_MOVE_ABS (1) ^ SCR_DATA_IN, - NADDR (scratch), - /* - ** .. and repeat as required. - */ - SCR_CALL, - PADDR (dispatch), - SCR_JUMP, - PADDR (no_data), -}/*-------------------------< CHECKATN >--------------------*/,{ - /* - ** If AAP (bit 1 of scntl0 register) is set - ** and a parity error is detected, - ** the script processor asserts ATN. - ** - ** The target should switch to a MSG_OUT phase - ** to get the message. - */ - SCR_FROM_REG (socl), - 0, - SCR_JUMP ^ IFFALSE (MASK (CATN, CATN)), - PADDR (dispatch), - /* - ** count it - */ - SCR_REG_REG (PS_REG, SCR_ADD, 1), - 0, - /* - ** Prepare a M_ID_ERROR message - ** (initiator detected error). - ** The target should retry the transfer. - */ - SCR_LOAD_REG (scratcha, M_ID_ERROR), - 0, - SCR_JUMP, - PADDR (setmsg), - -}/*-------------------------< COMMAND >--------------------*/,{ - /* - ** If this is not a GETCC transfer ... - */ - SCR_FROM_REG (SS_REG), - 0, -/*<<<*/ SCR_JUMPR ^ IFTRUE (DATA (S_CHECK_COND)), - 28, - /* - ** ... set a timestamp ... - */ - SCR_COPY (sizeof (struct timeval)), - (ncrcmd) &time, - NADDR (header.stamp.command), - /* - ** ... and send the command - */ - SCR_MOVE_TBL ^ SCR_COMMAND, - offsetof (struct dsb, cmd), - SCR_JUMP, - PADDR (dispatch), - /* - ** Send the GETCC command - */ -/*>>>*/ SCR_MOVE_ABS (6) ^ SCR_COMMAND, - (ncrcmd) &rs_cmd, - SCR_JUMP, - PADDR (dispatch), - -}/*-------------------------< STATUS >--------------------*/,{ - /* - ** set the timestamp. - */ - SCR_COPY (sizeof (struct timeval)), - (ncrcmd) &time, - NADDR (header.stamp.status), - /* - ** If this is a GETCC transfer, - */ - SCR_FROM_REG (SS_REG), - 0, -/*<<<*/ SCR_JUMPR ^ IFFALSE (DATA (S_CHECK_COND)), - 40, - /* - ** get the status - */ - SCR_MOVE_ABS (1) ^ SCR_STATUS, - NADDR (scratch), - /* - ** Save status to scsi_status. - ** Mark as complete. - ** And wait for disconnect. - */ - SCR_TO_REG (SS_REG), - 0, - SCR_REG_REG (SS_REG, SCR_OR, S_SENSE), - 0, - SCR_LOAD_REG (HS_REG, HS_COMPLETE), - 0, - SCR_JUMP, - PADDR (checkatn), - /* - ** If it was no GETCC transfer, - ** save the status to scsi_status. - */ -/*>>>*/ SCR_MOVE_ABS (1) ^ SCR_STATUS, - NADDR (scratch), - SCR_TO_REG (SS_REG), - 0, - /* - ** if it was no check condition ... - */ - SCR_JUMP ^ IFTRUE (DATA (S_CHECK_COND)), - PADDR (checkatn), - /* - ** ... mark as complete. - */ - SCR_LOAD_REG (HS_REG, HS_COMPLETE), - 0, - SCR_JUMP, - PADDR (checkatn), - -}/*-------------------------< MSG_IN >--------------------*/,{ - /* - ** Get the first byte of the message - ** and save it to SCRATCHA. - ** - ** The script processor doesn't negate the - ** ACK signal after this transfer. - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_IN, - NADDR (msgin[0]), - /* - ** Check for message parity error. - */ - SCR_TO_REG (scratcha), - 0, - SCR_FROM_REG (socl), - 0, - SCR_JUMP ^ IFTRUE (MASK (CATN, CATN)), - PADDR (msg_parity), - SCR_FROM_REG (scratcha), - 0, - /* - ** Parity was ok, handle this message. - */ - SCR_JUMP ^ IFTRUE (DATA (M_COMPLETE)), - PADDR (complete), - SCR_JUMP ^ IFTRUE (DATA (M_SAVE_DP)), - PADDR (save_dp), - SCR_JUMP ^ IFTRUE (DATA (M_RESTORE_DP)), - PADDR (restore_dp), - SCR_JUMP ^ IFTRUE (DATA (M_DISCONNECT)), - PADDR (disconnect), - SCR_JUMP ^ IFTRUE (DATA (M_EXTENDED)), - PADDR (msg_extended), - SCR_JUMP ^ IFTRUE (DATA (M_NOOP)), - PADDR (clrack), - SCR_JUMP ^ IFTRUE (DATA (M_REJECT)), - PADDR (msg_reject), - SCR_JUMP ^ IFTRUE (DATA (M_IGN_RESIDUE)), - PADDR (msg_ign_residue), - /* - ** Rest of the messages left as - ** an exercise ... - ** - ** Unimplemented messages: - ** fall through to MSG_BAD. - */ -}/*-------------------------< MSG_BAD >------------------*/,{ - /* - ** unimplemented message - reject it. - */ - SCR_INT, - SIR_REJECT_SENT, - SCR_LOAD_REG (scratcha, M_REJECT), - 0, - SCR_JUMP, - PADDR (setmsg), - -}/*-------------------------< MSG_PARITY >---------------*/,{ - /* - ** count it - */ - SCR_REG_REG (PS_REG, SCR_ADD, 0x01), - 0, - /* - ** send a "message parity error" message. - */ - SCR_LOAD_REG (scratcha, M_PARITY), - 0, - SCR_JUMP, - PADDR (setmsg), -}/*-------------------------< MSG_REJECT >---------------*/,{ - /* - ** If a negotiation was in progress, - ** negotiation failed. - */ - SCR_FROM_REG (HS_REG), - 0, - SCR_INT ^ IFTRUE (DATA (HS_NEGOTIATE)), - SIR_NEGO_FAILED, - /* - ** else make host log this message - */ - SCR_INT ^ IFFALSE (DATA (HS_NEGOTIATE)), - SIR_REJECT_RECEIVED, - SCR_JUMP, - PADDR (clrack), - -}/*-------------------------< MSG_IGN_RESIDUE >----------*/,{ - /* - ** Terminate cycle - */ - SCR_CLR (SCR_ACK), - 0, - SCR_JUMP ^ IFFALSE (WHEN (SCR_MSG_IN)), - PADDR (dispatch), - /* - ** get residue size. - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_IN, - NADDR (msgin[1]), - /* - ** Check for message parity error. - */ - SCR_TO_REG (scratcha), - 0, - SCR_FROM_REG (socl), - 0, - SCR_JUMP ^ IFTRUE (MASK (CATN, CATN)), - PADDR (msg_parity), - SCR_FROM_REG (scratcha), - 0, - /* - ** Size is 0 .. ignore message. - */ - SCR_JUMP ^ IFTRUE (DATA (0)), - PADDR (clrack), - /* - ** Size is not 1 .. have to interrupt. - */ -/*<<<*/ SCR_JUMPR ^ IFFALSE (DATA (1)), - 40, - /* - ** Check for residue byte in swide register - */ - SCR_FROM_REG (scntl2), - 0, -/*<<<*/ SCR_JUMPR ^ IFFALSE (MASK (WSR, WSR)), - 16, - /* - ** There IS data in the swide register. - ** Discard it. - */ - SCR_REG_REG (scntl2, SCR_OR, WSR), - 0, - SCR_JUMP, - PADDR (clrack), - /* - ** Load again the size to the sfbr register. - */ -/*>>>*/ SCR_FROM_REG (scratcha), - 0, -/*>>>*/ SCR_INT, - SIR_IGN_RESIDUE, - SCR_JUMP, - PADDR (clrack), - -}/*-------------------------< MSG_EXTENDED >-------------*/,{ - /* - ** Terminate cycle - */ - SCR_CLR (SCR_ACK), - 0, - SCR_JUMP ^ IFFALSE (WHEN (SCR_MSG_IN)), - PADDR (dispatch), - /* - ** get length. - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_IN, - NADDR (msgin[1]), - /* - ** Check for message parity error. - */ - SCR_TO_REG (scratcha), - 0, - SCR_FROM_REG (socl), - 0, - SCR_JUMP ^ IFTRUE (MASK (CATN, CATN)), - PADDR (msg_parity), - SCR_FROM_REG (scratcha), - 0, - /* - */ - SCR_JUMP ^ IFTRUE (DATA (3)), - PADDR (msg_ext_3), - SCR_JUMP ^ IFFALSE (DATA (2)), - PADDR (msg_bad), -}/*-------------------------< MSG_EXT_2 >----------------*/,{ - SCR_CLR (SCR_ACK), - 0, - SCR_JUMP ^ IFFALSE (WHEN (SCR_MSG_IN)), - PADDR (dispatch), - /* - ** get extended message code. - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_IN, - NADDR (msgin[2]), - /* - ** Check for message parity error. - */ - SCR_TO_REG (scratcha), - 0, - SCR_FROM_REG (socl), - 0, - SCR_JUMP ^ IFTRUE (MASK (CATN, CATN)), - PADDR (msg_parity), - SCR_FROM_REG (scratcha), - 0, - SCR_JUMP ^ IFTRUE (DATA (M_X_WIDE_REQ)), - PADDR (msg_wdtr), - /* - ** unknown extended message - */ - SCR_JUMP, - PADDR (msg_bad) -}/*-------------------------< MSG_WDTR >-----------------*/,{ - SCR_CLR (SCR_ACK), - 0, - SCR_JUMP ^ IFFALSE (WHEN (SCR_MSG_IN)), - PADDR (dispatch), - /* - ** get data bus width - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_IN, - NADDR (msgin[3]), - SCR_FROM_REG (socl), - 0, - SCR_JUMP ^ IFTRUE (MASK (CATN, CATN)), - PADDR (msg_parity), - /* - ** let the host do the real work. - */ - SCR_INT, - SIR_NEGO_WIDE, - /* - ** let the target fetch our answer. - */ - SCR_SET (SCR_ATN), - 0, - SCR_CLR (SCR_ACK), - 0, - - SCR_INT ^ IFFALSE (WHEN (SCR_MSG_OUT)), - SIR_NEGO_PROTO, - /* - ** Send the M_X_WIDE_REQ - */ - SCR_MOVE_ABS (4) ^ SCR_MSG_OUT, - NADDR (msgout), - SCR_CLR (SCR_ATN), - 0, - SCR_COPY (1), - RADDR (sfbr), - NADDR (lastmsg), - SCR_JUMP, - PADDR (msg_out_done), - -}/*-------------------------< MSG_EXT_3 >----------------*/,{ - SCR_CLR (SCR_ACK), - 0, - SCR_JUMP ^ IFFALSE (WHEN (SCR_MSG_IN)), - PADDR (dispatch), - /* - ** get extended message code. - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_IN, - NADDR (msgin[2]), - /* - ** Check for message parity error. - */ - SCR_TO_REG (scratcha), - 0, - SCR_FROM_REG (socl), - 0, - SCR_JUMP ^ IFTRUE (MASK (CATN, CATN)), - PADDR (msg_parity), - SCR_FROM_REG (scratcha), - 0, - SCR_JUMP ^ IFTRUE (DATA (M_X_SYNC_REQ)), - PADDR (msg_sdtr), - /* - ** unknown extended message - */ - SCR_JUMP, - PADDR (msg_bad) - -}/*-------------------------< MSG_SDTR >-----------------*/,{ - SCR_CLR (SCR_ACK), - 0, - SCR_JUMP ^ IFFALSE (WHEN (SCR_MSG_IN)), - PADDR (dispatch), - /* - ** get period and offset - */ - SCR_MOVE_ABS (2) ^ SCR_MSG_IN, - NADDR (msgin[3]), - SCR_FROM_REG (socl), - 0, - SCR_JUMP ^ IFTRUE (MASK (CATN, CATN)), - PADDR (msg_parity), - /* - ** let the host do the real work. - */ - SCR_INT, - SIR_NEGO_SYNC, - /* - ** let the target fetch our answer. - */ - SCR_SET (SCR_ATN), - 0, - SCR_CLR (SCR_ACK), - 0, - - SCR_INT ^ IFFALSE (WHEN (SCR_MSG_OUT)), - SIR_NEGO_PROTO, - /* - ** Send the M_X_SYNC_REQ - */ - SCR_MOVE_ABS (5) ^ SCR_MSG_OUT, - NADDR (msgout), - SCR_CLR (SCR_ATN), - 0, - SCR_COPY (1), - RADDR (sfbr), - NADDR (lastmsg), - SCR_JUMP, - PADDR (msg_out_done), - -}/*-------------------------< COMPLETE >-----------------*/,{ - /* - ** Complete message. - ** - ** If it's not the get condition code, - ** copy TEMP register to LASTP in header. - */ - SCR_FROM_REG (SS_REG), - 0, -/*<<<*/ SCR_JUMPR ^ IFTRUE (MASK (S_SENSE, S_SENSE)), - 12, - SCR_COPY (4), - RADDR (temp), - NADDR (header.lastp), -/*>>>*/ /* - ** When we terminate the cycle by clearing ACK, - ** the target may disconnect immediately. - ** - ** We don't want to be told of an - ** "unexpected disconnect", - ** so we disable this feature. - */ - SCR_REG_REG (scntl2, SCR_AND, 0x7f), - 0, - /* - ** Terminate cycle ... - */ - SCR_CLR (SCR_ACK), - 0, - /* - ** ... and wait for the disconnect. - */ - SCR_WAIT_DISC, - 0, -}/*-------------------------< CLEANUP >-------------------*/,{ - /* - ** dsa: Pointer to ccb - ** or xxxxxxFF (no ccb) - ** - ** HS_REG: Host-Status (<>0!) - */ - SCR_FROM_REG (dsa), - 0, - SCR_JUMP ^ IFTRUE (DATA (0xff)), - PADDR (signal), - /* - ** dsa is valid. - ** save the status registers - */ - SCR_COPY (4), - RADDR (scr0), - NADDR (header.status), - /* - ** and copy back the header to the ccb. - */ - SCR_COPY (4), - RADDR (dsa), - PADDR (cleanup0), - SCR_COPY (sizeof (struct head)), - NADDR (header), -}/*-------------------------< CLEANUP0 >--------------------*/,{ - 0, - - /* - ** If command resulted in "check condition" - ** status and is not yet completed, - ** try to get the condition code. - */ - SCR_FROM_REG (HS_REG), - 0, -/*<<<*/ SCR_JUMPR ^ IFFALSE (MASK (0, HS_DONEMASK)), - 16, - SCR_FROM_REG (SS_REG), - 0, - SCR_JUMP ^ IFTRUE (DATA (S_CHECK_COND)), - PADDR(getcc2), - /* - ** And make the DSA register invalid. - */ -/*>>>*/ SCR_LOAD_REG (dsa, 0xff), /* invalid */ - 0, -}/*-------------------------< SIGNAL >----------------------*/,{ - /* - ** if status = queue full, - ** reinsert in startqueue and stall queue. - */ - SCR_FROM_REG (SS_REG), - 0, - SCR_INT ^ IFTRUE (DATA (S_QUEUE_FULL)), - SIR_STALL_QUEUE, - /* - ** if job completed ... - */ - SCR_FROM_REG (HS_REG), - 0, - /* - ** ... signal completion to the host - */ - SCR_INT_FLY ^ IFFALSE (MASK (0, HS_DONEMASK)), - 0, - /* - ** Auf zu neuen Schandtaten! - */ - SCR_JUMP, - PADDR(start), - -}/*-------------------------< SAVE_DP >------------------*/,{ - /* - ** SAVE_DP message: - ** Copy TEMP register to SAVEP in header. - */ - SCR_COPY (4), - RADDR (temp), - NADDR (header.savep), - SCR_JUMP, - PADDR (clrack), -}/*-------------------------< RESTORE_DP >---------------*/,{ - /* - ** RESTORE_DP message: - ** Copy SAVEP in header to TEMP register. - */ - SCR_COPY (4), - NADDR (header.savep), - RADDR (temp), - SCR_JUMP, - PADDR (clrack), - -}/*-------------------------< DISCONNECT >---------------*/,{ - /* - ** If QUIRK_AUTOSAVE is set, - ** do an "save pointer" operation. - */ - SCR_FROM_REG (QU_REG), - 0, -/*<<<*/ SCR_JUMPR ^ IFFALSE (MASK (QUIRK_AUTOSAVE, QUIRK_AUTOSAVE)), - 12, - /* - ** like SAVE_DP message: - ** Copy TEMP register to SAVEP in header. - */ - SCR_COPY (4), - RADDR (temp), - NADDR (header.savep), -/*>>>*/ /* - ** Check if temp==savep or temp==goalp: - ** if not, log a missing save pointer message. - ** In fact, it's a comparation mod 256. - ** - ** Hmmm, I hadn't thought that I would be urged to - ** write this kind of ugly self modifying code. - ** - ** It's unbelievable, but the ncr53c8xx isn't able - ** to subtract one register from another. - */ - SCR_FROM_REG (temp), - 0, - /* - ** You are not expected to understand this .. - */ - SCR_COPY (1), - NADDR (header.savep), - PADDR (disconnect0), -}/*-------------------------< DISCONNECT0 >--------------*/,{ -/*<<<*/ SCR_JUMPR ^ IFTRUE (DATA (1)), - 20, - /* - ** neither this - */ - SCR_COPY (1), - NADDR (header.goalp), - PADDR (disconnect1), -}/*-------------------------< DISCONNECT1 >--------------*/,{ - SCR_INT ^ IFFALSE (DATA (1)), - SIR_MISSING_SAVE, -/*>>>*/ - - /* - ** DISCONNECTing ... - ** - ** Disable the "unexpected disconnect" feature. - */ - SCR_REG_REG (scntl2, SCR_AND, 0x7f), - 0, - SCR_CLR (SCR_ACK), - 0, - /* - ** Wait for the disconnect. - */ - SCR_WAIT_DISC, - 0, - /* - ** Profiling: - ** Set a time stamp, - ** and count the disconnects. - */ - SCR_COPY (sizeof (struct timeval)), - (ncrcmd) &time, - NADDR (header.stamp.disconnect), - SCR_COPY (4), - NADDR (disc_phys), - RADDR (temp), - SCR_REG_REG (temp, SCR_ADD, 0x01), - 0, - SCR_COPY (4), - RADDR (temp), - NADDR (disc_phys), - /* - ** Status is: DISCONNECTED. - */ - SCR_LOAD_REG (HS_REG, HS_DISCONNECT), - 0, - SCR_JUMP, - PADDR (cleanup), - -}/*-------------------------< MSG_OUT >-------------------*/,{ - /* - ** The target requests a message. - ** First remove ATN so the target will - ** not continue fetching messages. - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_OUT, - NADDR (msgout), - SCR_COPY (1), - RADDR (sfbr), - NADDR (lastmsg), - /* - ** If it was no ABORT message ... - */ - SCR_JUMP ^ IFTRUE (DATA (M_ABORT)), - PADDR (msg_out_abort), - /* - ** ... wait for the next phase - ** if it's a message out, send it again, ... - */ - SCR_JUMP ^ IFTRUE (WHEN (SCR_MSG_OUT)), - PADDR (msg_out), -}/*-------------------------< MSG_OUT_DONE >--------------*/,{ - /* - ** ... else clear the message ... - */ - SCR_LOAD_REG (scratcha, M_NOOP), - 0, - SCR_COPY (4), - RADDR (scratcha), - NADDR (msgout), - /* - ** ... and process the next phase - */ - SCR_JUMP, - PADDR (dispatch), -}/*-------------------------< MSG_OUT_ABORT >-------------*/,{ - /* - ** After ABORT message, - ** - ** expect an immediate disconnect, ... - */ - SCR_REG_REG (scntl2, SCR_AND, 0x7f), - 0, - SCR_CLR (SCR_ACK), - 0, - SCR_WAIT_DISC, - 0, - /* - ** ... and set the status to "ABORTED" - */ - SCR_LOAD_REG (HS_REG, HS_ABORTED), - 0, - SCR_JUMP, - PADDR (cleanup), - -}/*-------------------------< GETCC >-----------------------*/,{ - /* - ** The ncr doesn't have an indirect load - ** or store command. So we have to - ** copy part of the control block to a - ** fixed place, where we can modify it. - ** - ** We patch the address part of a COPY command - ** with the address of the dsa register ... - */ - SCR_COPY (4), - RADDR (dsa), - PADDR (getcc1), - /* - ** ... then we do the actual copy. - */ - SCR_COPY (sizeof (struct head)), -}/*-------------------------< GETCC1 >----------------------*/,{ - 0, - NADDR (header), - /* - ** Initialize the status registers - */ - SCR_COPY (4), - NADDR (header.status), - RADDR (scr0), -}/*-------------------------< GETCC2 >----------------------*/,{ - /* - ** Get the condition code from a target. - ** - ** DSA points to a data structure. - ** Set TEMP to the script location - ** that receives the condition code. - ** - ** Because there is no script command - ** to load a longword into a register, - ** we use a CALL command. - */ -/*<<<*/ SCR_CALLR, - 24, - /* - ** Get the condition code. - */ - SCR_MOVE_TBL ^ SCR_DATA_IN, - offsetof (struct dsb, sense), - /* - ** No data phase may follow! - */ - SCR_CALL, - PADDR (checkatn), - SCR_JUMP, - PADDR (no_data), -/*>>>*/ - - /* - ** The CALL jumps to this point. - ** Prepare for a RESTORE_POINTER message. - ** Save the TEMP register into the saved pointer. - */ - SCR_COPY (4), - RADDR (temp), - NADDR (header.savep), - /* - ** Load scratcha, because in case of a selection timeout, - ** the host will expect a new value for startpos in - ** the scratcha register. - */ - SCR_COPY (4), - PADDR (startpos), - RADDR (scratcha), - /* - ** If QUIRK_NOMSG is set, select without ATN. - ** and don't send a message. - */ - SCR_FROM_REG (QU_REG), - 0, - SCR_JUMP ^ IFTRUE (MASK (QUIRK_NOMSG, QUIRK_NOMSG)), - PADDR(getcc3), - /* - ** Then try to connect to the target. - ** If we are reselected, special treatment - ** of the current job is required before - ** accepting the reselection. - */ - SCR_SEL_TBL_ATN ^ offsetof (struct dsb, select), - PADDR(badgetcc), - /* - ** save target id. - */ - SCR_FROM_REG (sdid), - 0, - SCR_TO_REG (ctest0), - 0, - /* - ** Send the IDENTIFY message. - ** In case of short transfer, remove ATN. - */ - SCR_MOVE_TBL ^ SCR_MSG_OUT, - offsetof (struct dsb, smsg2), - SCR_CLR (SCR_ATN), - 0, - /* - ** save the first byte of the message. - */ - SCR_COPY (1), - RADDR (sfbr), - NADDR (lastmsg), - SCR_JUMP, - PADDR (prepare2), - -}/*-------------------------< GETCC3 >----------------------*/,{ - /* - ** Try to connect to the target. - ** If we are reselected, special treatment - ** of the current job is required before - ** accepting the reselection. - ** - ** Silly target won't accept a message. - ** Select without ATN. - */ - SCR_SEL_TBL ^ offsetof (struct dsb, select), - PADDR(badgetcc), - /* - ** save target id. - */ - SCR_FROM_REG (sdid), - 0, - SCR_TO_REG (ctest0), - 0, - /* - ** Force error if selection timeout - */ - SCR_JUMPR ^ IFTRUE (WHEN (SCR_MSG_IN)), - 0, - /* - ** don't negotiate. - */ - SCR_JUMP, - PADDR (prepare2), - -}/*------------------------< BADGETCC >---------------------*/,{ - /* - ** If SIGP was set, clear it and try again. - */ - SCR_FROM_REG (ctest2), - 0, - SCR_JUMP ^ IFTRUE (MASK (CSIGP,CSIGP)), - PADDR (getcc2), - SCR_INT, - SIR_SENSE_FAILED, -}/*-------------------------< RESELECT >--------------------*/,{ - /* - ** make the DSA invalid. - */ - SCR_LOAD_REG (dsa, 0xff), - 0, - SCR_CLR (SCR_TRG), - 0, - /* - ** Sleep waiting for a reselection. - ** If SIGP is set, special treatment. - ** - ** Zu allem bereit .. - */ - SCR_WAIT_RESEL, - PADDR(reselect2), - /* - ** ... zu nichts zu gebrauchen ? - ** - ** load the target id into the SFBR - ** and jump to the control block. - ** - ** Look at the declarations of - ** - struct ncb - ** - struct tcb - ** - struct lcb - ** - struct ccb - ** to understand what's going on. - */ - SCR_REG_SFBR (ssid, SCR_AND, 0x87), - 0, - SCR_TO_REG (ctest0), - 0, - SCR_JUMP, - NADDR (jump_tcb), -}/*-------------------------< RESELECT2 >-------------------*/,{ - /* - ** If it's not connected :( - ** -> interrupted by SIGP bit. - ** Jump to start. - */ - SCR_FROM_REG (ctest2), - 0, - SCR_JUMP ^ IFTRUE (MASK (CSIGP,CSIGP)), - PADDR (start), - SCR_JUMP, - PADDR (reselect), - -}/*-------------------------< RESEL_TMP >-------------------*/,{ - /* - ** The return address in TEMP - ** is in fact the data structure address, - ** so copy it to the DSA register. - */ - SCR_COPY (4), - RADDR (temp), - RADDR (dsa), - SCR_JUMP, - PADDR (prepare), - -}/*-------------------------< RESEL_LUN >-------------------*/,{ - /* - ** come back to this point - ** to get an IDENTIFY message - ** Wait for a msg_in phase. - */ -/*<<<*/ SCR_JUMPR ^ IFFALSE (WHEN (SCR_MSG_IN)), - 48, - /* - ** message phase - ** It's not a sony, it's a trick: - ** read the data without acknowledging it. - */ - SCR_FROM_REG (sbdl), - 0, -/*<<<*/ SCR_JUMPR ^ IFFALSE (MASK (M_IDENTIFY, 0x98)), - 32, - /* - ** It WAS an Identify message. - ** get it and ack it! - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_IN, - NADDR (msgin), - SCR_CLR (SCR_ACK), - 0, - /* - ** Mask out the LUN. - */ - SCR_REG_REG (sfbr, SCR_AND, 0x07), - 0, - SCR_RETURN, - 0, - /* - ** No message phase or no IDENTIFY message: - ** return 0. - */ -/*>>>*/ SCR_LOAD_SFBR (0), - 0, - SCR_RETURN, - 0, - -}/*-------------------------< RESEL_TAG >-------------------*/,{ - /* - ** come back to this point - ** to get a SIMPLE_TAG message - ** Wait for a MSG_IN phase. - */ -/*<<<*/ SCR_JUMPR ^ IFFALSE (WHEN (SCR_MSG_IN)), - 64, - /* - ** message phase - ** It's a trick - read the data - ** without acknowledging it. - */ - SCR_FROM_REG (sbdl), - 0, -/*<<<*/ SCR_JUMPR ^ IFFALSE (DATA (M_SIMPLE_TAG)), - 48, - /* - ** It WAS a SIMPLE_TAG message. - ** get it and ack it! - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_IN, - NADDR (msgin), - SCR_CLR (SCR_ACK), - 0, - /* - ** Wait for the second byte (the tag) - */ -/*<<<*/ SCR_JUMPR ^ IFFALSE (WHEN (SCR_MSG_IN)), - 24, - /* - ** Get it and ack it! - */ - SCR_MOVE_ABS (1) ^ SCR_MSG_IN, - NADDR (msgin), - SCR_CLR (SCR_ACK|SCR_CARRY), - 0, - SCR_RETURN, - 0, - /* - ** No message phase or no SIMPLE_TAG message - ** or no second byte: return 0. - */ -/*>>>*/ SCR_LOAD_SFBR (0), - 0, - SCR_SET (SCR_CARRY), - 0, - SCR_RETURN, - 0, - -}/*-------------------------< DATA_IN >--------------------*/,{ -/* -** Because the size depends on the -** #define MAX_SCATTER parameter, -** it is filled in at runtime. -** -** SCR_JUMP ^ IFFALSE (WHEN (SCR_DATA_IN)), -** PADDR (no_data), -** SCR_COPY (sizeof (struct timeval)), -** (ncrcmd) &time, -** NADDR (header.stamp.data), -** SCR_MOVE_TBL ^ SCR_DATA_IN, -** offsetof (struct dsb, data[ 0]), -** -** ##===========< i=1; i<MAX_SCATTER >========= -** || SCR_CALL ^ IFFALSE (WHEN (SCR_DATA_IN)), -** || PADDR (checkatn), -** || SCR_MOVE_TBL ^ SCR_DATA_IN, -** || offsetof (struct dsb, data[ i]), -** ##========================================== -** -** SCR_CALL, -** PADDR (checkatn), -** SCR_JUMP, -** PADDR (no_data), -*/ -0 -}/*-------------------------< DATA_OUT >-------------------*/,{ -/* -** Because the size depends on the -** #define MAX_SCATTER parameter, -** it is filled in at runtime. -** -** SCR_JUMP ^ IFFALSE (WHEN (SCR_DATA_IN)), -** PADDR (no_data), -** SCR_COPY (sizeof (struct timeval)), -** (ncrcmd) &time, -** NADDR (header.stamp.data), -** SCR_MOVE_TBL ^ SCR_DATA_OUT, -** offsetof (struct dsb, data[ 0]), -** -** ##===========< i=1; i<MAX_SCATTER >========= -** || SCR_CALL ^ IFFALSE (WHEN (SCR_DATA_OUT)), -** || PADDR (dispatch), -** || SCR_MOVE_TBL ^ SCR_DATA_OUT, -** || offsetof (struct dsb, data[ i]), -** ##========================================== -** -** SCR_CALL, -** PADDR (dispatch), -** SCR_JUMP, -** PADDR (no_data), -** -**--------------------------------------------------------- -*/ -(u_long)&ident - -}/*-------------------------< ABORTTAG >-------------------*/,{ - /* - ** Abort a bad reselection. - ** Set the message to ABORT vs. ABORT_TAG - */ - SCR_LOAD_REG (scratcha, M_ABORT_TAG), - 0, - SCR_JUMPR ^ IFFALSE (CARRYSET), - 8, -}/*-------------------------< ABORT >----------------------*/,{ - SCR_LOAD_REG (scratcha, M_ABORT), - 0, - SCR_COPY (1), - RADDR (scratcha), - NADDR (msgout), - SCR_SET (SCR_ATN), - 0, - SCR_CLR (SCR_ACK), - 0, - /* - ** and send it. - ** we expect an immediate disconnect - */ - SCR_REG_REG (scntl2, SCR_AND, 0x7f), - 0, - SCR_MOVE_ABS (1) ^ SCR_MSG_OUT, - NADDR (msgout), - SCR_COPY (1), - RADDR (sfbr), - NADDR (lastmsg), - SCR_WAIT_DISC, - 0, - SCR_JUMP, - PADDR (start), -}/*-------------------------< SNOOPTEST >-------------------*/,{ - /* - ** Read the variable. - */ - SCR_COPY (4), - (ncrcmd) &ncr_cache, - RADDR (scratcha), - /* - ** Write the variable. - */ - SCR_COPY (4), - RADDR (temp), - (ncrcmd) &ncr_cache, - /* - ** Read back the variable. - */ - SCR_COPY (4), - (ncrcmd) &ncr_cache, - RADDR (temp), - /* - ** And stop. - */ - SCR_INT, - 99, -}/*--------------------------------------------------------*/ -}; - -/*========================================================== -** -** -** Fill in #define dependent parts of the script -** -** -**========================================================== -*/ - -void ncr_script_fill (struct script * scr) -{ - int i; - ncrcmd *p; - - p = scr->tryloop; - for (i=0; i<MAX_START; i++) { - *p++ =SCR_COPY (4); - *p++ =NADDR (squeue[i]); - *p++ =RADDR (dsa); - *p++ =SCR_CALL; - *p++ =PADDR (trysel); - }; - *p++ =SCR_JUMP; - *p++ =PADDR(tryloop); - - assert ((u_long)p == (u_long)&scr->tryloop + sizeof (scr->tryloop)); - - p = scr->data_in; - - *p++ =SCR_JUMP ^ IFFALSE (WHEN (SCR_DATA_IN)); - *p++ =PADDR (no_data); - *p++ =SCR_COPY (sizeof (struct timeval)); - *p++ =(ncrcmd) &time; - *p++ =NADDR (header.stamp.data); - *p++ =SCR_MOVE_TBL ^ SCR_DATA_IN; - *p++ =offsetof (struct dsb, data[ 0]); - - for (i=1; i<MAX_SCATTER; i++) { - *p++ =SCR_CALL ^ IFFALSE (WHEN (SCR_DATA_IN)); - *p++ =PADDR (checkatn); - *p++ =SCR_MOVE_TBL ^ SCR_DATA_IN; - *p++ =offsetof (struct dsb, data[i]); - }; - - *p++ =SCR_CALL; - *p++ =PADDR (checkatn); - *p++ =SCR_JUMP; - *p++ =PADDR (no_data); - - assert ((u_long)p == (u_long)&scr->data_in + sizeof (scr->data_in)); - - p = scr->data_out; - - *p++ =SCR_JUMP ^ IFFALSE (WHEN (SCR_DATA_OUT)); - *p++ =PADDR (no_data); - *p++ =SCR_COPY (sizeof (struct timeval)); - *p++ =(ncrcmd) &time; - *p++ =NADDR (header.stamp.data); - *p++ =SCR_MOVE_TBL ^ SCR_DATA_OUT; - *p++ =offsetof (struct dsb, data[ 0]); - - for (i=1; i<MAX_SCATTER; i++) { - *p++ =SCR_CALL ^ IFFALSE (WHEN (SCR_DATA_OUT)); - *p++ =PADDR (dispatch); - *p++ =SCR_MOVE_TBL ^ SCR_DATA_OUT; - *p++ =offsetof (struct dsb, data[i]); - }; - - *p++ =SCR_CALL; - *p++ =PADDR (dispatch); - *p++ =SCR_JUMP; - *p++ =PADDR (no_data); - - assert ((u_long)p == (u_long)&scr->data_out + sizeof (scr->data_out)); -} - -/*========================================================== -** -** -** Copy and rebind a script. -** -** -**========================================================== -*/ - -static void ncr_script_copy_and_bind (struct script *script, ncb_p np) -{ - ncrcmd opcode, new, old; - ncrcmd *src, *dst, *start, *end; - int relocs; - - np->script = (struct script *) - malloc (sizeof (struct script), M_DEVBUF, M_WAITOK); - np->p_script = vtophys(np->script); - - src = script->start; - dst = np->script->start; - - start = src; - end = src + (sizeof(struct script) / 4); - - while (src < end) { - - *dst++ = opcode = *src++; - - /* - ** If we forget to change the length - ** in struct script, a field will be - ** padded with 0. This is an illegal - ** command. - */ - - if (opcode == 0) { - printf ("%s: ERROR0 IN SCRIPT at %d.\n", - ncr_name(np), src-start-1); - DELAY (1000000); - }; - - if (DEBUG_FLAGS & DEBUG_SCRIPT) - printf ("%x: <%x>\n", - (unsigned)(src-1), (unsigned)opcode); - - /* - ** We don't have to decode ALL commands - */ - switch (opcode >> 28) { - - case 0xc: - /* - ** COPY has TWO arguments. - */ - relocs = 2; - if ((src[0] ^ src[1]) & 3) { - printf ("%s: ERROR1 IN SCRIPT at %d.\n", - ncr_name(np), src-start-1); - DELAY (1000000); - }; - break; - - case 0x0: - /* - ** MOVE (absolute address) - */ - relocs = 1; - break; - - case 0x8: - /* - ** JUMP / CALL - ** dont't relocate if relative :-) - */ - if (opcode & 0x00800000) - relocs = 0; - else - relocs = 1; - break; - - case 0x4: - case 0x5: - case 0x6: - case 0x7: - relocs = 1; - break; - - default: - relocs = 0; - break; - }; - - if (relocs) { - while (relocs--) { - old = *src++; - - switch (old & RELOC_MASK) { - case RELOC_REGISTER: - new = (old & ~RELOC_MASK) + np->paddr; - break; - case RELOC_LABEL: - new = (old & ~RELOC_MASK) + vtophys(np->script); - break; - case RELOC_SOFTC: - new = (old & ~RELOC_MASK) + vtophys(np); - break; - case 0: - /* Don't relocate a 0 address. */ - if (old == 0) { - new = old; - break; - } - /* fall through */ - default: - new = vtophys(old); - break; - } - - *dst++ = new; - } - } else - *dst++ = *src++; - - }; -} - -/*========================================================== -** -** -** Auto configuration. -** -** -**========================================================== -*/ - -/*---------------------------------------------------------- -** -** Reduce the transfer length to the max value -** we can transfer safely. -** -** Reading a block greater then MAX_SIZE from the -** raw (character) device exercises a memory leak -** in the vm subsystem. This is common to ALL devices. -** We have submitted a description of this bug to -** <FreeBSD-bugs@freefall.cdrom.com>. -** It should be fixed in the current release. -** -**---------------------------------------------------------- -*/ - -void ncr_min_phys (struct buf *bp) -{ - if (bp->b_bcount > MAX_SIZE) bp->b_bcount = MAX_SIZE; -} - -/*---------------------------------------------------------- -** -** Maximal number of outstanding requests per target. -** -**---------------------------------------------------------- -*/ - -U_INT32 ncr_info (int unit) -{ - return (1); /* may be changed later */ -} - -/*---------------------------------------------------------- -** -** Probe the hostadapter. -** -**---------------------------------------------------------- -*/ - -#ifdef __NetBSD__ - -int -ncr_probe(parent, self, aux) - struct device *parent, *self; - void *aux; -{ - struct cfdata *cf = self->dv_cfdata; - struct pci_attach_args *pa = aux; - - if (!pci_targmatch(cf, pa)) - return 0; - if (pa->pa_id != NCR_810_ID && - pa->pa_id != NCR_825_ID) - return 0; - - return 1; -} - -#else /* !__NetBSD__ */ - - -static char* ncr_probe (pcici_t tag, pcidi_t type) -{ - switch (type) { - - case NCR_810_ID: - return ("ncr 53c810 scsi"); - - case NCR_825_ID: - return ("ncr 53c825 wide scsi"); - } - return (0); -} - -#endif /* !__NetBSD__ */ - - -/*========================================================== -** -** -** Auto configuration: attach and init a host adapter. -** -** -**========================================================== -*/ - -#define MIN_ASYNC_PD 40 -#define MIN_SYNC_PD 20 - -#ifdef __NetBSD__ - -int -ncr_print() -{ -} - -void -ncr_attach(parent, self, aux) - struct device *parent, *self; - void *aux; -{ - struct pci_attach_args *pa = aux; - int retval; - ncb_p np = (void *)self; - - /* - ** XXX - ** Perhaps try to figure what which model chip it is and print that - ** out. - */ - printf("\n"); - - /* - ** Try to map the controller chip to - ** virtual and physical memory. - */ - - retval = pci_map_mem(pa->pa_tag, 0x14, &np->vaddr, &np->paddr); - if (retval) - return; - - np->sc_ih.ih_fun = ncr_intr; - np->sc_ih.ih_arg = np; - np->sc_ih.ih_level = IPL_BIO; - - retval = pci_map_int(pa->pa_tag, &np->sc_ih); - if (retval) - return; - -#else /* !__NetBSD__ */ - -static void ncr_attach (pcici_t config_id, int unit) -{ - ncb_p np; -#if ! (__FreeBSD__ >= 2) - extern unsigned bio_imask; -#endif - - - /* - ** allocate structure - */ - - np = (ncb_p) malloc (sizeof (struct ncb), M_DEVBUF, M_WAITOK); - if (!np) return; - ncrp[unit]=np; - - /* - ** initialize structure. - */ - - bzero (np, sizeof (*np)); - np->unit = unit; - - /* - ** Try to map the controller chip to - ** virtual and physical memory. - */ - - if (!pci_map_mem (config_id, 0x14, &np->vaddr, &np->paddr)) - return; - -#endif /* !__NetBSD__ */ - - /* - ** Do chip dependent initialization. - */ - -#ifdef __NetBSD__ - switch (pa->pa_id) { -#else - switch (pci_conf_read (config_id, PCI_ID_REG)) { -#endif - case NCR_810_ID: - np->maxwide = 0; - break; - case NCR_825_ID: - np->maxwide = 1; - break; - } - - /* - ** Patch script to physical addresses - */ - - ncr_script_fill (&script0); - ncr_script_copy_and_bind (&script0, np); - - /* - ** init data structure - */ - - np -> jump_tcb.l_cmd = SCR_JUMP ; - np -> jump_tcb.l_paddr = vtophys (&np->script->abort); - - /* - ** Make the controller's registers available. - ** Now the INB INW INL OUTB OUTW OUTL macros - ** can be used safely. - */ - - np->reg = (struct ncr_reg*) np->vaddr; - - /* - ** Get SCSI addr of host adapter (set by bios?). - */ - - np->myaddr = INB(nc_scid) & 0x07; - if (!np->myaddr) np->myaddr = SCSI_NCR_MYADDR; - - /* - ** Get the value of the chip's clock. - ** Find the right value for scntl3. - */ - - ncr_getclock (np); - - /* - ** Reset chip. - */ - - OUTB (nc_istat, SRST); - OUTB (nc_istat, 0 ); - - /* - ** Now check the cache handling of the pci chipset. - */ - - if (ncr_snooptest (np)) { - printf ("CACHE INCORRECTLY CONFIGURED.\n"); - return; - }; - -#ifndef __NetBSD__ - /* - ** Install the interrupt handler. - */ - - if (!pci_map_int (config_id, ncr_intr, np, &bio_imask)) - printf ("\tinterruptless mode: reduced performance.\n"); -#endif - - /* - ** After SCSI devices have been opened, we cannot - ** reset the bus safely, so we do it here. - ** Interrupt handler does the real work. - */ - - OUTB (nc_scntl1, CRST); - - /* - ** process the reset exception, - ** if interrupts are not enabled yet. - */ - ncr_exception (np); - -#ifdef ANCIENT - printf ("%s: waiting for scsi devices to settle\n", - ncr_name (np)); - DELAY (1000000); -#endif - printf ("%s scanning for targets 0..%d ($Revision: 1.11 $)\n", - ncr_name (np), MAX_TARGET-1); - - /* - ** Now let the generic SCSI driver - ** look for the SCSI devices on the bus .. - */ - -#ifndef ANCIENT -#ifdef __NetBSD__ - np->sc_link.adapter_softc = np; -#else /* !__NetBSD__ */ - np->sc_link.adapter_unit = unit; -#endif /* !__NetBSD__ */ - np->sc_link.adapter_targ = np->myaddr; - np->sc_link.adapter = &ncr_switch; - np->sc_link.device = &ncr_dev; - -#ifdef __NetBSD__ - config_found(self, &np->sc_link, ncr_print); -#else /* !__NetBSD__ */ - scsi_attachdevs (&np->sc_link); -#endif /* !__NetBSD__ */ -#else /* ANCIENT */ - scsi_attachdevs (unit, np->myaddr, &ncr_switch); -#endif /* ANCIENT */ - - /* - ** start the timeout daemon - */ - ncr_timeout (np); - np->lasttime=0; - - /* - ** Done. - */ - - return; -} - -/*========================================================== -** -** -** Process pending device interrupts. -** -** -**========================================================== -*/ - -int -ncr_intr(np) - ncb_p np; -{ - int n = 0; - - if (DEBUG_FLAGS & DEBUG_TINY) printf ("["); - - if (INB(nc_istat) & (INTF|SIP|DIP)) { - /* - ** Repeat until no outstanding ints - */ - do { - ncr_exception (np); - } while (INB(nc_istat) & (INTF|SIP|DIP)); - - n=1; - np->ticks = 100; - }; - - if (DEBUG_FLAGS & DEBUG_TINY) printf ("]\n"); - - return (n); -} - -/*========================================================== -** -** -** Start execution of a SCSI command. -** This is called from the generic SCSI driver. -** -** -**========================================================== -*/ - -static INT32 ncr_start (struct scsi_xfer * xp) -{ -#ifndef ANCIENT -#ifdef __NetBSD__ - ncb_p np = xp->sc_link->adapter_softc; -#else /*__NetBSD__*/ - ncb_p np = ncrp[xp->sc_link->adapter_unit]; -#endif/*__NetBSD__*/ -#else /* ANCIENT */ - ncb_p np = ncrp[xp->adapter]; -#endif /* ANCIENT */ - - struct scsi_generic * cmd = xp->cmd; - ccb_p cp; - lcb_p lp; - tcb_p tp = &np->target[xp->TARGET]; - - int i, oldspl, segments, flags = xp->flags; - u_char ptr, nego, idmsg; - u_long msglen, msglen2; - - - - /*--------------------------------------------- - ** - ** Reset SCSI bus - ** - ** Interrupt handler does the real work. - ** - **--------------------------------------------- - */ - - if (flags & SCSI_RESET) { - OUTB (nc_scntl1, CRST); - return(COMPLETE); - }; - - /*--------------------------------------------- - ** - ** Some shortcuts ... - ** - **--------------------------------------------- - */ - - if ((xp->TARGET == np->myaddr ) || - (xp->TARGET >= MAX_TARGET) || - (xp->LUN >= MAX_LUN ) || - (flags & SCSI_DATA_UIO)) { - xp->error = XS_DRIVER_STUFFUP; - return(HAD_ERROR); - }; - - /*--------------------------------------------- - ** - ** Diskaccess to partial blocks? - ** - **--------------------------------------------- - */ - - if ((xp->datalen & 0x1ff) && !(tp->inqdata[0] & 0x1f)) { - switch (cmd->opcode) { - case 0x28: /* READ_BIG (10) */ - case 0xa8: /* READ_HUGE (12) */ - case 0x2a: /* WRITE_BIG (10) */ - case 0xaa: /* WRITE_HUGE(12) */ - PRINT_ADDR(xp); - printf ("access to partial disk block refused.\n"); - xp->error = XS_DRIVER_STUFFUP; - return(HAD_ERROR); - }; - }; - -#ifdef ANCIENT - /*--------------------------------------------- - ** Ancient version of <sys/scsi/sd.c> - ** doesn't set the DATA_IN/DATA_OUT bits. - ** So we have to fix it .. - **--------------------------------------------- - */ - - switch (cmd->opcode) { - case 0x1a: /* MODE_SENSE */ - case 0x25: /* READ_CAPACITY */ - case 0x28: /* READ_BIG (10) */ - xp->flags |= SCSI_DATA_IN; - break; - case 0x2a: /* WRITE_BIG(10) */ - xp->flags |= SCSI_DATA_OUT; - break; - }; -#endif /* ANCIENT */ - - if (DEBUG_FLAGS & DEBUG_TINY) { - PRINT_ADDR(xp); - printf ("CMD=%x F=%x L=%x ", cmd->opcode, - (unsigned)xp->flags, (unsigned) xp->datalen); - } - - /*-------------------------------------------- - ** - ** Sanity checks ... - ** copied from Elischer's Adaptec driver. - ** - **-------------------------------------------- - */ - - flags = xp->flags; - if (!(flags & INUSE)) { - printf("%s: ?INUSE?\n", ncr_name (np)); - xp->flags |= INUSE; - }; - - if(flags & ITSDONE) { - printf("%s: ?ITSDONE?\n", ncr_name (np)); - xp->flags &= ~ITSDONE; - }; - - if (xp->bp) - flags |= (SCSI_NOSLEEP); /* just to be sure */ - - /*--------------------------------------------------- - ** - ** Assign a ccb / bind xp - ** - **---------------------------------------------------- - */ - - if (!(cp=ncr_get_ccb (np, flags, xp->TARGET, xp->LUN))) { - printf ("%s: no ccb.\n", ncr_name (np)); - xp->error = XS_DRIVER_STUFFUP; - return(TRY_AGAIN_LATER); - }; - cp->xfer = xp; - - /*--------------------------------------------------- - ** - ** timestamp - ** - **---------------------------------------------------- - */ - - bzero (&cp->phys.header.stamp, sizeof (struct tstamp)); - cp->phys.header.stamp.start = time; - - /*---------------------------------------------------- - ** - ** Get device quirks from a speciality table. - ** - ** @GENSCSI@ - ** This should be a part of the device table - ** in "scsi_conf.c". - ** - **---------------------------------------------------- - */ - - if (tp->quirks & QUIRK_UPDATE) { -#ifdef NEW_SCSICONF - tp->quirks = xp->sc_link->quirks; -#else - tp->quirks = ncr_lookup ((char*) &tp->inqdata[0]); -#endif - if (tp->quirks) { - PRINT_ADDR(xp); - printf ("quirks=%x.\n", tp->quirks); - }; - }; - - /*--------------------------------------------------- - ** - ** negotiation required? - ** - **---------------------------------------------------- - */ - - nego = 0; - - if (tp->inqdata[7]) { - /* - ** negotiate synchronous transfers? - */ - - if (!tp->period) { - if (tp->inqdata[7] & INQ7_SYNC) { - nego = NS_SYNC; - } else { - tp->period =0xffff; - tp->sval = 0xe0; - PRINT_ADDR(xp); - printf ("asynchronous.\n"); - }; - }; - - /* - ** negotiate wide transfers ? - */ - - if (!tp->widedone) { - if (tp->inqdata[7] & INQ7_WIDE16) { - if (!nego) nego = NS_WIDE; - } else - tp->widedone=1; - }; - }; - - /*--------------------------------------------------- - ** - ** choose a new tag ... - ** - **---------------------------------------------------- - */ - - if ((lp = tp->lp[xp->LUN]) && (lp->usetags)) { - /* - ** assign a tag to this ccb! - */ - while (!cp->tag) { - ccb_p cp2 = lp->next_ccb; - lp->lasttag = lp->lasttag % 255 + 1; - while (cp2 && cp2->tag != lp->lasttag) - cp2 = cp2->next_ccb; - if (cp2) continue; - cp->tag=lp->lasttag; - if (DEBUG_FLAGS & DEBUG_TAGS) { - PRINT_ADDR(xp); - printf ("using tag #%d.\n", cp->tag); - }; - }; - } else { - cp->tag=0; -#if !defined(ANCIENT) && !defined(__NetBSD__) && !(__FreeBSD__ >= 2) - /* - ** @GENSCSI@ Bug in "/sys/scsi/cd.c" - ** - ** /sys/scsi/cd.c initializes opennings with 2. - ** Our info value of 1 is not respected. - */ - if (xp->sc_link && xp->sc_link->opennings) { - PRINT_ADDR(xp); - printf ("opennings set to 0.\n"); - xp->sc_link->opennings = 0; - }; -#endif - }; - - /*---------------------------------------------------- - ** - ** Build the identify / tag / sdtr message - ** - **---------------------------------------------------- - */ - - idmsg = (cp==&np->ccb ? 0x80 : 0xc0) | xp->LUN; - - cp -> scsi_smsg [0] = idmsg; - msglen=1; - - if (cp->tag) { - - /* - ** Ordered write ops, unordered read ops. - */ - switch (cmd->opcode) { - case 0x08: /* READ_SMALL (6) */ - case 0x28: /* READ_BIG (10) */ - case 0xa8: /* READ_HUGE (12) */ - cp -> scsi_smsg [msglen] = M_SIMPLE_TAG; - break; - default: - cp -> scsi_smsg [msglen] = M_ORDERED_TAG; - } - - /* - ** can be overwritten by ncrcontrol - */ - switch (np->order) { - case M_SIMPLE_TAG: - case M_ORDERED_TAG: - cp -> scsi_smsg [msglen] = np->order; - }; - msglen++; - cp -> scsi_smsg [msglen++] = cp -> tag; - } - - switch (nego) { - case NS_SYNC: - cp -> scsi_smsg [msglen++] = M_EXTENDED; - cp -> scsi_smsg [msglen++] = 3; - cp -> scsi_smsg [msglen++] = M_X_SYNC_REQ; - cp -> scsi_smsg [msglen++] = tp->minsync; - cp -> scsi_smsg [msglen++] = tp->maxoffs; - if (DEBUG_FLAGS & DEBUG_NEGO) { - PRINT_ADDR(cp->xfer); - printf ("sync msgout: "); - ncr_show_msg (&cp->scsi_smsg [msglen-5]); - printf (".\n"); - }; - break; - case NS_WIDE: - cp -> scsi_smsg [msglen++] = M_EXTENDED; - cp -> scsi_smsg [msglen++] = 2; - cp -> scsi_smsg [msglen++] = M_X_WIDE_REQ; - cp -> scsi_smsg [msglen++] = tp->usrwide; - if (DEBUG_FLAGS & DEBUG_NEGO) { - PRINT_ADDR(cp->xfer); - printf ("wide msgout: "); - ncr_show_msg (&cp->scsi_smsg [msglen-4]); - printf (".\n"); - }; - break; - }; - - /*---------------------------------------------------- - ** - ** Build the identify message for getcc. - ** - **---------------------------------------------------- - */ - - cp -> scsi_smsg2 [0] = idmsg; - msglen2 = 1; - - /*---------------------------------------------------- - ** - ** Build the data descriptors - ** - **---------------------------------------------------- - */ - - segments = ncr_scatter (&cp->phys, (vm_offset_t) xp->data, - (vm_size_t) xp->datalen); - - if (segments < 0) { - xp->error = XS_DRIVER_STUFFUP; - ncr_free_ccb(np, cp, flags); - return(HAD_ERROR); - }; - - /*---------------------------------------------------- - ** - ** Set the SAVED_POINTER. - ** - **---------------------------------------------------- - */ - - if (flags & SCSI_DATA_IN) { - cp->phys.header.savep = vtophys (&np->script->data_in); - cp->phys.header.goalp = cp->phys.header.savep +20 +segments*16; - } else if (flags & SCSI_DATA_OUT) { - cp->phys.header.savep = vtophys (&np->script->data_out); - cp->phys.header.goalp = cp->phys.header.savep +20 +segments*16; - } else { - cp->phys.header.savep = vtophys (&np->script->no_data); - cp->phys.header.goalp = cp->phys.header.savep; - }; - cp->phys.header.lastp = cp->phys.header.savep; - - - /*---------------------------------------------------- - ** - ** fill ccb - ** - **---------------------------------------------------- - ** - ** - ** physical -> virtual backlink - ** Generic SCSI command - */ - cp->phys.header.cp = cp; - /* - ** Startqueue - */ - cp->phys.header.launch.l_paddr = vtophys (&np->script->select); - cp->phys.header.launch.l_cmd = SCR_JUMP; - /* - ** select - */ - cp->phys.select.sel_id = xp->TARGET; - cp->phys.select.sel_scntl3 = tp->wval; - cp->phys.select.sel_sxfer = tp->sval; - /* - ** message - */ - cp->phys.smsg.addr = vtophys (&cp->scsi_smsg ); - cp->phys.smsg.size = msglen; - cp->phys.smsg2.addr = vtophys (&cp->scsi_smsg2); - cp->phys.smsg2.size = msglen2; - /* - ** command - */ -#ifdef ANCIENT - bcopy (cmd, &cp->cmd, sizeof (cp->cmd)); - cp->phys.cmd.addr = vtophys (&cp->cmd); -#else /* ANCIENT */ - cp->phys.cmd.addr = vtophys (cmd); -#endif /* ANCIENT */ - cp->phys.cmd.size = xp->cmdlen; - /* - ** sense data - */ - cp->phys.sense.addr = vtophys (&cp->xfer->sense); - cp->phys.sense.size = sizeof(struct scsi_sense_data); - /* - ** status - */ - cp->actualquirks = tp->quirks; - cp->host_status = nego ? HS_NEGOTIATE : HS_BUSY; - cp->scsi_status = S_ILLEGAL; - cp->parity_status = 0; - - cp->xerr_status = XE_OK; - cp->sync_status = tp->sval; - cp->nego_status = nego; - cp->wide_status = tp->wval; - - /*---------------------------------------------------- - ** - ** Critical region: starting this job. - ** - **---------------------------------------------------- - */ - - oldspl = 0; /* for the sake of gcc */ - if (!(flags & SCSI_NOMASK)) oldspl = splbio(); - np->lock++; - - /* - ** reselect pattern and activate this job. - */ - - cp->jump_ccb.l_cmd = (SCR_JUMP ^ IFFALSE (DATA (cp->tag))); - cp->tlimit = time.tv_sec + xp->timeout / 1000 + 2; - cp->magic = CCB_MAGIC; - - /* - ** insert into startqueue. - */ - - ptr = np->squeueput + 1; - if (ptr >= MAX_START) ptr=0; - np->squeue [ptr ] = vtophys(&np->script->idle); - np->squeue [np->squeueput] = vtophys(&cp->phys); - np->squeueput = ptr; - - if(DEBUG_FLAGS & DEBUG_QUEUE) - printf ("%s: queuepos=%d tryoffset=%d.\n", ncr_name (np), - np->squeueput, - (unsigned)(np->script->startpos[0]- - (vtophys(&np->script->tryloop)))); - - /* - ** Script processor may be waiting for reconnect. - ** Wake it up. - */ - OUTB (nc_istat, SIGP); - - /* - ** If interrupts are enabled, return now. - ** Command is successfully queued. - */ - - np->lock--; - if (!(flags & SCSI_NOMASK)) { - splx (oldspl); - if (np->lasttime) { - if(DEBUG_FLAGS & DEBUG_TINY) printf ("Q"); - return(SUCCESSFULLY_QUEUED); - }; - }; - - /*---------------------------------------------------- - ** - ** Interrupts not yet enabled - have to poll. - ** - **---------------------------------------------------- - */ - - if (DEBUG_FLAGS & DEBUG_POLL) printf("P"); - - for (i=xp->timeout; i && !(xp->flags & ITSDONE);i--) { - if ((DEBUG_FLAGS & DEBUG_POLL) && (cp->host_status)) - printf ("%c", (cp->host_status & 0xf) + '0'); - DELAY (1000); - ncr_exception (np); - }; - - /* - ** Abort if command not done. - */ - if (!(xp->flags & ITSDONE)) { - printf ("%s: aborting job ...\n", ncr_name (np)); - OUTB (nc_istat, CABRT); - DELAY (100000); - OUTB (nc_istat, SIGP); - ncr_exception (np); - }; - - if (!(xp->flags & ITSDONE)) { - printf ("%s: abortion failed at %x.\n", - ncr_name (np), (unsigned) INL(nc_dsp)); - ncr_init (np, "timeout", HS_TIMEOUT); - }; - - if (!(xp->flags & ITSDONE)) { - cp-> host_status = HS_SEL_TIMEOUT; - ncr_complete (np, cp); - }; - - if (DEBUG_FLAGS & DEBUG_RESULT) { - printf ("%s: result: %x %x.\n", - ncr_name (np), cp->host_status, cp->scsi_status); - }; - if (!(flags & SCSI_NOMASK)) - return (SUCCESSFULLY_QUEUED); - switch (xp->error) { - case 0 : return (COMPLETE); - case XS_BUSY: return (TRY_AGAIN_LATER); - }; - return (HAD_ERROR); -} - -/*========================================================== -** -** -** Complete execution of a SCSI command. -** Signal completion to the generic SCSI driver. -** -** -**========================================================== -*/ - -void ncr_complete (ncb_p np, ccb_p cp) -{ - struct scsi_xfer * xp; - tcb_p tp; - lcb_p lp; - - /* - ** Sanity check - */ - - if (!cp || !cp->magic || !cp->xfer) return; - cp->magic = 1; - cp->tlimit= 0; - - /* - ** No Reselect anymore. - */ - cp->jump_ccb.l_cmd = (SCR_JUMP); - - /* - ** No starting. - */ - cp->phys.header.launch.l_paddr= vtophys (&np->script->idle); - - /* - ** timestamp - */ - ncb_profile (np, cp); - - if (DEBUG_FLAGS & DEBUG_TINY) - printf ("CCB=%x STAT=%x/%x\n", (unsigned)cp & 0xfff, - cp->host_status,cp->scsi_status); - - xp = cp->xfer; - cp->xfer = NULL; - tp = &np->target[xp->TARGET]; - lp = tp->lp[xp->LUN]; - - /* - ** Check for parity errors. - */ - - if (cp->parity_status) { - PRINT_ADDR(xp); - printf ("%d parity error(s), fallback.\n", cp->parity_status); - /* - ** fallback to asynch transfer. - */ - tp->usrsync=255; - tp->period = 0; - }; - - /* - ** Check for extended errors. - */ - - if (cp->xerr_status != XE_OK) { - PRINT_ADDR(xp); - switch (cp->xerr_status) { - case XE_EXTRA_DATA: - printf ("extraneous data discarded.\n"); - break; - case XE_BAD_PHASE: - printf ("illegal scsi phase (4/5).\n"); - break; - default: - printf ("extended error %d.\n", cp->xerr_status); - break; - }; - if (cp->host_status==HS_COMPLETE) - cp->host_status = HS_FAIL; - }; - - /* - ** Check the status. - */ - if ( (cp->host_status == HS_COMPLETE) - && (cp->scsi_status == S_GOOD)) { - - /* - ** All went well. - */ - - xp->resid = 0; - - /* - ** if (cp->phys.header.lastp != cp->phys.header.goalp)... - ** - ** @RESID@ - ** Could dig out the correct value for resid, - ** but it would be quite complicated. - ** - ** The ah1542.c driver sets it to 0 too ... - */ - - /* - ** Try to assign a ccb to this nexus - */ - ncr_alloc_ccb (np, xp); - - /* - ** On inquire cmd (0x12) save some data. - */ -#ifdef ANCIENT - if (cp->cmd.opcode == 0x12) { -#else /* ANCIENT */ - if (xp->cmd->opcode == 0x12) { -#endif /* ANCIENT */ - bcopy ( xp->data, - &tp->inqdata, - sizeof (tp->inqdata)); - - /* - ** set number of tags - */ - ncr_setmaxtags (tp, tp->usrtags); - - /* - ** prepare negotiation of synch and wide. - */ - ncr_negotiate (np, tp); - - /* - ** force quirks update before next command start - */ - tp->quirks |= QUIRK_UPDATE; - }; - - /* - ** Announce changes to the generic driver - */ - if (lp) { - ncr_settags (tp, lp); - if (lp->reqlink != lp->actlink) - ncr_opennings (np, lp, xp); - }; - -#ifdef DK - dk_xfer[DK] ++; - dk_wds [DK] += xp->datalen/64; - dk_wpms[DK] = 1000000; -#endif /* DK */ - - tp->bytes += xp->datalen; - tp->transfers ++; - - } else if (xp->flags & SCSI_ERR_OK) { - - /* - ** Not correct, but errors expected. - */ - xp->resid = 0; - - } else if ((cp->host_status == HS_COMPLETE) - && (cp->scsi_status == (S_SENSE|S_GOOD))) { - - /* - ** Check condition code - */ - xp->error = XS_SENSE; - - if (DEBUG_FLAGS & (DEBUG_RESULT|DEBUG_TINY)) { - u_char * p = (u_char*) & xp->sense; - int i; - printf ("\n%s: sense data:", ncr_name (np)); - for (i=0; i<14; i++) printf (" %x", *p++); - printf (".\n"); - }; - - } else if ((cp->host_status == HS_COMPLETE) - && (cp->scsi_status == S_BUSY)) { - - /* - ** Target is busy. - */ - xp->error = XS_BUSY; - - } else if ((cp->host_status == HS_SEL_TIMEOUT) - || (cp->host_status == HS_TIMEOUT)) { - - /* - ** No response - */ - xp->error = XS_TIMEOUT; - - } else { - - /* - ** Other protocol messes - */ - PRINT_ADDR(xp); - printf ("COMMAND FAILED (%x %x) @%x.\n", - cp->host_status, cp->scsi_status, (unsigned)cp); - - xp->error = XS_DRIVER_STUFFUP; - } - - xp->flags |= ITSDONE; - - /* - ** trace output - */ - - if (tp->usrflag & UF_TRACE) { - u_char * p; - int i; - PRINT_ADDR(xp); - printf (" CMD:"); -#ifdef ANCIENT - p = (u_char*) &cp->cmd.opcode; -#else /* ANCIENT */ - p = (u_char*) &xp->cmd->opcode; -#endif /* ANCIENT */ - for (i=0; i<xp->cmdlen; i++) printf (" %x", *p++); - - if (cp->host_status==HS_COMPLETE) { - switch (cp->scsi_status) { - case S_GOOD: - printf (" GOOD"); - break; - case S_CHECK_COND: - printf (" SENSE:"); - p = (u_char*) &xp->sense; -#ifdef ANCIENT - for (i=0; i<sizeof(xp->sense); i++) -#else /* ANCIENT */ - for (i=0; i<xp->req_sense_length; i++) -#endif /* ANCIENT */ - printf (" %x", *p++); - break; - default: - printf (" STAT: %x\n", cp->scsi_status); - break; - }; - } else printf (" HOSTERROR: %x", cp->host_status); - printf ("\n"); - }; - - /* - ** Free this ccb - */ - ncr_free_ccb (np, cp, xp->flags); - - /* - ** signal completion to generic driver. - */ -#ifdef ANCIENT - if (xp->when_done) - (*(xp->when_done))(xp->done_arg,xp->done_arg2); -#else /* ANCIENT */ - scsi_done (xp); -#endif /* ANCIENT */ -} - -/*========================================================== -** -** -** Signal all (or one) control block done. -** -** -**========================================================== -*/ - -void ncr_wakeup (ncb_p np, u_long code) -{ - /* - ** Starting at the default ccb and following - ** the links, complete all jobs with a - ** host_status greater than "disconnect". - ** - ** If the "code" parameter is not zero, - ** complete all jobs that are not IDLE. - */ - - int s=splbio(); - - ccb_p cp = &np->ccb; - while (cp) { - switch (cp->host_status) { - - case HS_IDLE: - break; - - case HS_DISCONNECT: - if(DEBUG_FLAGS & DEBUG_TINY) printf ("D"); - /* fall through */ - - case HS_BUSY: - case HS_NEGOTIATE: - if (!code) break; - cp->host_status = code; - - /* fall through */ - - default: - ncr_complete (np, cp); - break; - }; - cp = cp -> link_ccb; - }; - splx (s); -} - -/*========================================================== -** -** -** Start NCR chip. -** -** -**========================================================== -*/ - -void ncr_init (ncb_p np, char * msg, u_long code) -{ - int i; - u_long usrsync; - u_char usrwide; - - /* - ** Reset chip. - */ - - OUTB (nc_istat, SRST ); - - /* - ** Message. - */ - - if (msg) printf ("%s: restart (%s).\n", ncr_name (np), msg); - - /* - ** Clear Start Queue - */ - - for (i=0;i<MAX_START;i++) - np -> squeue [i] = vtophys (&np->script->idle); - - /* - ** Start at first entry. - */ - - np->squeueput = 0; - np->script->startpos[0] = vtophys (&np->script->tryloop); - np->script->start0 [0] = SCR_INT ^ IFFALSE (0); - - /* - ** Wakeup all pending jobs. - */ - - ncr_wakeup (np, code); - - /* - ** Init chip. - */ - - OUTB (nc_istat, 0 ); /* Remove Reset, abort ... */ - OUTB (nc_scntl0, 0xca ); /* full arb., ena parity, par->ATN */ - OUTB (nc_scntl1, 0x00 ); /* odd parity, and remove CRST!! */ - OUTB (nc_scntl3, np->rv_scntl3);/* timing prescaler */ - OUTB (nc_scid , 0x40|np->myaddr);/* host adapter SCSI address */ - OUTW (nc_respid, 1ul<<np->myaddr);/* id to respond to */ - OUTB (nc_istat , SIGP ); /* Signal Process */ - OUTB (nc_dmode , 0xc0 ); /* Burst length = 16 transfer */ - OUTB (nc_dcntl , NOCOM ); /* no single step mode, protect SFBR*/ - OUTB (nc_ctest4, 0x08 ); /* enable master parity checking */ - OUTB (nc_stest2, EXT ); /* Extended Sreq/Sack filtering */ - OUTB (nc_stest3, TE ); /* TolerANT enable */ - OUTB (nc_stime0, 0xfb ); /* HTH = 1.6sec STO = 0.1 sec. */ - - /* - ** Reinitialize usrsync. - ** Have to renegotiate synch mode. - */ - - usrsync = 255; - if (SCSI_NCR_MAX_SYNC) { - u_long period; - period =1000000/SCSI_NCR_MAX_SYNC; /* ns = 10e6 / kHz */ - if (period <= 11 * np->ns_sync) { - if (period < 4 * np->ns_sync) - usrsync = np->ns_sync; - else - usrsync = period / 4; - }; - }; - - /* - ** Reinitialize usrwide. - ** Have to renegotiate wide mode. - */ - - usrwide = (SCSI_NCR_MAX_WIDE); - if (usrwide > np->maxwide) usrwide=np->maxwide; - - /* - ** Fill in target structure. - */ - - for (i=0;i<MAX_TARGET;i++) { - tcb_p tp = &np->target[i]; - - tp->sval = 0; - tp->wval = np->rv_scntl3; - - tp->usrsync = usrsync; - tp->usrwide = usrwide; - - ncr_negotiate (np, tp); - } - - /* - ** enable ints - */ - - OUTW (nc_sien , STO|HTH|MA|SGE|UDC|RST); - OUTB (nc_dien , MDPE|BF|ABRT|SSI|SIR|IID); - - /* - ** Start script processor. - */ - - OUTL (nc_dsp, vtophys (&np->script->start)); -} - -/*========================================================== -** -** Prepare the negotiation values for wide and -** synchronous transfers. -** -**========================================================== -*/ - -static void ncr_negotiate (struct ncb* np, struct tcb* tp) -{ - /* - ** minsync unit is 4ns ! - */ - - u_long minsync = tp->usrsync; - - if (minsync < 25) minsync=25; - - /* - ** if not scsi 2 - ** don't believe FAST! - */ - - if ((minsync < 50) && (tp->inqdata[2] & 0x0f) < 2) - minsync=50; - - /* - ** our limit .. - */ - - if (minsync < np->ns_sync) - minsync = np->ns_sync; - - /* - ** divider limit - */ - - if (minsync > (np->ns_sync * 11) / 4) - minsync = 255; - - tp->minsync = minsync; - tp->maxoffs = (minsync<255 ? 8 : 0); - - /* - ** period=0: has to negotiate sync transfer - */ - - tp->period=0; - - /* - ** widedone=0: has to negotiate wide transfer - */ - tp->widedone=0; -} - -/*========================================================== -** -** Switch sync mode for current job and it's target -** -**========================================================== -*/ - -static void ncr_setsync (ncb_p np, ccb_p cp, u_char sxfer) -{ - struct scsi_xfer *xp; - tcb_p tp; - u_char target = INB (nc_ctest0)&7; - - assert (cp); - if (!cp) return; - - xp = cp->xfer; - assert (xp); - if (!xp) return; - assert (target == xp->TARGET & 7); - - tp = &np->target[target]; - tp->period= sxfer&0xf ? ((sxfer>>5)+4) * np->ns_sync : 0xffff; - - if (tp->sval == sxfer) return; - tp->sval = sxfer; - - /* - ** Bells and whistles ;-) - */ - PRINT_ADDR(xp); - if (sxfer & 0x0f) { - /* - ** Disable extended Sreq/Sack filtering - */ - if (tp->period <= 200) OUTB (nc_stest2, 0); - printf ("%s%dns (%d Mb/sec) offset %d.\n", - tp->period<200 ? "FAST SCSI-2 ":"", - tp->period, (1000+tp->period/2)/tp->period, - sxfer & 0x0f); - } else printf ("asynchronous.\n"); - - /* - ** set actual value and sync_status - */ - OUTB (nc_sxfer, sxfer); - np->sync_st = sxfer; - - /* - ** patch ALL ccbs of this target. - */ - for (cp = &np->ccb; cp; cp = cp->link_ccb) { - if (!cp->xfer) continue; - if (cp->xfer->TARGET != target) continue; - cp->sync_status = sxfer; - }; -} - -/*========================================================== -** -** Switch wide mode for current job and it's target -** -**========================================================== -*/ - -static void ncr_setwide (ncb_p np, ccb_p cp, u_char wide) -{ - struct scsi_xfer *xp; - u_short target = INB (nc_ctest0)&7; - tcb_p tp; - u_char scntl3 = np->rv_scntl3 | (wide ? EWS : 0); - - assert (cp); - if (!cp) return; - - xp = cp->xfer; - assert (xp); - if (!xp) return; - assert (target == xp->TARGET & 7); - - tp = &np->target[target]; - tp->widedone = wide+1; - if (tp->wval == scntl3) return; - tp->wval = scntl3; - - /* - ** Bells and whistles ;-) - */ - PRINT_ADDR(xp); - if (scntl3 & EWS) - printf ("WIDE SCSI (16 bit) enabled.\n"); - else - printf ("WIDE SCSI disabled.\n"); - - /* - ** set actual value and sync_status - */ - OUTB (nc_scntl3, scntl3); - np->wide_st = scntl3; - - /* - ** patch ALL ccbs of this target. - */ - for (cp = &np->ccb; cp; cp = cp->link_ccb) { - if (!cp->xfer) continue; - if (cp->xfer->TARGET != target) continue; - cp->wide_status = scntl3; - }; -} - -/*========================================================== -** -** Switch tagged mode for a target. -** -**========================================================== -*/ - -static void ncr_setmaxtags (tcb_p tp, u_long usrtags) -{ - int l; - tp->usrtags = usrtags; - for (l=0; l<MAX_LUN; l++) { - lcb_p lp; - if (!tp) break; - lp=tp->lp[l]; - if (!lp) continue; - ncr_settags (tp, lp); - }; -} - -static void ncr_settags (tcb_p tp, lcb_p lp) -{ - u_char reqtags, tmp; - - if ((!tp) || (!lp)) return; - - /* - ** only devices capable of tagges commands - ** only disk devices - ** only if enabled by user .. - */ - if (( tp->inqdata[7] & INQ7_QUEUE) && ((tp->inqdata[0] & 0x1f)==0x00) - && tp->usrtags) { - reqtags = tp->usrtags; - if (lp->actlink <= 1) - lp->usetags=reqtags; - } else { - reqtags = 1; - if (lp->actlink <= 1) - lp->usetags=0; - }; - - /* - ** don't announce more than available. - */ - tmp = lp->actccbs; - if (tmp > reqtags) tmp = reqtags; - lp->reqlink = tmp; - - /* - ** don't discard if announced. - */ - tmp = lp->actlink; - if (tmp < reqtags) tmp = reqtags; - lp->reqccbs = tmp; -} - -/*---------------------------------------------------- -** -** handle user commands -** -**---------------------------------------------------- -*/ - -static void ncr_usercmd (ncb_p np) -{ - u_char t; - tcb_p tp; - - switch (np->user.cmd) { - - case 0: return; - - case UC_SETSYNC: - for (t=0; t<MAX_TARGET; t++) { - if (!((np->user.target>>t)&1)) continue; - tp = &np->target[t]; - tp->usrsync = np->user.data; - ncr_negotiate (np, tp); - }; - break; - - case UC_SETTAGS: - if (np->user.data > MAX_TAGS) - break; - for (t=0; t<MAX_TARGET; t++) { - if (!((np->user.target>>t)&1)) continue; - ncr_setmaxtags (&np->target[t], np->user.data); - }; - break; - - case UC_SETDEBUG: - ncr_debug = np->user.data; - break; - - case UC_SETORDER: - np->order = np->user.data; - break; - - case UC_SETWIDE: - for (t=0; t<MAX_TARGET; t++) { - u_long size; - if (!((np->user.target>>t)&1)) continue; - tp = &np->target[t]; - size = np->user.data; - if (size > np->maxwide) size=np->maxwide; - tp->usrwide = size; - ncr_negotiate (np, tp); - }; - break; - - case UC_SETFLAG: - for (t=0; t<MAX_TARGET; t++) { - if (!((np->user.target>>t)&1)) continue; - tp = &np->target[t]; - tp->usrflag = np->user.data; - }; - break; - } - np->user.cmd=0; -} - - - - -/*========================================================== -** -** -** ncr timeout handler. -** -** -**========================================================== -** -** Misused to keep the driver running when -** interrupts are not configured correctly. -** -**---------------------------------------------------------- -*/ - -static void ncr_timeout (ncb_p np) -{ - u_long thistime = time.tv_sec; - u_long step = np->ticks; - u_long count = 0; - long signed t; - ccb_p cp; - - if (np->lasttime != thistime) { - np->lasttime = thistime; - - ncr_usercmd (np); - - /*---------------------------------------------------- - ** - ** handle ncr chip timeouts - ** - ** Assumption: - ** We have a chance to arbitrate for the - ** SCSI bus at least every 10 seconds. - ** - **---------------------------------------------------- - */ - - t = thistime - np->heartbeat; - - if (t<2) np->latetime=0; else np->latetime++; - - if (np->latetime>2) { - /* - ** If there are no requests, the script - ** processor will sleep on SEL_WAIT_RESEL. - ** But we have to check whether it died. - ** Let's wake it up. - */ - OUTB (nc_istat, SIGP); - }; - - if (np->latetime>10) { - /* - ** Although we tried to wakeup it, - ** the script processor didn't answer. - ** - ** May be a target is hanging, - ** or another initator lets a tape device - ** rewind with disconnect disabled :-( - ** - ** We won't accept that. - */ - printf ("%s: reset by timeout.\n", ncr_name (np)); - OUTB (nc_istat, SRST); - OUTB (nc_istat, 0); - if (INB (nc_sbcl) & CBSY) - OUTB (nc_scntl1, CRST); - ncr_init (np, NULL, HS_TIMEOUT); - np->heartbeat = thistime; - }; - - /*---------------------------------------------------- - ** - ** handle ccb timeouts - ** - **---------------------------------------------------- - */ - - for (cp=&np->ccb; cp; cp=cp->link_ccb) { - /* - ** look for timed out ccbs. - */ - if (!cp->host_status) continue; - count++; - if (cp->tlimit > thistime) continue; - - /* - ** Disable reselect. - ** Remove it from startqueue. - */ - cp->jump_ccb.l_cmd = (SCR_JUMP); - if (cp->phys.header.launch.l_paddr == - vtophys (&np->script->select)) { - printf ("%s: timeout ccb=%x (skip)\n", - ncr_name (np), (unsigned)cp); - cp->phys.header.launch.l_paddr - = vtophys (&np->script->skip); - }; - - switch (cp->host_status) { - - case HS_BUSY: - case HS_NEGOTIATE: - /* - ** still in start queue ? - */ - if (cp->phys.header.launch.l_paddr == - vtophys (&np->script->skip)) - continue; - - /* fall through */ - case HS_DISCONNECT: - cp->host_status=HS_TIMEOUT; - }; - cp->tag = 0; - - /* - ** wakeup this ccb. - */ - { - int oldspl = splbio(); - ncr_complete (np, cp); - splx (oldspl); - }; - }; - } - - timeout (TIMEOUT ncr_timeout, (caddr_t) np, step ? step : 1); - - if ((INB(nc_istat) & (INTF|SIP|DIP)) && !np->lock) { - - /* - ** Process pending interrupts. - */ - - int oldspl = splbio (); - if (DEBUG_FLAGS & DEBUG_TINY) printf ("{"); - ncr_exception (np); - if (DEBUG_FLAGS & DEBUG_TINY) printf ("}"); - splx (oldspl); - }; -} - -/*========================================================== -** -** -** ncr chip exception handler. -** -** -**========================================================== -*/ - -void ncr_exception (ncb_p np) -{ - u_char istat, dstat; - u_short sist; - u_long dsp; - - /* - ** interrupt on the fly ? - */ - while ((istat = INB (nc_istat)) & INTF) { - if (DEBUG_FLAGS & DEBUG_TINY) printf ("F"); - OUTB (nc_istat, INTF); - np->profile.num_fly++; - ncr_wakeup (np, 0); - }; - - if (!(istat & (SIP|DIP))) return; - - /* - ** Steinbach's Guideline for Systems Programming: - ** Never test for an error condition you don't know how to handle. - */ - - dstat = INB (nc_dstat); - sist = INW (nc_sist) ; - np->profile.num_int++; - - if (DEBUG_FLAGS & DEBUG_TINY) - printf ("<%d|%x:%x|%x:%x>", - INB(nc_scr0), - dstat,sist, - (unsigned)INL(nc_dsp), - (unsigned)INL(nc_dbc)); - if ((dstat==DFE) && (sist==PAR)) return; - -/*========================================================== -** -** First the normal cases. -** -**========================================================== -*/ - /*------------------------------------------- - ** SCSI reset - **------------------------------------------- - */ - - if (sist & RST) { - ncr_init (np, "scsi reset", HS_RESET); - return; - }; - - /*------------------------------------------- - ** selection timeout - ** - ** IID excluded from dstat mask! - ** (chip bug) - **------------------------------------------- - */ - - if ((sist & STO) && - !(sist & (GEN|HTH|MA|SGE|UDC|RST|PAR)) && - !(dstat & (MDPE|BF|ABRT|SIR))) { - ncr_int_sto (np); - return; - }; - - /*------------------------------------------- - ** Phase mismatch. - **------------------------------------------- - */ - - if ((sist & MA) && - !(sist & (STO|GEN|HTH|SGE|UDC|RST|PAR)) && - !(dstat & (MDPE|BF|ABRT|SIR|IID))) { - ncr_int_ma (np); - return; - }; - - /*---------------------------------------- - ** move command with length 0 - **---------------------------------------- - */ - - if ((dstat & IID) && - !(sist & (STO|GEN|HTH|MA|SGE|UDC|RST|PAR)) && - !(dstat & (MDPE|BF|ABRT|SIR)) && - ((INL(nc_dbc) & 0xf8000000) == SCR_MOVE_TBL)) { - /* - ** Target wants more data than available. - ** The "no_data" script will do it. - */ - OUTL (nc_dsp, vtophys(&np->script->no_data)); - return; - }; - - /*------------------------------------------- - ** Programmed interrupt - **------------------------------------------- - */ - - if ((dstat & SIR) && - !(sist & (STO|GEN|HTH|MA|SGE|UDC|RST|PAR)) && - !(dstat & (MDPE|BF|ABRT|IID)) && - (INB(nc_dsps) <= SIR_MAX)) { - ncr_int_sir (np); - return; - }; - - /*======================================== - ** do the register dump - **======================================== - */ - - if (time.tv_sec - np->regtime.tv_sec>10) { - int i; - np->regtime = time; - for (i=0; i<sizeof(np->regdump); i++) - ((char*)&np->regdump)[i] = ((char*)np->reg)[i]; - np->regdump.nc_dstat = dstat; - np->regdump.nc_sist = sist; - }; - - printf ("%s targ %d?: ERROR (%x:%x:%x) (%x/%x) @ (%x:%x).\n", - ncr_name (np), INB (nc_ctest0)&7, dstat, sist, - INB (nc_sbcl), - INB (nc_sxfer),INB (nc_scntl3), - (unsigned) (dsp = INL (nc_dsp)), - (unsigned) INL (nc_dbc)); - - /*---------------------------------------- - ** clean up the dma fifo - **---------------------------------------- - */ - - if ( (INB(nc_sstat0) & (ILF|ORF|OLF) ) || - (INB(nc_sstat1) & (FF3210) ) || - (INB(nc_sstat2) & (ILF1|ORF1|OLF1)) || /* wide .. */ - !(dstat & DFE)) { - printf ("%s: have to clear fifos.\n", ncr_name (np)); - OUTB (nc_stest3, TE|CSF); /* clear scsi fifo */ - OUTB (nc_ctest3, CLF); /* clear dma fifo */ - } - - /*---------------------------------------- - ** unexpected disconnect - **---------------------------------------- - */ - - if ((sist & UDC) && - !(sist & (STO|GEN|HTH|MA|SGE|RST|PAR)) && - !(dstat & (MDPE|BF|ABRT|SIR|IID))) { - OUTB (nc_scr0, HS_UNEXPECTED); - OUTL (nc_dsp, vtophys(&np->script->cleanup)); - return; - }; - - /*---------------------------------------- - ** cannot disconnect - **---------------------------------------- - */ - - if ((dstat & IID) && - !(sist & (STO|GEN|HTH|MA|SGE|UDC|RST|PAR)) && - !(dstat & (MDPE|BF|ABRT|SIR)) && - ((INL(nc_dbc) & 0xf8000000) == SCR_WAIT_DISC)) { - /* - ** Data cycles while waiting for disconnect. - ** Force disconnect. - */ - OUTB (nc_scntl1, 0); - /* - ** System may hang, but timeout will handle that. - ** In fact, timeout can handle ALL problems :-) - */ - OUTB (nc_dcntl, (STD|NOCOM)); - return; - }; - - /*---------------------------------------- - ** single step - **---------------------------------------- - */ - - if ((dstat & SSI) && - !(sist & (STO|GEN|HTH|MA|SGE|UDC|RST|PAR)) && - !(dstat & (MDPE|BF|ABRT|SIR|IID))) { - OUTB (nc_dcntl, (STD|NOCOM)); - return; - }; - -/* -** @RECOVER@ HTH, SGE, ABRT. -** -** We should try to recover from these interrupts. -** They may occur if there are problems with synch transfers, -** or if targets are powerswitched while the driver is running. -*/ - - if (sist & SGE) { - OUTB (nc_ctest3, CLF); /* clear scsi offsets */ - } - - /* - ** Freeze controller to be able to read the messages. - */ - - if (DEBUG_FLAGS & DEBUG_FREEZE) { - int i; - unsigned char val; - for (i=0; i<0x60; i++) { - switch (i%16) { - - case 0: - printf ("%s: reg[%d0]: ", - ncr_name(np),i/16); - break; - case 4: - case 8: - case 12: - printf (" "); - break; - }; - val = ((unsigned char*) np->vaddr) [i]; - printf (" %x%x", val/16, val%16); - if (i%16==15) printf (".\n"); - }; - - untimeout (TIMEOUT ncr_timeout, (caddr_t) np); - - printf ("%s: halted!\n", ncr_name(np)); - /* - ** don't restart controller ... - */ - OUTB (nc_istat, SRST); - return; - }; - - /* - ** sorry, have to kill ALL jobs ... - */ - - ncr_init (np, "fatal error", HS_FAIL); -} - -/*========================================================== -** -** ncr chip exception handler for selection timeout -** -**========================================================== -** -** There seems to be a bug in the 53c810. -** Although a STO-interrupt is pending, -** it continues executing script commands. -** But it will fail and interrupt (IID) on -** the next instruction where it's looking -** for a valid phase. -** -**---------------------------------------------------------- -*/ - -void ncr_int_sto (ncb_p np) -{ - u_long dsa, scratcha, diff; - ccb_p cp; - if (DEBUG_FLAGS & DEBUG_TINY) printf ("T"); - - /* - ** look for ccb and set the status. - */ - - dsa = INL (nc_dsa); - cp = &np->ccb; - while (cp && (vtophys(&cp->phys) != dsa)) - cp = cp->link_ccb; - - if (cp) { - cp-> host_status = HS_SEL_TIMEOUT; - ncr_complete (np, cp); - }; - - /* - ** repair start queue - */ - - scratcha = INL (nc_scratcha); - diff = scratcha - vtophys(&np->script->tryloop); - - assert ((diff <= MAX_START * 20) && !(diff % 20)); - - if ((diff <= MAX_START * 20) && !(diff % 20)) { - np->script->startpos[0] = scratcha; - OUTL (nc_dsp, vtophys (&np->script->start)); - return; - }; - ncr_init (np, "selection timeout", HS_FAIL); -} - -/*========================================================== -** -** -** ncr chip exception handler for phase errors. -** -** -**========================================================== -** -** We have to construct a new transfer descriptor, -** to transfer the rest of the current block. -** -**---------------------------------------------------------- -*/ - -static void ncr_int_ma (ncb_p np) -{ - u_long dbc; - u_long rest; - u_long dsa; - u_long dsp; - u_long nxtdsp; - u_long *vdsp; - u_long oadr, olen; - u_long *tblp, *newcmd; - u_char cmd, sbcl, delta, ss0, ss2; - ccb_p cp; - - dsp = INL (nc_dsp); - dsa = INL (nc_dsa); - dbc = INL (nc_dbc); - ss0 = INB (nc_sstat0); - ss2 = INB (nc_sstat2); - sbcl= INB (nc_sbcl); - - cmd = dbc >> 24; - rest= dbc & 0xffffff; - delta=(INB (nc_dfifo) - rest) & 0x7f; - - /* - ** The data in the dma fifo has not been transfered to - ** the target -> add the amount to the rest - ** and clear the data. - ** Check the sstat2 register in case of wide transfer. - */ - - if (! (INB(nc_dstat) & DFE)) rest += delta; - if (ss0 & OLF) rest++; - if (ss0 & ORF) rest++; - if (INB(nc_scntl3) & EWS) { - if (ss2 & OLF1) rest++; - if (ss2 & ORF1) rest++; - }; - OUTB (nc_ctest3, CLF ); /* clear dma fifo */ - OUTB (nc_stest3, TE|CSF); /* clear scsi fifo */ - - /* - ** verify cp - */ - dsa = INL (nc_dsa); - cp = &np->ccb; - while (cp && (vtophys(&cp->phys) != dsa)) - cp = cp->link_ccb; - - assert (cp == np->header.cp); - assert (cp); - if (!cp) - return; - - /* - ** find the interrupted script command, - ** and the address at where to continue. - */ - - if (dsp == vtophys (&cp->patch[2])) { - vdsp = &cp->patch[0]; - nxtdsp = vdsp[3]; - } else if (dsp == vtophys (&cp->patch[6])) { - vdsp = &cp->patch[4]; - nxtdsp = vdsp[3]; - } else { - vdsp = (u_long*) ((char*)np->script - vtophys(np->script) + dsp -8); - nxtdsp = dsp; - }; - - /* - ** log the information - */ - if (DEBUG_FLAGS & (DEBUG_TINY|DEBUG_PHASE)) { - printf ("P%d%d ",cmd&7, sbcl&7); - printf ("RL=%d D=%d SS0=%x ", - (unsigned) rest, (unsigned) delta, ss0); - }; - if (DEBUG_FLAGS & DEBUG_PHASE) { - printf ("\nCP=%x CP2=%x DSP=%x NXT=%x VDSP=%x CMD=%x ", - (unsigned)cp, (unsigned)np->header.cp, - (unsigned)dsp, - (unsigned)nxtdsp, (unsigned)vdsp, cmd); - }; - - /* - ** get old startaddress and old length. - */ - - oadr = vdsp[1]; - - if (cmd & 0x10) { /* Table indirect */ - tblp = (u_long*) ((char*) &cp->phys + oadr); - olen = tblp[0]; - oadr = tblp[1]; - } else { - tblp = (u_long*) 0; - olen = vdsp[0] & 0xffffff; - }; - - if (DEBUG_FLAGS & DEBUG_PHASE) { - printf ("OCMD=%x\nTBLP=%x OLEN=%x OADR=%x\n", - (unsigned) (vdsp[0] >> 24), - (unsigned) tblp, - (unsigned) olen, - (unsigned) oadr); - }; - - /* - ** if old phase not dataphase, leave here. - */ - - assert (cmd == (vdsp[0] >> 24)); - if (cmd & 0x06) { - PRINT_ADDR(cp->xfer); - printf ("phase change %d-%d %d@%x resid=%d.\n", - cmd&7, sbcl&7, (unsigned)olen, - (unsigned)oadr, (unsigned)rest); - - OUTB (nc_dcntl, (STD|NOCOM)); - return; - }; - - /* - ** choose the correct patch area. - ** if savep points to one, choose the other. - */ - - newcmd = cp->patch; - if (cp->phys.header.savep == vtophys (newcmd)) newcmd+=4; - - /* - ** fillin the commands - */ - - newcmd[0] = ((cmd & 0x0f) << 24) | rest; - newcmd[1] = oadr + olen - rest; - newcmd[2] = SCR_JUMP; - newcmd[3] = nxtdsp; - - if (DEBUG_FLAGS & DEBUG_PHASE) { - PRINT_ADDR(cp->xfer); - printf ("newcmd[%d] %x %x %x %x.\n", - newcmd - cp->patch, - (unsigned)newcmd[0], - (unsigned)newcmd[1], - (unsigned)newcmd[2], - (unsigned)newcmd[3]); - } - /* - ** fake the return address (to the patch). - ** and restart script processor at dispatcher. - */ - np->profile.num_break++; - OUTL (nc_temp, vtophys (newcmd)); - OUTL (nc_dsp, vtophys (&np->script->dispatch)); -} - -/*========================================================== -** -** -** ncr chip exception handler for programmed interrupts. -** -** -**========================================================== -*/ - -static int ncr_show_msg (u_char * msg) -{ - u_char i; - printf ("%x",*msg); - if (*msg==M_EXTENDED) { - for (i=1;i<8;i++) { - if (i-1>msg[1]) break; - printf ("-%x",msg[i]); - }; - return (i+1); - } else if ((*msg & 0xf0) == 0x20) { - printf ("-%x",msg[1]); - return (2); - }; - return (1); -} - -void ncr_int_sir (ncb_p np) -{ - u_char chg, ofs, per, fak, wide; - u_char num = INB (nc_dsps); - ccb_p cp=0; - u_long dsa; - u_char target = INB (nc_ctest0) & 7; - tcb_p tp = &np->target[target]; - int i; - if (DEBUG_FLAGS & DEBUG_TINY) printf ("I#%d", num); - - switch (num) { - case SIR_SENSE_RESTART: - case SIR_STALL_RESTART: - break; - - default: - /* - ** lookup the ccb - */ - dsa = INL (nc_dsa); - cp = &np->ccb; - while (cp && (vtophys(&cp->phys) != dsa)) - cp = cp->link_ccb; - - assert (cp == np->header.cp); - assert (cp); - if (!cp) - goto out; - } - - switch (num) { - -/*-------------------------------------------------------------------- -** -** Processing of interrupted getcc selects -** -**-------------------------------------------------------------------- -*/ - - case SIR_SENSE_RESTART: - /*------------------------------------------ - ** Script processor is idle. - ** Look for interrupted "check cond" - **------------------------------------------ - */ - - if (DEBUG_FLAGS & DEBUG_RESTART) - printf ("%s: int#%d",ncr_name (np),num); - cp = (ccb_p) 0; - for (i=0; i<MAX_TARGET; i++) { - if (DEBUG_FLAGS & DEBUG_RESTART) printf (" t%d", i); - tp = &np->target[i]; - if (DEBUG_FLAGS & DEBUG_RESTART) printf ("+"); - cp = tp->hold_cp; - if (!cp) continue; - if (DEBUG_FLAGS & DEBUG_RESTART) printf ("+"); - if ((cp->host_status==HS_BUSY) && - (cp->scsi_status==S_CHECK_COND)) - break; - if (DEBUG_FLAGS & DEBUG_RESTART) printf ("- (remove)"); - tp->hold_cp = cp = (ccb_p) 0; - }; - - if (cp) { - if (DEBUG_FLAGS & DEBUG_RESTART) - printf ("+ restart job ..\n"); - OUTL (nc_dsa, vtophys (&cp->phys)); - OUTL (nc_dsp, vtophys (&np->script->getcc)); - return; - }; - - /* - ** no job, resume normal processing - */ - if (DEBUG_FLAGS & DEBUG_RESTART) printf (" -- remove trap\n"); - np->script->start0[0] = SCR_INT ^ IFFALSE (0); - break; - - case SIR_SENSE_FAILED: - /*------------------------------------------- - ** While trying to reselect for - ** getting the condition code, - ** a target reselected us. - **------------------------------------------- - */ - PRINT_ADDR(cp->xfer); - if (DEBUG_FLAGS & DEBUG_RESTART) - printf ("in getcc reselect by t%d.\n", - INB(nc_ssid)&7); - - /* - ** Mark this job - */ - cp->host_status = HS_BUSY; - cp->scsi_status = S_CHECK_COND; - np->target[cp->xfer->TARGET].hold_cp = cp; - - /* - ** And patch code to restart it. - */ - np->script->start0[0] = SCR_INT; - break; - -/*----------------------------------------------------------------------------- -** -** Was Sie schon immer ueber transfermode negotiation wissen wollten ... -** -** We try to negotiate sync and wide transfer only after -** a successfull inquire command. We look to byte 7 of the -** inquire data to determine the capabilities if the target. -** -** When we try to negotiate, we append the negotiation message -** to the identify and (maybe) simpletag message. -** The host status field is set to HS_NEGOTIATE to mark this -** situation. -** -** If the target doesn't answer this message immidiately -** (as required by the standard), the SIR_NEGO_FAIL interrupt -** will be raised eventually. -** The handler removes the HS_NEGOTIATE status, and sets the -** negotiated value to the default (async / nowide). -** -** If we receive a matching answer immediately, we check it -** for validity, and set the values. -** -** If we receive a Reject message immediately, we assume the -** negotiation has failed, and set to the standard values. -** -** If we receive a negotiation message while not in HS_NEGOTIATE -** state, it's a target initiated negotiation. We prepare a -** (hopefully) valid answer, set the values, and send this -** answer back to the target. -** -** If the target doesn't fetch the answer (no message out phase), -** we assume the negotiation has failed, and set the values to -** the default. -** -** When we set the values, we set in all ccbs belonging to this -** target, in the controllers register, and in the "phys" -** field of the controllers struct ncb. -** -** Possible cases: hs sir msg_in value send goto -** We try try to negotiate: -** -> target doesnt't msgin NEG FAIL noop defa. - dispatch -** -> target rejected our msg NEG FAIL reject defa. - dispatch -** -> target answered (ok) NEG SYNC sdtr set - clrack -** -> target answered (!ok) NEG SYNC sdtr defa. REJ--->msg_bad -** -> target answered (ok) NEG WIDE wdtr set - clrack -** -> target answered (!ok) NEG WIDE wdtr defa. REJ--->msg_bad -** -> any other msgin NEG FAIL noop defa - dispatch -** -** Target tries to negotiate: -** -> incoming message --- SYNC sdtr set SDTR - -** -> incoming message --- WIDE wdtr set WDTR - -** We sent our answer: -** -> target doesn't msgout --- PROTO ? defa. - dispatch -** -**----------------------------------------------------------------------------- -*/ - - case SIR_NEGO_FAILED: - /*------------------------------------------------------- - ** - ** Negotiation failed. - ** Target doesn't send an answer message, - ** or target rejected our message. - ** - ** Remove negotiation request. - ** - **------------------------------------------------------- - */ - OUTB (HS_PRT, HS_BUSY); - - /* fall through */ - - case SIR_NEGO_PROTO: - /*------------------------------------------------------- - ** - ** Negotiation failed. - ** Target doesn't fetch the answer message. - ** - **------------------------------------------------------- - */ - - if (DEBUG_FLAGS & DEBUG_NEGO) { - PRINT_ADDR(cp->xfer); - printf ("negotiation failed sir=%x status=%x.\n", - num, cp->nego_status); - }; - - /* - ** any error in negotiation: - ** fall back to default mode. - */ - switch (cp->nego_status) { - - case NS_SYNC: - ncr_setsync (np, cp, 0xe0); - break; - - case NS_WIDE: - ncr_setwide (np, cp, 0); - break; - - }; - np->msgin [0] = M_NOOP; - np->msgout[0] = M_NOOP; - cp->nego_status = 0; - OUTL (nc_dsp,vtophys (&np->script->dispatch)); - break; - - case SIR_NEGO_SYNC: - /* - ** Synchronous request message received. - */ - - if (DEBUG_FLAGS & DEBUG_NEGO) { - PRINT_ADDR(cp->xfer); - printf ("sync msgin: "); - (void) ncr_show_msg (np->msgin); - printf (".\n"); - }; - - /* - ** get requested values. - */ - - chg = 0; - per = np->msgin[3]; - ofs = np->msgin[4]; - if (ofs==0) per=255; - - /* - ** if target sends SDTR message, - ** it CAN transfer synch. - */ - - if (ofs) - tp->inqdata[7] |= INQ7_SYNC; - - /* - ** check values against driver limits. - */ - - if (per < np->ns_sync) - {chg = 1; per = np->ns_sync;} - if (per < tp->minsync) - {chg = 1; per = tp->minsync;} - if (ofs > tp->maxoffs) - {chg = 1; ofs = tp->maxoffs;} - - /* - ** Check against controller limits. - */ - fak = (4ul * per - 1) / np->ns_sync - 3; - if (ofs && (fak>7)) {chg = 1; ofs = 0;} - if (!ofs) fak=7; - - if (DEBUG_FLAGS & DEBUG_NEGO) { - PRINT_ADDR(cp->xfer); - printf ("sync: per=%d ofs=%d fak=%d chg=%d.\n", - per, ofs, fak, chg); - } - - if (INB (HS_PRT) == HS_NEGOTIATE) { - OUTB (HS_PRT, HS_BUSY); - switch (cp->nego_status) { - - case NS_SYNC: - /* - ** This was an answer message - */ - if (chg) { - /* - ** Answer wasn't acceptable. - */ - ncr_setsync (np, cp, 0xe0); - OUTL (nc_dsp,vtophys (&np->script->msg_bad)); - } else { - /* - ** Answer is ok. - */ - ncr_setsync (np, cp, (fak<<5)|ofs); - OUTL (nc_dsp,vtophys (&np->script->clrack)); - }; - return; - - case NS_WIDE: - ncr_setwide (np, cp, 0); - break; - }; - }; - - /* - ** It was a request. Set value and - ** prepare an answer message - */ - - ncr_setsync (np, cp, (fak<<5)|ofs); - - np->msgout[0] = M_EXTENDED; - np->msgout[1] = 3; - np->msgout[2] = M_X_SYNC_REQ; - np->msgout[3] = per; - np->msgout[4] = ofs; - - np->msgin [0] = M_NOOP; - - cp->nego_status = NS_SYNC; - - if (DEBUG_FLAGS & DEBUG_NEGO) { - PRINT_ADDR(cp->xfer); - printf ("sync msgout: "); - (void) ncr_show_msg (np->msgin); - printf (".\n"); - } - break; - - case SIR_NEGO_WIDE: - /* - ** Wide request message received. - */ - if (DEBUG_FLAGS & DEBUG_NEGO) { - PRINT_ADDR(cp->xfer); - printf ("wide msgin: "); - (void) ncr_show_msg (np->msgin); - printf (".\n"); - }; - - /* - ** get requested values. - */ - - chg = 0; - wide = np->msgin[3]; - - /* - ** if target sends WDTR message, - ** it CAN transfer wide. - */ - - if (wide) - tp->inqdata[7] |= INQ7_WIDE16; - - /* - ** check values against driver limits. - */ - - if (wide > tp->usrwide) - {chg = 1; wide = tp->usrwide;} - - if (DEBUG_FLAGS & DEBUG_NEGO) { - PRINT_ADDR(cp->xfer); - printf ("wide: wide=%d chg=%d.\n", wide, chg); - } - - if (INB (HS_PRT) == HS_NEGOTIATE) { - OUTB (HS_PRT, HS_BUSY); - switch (cp->nego_status) { - - case NS_WIDE: - /* - ** This was an answer message - */ - if (chg) { - /* - ** Answer wasn't acceptable. - */ - ncr_setwide (np, cp, 0); - OUTL (nc_dsp,vtophys (&np->script->msg_bad)); - } else { - /* - ** Answer is ok. - */ - ncr_setwide (np, cp, wide); - OUTL (nc_dsp,vtophys (&np->script->clrack)); - }; - return; - - case NS_SYNC: - ncr_setsync (np, cp, 0xe0); - break; - }; - }; - - /* - ** It was a request, set value and - ** prepare an answer message - */ - - ncr_setwide (np, cp, wide); - - np->msgout[0] = M_EXTENDED; - np->msgout[1] = 2; - np->msgout[2] = M_X_WIDE_REQ; - np->msgout[3] = wide; - - np->msgin [0] = M_NOOP; - - cp->nego_status = NS_WIDE; - - if (DEBUG_FLAGS & DEBUG_NEGO) { - PRINT_ADDR(cp->xfer); - printf ("wide msgout: "); - (void) ncr_show_msg (np->msgin); - printf (".\n"); - } - break; - -/*-------------------------------------------------------------------- -** -** Processing of special messages -** -**-------------------------------------------------------------------- -*/ - - case SIR_REJECT_RECEIVED: - /*----------------------------------------------- - ** - ** We received a M_REJECT message. - ** - **----------------------------------------------- - */ - - PRINT_ADDR(cp->xfer); - printf ("M_REJECT received (%x:%x).\n", - (unsigned)np->lastmsg, np->msgout[0]); - break; - - case SIR_REJECT_SENT: - /*----------------------------------------------- - ** - ** We received an unknown message - ** - **----------------------------------------------- - */ - - PRINT_ADDR(cp->xfer); - printf ("M_REJECT sent for "); - (void) ncr_show_msg (np->msgin); - printf (".\n"); - break; - -/*-------------------------------------------------------------------- -** -** Processing of special messages -** -**-------------------------------------------------------------------- -*/ - - case SIR_IGN_RESIDUE: - /*----------------------------------------------- - ** - ** We received an IGNORE RESIDUE message, - ** which couldn't be handled by the script. - ** - **----------------------------------------------- - */ - - PRINT_ADDR(cp->xfer); - printf ("M_IGN_RESIDUE received, but not yet implemented.\n"); - break; - - case SIR_MISSING_SAVE: - /*----------------------------------------------- - ** - ** We received an DISCONNECT message, - ** but the datapointer wasn't saved before. - ** - **----------------------------------------------- - */ - - PRINT_ADDR(cp->xfer); - printf ("M_DISCONNECT received, but datapointer not saved:\n" - "\tdata=%x save=%x goal=%x.\n", - (unsigned) INL (nc_temp), - (unsigned) np->header.savep, - (unsigned) np->header.goalp); - break; - -/*-------------------------------------------------------------------- -** -** Processing of a "S_QUEUE_FULL" status. -** -** The current command has been rejected, -** because there are too many in the command queue. -** We have started too many commands for that target. -** -** If possible, reinsert at head of queue. -** Stall queue until there are no disconnected jobs -** (ncr is REALLY idle). Then restart processing. -** -** We should restart the current job after the controller -** has become idle. But this is not yet implemented. -** -**-------------------------------------------------------------------- -*/ - case SIR_STALL_QUEUE: - /*----------------------------------------------- - ** - ** Stall the start queue. - ** - **----------------------------------------------- - */ - PRINT_ADDR(cp->xfer); - printf ("queue full.\n"); - - np->script->start1[0] = SCR_INT; - - /* - ** Try to disable tagged transfers. - */ - ncr_setmaxtags (&np->target[target], 0); - - /* - ** @QUEUE@ - ** - ** Should update the launch field of the - ** current job to be able to restart it. - ** Then prepend it to the start queue. - */ - - /* fall through */ - - case SIR_STALL_RESTART: - /*----------------------------------------------- - ** - ** Enable selecting again, - ** if NO disconnected jobs. - ** - **----------------------------------------------- - */ - /* - ** Look for a disconnected job. - */ - cp = &np->ccb; - while (cp && cp->host_status != HS_DISCONNECT) - cp = cp->link_ccb; - - /* - ** if there is one, ... - */ - if (cp) { - /* - ** wait for reselection - */ - OUTL (nc_dsp, vtophys (&np->script->reselect)); - return; - }; - - /* - ** else remove the interrupt. - */ - - printf ("%s: queue empty.\n", ncr_name (np)); - np->script->start1[0] = SCR_INT ^ IFFALSE (0); - break; - }; - -out: - OUTB (nc_dcntl, (STD|NOCOM)); -} - -/*========================================================== -** -** -** Aquire a control block -** -** -**========================================================== -*/ - -static ccb_p ncr_get_ccb - (ncb_p np, u_long flags, u_long target, u_long lun) -{ - lcb_p lp; - ccb_p cp = (ccb_p ) 0; - - /* - ** Lun structure available ? - */ - - lp = np->target[target].lp[lun]; - if (lp) - cp = lp->next_ccb; - - /* - ** Look for free CCB - */ - - while (cp && cp->magic) cp = cp->next_ccb; - - /* - ** if nothing available, take the default. - */ - - if (!cp) cp = &np->ccb; - - /* - ** Wait until available. - */ - - while (cp->magic) { - if (flags & SCSI_NOSLEEP) break; - if (tsleep ((caddr_t)cp, PZERO|PCATCH, "ncr", 0)) - break; - }; - - if (cp->magic) - return ((ccb_p) 0); - - cp->magic = 1; - return (cp); -} - -/*========================================================== -** -** -** Release one control block -** -** -**========================================================== -*/ - -void ncr_free_ccb (ncb_p np, ccb_p cp, int flags) -{ - /* - ** sanity - */ - - if (!cp) return; - - cp -> host_status = HS_IDLE; - cp -> magic = 0; - if (cp == &np->ccb) - wakeup ((caddr_t) cp); -} - -/*========================================================== -** -** -** Allocation of resources for Targets/Luns/Tags. -** -** -**========================================================== -*/ - -static void ncr_alloc_ccb (ncb_p np, struct scsi_xfer * xp) -{ - tcb_p tp; - lcb_p lp; - ccb_p cp; - - u_long target; - u_long lun; - - if (!np) return; - if (!xp) return; - - target = xp->TARGET; - lun = xp->LUN; - - if (target>=MAX_TARGET) return; - if (lun >=MAX_LUN ) return; - - tp=&np->target[target]; - - if (!tp->jump_tcb.l_cmd) { - - /* - ** initialize it. - */ - tp->jump_tcb.l_cmd = (SCR_JUMP^IFFALSE (DATA (0x80 + target))); - tp->jump_tcb.l_paddr = np->jump_tcb.l_paddr; - - tp->getscr[0] = SCR_COPY (1); - tp->getscr[1] = vtophys (&tp->sval); - tp->getscr[2] = np->paddr + offsetof (struct ncr_reg, nc_sxfer); - tp->getscr[3] = SCR_COPY (1); - tp->getscr[4] = vtophys (&tp->wval); - tp->getscr[5] = np->paddr + offsetof (struct ncr_reg, nc_scntl3); - - assert (( (offsetof(struct ncr_reg, nc_sxfer) ^ - offsetof(struct tcb , sval )) &3) == 0); - assert (( (offsetof(struct ncr_reg, nc_scntl3) ^ - offsetof(struct tcb , wval )) &3) == 0); - - tp->call_lun.l_cmd = (SCR_CALL); - tp->call_lun.l_paddr = vtophys (&np->script->resel_lun); - - tp->jump_lcb.l_cmd = (SCR_JUMP); - tp->jump_lcb.l_paddr = vtophys (&np->script->abort); - np->jump_tcb.l_paddr = vtophys (&tp->jump_tcb); - - ncr_setmaxtags (tp, SCSI_NCR_MAX_TAGS); - } - - /* - ** Logic unit control block - */ - lp = tp->lp[lun]; - if (!lp) { - /* - ** Allocate a lcb - */ - lp = (lcb_p) malloc (sizeof (struct lcb), M_DEVBUF, M_NOWAIT); - if (!lp) return; - - /* - ** Initialize it - */ - bzero (lp, sizeof (*lp)); - lp->jump_lcb.l_cmd = (SCR_JUMP ^ IFFALSE (DATA (lun))); - lp->jump_lcb.l_paddr = tp->jump_lcb.l_paddr; - - lp->call_tag.l_cmd = (SCR_CALL); - lp->call_tag.l_paddr = vtophys (&np->script->resel_tag); - - lp->jump_ccb.l_cmd = (SCR_JUMP); - lp->jump_ccb.l_paddr = vtophys (&np->script->aborttag); - - lp->actlink = 1; - /* - ** Link into Lun-Chain - */ - - tp->jump_lcb.l_paddr = vtophys (&lp->jump_lcb); - tp->lp[lun] = lp; - - } - - /* - ** Limit possible number of ccbs. - ** - ** If tagged command queueing is enabled, - ** can use more than one ccb. - */ - - if (np->actccbs >= MAX_START-2) return; - if (lp->actccbs && (lp->actccbs >= lp->reqccbs)) - return; - - /* - ** Allocate a ccb - */ - cp = (ccb_p) malloc (sizeof (struct ccb), M_DEVBUF, M_NOWAIT); - - if (!cp) - return; - - if (DEBUG_FLAGS & DEBUG_ALLOC) { - PRINT_ADDR(xp); - printf ("new ccb @%x.\n", (unsigned) cp); - } - - /* - ** Count it - */ - lp->actccbs++; - np->actccbs++; - - /* - ** Initialize it. - */ - bzero (cp, sizeof (*cp)); - - /* - ** link in reselect chain. - */ - cp->jump_ccb.l_cmd = SCR_JUMP; - cp->jump_ccb.l_paddr = lp->jump_ccb.l_paddr; - lp->jump_ccb.l_paddr = vtophys(&cp->jump_ccb); - cp->call_tmp.l_cmd = SCR_CALL; - cp->call_tmp.l_paddr = vtophys(&np->script->resel_tmp); - - /* - ** link in wakeup chain - */ - cp->link_ccb = np->ccb.link_ccb; - np->ccb.link_ccb = cp; - - /* - ** Link into CCB-Chain - */ - cp->next_ccb = lp->next_ccb; - lp->next_ccb = cp; -} - -/*========================================================== -** -** -** Announce the number of ccbs/tags to the scsi driver. -** -** -**========================================================== -*/ - -static void ncr_opennings (ncb_p np, lcb_p lp, struct scsi_xfer * xp) -{ -#ifndef ANCIENT - /* - ** want to reduce the number ... - */ - if (lp->actlink > lp->reqlink) { - - /* - ** Try to reduce the count. - ** We assume to run at splbio .. - */ - u_char diff = lp->actlink - lp->reqlink; - - if (!diff) return; - - if (diff > xp->sc_link->opennings) - diff = xp->sc_link->opennings; - - xp->sc_link->opennings -= diff; - lp->actlink -= diff; - if (DEBUG_FLAGS & DEBUG_TAGS) - printf ("%s: actlink: diff=%d, new=%d, req=%d\n", - ncr_name(np), diff, lp->actlink, lp->reqlink); - return; - }; - - /* - ** want to increase the number ? - */ - if (lp->reqlink > lp->actlink) { - u_char diff = lp->reqlink - lp->actlink; - - xp->sc_link->opennings += diff; - lp->actlink += diff; - wakeup ((caddr_t) xp->sc_link); - if (DEBUG_FLAGS & DEBUG_TAGS) - printf ("%s: actlink: diff=%d, new=%d, req=%d\n", - ncr_name(np), diff, lp->actlink, lp->reqlink); - }; -#endif -} - -/*========================================================== -** -** -** Build Scatter Gather Block -** -** -**========================================================== -** -** The transfer area may be scattered among -** several non adjacent physical pages. -** -** We may use MAX_SCATTER blocks. -** -**---------------------------------------------------------- -*/ - -static int ncr_scatter - (struct dsb* phys, vm_offset_t vaddr, vm_size_t datalen) -{ - u_long paddr, pnext; - - u_short segment = 0; - u_long segsize, segaddr; - u_long size, csize = 0; - u_long chunk = MAX_SIZE; - int free; - - bzero (&phys->data, sizeof (phys->data)); - if (!datalen) return (0); - - paddr = vtophys (vaddr); - - /* - ** insert extra break points at a distance of chunk. - ** We try to reduce the number of interrupts due to - ** unexpected phase changes due to disconnects. - ** A typical harddisk may disconnect before ANY block. - ** If we want to avoid unexpected phase changes at all - ** we have to use a break point every 512 bytes. - ** Of course the number of scatter/gather blocks is - ** limited. - */ - - free = MAX_SCATTER - 1; - - if (vaddr & (NBPG-1)) free -= datalen / NBPG; - - if (free>1) - while ((chunk * free >= 2 * datalen) && (chunk>=1024)) - chunk /= 2; - - if(DEBUG_FLAGS & DEBUG_SCATTER) - printf("ncr?:\tscattering virtual=0x%x size=%d chunk=%d.\n", - (unsigned) vaddr, (unsigned) datalen, (unsigned) chunk); - - /* - ** Build data descriptors. - */ - while (datalen && (segment < MAX_SCATTER)) { - - /* - ** this segment is empty - */ - segsize = 0; - segaddr = paddr; - pnext = paddr; - - if (!csize) csize = chunk; - - while ((datalen) && (paddr == pnext) && (csize)) { - - /* - ** continue this segment - */ - pnext = (paddr & (~(NBPG - 1))) + NBPG; - - /* - ** Compute max size - */ - - size = pnext - paddr; /* page size */ - if (size > datalen) size = datalen; /* data size */ - if (size > csize ) size = csize ; /* chunksize */ - - segsize += size; - vaddr += size; - csize -= size; - datalen -= size; - paddr = vtophys (vaddr); - }; - - if(DEBUG_FLAGS & DEBUG_SCATTER) - printf ("\tseg #%d addr=%x size=%d (rest=%d).\n", - segment, - (unsigned) segaddr, - (unsigned) segsize, - (unsigned) datalen); - - phys->data[segment].addr = segaddr; - phys->data[segment].size = segsize; - segment++; - } - - if (datalen) { - printf("ncr?: scatter/gather failed (residue=%d).\n", - (unsigned) datalen); - return (-1); - }; - - return (segment); -} - -/*========================================================== -** -** -** Test the pci bus snoop logic :-( -** -** Has to be called with interrupts disabled. -** -** -**========================================================== -*/ - -static int ncr_snooptest (struct ncb* np) -{ - u_long ncr_rd, ncr_wr, ncr_bk, host_rd, host_wr, pc, err=0; - /* - ** init - */ - pc = vtophys (&np->script->snooptest); - host_wr = 1; - ncr_wr = 2; - /* - ** Set memory and register. - */ - ncr_cache = host_wr; - OUTL (nc_temp, ncr_wr); - /* - ** Start script (exchange values) - */ - OUTL (nc_dsp, pc); - /* - ** Wait 'til done - */ - while (!(INB(nc_istat) & (INTF|SIP|DIP))); - /* - ** Read memory and register. - */ - host_rd = ncr_cache; - ncr_rd = INL (nc_scratcha); - ncr_bk = INL (nc_temp); - /* - ** Reset ncr chip - */ - OUTB (nc_istat, SRST); - OUTB (nc_istat, 0 ); - /* - ** Show results. - */ - if (host_wr != ncr_rd) { - printf ("CACHE TEST FAILED: host wrote %d, ncr read %d.\n", - (int) host_wr, (int) ncr_rd); - err |= 1; - }; - if (host_rd != ncr_wr) { - printf ("CACHE TEST FAILED: ncr wrote %d, host read %d.\n", - (int) ncr_wr, (int) host_rd); - err |= 2; - }; - if (ncr_bk != ncr_wr) { - printf ("CACHE TEST FAILED: ncr wrote %d, read back %d.\n", - (int) ncr_wr, (int) ncr_bk); - err |= 4; - }; - return (err); -} - -/*========================================================== -** -** -** Profiling the drivers and targets performance. -** -** -**========================================================== -*/ - -/* -** Compute the difference in milliseconds. -**/ - -static int ncr_delta (struct timeval * from, struct timeval * to) -{ - if (!from->tv_sec) return (-1); - if (!to ->tv_sec) return (-2); - return ( (to->tv_sec - from->tv_sec - 2)*1000+ - +(to->tv_usec - from->tv_usec + 2000000)/1000); -} - -#define PROFILE cp->phys.header.stamp -static void ncb_profile (ncb_p np, ccb_p cp) -{ - int co, da, st, en, di, se, post,work,disc; - u_long diff; - - PROFILE.end = time; - - st = ncr_delta (&PROFILE.start,&PROFILE.status); - if (st<0) return; /* status not reached */ - - da = ncr_delta (&PROFILE.start,&PROFILE.data); - if (da<0) return; /* No data transfer phase */ - - co = ncr_delta (&PROFILE.start,&PROFILE.command); - if (co<0) return; /* command not executed */ - - en = ncr_delta (&PROFILE.start,&PROFILE.end), - di = ncr_delta (&PROFILE.start,&PROFILE.disconnect), - se = ncr_delta (&PROFILE.start,&PROFILE.select); - post = en - st; - - /* - ** @PROFILE@ Disconnect time invalid if multiple disconnects - */ - - if (di>=0) disc = se-di; else disc = 0; - - work = (st - co) - disc; - - diff = (np->disc_phys - np->disc_ref) & 0xff; - np->disc_ref += diff; - - np->profile.num_trans += 1; - if (cp->xfer) - np->profile.num_bytes += cp->xfer->datalen; - np->profile.num_disc += diff; - np->profile.ms_setup += co; - np->profile.ms_data += work; - np->profile.ms_disc += disc; - np->profile.ms_post += post; -} -#undef PROFILE - -/*========================================================== -** -** -** Device lookup. -** -** @GENSCSI@ should be integrated to scsiconf.c -** -** -**========================================================== -*/ - -#ifndef NEW_SCSICONF - -struct table_entry { - char * manufacturer; - char * model; - char * version; - u_long info; -}; - -static struct table_entry device_tab[] = -{ - {"SONY", "SDT-5000", "3.17", QUIRK_NOMSG}, - {"WangDAT", "Model 2600", "01.7", QUIRK_NOMSG}, - {"WangDAT", "Model 3200", "02.2", QUIRK_NOMSG}, - {"WangDAT", "Model 1300", "02.4", QUIRK_NOMSG}, - {"", "", "", 0} /* catch all: must be last entry. */ -}; - -static u_long ncr_lookup(char * id) -{ - struct table_entry * p = device_tab; - char *d, *r, c; - - for (;;p++) { - - d = id+8; - r = p->manufacturer; - while ((c=*r++)) if (c!=*d++) break; - if (c) continue; - - d = id+16; - r = p->model; - while ((c=*r++)) if (c!=*d++) break; - if (c) continue; - - d = id+32; - r = p->version; - while ((c=*r++)) if (c!=*d++) break; - if (c) continue; - - return (p->info); - } -} -#endif - -/*========================================================== -** -** Determine the ncr's clock frequency. -** This is important for the negotiation -** of the synchronous transfer rate. -** -**========================================================== -** -** Note: we have to return the correct value. -** THERE IS NO SAVE DEFAULT VALUE. -** -** We assume that all NCR based boards are delivered -** with a 40Mhz clock. Because we have to divide -** by an integer value greater than 3, only clock -** frequencies of 40Mhz (/4) or 50MHz (/5) permit -** the FAST-SCSI rate of 10MHz. -** -**---------------------------------------------------------- -*/ - -#ifndef NCR_CLOCK -# define NCR_CLOCK 40 -#endif /* NCR_CLOCK */ - - -static void ncr_getclock (ncb_p np) -{ - u_char tbl[5] = {6,2,3,4,6}; - u_char f; - u_char ns_clock = (1000/NCR_CLOCK); - - /* - ** Compute the best value for scntl3. - */ - - f = (2 * MIN_SYNC_PD - 1) / ns_clock; - if (!f ) f=1; - if (f>4) f=4; - np -> ns_sync = (ns_clock * tbl[f]) / 2; - np -> rv_scntl3 = f<<4; - - f = (2 * MIN_ASYNC_PD - 1) / ns_clock; - if (!f ) f=1; - if (f>4) f=4; - np -> ns_async = (ns_clock * tbl[f]) / 2; - np -> rv_scntl3 |= f; - if (DEBUG_FLAGS & DEBUG_TIMING) - printf ("%s: sclk=%d async=%d sync=%d (ns) scntl3=0x%x\n", - ncr_name (np), ns_clock, np->ns_async, np->ns_sync, np->rv_scntl3); -} - -/*=========================================================================*/ -#endif /* KERNEL */ - - diff --git a/sys/pci/ncrreg.h b/sys/pci/ncrreg.h deleted file mode 100644 index 1a22aee38d24f..0000000000000 --- a/sys/pci/ncrreg.h +++ /dev/null @@ -1,547 +0,0 @@ -/************************************************************************** -** -** $Id: ncrreg.h,v 2.3 94/10/09 21:10:34 wolf Oct11 $ -** -** Device driver for the NCR 53C810 PCI-SCSI-Controller. -** -** 386bsd / FreeBSD / NetBSD -** -**------------------------------------------------------------------------- -** -** Written for 386bsd and FreeBSD by -** wolf@dentaro.gun.de Wolfgang Stanglmeier -** se@mi.Uni-Koeln.de Stefan Esser -** -** Ported to NetBSD by -** mycroft@gnu.ai.mit.edu -** -**------------------------------------------------------------------------- -** -** Copyright (c) 1994 Wolfgang Stanglmeier. All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** 3. The name of the author may not be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -** -*************************************************************************** -*/ - -#ifndef __NCR_REG_H__ -#define __NCR_REG_H__ - - -/*----------------------------------------------------------------- -** -** The ncr 53c810 register structure. -** -**----------------------------------------------------------------- -*/ - -struct ncr_reg { -/*00*/ u_char nc_scntl0; /* full arb., ena parity, par->ATN */ - -/*01*/ u_char nc_scntl1; /* no reset */ - #define ISCON 0x10 /* connected to scsi */ - #define CRST 0x08 /* force reset */ - -/*02*/ u_char nc_scntl2; /* no disconnect expected */ - #define SDU 0x80 /* cmd: disconnect will raise error */ - #define CHM 0x40 /* sta: chained mode */ - #define WSS 0x08 /* sta: wide scsi send [W]*/ - #define WSR 0x01 /* sta: wide scsi received [W]*/ - -/*03*/ u_char nc_scntl3; /* cnf system clock dependent */ - #define EWS 0x08 /* cmd: enable wide scsi [W]*/ - -/*04*/ u_char nc_scid; /* cnf host adapter scsi address */ - #define RRE 0x40 /* r/w:e enable response to resel. */ - #define SRE 0x20 /* r/w:e enable response to select */ - -/*05*/ u_char nc_sxfer; /* ### Sync speed and count */ - -/*06*/ u_char nc_sdid; /* ### Destination-ID */ - -/*07*/ u_char nc_gpreg; /* ??? IO-Pins */ - -/*08*/ u_char nc_sfbr; /* ### First byte in phase */ - -/*09*/ u_char nc_socl; - #define CREQ 0x80 /* r/w: SCSI-REQ */ - #define CACK 0x40 /* r/w: SCSI-ACK */ - #define CBSY 0x20 /* r/w: SCSI-BSY */ - #define CSEL 0x10 /* r/w: SCSI-SEL */ - #define CATN 0x08 /* r/w: SCSI-ATN */ - #define CMSG 0x04 /* r/w: SCSI-MSG */ - #define CC_D 0x02 /* r/w: SCSI-C_D */ - #define CI_O 0x01 /* r/w: SCSI-I_O */ - -/*0a*/ u_char nc_ssid; - -/*0b*/ u_char nc_sbcl; - -/*0c*/ u_char nc_dstat; - #define DFE 0x80 /* sta: dma fifo empty */ - #define MDPE 0x40 /* int: master data parity error */ - #define BF 0x20 /* int: script: bus fault */ - #define ABRT 0x10 /* int: script: command aborted */ - #define SSI 0x08 /* int: script: single step */ - #define SIR 0x04 /* int: script: interrupt instruct. */ - #define IID 0x01 /* int: script: illegal instruct. */ - -/*0d*/ u_char nc_sstat0; - #define ILF 0x80 /* sta: data in SIDL register lsb */ - #define ORF 0x40 /* sta: data in SODR register lsb */ - #define OLF 0x20 /* sta: data in SODL register lsb */ - #define AIP 0x10 /* sta: arbitration in progress */ - #define LOA 0x08 /* sta: arbitration lost */ - #define WOA 0x04 /* sta: arbitration won */ - #define IRST 0x02 /* sta: scsi reset signal */ - #define SDP 0x01 /* sta: scsi parity signal */ - -/*0e*/ u_char nc_sstat1; - #define FF3210 0xf0 /* sta: bytes in the scsi fifo */ - -/*0f*/ u_char nc_sstat2; - #define ILF1 0x80 /* sta: data in SIDL register msb[W]*/ - #define ORF1 0x40 /* sta: data in SODR register msb[W]*/ - #define OLF1 0x20 /* sta: data in SODL register msb[W]*/ - -/*10*/ u_long nc_dsa; /* --> Base page */ - -/*14*/ u_char nc_istat; /* --> Main Command and status */ - #define CABRT 0x80 /* cmd: abort current operation */ - #define SRST 0x40 /* mod: reset chip */ - #define SIGP 0x20 /* r/w: message from host to ncr */ - #define SEM 0x10 /* r/w: message between host + ncr */ - #define CON 0x08 /* sta: connected to scsi */ - #define INTF 0x04 /* sta: int on the fly (reset by wr)*/ - #define SIP 0x02 /* sta: scsi-interrupt */ - #define DIP 0x01 /* sta: host/script interrupt */ - -/*15*/ u_char nc_15_; -/*16*/ u_char nc_16_; -/*17*/ u_char nc_17_; - -/*18*/ u_char nc_ctest0; -/*19*/ u_char nc_ctest1; - -/*1a*/ u_char nc_ctest2; - #define CSIGP 0x40 - -/*1b*/ u_char nc_ctest3; - #define CLF 0x04 /* clear scsi fifo */ - -/*1c*/ u_long nc_temp; /* ### Temporary stack */ - -/*20*/ u_char nc_dfifo; -/*21*/ u_char nc_ctest4; -/*22*/ u_char nc_ctest5; -/*23*/ u_char nc_ctest6; - -/*24*/ u_long nc_dbc; /* ### Byte count and command */ -/*28*/ u_long nc_dnad; /* ### Next command register */ -/*2c*/ u_long nc_dsp; /* --> Script Pointer */ -/*30*/ u_long nc_dsps; /* --> Script pointer save/opcode#2 */ -/*34*/ u_long nc_scratcha; /* ??? Temporary register a */ - -/*38*/ u_char nc_dmode; -/*39*/ u_char nc_dien; -/*3a*/ u_char nc_dwt; - -/*3b*/ u_char nc_dcntl; /* --> Script execution control */ - #define SSM 0x10 /* mod: single step mode */ - #define STD 0x04 /* cmd: start dma mode */ - #define NOCOM 0x01 /* cmd: protect sfbr while reselect */ - -/*3c*/ u_long nc_adder; - -/*40*/ u_short nc_sien; /* -->: interrupt enable */ -/*42*/ u_short nc_sist; /* <--: interrupt status */ - #define STO 0x0400/* sta: timeout (select) */ - #define GEN 0x0200/* sta: timeout (general) */ - #define HTH 0x0100/* sta: timeout (handshake) */ - #define MA 0x80 /* sta: phase mismatch */ - #define CMP 0x40 /* sta: arbitration complete */ - #define SEL 0x20 /* sta: selected by another device */ - #define RSL 0x10 /* sta: reselected by another device*/ - #define SGE 0x08 /* sta: gross error (over/underflow)*/ - #define UDC 0x04 /* sta: unexpected disconnect */ - #define RST 0x02 /* sta: scsi bus reset detected */ - #define PAR 0x01 /* sta: scsi parity error */ - -/*44*/ u_char nc_slpar; -/*45*/ u_char nc_swide; -/*46*/ u_char nc_macntl; -/*47*/ u_char nc_gpcntl; -/*48*/ u_char nc_stime0; /* cmd: timeout for select&handshake*/ -/*49*/ u_char nc_stime1; /* cmd: timeout user defined */ -/*4a*/ u_short nc_respid; /* sta: Reselect-IDs */ - -/*4c*/ u_char nc_stest0; - -/*4d*/ u_char nc_stest1; - -/*4e*/ u_char nc_stest2; - #define ROF 0x40 /* reset scsi offset (after gross error!) */ - #define EXT 0x02 /* extended filtering */ - -/*4f*/ u_char nc_stest3; - #define TE 0x80 /* c: tolerAnt enable */ - #define CSF 0x02 /* c: clear scsi fifo */ - -/*50*/ u_short nc_sidl; /* Lowlevel: latched from scsi data */ -/*52*/ u_short nc_52_; -/*54*/ u_short nc_sodl; /* Lowlevel: data out to scsi data */ -/*56*/ u_short nc_56_; -/*58*/ u_short nc_sbdl; /* Lowlevel: data from scsi data */ -/*5a*/ u_short nc_5a_; -/*5c*/ u_char nc_scr0; /* Working register B */ -/*5d*/ u_char nc_scr1; /* */ -/*5e*/ u_char nc_scr2; /* */ -/*5f*/ u_char nc_scr3; /* */ -/*60*/ -}; - -/*----------------------------------------------------------- -** -** Utility macros for the script. -** -**----------------------------------------------------------- -*/ - -#define REGJ(p,r) (offsetof(struct ncr_reg, p ## r)) -#define REG(r) REGJ (nc_, r) - -#ifndef TARGET_MODE -#define TARGET_MODE 0 -#endif - -typedef unsigned long ncrcmd; - -/*----------------------------------------------------------- -** -** SCSI phases -** -**----------------------------------------------------------- -*/ - -#define SCR_DATA_OUT 0x00000000 -#define SCR_DATA_IN 0x01000000 -#define SCR_COMMAND 0x02000000 -#define SCR_STATUS 0x03000000 -#define SCR_ILG_OUT 0x04000000 -#define SCR_ILG_IN 0x05000000 -#define SCR_MSG_OUT 0x06000000 -#define SCR_MSG_IN 0x07000000 - -/*----------------------------------------------------------- -** -** Data transfer via SCSI. -** -**----------------------------------------------------------- -** -** MOVE_ABS (LEN) -** <<start address>> -** -** MOVE_IND (LEN) -** <<dnad_offset>> -** -** MOVE_TBL -** <<dnad_offset>> -** -**----------------------------------------------------------- -*/ - -#define SCR_MOVE_ABS(l) ((0x08000000 ^ (TARGET_MODE << 1ul)) | (l)) -#define SCR_MOVE_IND(l) ((0x28000000 ^ (TARGET_MODE << 1ul)) | (l)) -#define SCR_MOVE_TBL (0x18000000 ^ (TARGET_MODE << 1ul)) - -struct scr_tblmove { - u_long size; - u_long addr; -}; - -/*----------------------------------------------------------- -** -** Selection -** -**----------------------------------------------------------- -** -** SEL_ABS | SCR_ID (0..7) [ | REL_JMP] -** <<alternate_address>> -** -** SEL_TBL | << dnad_offset>> [ | REL_JMP] -** <<alternate_address>> -** -**----------------------------------------------------------- -*/ - -#define SCR_SEL_ABS 0x40000000 -#define SCR_SEL_ABS_ATN 0x41000000 -#define SCR_SEL_TBL 0x42000000 -#define SCR_SEL_TBL_ATN 0x43000000 - -struct scr_tblsel { - u_char sel_0; - u_char sel_sxfer; - u_char sel_id; - u_char sel_scntl3; -}; - -#define SCR_JMP_REL 0x04000000 -#define SCR_ID(id) (((u_long)(id)) << 16) - -/*----------------------------------------------------------- -** -** Waiting for Disconnect or Reselect -** -**----------------------------------------------------------- -** -** WAIT_DISC -** dummy: <<alternate_address>> -** -** WAIT_RESEL -** <<alternate_address>> -** -**----------------------------------------------------------- -*/ - -#define SCR_WAIT_DISC 0x48000000 -#define SCR_WAIT_RESEL 0x50000000 - -/*----------------------------------------------------------- -** -** Bit Set / Reset -** -**----------------------------------------------------------- -** -** SET (flags {|.. }) -** -** CLR (flags {|.. }) -** -**----------------------------------------------------------- -*/ - -#define SCR_SET(f) (0x58000000 | (f)) -#define SCR_CLR(f) (0x60000000 | (f)) - -#define SCR_CARRY 0x00000400 -#define SCR_TRG 0x00000200 -#define SCR_ACK 0x00000040 -#define SCR_ATN 0x00000008 - - - - -/*----------------------------------------------------------- -** -** Memory to memory move -** -**----------------------------------------------------------- -** -** COPY (bytecount) -** << source_address >> -** << destination_address >> -** -**----------------------------------------------------------- -*/ - -#define SCR_COPY(n) (0xc0000000 | (n)) - -/*----------------------------------------------------------- -** -** Register move and binary operations -** -**----------------------------------------------------------- -** -** SFBR_REG (reg, op, data) reg = SFBR op data -** << 0 >> -** -** REG_SFBR (reg, op, data) SFBR = reg op data -** << 0 >> -** -** REG_REG (reg, op, data) reg = reg op data -** << 0 >> -** -**----------------------------------------------------------- -*/ - -#define SCR_REG_OFS(ofs) ((ofs) << 16ul) - -#define SCR_SFBR_REG(reg,op,data) \ - (0x68000000 | (SCR_REG_OFS(REG(reg))) | (op) | ((data)<<8ul)) - -#define SCR_REG_SFBR(reg,op,data) \ - (0x70000000 | (SCR_REG_OFS(REG(reg))) | (op) | ((data)<<8ul)) - -#define SCR_REG_REG(reg,op,data) \ - (0x78000000 | (SCR_REG_OFS(REG(reg))) | (op) | ((data)<<8ul)) - - -#define SCR_LOAD 0x00000000 -#define SCR_SHL 0x01000000 -#define SCR_OR 0x02000000 -#define SCR_XOR 0x03000000 -#define SCR_AND 0x04000000 -#define SCR_SHR 0x05000000 -#define SCR_ADD 0x06000000 -#define SCR_ADDC 0x07000000 - -/*----------------------------------------------------------- -** -** FROM_REG (reg) reg = SFBR -** << 0 >> -** -** TO_REG (reg) SFBR = reg -** << 0 >> -** -** LOAD_REG (reg, data) reg = <data> -** << 0 >> -** -** LOAD_SFBR(data) SFBR = <data> -** << 0 >> -** -**----------------------------------------------------------- -*/ - -#define SCR_FROM_REG(reg) \ - SCR_REG_SFBR(reg,SCR_OR,0) - -#define SCR_TO_REG(reg) \ - SCR_SFBR_REG(reg,SCR_OR,0) - -#define SCR_LOAD_REG(reg,data) \ - SCR_REG_REG(reg,SCR_LOAD,data) - -#define SCR_LOAD_SFBR(data) \ - (SCR_REG_SFBR (gpreg, SCR_LOAD, data)) - -/*----------------------------------------------------------- -** -** Waiting for Disconnect or Reselect -** -**----------------------------------------------------------- -** -** JUMP [ | IFTRUE/IFFALSE ( ... ) ] -** <<address>> -** -** JUMPR [ | IFTRUE/IFFALSE ( ... ) ] -** <<distance>> -** -** CALL [ | IFTRUE/IFFALSE ( ... ) ] -** <<address>> -** -** CALLR [ | IFTRUE/IFFALSE ( ... ) ] -** <<distance>> -** -** RETURN [ | IFTRUE/IFFALSE ( ... ) ] -** <<dummy>> -** -** INT [ | IFTRUE/IFFALSE ( ... ) ] -** <<ident>> -** -** INT_FLY [ | IFTRUE/IFFALSE ( ... ) ] -** <<ident>> -** -** Conditions: -** WHEN (phase) -** IF (phase) -** CARRY -** DATA (data, mask) -** -**----------------------------------------------------------- -*/ - -#define SCR_JUMP 0x80080000 -#define SCR_JUMPR 0x80880000 -#define SCR_CALL 0x88080000 -#define SCR_CALLR 0x88880000 -#define SCR_RETURN 0x90080000 -#define SCR_INT 0x98080000 -#define SCR_INT_FLY 0x98180000 - -#define IFFALSE(arg) (0x00080000 | (arg)) -#define IFTRUE(arg) (0x00000000 | (arg)) - -#define WHEN(phase) (0x00030000 | (phase)) -#define IF(phase) (0x00020000 | (phase)) - -#define DATA(D) (0x00040000 | ((D) & 0xff)) -#define MASK(D,M) (0x00040000 | (((M ^ 0xff) & 0xff) << 8ul)|((D) & 0xff)) - -#define CARRYSET (0x00200000) - -/*----------------------------------------------------------- -** -** SCSI constants. -** -**----------------------------------------------------------- -*/ - -/* -** Messages -*/ - -#define M_COMPLETE (0x00) -#define M_EXTENDED (0x01) -#define M_SAVE_DP (0x02) -#define M_RESTORE_DP (0x03) -#define M_DISCONNECT (0x04) -#define M_ID_ERROR (0x05) -#define M_ABORT (0x06) -#define M_REJECT (0x07) -#define M_NOOP (0x08) -#define M_PARITY (0x09) -#define M_LCOMPLETE (0x0a) -#define M_FCOMPLETE (0x0b) -#define M_RESET (0x0c) -#define M_ABORT_TAG (0x0d) -#define M_CLEAR_QUEUE (0x0e) -#define M_INIT_REC (0x0f) -#define M_REL_REC (0x10) -#define M_TERMINATE (0x11) -#define M_SIMPLE_TAG (0x20) -#define M_HEAD_TAG (0x21) -#define M_ORDERED_TAG (0x22) -#define M_IGN_RESIDUE (0x23) -#define M_IDENTIFY (0x80) - -#define M_X_MODIFY_DP (0x00) -#define M_X_SYNC_REQ (0x01) -#define M_X_WIDE_REQ (0x03) - -/* -** Status -*/ - -#define S_GOOD (0x00) -#define S_CHECK_COND (0x02) -#define S_COND_MET (0x04) -#define S_BUSY (0x08) -#define S_INT (0x10) -#define S_INT_COND_MET (0x14) -#define S_CONFLICT (0x18) -#define S_TERMINATED (0x20) -#define S_QUEUE_FULL (0x28) -#define S_ILLEGAL (0xff) -#define S_SENSE (0x80) - -#endif /*__NCR_REG_H__*/ diff --git a/sys/pci/pci.c b/sys/pci/pci.c deleted file mode 100644 index 6ef71637bf566..0000000000000 --- a/sys/pci/pci.c +++ /dev/null @@ -1,778 +0,0 @@ -/************************************************************************** -** -** $Id: pci.c,v 1.8 1994/10/25 23:09:08 se Exp $ -** -** General subroutines for the PCI bus on 80*86 systems. -** pci_configure () -** -** 386bsd / FreeBSD -** -**------------------------------------------------------------------------- -** -** Copyright (c) 1994 Wolfgang Stanglmeier. All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** 3. The name of the author may not be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -** -*************************************************************************** -*/ - -#include <pci.h> -#if NPCI > 0 - -#ifndef __FreeBSD2__ -#if __FreeBSD__ >= 2 -#define __FreeBSD2__ -#endif -#endif - -/*======================================================== -** -** #includes and declarations -** -**======================================================== -*/ - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/malloc.h> -#include <sys/errno.h> - -#include <vm/vm.h> -#include <vm/vm_param.h> - -#include <i386/isa/isa.h> -#include <i386/isa/isa_device.h> -#include <i386/isa/icu.h> -#include <i386/pci/pcireg.h> - -#ifdef __FreeBSD2__ -#include <sys/devconf.h> - -struct pci_devconf { - struct kern_devconf pdc_kdc; - struct pci_info pdc_pi; -}; -#endif - -/* -** Function prototypes missing in system headers -*/ - -#ifndef __FreeBSD2__ -extern pmap_t pmap_kernel(void); -static vm_offset_t pmap_mapdev (vm_offset_t paddr, vm_size_t vsize); - -/* - * Type of the first (asm) part of an interrupt handler. - */ -typedef void inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss)); - -/* - * Usual type of the second (C) part of an interrupt handler. Some bogus - * ones need the arg to be the interrupt frame (and not a copy of it, which - * is all that is possible in C). - */ -typedef void inthand2_t __P((int unit)); - -/* -** XXX @FreeBSD2@ -** -** Unfortunately, the mptr argument is _no_ pointer in 2.0 FreeBSD. -** We would prefer a pointer because it enables us to install -** new interrupt handlers at any time. -** (This is just going to be changed ... <se> :) -** In 2.0 FreeBSD later installed interrupt handlers may change -** the xyz_imask, but this would not be recognized by handlers -** which are installed before. -*/ - -static int -register_intr __P((int intr, int device_id, unsigned int flags, - inthand2_t *handler, unsigned int * mptr, int unit)); -extern unsigned intr_mask[ICU_LEN]; - -#endif /* !__FreeBSD2__ */ - -/*======================================================== -** -** Autoconfiguration of pci devices. -** -** This is reverse to the isa configuration. -** (1) find a pci device. -** (2) look for a driver. -** -**======================================================== -*/ - -/*-------------------------------------------------------- -** -** The pci devices can be mapped to any address. -** As default we start at the last gigabyte. -** -**-------------------------------------------------------- -*/ - -#ifndef PCI_PMEM_START -#define PCI_PMEM_START 0xc0000000 -#endif - -static vm_offset_t pci_paddr = PCI_PMEM_START; - -/*-------------------------------------------------------- -** -** The pci device interrupt lines should have been -** assigned by the bios. But if the bios failed to -** to it, we set it. -** -**-------------------------------------------------------- -*/ - -#ifndef PCI_IRQ -#define PCI_IRQ 0 -#endif - -static u_long pci_irq = PCI_IRQ; - -/*--------------------------------------------------------- -** -** pci_configure () -** -** Probe all devices on pci bus and attach them. -** -** May be called more than once. -** Any device is attached only once. -** (Attached devices are remembered in pci_seen.) -** -**--------------------------------------------------------- -*/ - -static void not_supported (pcici_t tag, u_long type); - -static unsigned long pci_seen[NPCI]; - -static int pci_conf_count; - -#ifdef __FreeBSD2__ -static int -pci_externalize (struct proc *, struct kern_devconf *, void *, size_t); - -static int -pci_internalize (struct proc *, struct kern_devconf *, void *, size_t); - -#endif /* __FreeBSD2__ */ - -void pci_configure() -{ - u_char device,last_device; - u_short bus; - pcici_t tag; - pcidi_t type; - u_long data; - int unit; - int pci_mechanism; - int pciint; - int irq; - char* name=0; - vm_offset_t old_addr=pci_paddr; - - struct pci_driver *drp=0; - struct pci_device *dvp; - -#ifdef __FreeBSD2__ - struct pci_devconf *pdcp; -#endif - - /* - ** check pci bus present - */ - - pci_mechanism = pci_conf_mode (); - if (!pci_mechanism) return; - last_device = pci_mechanism==1 ? 31 : 15; - - /* - ** hello world .. - */ - - - for (bus=0;bus<NPCI;bus++) { -#ifndef PCI_QUIET - printf ("pci%d: scanning device 0..%d, mechanism=%d.\n", - bus, last_device, pci_mechanism); -#endif - for (device=0; device<=last_device; device ++) { - - if (pci_seen[bus] & (1ul << device)) - continue; - - tag = pcitag (bus, device, 0); - type = pci_conf_read (tag, PCI_ID_REG); - - if ((!type) || (type==0xfffffffful)) continue; - - /* - ** lookup device in ioconfiguration: - */ - - for (dvp = pci_devtab; dvp->pd_name; dvp++) { - drp = dvp->pd_driver; - if (!drp) - continue; - if ((name=(*drp->probe)(tag, type))) - break; - }; - - if (!dvp->pd_name) { -#ifndef PCI_QUIET - if (pci_conf_count) - continue; - printf("pci%d:%d: ", bus, device); - not_supported (tag, type); -#endif - continue; - }; - - pci_seen[bus] |= (1ul << device); - /* - ** Get and increment the unit. - */ - - unit = (*drp->count)++; - - /* - ** ignore device ? - */ - - if (!*name) continue; - - /* - ** Announce this device - */ - - printf ("%s%d <%s>", dvp->pd_name, unit, name); - - /* - ** Get the int pin number (pci interrupt number a-d) - ** from the pci configuration space. - */ - - data = pci_conf_read (tag, PCI_INTERRUPT_REG); - pciint = PCI_INTERRUPT_PIN_EXTRACT(data); - - if (pciint) { - - printf (" int %c", 0x60+pciint); - - /* - ** If the interrupt line register is not set, - ** set it now from PCI_IRQ. - */ - - if (!(PCI_INTERRUPT_LINE_EXTRACT(data))) { - - irq = pci_irq & 0x0f; - pci_irq >>= 4; - - data = PCI_INTERRUPT_LINE_INSERT(data, irq); - printf (" (config)"); - pci_conf_write (tag, PCI_INTERRUPT_REG, data); - }; - - irq = PCI_INTERRUPT_LINE_EXTRACT(data); - - /* - ** If it's zero, the isa irq number is unknown, - ** and we cannot bind the pci interrupt to isa. - */ - - if (irq) - printf (" irq %d", irq); - else - printf (" not bound"); - }; - - /* - ** enable memory access - */ - - data = (pci_conf_read (tag, PCI_COMMAND_STATUS_REG) - & 0xffff) | PCI_COMMAND_MEM_ENABLE; - - pci_conf_write (tag, (u_char) PCI_COMMAND_STATUS_REG, data); - - /* - ** show pci slot. - */ - - printf (" on pci%d:%d\n", bus, device); - -#ifdef __FreeBSD2__ - - /* - ** Allocate a devconf structure - */ - - pdcp = (struct pci_devconf *) - malloc (sizeof (struct pci_devconf),M_DEVBUF,M_WAITOK); - - /* - ** Fill in. - ** - ** Sorry, this is not yet complete. - ** We should, and eventually will, set the - ** parent pointer to a pci bus devconf structure, - ** and arrange to set the state field dynamically. - ** - ** But I'll go to vacation today, and after all, - ** wasn't there a new feature freeze on Oct 1.? - */ - - pdcp -> pdc_pi.pi_bus = bus; - pdcp -> pdc_pi.pi_device = device; - - pdcp -> pdc_kdc.kdc_name = dvp->pd_name; - pdcp -> pdc_kdc.kdc_unit = unit; - - pdcp -> pdc_kdc.kdc_md.mddc_devtype = MDDT_PCI; - - pdcp -> pdc_kdc.kdc_externalize = pci_externalize; - pdcp -> pdc_kdc.kdc_internalize = pci_internalize; - - pdcp -> pdc_kdc.kdc_datalen = PCI_EXTERNAL_LEN; - pdcp -> pdc_kdc.kdc_parentdata = &pdcp->pdc_pi; - pdcp -> pdc_kdc.kdc_state = DC_UNKNOWN; - pdcp -> pdc_kdc.kdc_description = name; - - /* - ** And register this device - */ - - dev_attach (&pdcp->pdc_kdc); - -#endif /* __FreeBSD2__ */ - - - /* - ** attach device - ** may produce additional log messages, - ** i.e. when installing subdevices. - */ - - (*drp->attach) (tag, unit); - }; - }; - -#ifndef PCI_QUIET - if (pci_paddr != old_addr) - printf ("pci uses physical addresses from 0x%lx to 0x%lx\n", - (u_long)PCI_PMEM_START, (u_long)pci_paddr); -#endif - pci_conf_count++; -} - -/*----------------------------------------------------------------------- -** -** Map device into port space. -** -** PCI-Specification: 6.2.5.1: address maps -** -**----------------------------------------------------------------------- -*/ - -int pci_map_port (pcici_t tag, u_long reg, u_short* pa) -{ - /* - ** @MAPIO@ not yet implemented. - */ - printf ("pci_map_port failed: not yet implemented\n"); - return (0); -} - -/*----------------------------------------------------------------------- -** -** Map device into virtual and physical space -** -** PCI-Specification: 6.2.5.1: address maps -** -**----------------------------------------------------------------------- -*/ - -int pci_map_mem (pcici_t tag, u_long reg, vm_offset_t* va, vm_offset_t* pa) -{ - u_long data; - vm_size_t vsize; - vm_offset_t vaddr; - - /* - ** sanity check - */ - - if (reg < PCI_MAP_REG_START || reg >= PCI_MAP_REG_END || (reg & 3)) { - printf ("pci_map_mem failed: bad register=0x%x\n", - (unsigned)reg); - return (0); - }; - - /* - ** get size and type of memory - ** - ** type is in the lowest four bits. - ** If device requires 2^n bytes, the next - ** n-4 bits are read as 0. - */ - - pci_conf_write (tag, reg, 0xfffffffful); - data = pci_conf_read (tag, reg); - - switch (data & 0x0f) { - - case PCI_MAP_MEMORY_TYPE_32BIT: /* 32 bit non cachable */ - break; - - default: /* unknown */ - printf ("pci_map_mem failed: bad memory type=0x%x\n", - (unsigned) data); - return (0); - }; - - /* - ** mask out the type, - ** and round up to a page size - */ - - vsize = round_page (-(data & PCI_MAP_MEMORY_ADDRESS_MASK)); - - if (!vsize) return (0); - - /* - ** align physical address to virtual size - */ - - if ((data = pci_paddr % vsize)) - pci_paddr += vsize - data; - - vaddr = (vm_offset_t) pmap_mapdev (pci_paddr, vsize); - - - if (!vaddr) return (0); - -#ifndef PCI_QUIET - /* - ** display values. - */ - - printf ("\treg%d: virtual=0x%lx physical=0x%lx\n", - (unsigned) reg, (u_long)vaddr, (u_long)pci_paddr); -#endif - - /* - ** return them to the driver - */ - - *va = vaddr; - *pa = pci_paddr; - - /* - ** set device address - */ - - pci_conf_write (tag, reg, pci_paddr); - - /* - ** and don't forget to increment pci_paddr - */ - - pci_paddr += vsize; - - return (1); -} - -/*------------------------------------------------------------ -** -** Interface functions for the devconf module. -** -**------------------------------------------------------------ -*/ - -static int -pci_externalize (struct proc *p, struct kern_devconf *kdcp, void *u, size_t l) -{ - struct pci_externalize_buffer buffer; - struct pci_info * pip = kdcp->kdc_parentdata; - pcici_t tag; - int i; - - if (l < sizeof buffer) { - return ENOMEM; - }; - - tag = pcitag (pip->pi_bus, pip->pi_device, 0); - - buffer.peb_pci_info = *pip; - - for (i=0; i<PCI_EXT_CONF_LEN; i++) { - buffer.peb_config[i] = pci_conf_read (tag, i*4); - }; - - return copyout(&buffer, u, sizeof buffer); -} - - -static int -pci_internalize (struct proc *p, struct kern_devconf *kdcp, void *u, size_t s) -{ - return EOPNOTSUPP; -} - -/*----------------------------------------------------------------------- -** -** Map pci interrupts to isa interrupts. -** -**----------------------------------------------------------------------- -*/ - -static unsigned int pci_int_mask [16]; - -int pci_map_int (pcici_t tag, int(*func)(), void* arg, unsigned* maskptr) -{ - int irq; - unsigned mask; - - irq = PCI_INTERRUPT_LINE_EXTRACT( - pci_conf_read (tag, PCI_INTERRUPT_REG)); - - if (irq >= 16 || irq <= 0) { - printf ("pci_map_int failed: no int line set.\n"); - return (0); - } - - mask = 1ul << irq; - - if (!maskptr) - maskptr = &pci_int_mask[irq]; - - INTRMASK (*maskptr, mask); - - register_intr( - irq, /* isa irq */ - 0, /* deviced?? */ - 0, /* flags? */ - (inthand2_t*) func, /* handler */ - maskptr, /* mask pointer */ - (int) arg); /* handler arg */ - -#ifdef __FreeBSD2__ - /* - ** XXX See comment at beginning of file. - ** - ** Have to update all the interrupt masks ... Grrrrr!!! - */ - { - unsigned * mp = &intr_mask[0]; - /* - ** update the isa interrupt masks. - */ - for (mp=&intr_mask[0]; mp<&intr_mask[ICU_LEN]; mp++) - if (*mp & *maskptr) - *mp |= mask; - /* - ** update the pci interrupt masks. - */ - for (mp=&pci_int_mask[0]; mp<&pci_int_mask[16]; mp++) - if (*mp & *maskptr) - *mp |= mask; - }; -#endif - - INTREN (mask); - - return (1); -} - -/*----------------------------------------------------------- -** -** Display of unknown devices. -** -**----------------------------------------------------------- -*/ -struct vt { - u_short ident; - char* name; -}; - -static struct vt VendorTable[] = { - {0x1002, "ATI TECHNOLOGIES INC"}, - {0x1011, "DIGITAL EQUIPMENT CORPORATION"}, - {0x101A, "NCR"}, - {0x102B, "MATROX"}, - {0x1045, "OPTI"}, - {0x5333, "S3 INC."}, - {0x8086, "INTEL CORPORATION"}, - {0,0} -}; - -static const char *const majclasses[] = { - "old", "storage", "network", "display", - "multimedia", "memory", "bridge" -}; - -void not_supported (pcici_t tag, u_long type) -{ - u_char reg; - u_long data; - struct vt * vp; - - /* - ** lookup the names. - */ - - for (vp=VendorTable; vp->ident; vp++) - if (vp->ident == (type & 0xffff)) - break; - - /* - ** and display them. - */ - - if (vp->ident) printf (vp->name); - else printf ("vendor=0x%lx", type & 0xffff); - - printf (", device=0x%lx", type >> 16); - - data = (pci_conf_read(tag, PCI_CLASS_REG) >> 24) & 0xff; - if (data < sizeof(majclasses) / sizeof(majclasses[0])) - printf(", class=%s", majclasses[data]); - - printf (" [not supported]\n"); - - for (reg=PCI_MAP_REG_START; reg<PCI_MAP_REG_END; reg+=4) { - data = pci_conf_read (tag, reg); - if (!data) continue; - switch (data&7) { - - case 1: - case 5: - printf (" map(%x): io(%lx)\n", - reg, data & ~3); - break; - case 0: - printf (" map(%x): mem32(%lx)\n", - reg, data & ~7); - break; - case 2: - printf (" map(%x): mem20(%lx)\n", - reg, data & ~7); - break; - case 4: - printf (" map(%x): mem64(%lx)\n", - reg, data & ~7); - break; - } - } -} - -#ifndef __FreeBSD2__ -/*----------------------------------------------------------- -** -** Mapping of physical to virtual memory -** -**----------------------------------------------------------- -*/ - -extern vm_map_t kernel_map; - -static vm_offset_t pmap_mapdev (vm_offset_t paddr, vm_size_t vsize) -{ - vm_offset_t vaddr,value; - u_long result; - - vaddr = vm_map_min (kernel_map); - - result = vm_map_find (kernel_map, (void*)0, (vm_offset_t) 0, - &vaddr, vsize, TRUE); - - if (result != KERN_SUCCESS) { - printf (" vm_map_find failed(%d)\n", result); - return (0); - }; - - /* - ** map physical - */ - - value = vaddr; - while (vsize >= NBPG) { - pmap_enter (pmap_kernel(), vaddr, paddr, - VM_PROT_READ|VM_PROT_WRITE, TRUE); - vaddr += NBPG; - paddr += NBPG; - vsize -= NBPG; - }; - return (value); -} - -/*------------------------------------------------------------ -** -** Emulate the register_intr() function of FreeBSD 2.0 -** -** requires a patch: -** FreeBSD 2.0: "/sys/i386/isa/vector.s" -** 386bsd0.1: "/sys/i386/isa/icu.s" -** 386bsd1.0: Please ask Jesus Monroy Jr. -** -**------------------------------------------------------------ -*/ - -#include <machine/segments.h> - -int pci_int_unit [16]; -inthand2_t* (pci_int_hdlr [16]); -unsigned int * pci_int_mptr [16]; -unsigned int pci_int_count[16]; - -extern void - Vpci3(), Vpci4(), Vpci5(), Vpci6(), Vpci7(), Vpci8(), Vpci9(), - Vpci10(), Vpci11(), Vpci12(), Vpci13(), Vpci14(), Vpci15(); - -static inthand_t* pci_int_glue[16] = { - 0, 0, 0, Vpci3, Vpci4, Vpci5, Vpci6, Vpci7, Vpci8, - Vpci9, Vpci10, Vpci11, Vpci12, Vpci13, Vpci14, Vpci15 }; - -static int -register_intr __P((int intr, int device_id, unsigned int flags, - inthand2_t *handler, unsigned int* mptr, int unit)) -{ - if (intr >= 16 || intr <= 2) - return (EINVAL); - if (pci_int_hdlr [intr]) - return (EBUSY); - - pci_int_hdlr [intr] = handler; - pci_int_unit [intr] = unit; - pci_int_mptr [intr] = mptr; - - setidt(NRSVIDT + intr, pci_int_glue[intr], SDT_SYS386IGT, SEL_KPL); - return (0); -} -#endif /* __FreeBSD2__ */ -#endif /* NPCI */ diff --git a/sys/pci/pcireg.h b/sys/pci/pcireg.h deleted file mode 100644 index dd1f1ccf3280e..0000000000000 --- a/sys/pci/pcireg.h +++ /dev/null @@ -1,423 +0,0 @@ -/************************************************************************** -** -** $Id: pcireg.h,v 1.1 1994/10/12 02:25:03 se Exp $ -** -** Declarations for pci bus drivers. -** -** 386bsd / FreeBSD -** -**------------------------------------------------------------------------- -** -** Copyright (c) 1994 Wolfgang Stanglmeier. All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** 3. The name of the author may not be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -** -*************************************************************************** -*/ - -#ifndef __PCI_REG_H__ -#define __PCI_REG_H__ - -/*----------------------------------------------------------------- -** -** main pci initialization function. -** called at boot time from autoconf.c -** -**----------------------------------------------------------------- -*/ - -void pci_configure (void); - -/*----------------------------------------------------------------- -** -** The pci configuration id describes a pci device on the bus. -** It is constructed from: bus, device & function numbers. -** -**----------------------------------------------------------------- -*/ - -typedef union { - u_long cfg1; - struct { - u_char enable; - u_char forward; - u_short port; - } cfg2; - } pcici_t; - -/*----------------------------------------------------------------- -** -** Each pci device has an unique device id. -** It is used to find a matching driver. -** -**----------------------------------------------------------------- -*/ - -typedef u_long pcidi_t; - -/*----------------------------------------------------------------- -** -** The pci driver structure. -** -** probe: Checks if the driver can support a device -** with this type. The tag may be used to get -** more info with pci_read_conf(). See below. -** It returns a string with the devices name, -** or a NULL pointer, if the driver cannot -** support this device. -** -** attach: Allocate a control structure and prepare -** it. This function may use the pci mapping -** functions. See below. -** (configuration id) or type. -** -** count: A pointer to a unit counter. -** It's used by the pci configurator to -** allocate unit numbers. -** -**----------------------------------------------------------------- -*/ - -struct pci_driver { - char* (*probe ) (pcici_t tag, pcidi_t type); - void (*attach) (pcici_t tag, int unit); - u_long *count; -}; - -/*----------------------------------------------------------------- -** -** The pci-devconf interface. -** -**----------------------------------------------------------------- -*/ - -struct pci_info { - u_short pi_bus; - u_short pi_device; -}; - -#define PCI_EXT_CONF_LEN (16) -#define PCI_EXTERNAL_LEN (sizeof(struct pci_externalize_buffer)) - -struct pci_externalize_buffer { - struct pci_info peb_pci_info; - u_long peb_config[PCI_EXT_CONF_LEN]; -}; - - -/*----------------------------------------------------------------- -** -** Per device structure. -** -** An array of this structure should be created by the -** config utility and live in "ioconf.c". -** -** At the moment it's created by hand and lives in -** pci_config.c -** -** pd_driver: -** a pointer to the driver structure. -** -** pd_name: -** the name of the devices which are supported -** by this driver for kernel messages. -** -** pd_flags: -** for further study. -** -**----------------------------------------------------------------- -*/ - -struct pci_device { - struct - pci_driver* pd_driver; - const char * pd_name; - int pd_flags; -}; - -/*----------------------------------------------------------------- -** -** This table should be generated in file "ioconf.c" -** by the config program. -** It is used at boot time by the configuration function -** pci_configure() -** -**----------------------------------------------------------------- -*/ - -extern struct pci_device pci_devtab[]; - -/*----------------------------------------------------------------- -** -** Map a pci device to physical and virtual memory. -** -** The va and pa addresses are "in/out" parameters. -** If they are 0 on entry, the function assigns an address. -** -** Entry selects the register in the pci configuration -** space, which supplies the size of the region, and -** receives the physical address. -** -** If there is any error, a message is written, and -** the function returns with zero. -** Else it returns with a value different to zero. -** -**----------------------------------------------------------------- -*/ - -int pci_map_mem (pcici_t tag, u_long entry, u_long * va, u_long * pa); - -/*----------------------------------------------------------------- -** -** Map a pci device to an io port area. -** -** *pa is an "in/out" parameter. -** If it's 0 on entry, the function assigns an port number.. -** -** Entry selects the register in the pci configuration -** space, which supplies the size of the region, and -** receives the port number. -** -** If there is any error, a message is written, and -** the function returns with zero. -** Else it returns with a value different to zero. -** -**----------------------------------------------------------------- -*/ - -int pci_map_port(pcici_t tag, u_long entry, u_short * pa); - -/*----------------------------------------------------------------- -** -** Map a pci interrupt to an isa irq line, -** and enable the interrupt. -** -** func is the interrupt handler, arg is the argument -** to this function. -** -** The maskptr argument should be &bio_imask, -** &net_imask etc. or NULL. -** -** If there is any error, a message is written, and -** the function returns with zero. -** Else it returns with a value different to zero. -** -** A word of caution for FreeBSD 2.0: -** -** We use the register_intr() function. -** -** The interrupt line of the selected device is included -** into the supplied mask: after the corresponding splXXX -** this drivers interrupts are blocked. -** -** But in the interrupt handlers startup code ONLY -** the interrupt of the driver is blocked, and NOT -** all interrupts of the spl group. -** -** It may be required to additional block the group -** interrupts by splXXX() inside the interrupt handler. -** -** In pre 2.0 kernels we emulate the register_intr -** function. The emulating function blocks all interrupts -** of the group in the interrupt handler prefix code. -** -**----------------------------------------------------------------- -*/ - -int pci_map_int (pcici_t tag, int (*func)(), void* arg, unsigned * maskptr); - -/*----------------------------------------------------------------- -** -** The following functions are provided by the pci bios. -** They are used only by the pci configuration. -** -** pci_conf_mode(): -** Probes for a pci system. -** Returns 1 or 2 for pci configuration mechanism. -** Returns 0 if no pci system. -** -** pcitag(): -** Gets a handle for accessing the pci configuration -** space. -** This handle is given to the mapping functions (see -** above) or to the read/write functions. -** -** pci_conf_read(): -** Read a long word from the pci configuration space. -** Requires a tag (from pcitag) and the register -** number (should be a long word alligned one). -** -** pci_conf_write(): -** Writes a long word to the pci configuration space. -** Requires a tag (from pcitag), the register number -** (should be a long word alligned one), and a value. -** -**----------------------------------------------------------------- -*/ - -int pci_conf_mode (void); - -pcici_t pcitag (unsigned char bus, - unsigned char device, - unsigned char func); - -u_long pci_conf_read (pcici_t tag, u_long reg ); -void pci_conf_write (pcici_t tag, u_long reg, u_long data); - - -/*------------------------------------------------------------------ -** -** Names for PCI configuration space registers. -** -** Copyright (c) 1994 Charles Hannum. All rights reserved. -** -**------------------------------------------------------------------ -*/ - -/* - * Device identification register; contains a vendor ID and a device ID. - * We have little need to distinguish the two parts. - */ -#define PCI_ID_REG 0x00 - -/* - * Command and status register. - */ -#define PCI_COMMAND_STATUS_REG 0x04 - -#define PCI_COMMAND_IO_ENABLE 0x00000001 -#define PCI_COMMAND_MEM_ENABLE 0x00000002 -#define PCI_COMMAND_MASTER_ENABLE 0x00000004 -#define PCI_COMMAND_SPECIAL_ENABLE 0x00000008 -#define PCI_COMMAND_INVALIDATE_ENABLE 0x00000010 -#define PCI_COMMAND_PALETTE_ENABLE 0x00000020 -#define PCI_COMMAND_PARITY_ENABLE 0x00000040 -#define PCI_COMMAND_STEPPING_ENABLE 0x00000080 -#define PCI_COMMAND_SERR_ENABLE 0x00000100 -#define PCI_COMMAND_BACKTOBACK_ENABLE 0x00000200 - -#define PCI_STATUS_BACKTOBACK_OKAY 0x00800000 -#define PCI_STATUS_PARITY_ERROR 0x01000000 -#define PCI_STATUS_DEVSEL_FAST 0x00000000 -#define PCI_STATUS_DEVSEL_MEDIUM 0x02000000 -#define PCI_STATUS_DEVSEL_SLOW 0x04000000 -#define PCI_STATUS_DEVSEL_MASK 0x06000000 -#define PCI_STATUS_TARGET_TARGET_ABORT 0x08000000 -#define PCI_STATUS_MASTER_TARGET_ABORT 0x10000000 -#define PCI_STATUS_MASTER_ABORT 0x20000000 -#define PCI_STATUS_SPECIAL_ERROR 0x40000000 -#define PCI_STATUS_PARITY_DETECT 0x80000000 - -/* - * Class register; defines basic type of device. - */ -#define PCI_CLASS_REG 0x08 - -#define PCI_CLASS_MASK 0xff000000 -#define PCI_SUBCLASS_MASK 0x00ff0000 - -/* base classes */ -#define PCI_CLASS_PREHISTORIC 0x00000000 -#define PCI_CLASS_MASS_STORAGE 0x01000000 -#define PCI_CLASS_NETWORK 0x02000000 -#define PCI_CLASS_DISPLAY 0x03000000 -#define PCI_CLASS_MULTIMEDIA 0x04000000 -#define PCI_CLASS_MEMORY 0x05000000 -#define PCI_CLASS_BRIDGE 0x06000000 -#define PCI_CLASS_UNDEFINED 0xff000000 - -/* 0x00 prehistoric subclasses */ -#define PCI_SUBCLASS_PREHISTORIC_MISC 0x00000000 -#define PCI_SUBCLASS_PREHISTORIC_VGA 0x00010000 - -/* 0x01 mass storage subclasses */ -#define PCI_SUBCLASS_MASS_STORAGE_SCSI 0x00000000 -#define PCI_SUBCLASS_MASS_STORAGE_IDE 0x00010000 -#define PCI_SUBCLASS_MASS_STORAGE_FLOPPY 0x00020000 -#define PCI_SUBCLASS_MASS_STORAGE_IPI 0x00030000 -#define PCI_SUBCLASS_MASS_STORAGE_MISC 0x00800000 - -/* 0x02 network subclasses */ -#define PCI_SUBCLASS_NETWORK_ETHERNET 0x00000000 -#define PCI_SUBCLASS_NETWORK_TOKENRING 0x00010000 -#define PCI_SUBCLASS_NETWORK_FDDI 0x00020000 -#define PCI_SUBCLASS_NETWORK_MISC 0x00800000 - -/* 0x03 display subclasses */ -#define PCI_SUBCLASS_DISPLAY_VGA 0x00000000 -#define PCI_SUBCLASS_DISPLAY_XGA 0x00010000 -#define PCI_SUBCLASS_DISPLAY_MISC 0x00800000 - -/* 0x04 multimedia subclasses */ -#define PCI_SUBCLASS_MULTIMEDIA_VIDEO 0x00000000 -#define PCI_SUBCLASS_MULTIMEDIA_AUDIO 0x00010000 -#define PCI_SUBCLASS_MULTIMEDIA_MISC 0x00800000 - -/* 0x05 memory subclasses */ -#define PCI_SUBCLASS_MEMORY_RAM 0x00000000 -#define PCI_SUBCLASS_MEMORY_FLASH 0x00010000 -#define PCI_SUBCLASS_MEMORY_MISC 0x00800000 - -/* 0x06 bridge subclasses */ -#define PCI_SUBCLASS_BRIDGE_HOST 0x00000000 -#define PCI_SUBCLASS_BRIDGE_ISA 0x00010000 -#define PCI_SUBCLASS_BRIDGE_EISA 0x00020000 -#define PCI_SUBCLASS_BRIDGE_MC 0x00030000 -#define PCI_SUBCLASS_BRIDGE_PCI 0x00040000 -#define PCI_SUBCLASS_BRIDGE_PCMCIA 0x00050000 -#define PCI_SUBCLASS_BRIDGE_MISC 0x00800000 - -/* - * Mapping registers - */ -#define PCI_MAP_REG_START 0x10 -#define PCI_MAP_REG_END 0x28 - -#define PCI_MAP_MEMORY 0x00000000 -#define PCI_MAP_IO 0x00000001 - -#define PCI_MAP_MEMORY_TYPE_32BIT 0x00000000 -#define PCI_MAP_MEMORY_TYPE_32BIT_1M 0x00000002 -#define PCI_MAP_MEMORY_TYPE_64BIT 0x00000004 -#define PCI_MAP_MEMORY_TYPE_MASK 0x00000006 -#define PCI_MAP_MEMORY_CACHABLE 0x00000008 -#define PCI_MAP_MEMORY_ADDRESS_MASK 0xfffffff0 - -/* - * Interrupt configuration register - */ -#define PCI_INTERRUPT_REG 0x3c - -#define PCI_INTERRUPT_PIN_MASK 0x0000ff00 -#define PCI_INTERRUPT_PIN_EXTRACT(x) ((((x) & PCI_INTERRUPT_PIN_MASK) >> 8) & 0xff) -#define PCI_INTERRUPT_PIN_NONE 0x00 -#define PCI_INTERRUPT_PIN_A 0x01 -#define PCI_INTERRUPT_PIN_B 0x02 -#define PCI_INTERRUPT_PIN_C 0x03 -#define PCI_INTERRUPT_PIN_D 0x04 - -#define PCI_INTERRUPT_LINE_MASK 0x000000ff -#define PCI_INTERRUPT_LINE_EXTRACT(x) ((((x) & PCI_INTERRUPT_LINE_MASK) >> 0) & 0xff) -#define PCI_INTERRUPT_LINE_INSERT(x,v) (((x) & ~PCI_INTERRUPT_LINE_MASK) | ((v) << 0)) - -#endif /* __PCI_REG_H__ */ diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c deleted file mode 100644 index 6b8a9fec38f6a..0000000000000 --- a/sys/pci/pcisupport.c +++ /dev/null @@ -1,394 +0,0 @@ -/************************************************************************** -** -** $Id: pcisupport.c,v 1.4 1994/10/17 21:11:31 phk Exp $ -** -** Device driver for INTEL PCI chipsets. -** -** 386bsd / FreeBSD -** -**------------------------------------------------------------------------- -** -** Written for 386bsd and FreeBSD by -** wolf@dentaro.gun.de Wolfgang Stanglmeier -** se@mi.Uni-Koeln.de Stefan Esser -** -**------------------------------------------------------------------------- -** -** Copyright (c) 1994 Stefan Esser. All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** 3. The name of the author may not be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -** -*************************************************************************** -*/ - - -/*========================================================== -** -** Include files -** -**========================================================== -*/ - -#include <sys/types.h> - -#include <i386/pci/pcireg.h> - -extern void printf(); - -/*--------------------------------------------------------- -** -** Intel chipsets for 486 / Pentium processor -** -**--------------------------------------------------------- -*/ - -static char* chipset_probe (pcici_t tag, pcidi_t type); -static void chipset_attach(pcici_t tag, int unit); -static u_long chipset_count; - -struct pci_driver chipset_device = { - chipset_probe, - chipset_attach, - &chipset_count -}; - -static char confread(pcici_t config_id, int port); - -struct condmsg { - unsigned char port; - unsigned char mask; - unsigned char value; - char flags; - char *text; -}; - -#define M_EQ 0 /* mask and return true if equal */ -#define M_NE 1 /* mask and return true if not equal */ -#define TRUE 2 /* don't read config, always true */ - -static char* chipset_probe (pcici_t tag, pcidi_t type) -{ - switch (type) { - case 0x04848086: - return ("intel 82378IB pci-isa bridge"); - case 0x04838086: - return ("intel 82424ZX cache dram controller"); - case 0x04828086: - return ("intel 82375EB pci-eisa bridge"); - case 0x04a38086: - return ("intel 82434LX pci cache memory controller"); - }; - return ((char*)0); -} - -struct condmsg conf82424zx[] = -{ - { 0x00, 0x00, 0x00, TRUE, "\tCPU: " }, - { 0x50, 0xe0, 0x00, M_EQ, "486DX" }, - { 0x50, 0xe0, 0x20, M_EQ, "486SX" }, - { 0x50, 0xe0, 0x40, M_EQ, "486DX2 or 486DX4" }, - { 0x50, 0xe0, 0x80, M_EQ, "Overdrive (writeback)" }, - - { 0x00, 0x00, 0x00, TRUE, ", bus=" }, - { 0x50, 0x03, 0x00, M_EQ, "25MHz" }, - { 0x50, 0x03, 0x01, M_EQ, "33MHz" }, - { 0x53, 0x01, 0x01, TRUE, ", CPU->Memory posting "}, - { 0x53, 0x01, 0x00, M_EQ, "OFF" }, - { 0x53, 0x01, 0x01, M_EQ, "ON" }, - - { 0x56, 0x30, 0x00, M_NE, "\n\tWarning:" }, - { 0x56, 0x20, 0x00, M_NE, " NO cache parity!" }, - { 0x56, 0x10, 0x00, M_NE, " NO DRAM parity!" }, - { 0x55, 0x04, 0x04, M_EQ, "\n\tWarning: refresh OFF! " }, - - { 0x00, 0x00, 0x00, TRUE, "\n\tCache: " }, - { 0x52, 0x01, 0x00, M_EQ, "None" }, - { 0x52, 0xc1, 0x01, M_EQ, "64KB" }, - { 0x52, 0xc1, 0x41, M_EQ, "128KB" }, - { 0x52, 0xc1, 0x81, M_EQ, "256KB" }, - { 0x52, 0xc1, 0xc1, M_EQ, "512KB" }, - { 0x52, 0x03, 0x01, M_EQ, " writethrough" }, - { 0x52, 0x03, 0x03, M_EQ, " writeback" }, - - { 0x52, 0x01, 0x01, M_EQ, ", cache clocks=" }, - { 0x52, 0x05, 0x01, M_EQ, "3-1-1-1" }, - { 0x52, 0x05, 0x05, M_EQ, "2-1-1-1" }, - - { 0x00, 0x00, 0x00, TRUE, "\n\tDRAM:" }, - { 0x55, 0x43, 0x00, M_NE, " page mode" }, - { 0x55, 0x02, 0x02, M_EQ, " code fetch" }, - { 0x55, 0x43, 0x43, M_EQ, "," }, - { 0x55, 0x43, 0x42, M_EQ, " and" }, - { 0x55, 0x40, 0x40, M_EQ, " read" }, - { 0x55, 0x03, 0x03, M_EQ, " and" }, - { 0x55, 0x43, 0x41, M_EQ, " and" }, - { 0x55, 0x01, 0x01, M_EQ, " write" }, - { 0x55, 0x43, 0x00, M_NE, "," }, - - { 0x00, 0x00, 0x00, TRUE, " memory clocks=" }, - { 0x55, 0x20, 0x00, M_EQ, "X-2-2-2" }, - { 0x55, 0x20, 0x20, M_EQ, "X-1-2-1" }, - - { 0x00, 0x00, 0x00, TRUE, "\n\tCPU->PCI: posting " }, - { 0x53, 0x02, 0x00, M_NE, "ON" }, - { 0x53, 0x02, 0x00, M_EQ, "OFF" }, - { 0x00, 0x00, 0x00, TRUE, ", burst mode " }, - { 0x54, 0x02, 0x00, M_NE, "ON" }, - { 0x54, 0x02, 0x00, M_EQ, "OFF" }, - { 0x00, 0x00, 0x00, TRUE, "\n\tPCI->Memory: posting " }, - { 0x54, 0x01, 0x00, M_NE, "ON" }, - { 0x54, 0x01, 0x00, M_EQ, "OFF" }, - - { 0x00, 0x00, 0x00, TRUE, "\n" }, - -/* end marker */ - { 0 } -}; - -struct condmsg conf82434lx[] = -{ - { 0x00, 0x00, 0x00, TRUE, "\tCPU: " }, - { 0x50, 0xe3, 0x82, M_EQ, "Pentium, 60MHz" }, - { 0x50, 0xe3, 0x83, M_EQ, "Pentium, 66MHz" }, - { 0x50, 0xe3, 0xa2, M_EQ, "Pentium, 90MHz" }, - { 0x50, 0xe3, 0xa3, M_EQ, "Pentium, 100MHz" }, - { 0x50, 0xc2, 0x82, M_NE, "(unknown)" }, - { 0x50, 0x04, 0x00, M_EQ, " (primary cache OFF)" }, - - { 0x53, 0x01, 0x01, TRUE, ", CPU->Memory posting "}, - { 0x53, 0x01, 0x01, M_NE, "OFF" }, - { 0x53, 0x01, 0x01, M_EQ, "ON" }, - - { 0x53, 0x04, 0x00, M_NE, ", read around write"}, - - { 0x71, 0xc0, 0x00, M_NE, "\n\tWarning: NO cache parity!" }, - { 0x57, 0x20, 0x00, M_NE, "\n\tWarning: NO DRAM parity!" }, - { 0x55, 0x01, 0x01, M_EQ, "\n\tWarning: refresh OFF! " }, - - { 0x00, 0x00, 0x00, TRUE, "\n\tCache: " }, - { 0x52, 0x01, 0x00, M_EQ, "None" }, - { 0x52, 0x81, 0x01, M_EQ, "" }, - { 0x52, 0xc1, 0x81, M_EQ, "256KB" }, - { 0x52, 0xc1, 0xc1, M_EQ, "512KB" }, - { 0x52, 0x03, 0x01, M_EQ, " writethrough" }, - { 0x52, 0x03, 0x03, M_EQ, " writeback" }, - - { 0x52, 0x01, 0x01, M_EQ, ", cache clocks=" }, - { 0x52, 0x20, 0x00, M_EQ, "3-2-2-2/4-2-2-2" }, - { 0x52, 0x20, 0x00, M_NE, "3-1-1-1" }, - - { 0x00, 0x00, 0x00, TRUE, "\n\tDRAM:" }, - { 0x57, 0x10, 0x00, M_EQ, " page mode" }, - - { 0x00, 0x00, 0x00, TRUE, " memory clocks=" }, - { 0x57, 0xc0, 0x00, M_EQ, "X-4-4-4 (70ns)" }, - { 0x57, 0xc0, 0x40, M_EQ, "X-4-4-4/X-3-3-3 (60ns)" }, - { 0x57, 0xc0, 0x80, M_EQ, "???" }, - { 0x57, 0xc0, 0xc0, M_EQ, "X-3-3-3 (50ns)" }, - - { 0x00, 0x00, 0x00, TRUE, "\n\tCPU->PCI: posting " }, - { 0x53, 0x02, 0x02, M_EQ, "ON" }, - { 0x53, 0x02, 0x00, M_EQ, "OFF" }, - { 0x00, 0x00, 0x00, TRUE, ", burst mode " }, - { 0x54, 0x02, 0x00, M_NE, "ON" }, - { 0x54, 0x02, 0x00, M_EQ, "OFF" }, - { 0x54, 0x04, 0x00, TRUE, ", PCI clocks=" }, - { 0x54, 0x04, 0x00, M_EQ, "2-2-2-2" }, - { 0x54, 0x04, 0x00, M_NE, "2-1-1-1" }, - { 0x00, 0x00, 0x00, TRUE, "\n\tPCI->Memory: posting " }, - { 0x54, 0x01, 0x00, M_NE, "ON" }, - { 0x54, 0x01, 0x00, M_EQ, "OFF" }, - - { 0x00, 0x00, 0x00, TRUE, "\n" }, - -/* end marker */ - { 0 } -}; - -static char confread (pcici_t config_id, int port) -{ - unsigned long portw = port & ~3; - unsigned long ports = (port - portw) << 3; - - unsigned long l = pci_conf_read (config_id, portw); - return (l >> ports); -} - -static void writeconfig(pcici_t config_id, struct condmsg *tbl) -{ - while (tbl->text) { - int cond = 0; - if (tbl->flags == TRUE) { - cond = 1; - } else { - unsigned char v = (unsigned char) confread(config_id, tbl->port); - switch (tbl->flags) { - case M_EQ: - if ((v & tbl->mask) == tbl->value) cond = 1; - break; - case M_NE: - if ((v & tbl->mask) != tbl->value) cond = 1; - break; - } - } - if (cond) printf ("%s", tbl->text); - tbl++; - } -} - -void chipset_attach(pcici_t config_id, int unit) -{ -#ifdef PROBE_VERBOSE - switch (pci_conf_read (config_id, 0)) { - - case 0x04838086: - writeconfig (config_id, conf82424zx); - break; - case 0x04a38086: - writeconfig (config_id, conf82434lx); - break; - case 0x04848086: - case 0x04828086: - printf ("\t[40] %lx [50] %lx [54] %lx\n", - pci_conf_read (config_id, 0x40), - pci_conf_read (config_id, 0x50), - pci_conf_read (config_id, 0x54)); - break; - }; -#endif -} - -/*--------------------------------------------------------- -** -** Catchall driver for VGA devices -** -** -** By Garrett Wollman -** <wollman@halloran-eldar.lcs.mit.edu> -** -**--------------------------------------------------------- -*/ - -static char* vga_probe (pcici_t tag, pcidi_t type); -static void vga_attach(pcici_t tag, int unit); -static u_long vga_count; - -struct pci_driver vga_device = { - vga_probe, - vga_attach, - &vga_count -}; - -static char* vga_probe (pcici_t tag, pcidi_t type) -{ - int data = pci_conf_read(tag, PCI_CLASS_REG); - - switch (data & PCI_CLASS_MASK) { - - case PCI_CLASS_PREHISTORIC: - if ((data & PCI_SUBCLASS_MASK) - != PCI_SUBCLASS_PREHISTORIC_VGA) - break; - - case PCI_CLASS_DISPLAY: - return ("display device"); - }; - return ((char*)0); -} - -static void vga_attach(pcici_t tag, int unit) -{ -/* -** Breaks some systems. -** The assigned adresses _have_ to be announced to the console driver. -*/ -#if 0 - vm_offset_t va; - vm_offset_t pa; - int reg; - for (reg = PCI_MAP_REG_START; reg < PCI_MAP_REG_END; reg += 4) - (void) pci_map_mem (tag, reg, &va, &pa); -#endif -} - -/*--------------------------------------------------------- -** -** Hook for loadable pci drivers -** -**--------------------------------------------------------- -*/ - -static char* lkm_probe (pcici_t tag, pcidi_t type); -static void lkm_attach(pcici_t tag, int unit); -static u_long lkm_count; - -struct pci_driver lkm_device = { - lkm_probe, - lkm_attach, - &lkm_count -}; - -static char* lkm_probe (pcici_t tag, pcidi_t type) -{ - /* - ** Should try to load a matching driver. - ** XXX Not yet! - */ - return ((char*)0); -} - -static void lkm_attach(pcici_t tag, int unit) -{ -} - -/*--------------------------------------------------------- -** -** Devices to ignore -** -**--------------------------------------------------------- -*/ - -static char* ign_probe (pcici_t tag, pcidi_t type); -static void ign_attach(pcici_t tag, int unit); -static u_long ign_count; - -struct pci_driver ign_device = { - ign_probe, - ign_attach, - &ign_count -}; - -static char* ign_probe (pcici_t tag, pcidi_t type) -{ - switch (type) { - - case 0x10001042ul: /* wd */ - return (""); - - }; - return ((char*)0); -} - -static void ign_attach(pcici_t tag, int unit) -{ -} diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 62d5aae80774d..d06deda8571d2 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: cd.c,v 1.28 1994/10/27 20:45:00 jkh Exp $ + * cd.c,v 1.29 1994/11/15 14:49:12 bde Exp */ #define SPLCD splbio diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 662038e567ffe..c18edca59b989 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -2,7 +2,7 @@ * Written by grefen@????? * Based on scsi drivers by Julian Elischer (julian@tfs.com) * - * $Id: ch.c,v 1.10 1994/10/21 01:19:20 wollman Exp $ + * ch.c,v 1.11 1994/10/23 21:27:53 wollman Exp */ #include <sys/types.h> diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h index ad05f0f5295bc..4fdb31a985b6f 100644 --- a/sys/scsi/scsi_all.h +++ b/sys/scsi/scsi_all.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_all.h,v 1.6 1993/11/18 05:02:49 rgrimes Exp $ + * scsi_all.h,v 1.7 1994/08/02 07:52:32 davidg Exp */ /* diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 4e4b21f11fe9c..02b333a422215 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -8,7 +8,7 @@ * file. * * Written by Julian Elischer (julian@dialix.oz.au) - * $Id: scsi_base.c,v 1.14 1994/10/08 22:26:36 phk Exp $ + * scsi_base.c,v 1.15 1994/11/15 14:49:56 bde Exp */ #define SPLSD splbio diff --git a/sys/scsi/scsi_cd.h b/sys/scsi/scsi_cd.h index 0a4759b8a718d..ad894785ba0ce 100644 --- a/sys/scsi/scsi_cd.h +++ b/sys/scsi/scsi_cd.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_cd.h,v 1.6 93/08/26 21:09:19 julian Exp Locker: julian $ + * scsi_cd.h,v 1.6 1993/11/18 05:02:52 rgrimes Exp */ #ifndef _SCSI_SCSI_CD_H #define _SCSI_SCSI_CD_H 1 diff --git a/sys/scsi/scsi_changer.h b/sys/scsi/scsi_changer.h index 85819c8e63b1b..98ffceeb43922 100644 --- a/sys/scsi/scsi_changer.h +++ b/sys/scsi/scsi_changer.h @@ -19,7 +19,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_changer.h,v 1.5 93/08/26 21:09:22 julian Exp Locker: julian $ + * scsi_changer.h,v 1.6 1993/11/18 05:02:53 rgrimes Exp */ #ifndef _SCSI_SCSI_CHANGER_H #define _SCSI_SCSI_CHANGER_H 1 diff --git a/sys/scsi/scsi_debug.h b/sys/scsi/scsi_debug.h index 480ff146e57c3..79baba8b75d4d 100644 --- a/sys/scsi/scsi_debug.h +++ b/sys/scsi/scsi_debug.h @@ -2,7 +2,7 @@ /* * Written by Julian Elischer (julian@tfs.com) * - * $Id: scsi_debug.h,v 1.3 93/10/10 09:26:05 julian Exp Locker: julian $ + * scsi_debug.h,v 1.1 1993/11/18 05:02:54 rgrimes Exp */ #ifndef _SCSI_SCSI_DEBUG_H #define _SCSI_SCSI_DEBUG_H 1 diff --git a/sys/scsi/scsi_disk.h b/sys/scsi/scsi_disk.h index 60d0bcc477a56..0c5c634bb755e 100644 --- a/sys/scsi/scsi_disk.h +++ b/sys/scsi/scsi_disk.h @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_disk.h,v 1.4 93/08/26 21:09:23 julian Exp Locker: julian $ + * scsi_disk.h,v 1.6 1993/11/18 05:02:55 rgrimes Exp */ /* diff --git a/sys/scsi/scsi_generic.h b/sys/scsi/scsi_generic.h index 44f2bd11cfc98..d9db37561e23d 100644 --- a/sys/scsi/scsi_generic.h +++ b/sys/scsi/scsi_generic.h @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * from: @(#)stdio.h 5.17 (Berkeley) 6/3/91 - * $Id$ + * scsi_generic.h,v 1.2 1993/10/16 17:21:05 rgrimes Exp */ /* generic SCSI header file. We use the same minor number format diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index 1228ec5c26b5e..aac792159fffc 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -5,7 +5,7 @@ * Berkeley style copyright. * * - * $Id: scsi_ioctl.c,v 1.7 1994/08/02 07:52:33 davidg Exp $ + * scsi_ioctl.c,v 1.8 1994/10/08 22:26:37 phk Exp */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/scsi/scsi_tape.h b/sys/scsi/scsi_tape.h index 37411368df3f1..81a27fe4076a6 100644 --- a/sys/scsi/scsi_tape.h +++ b/sys/scsi/scsi_tape.h @@ -21,7 +21,7 @@ /* * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_tape.h,v 1.9 1994/09/28 20:16:42 se Exp $ + * scsi_tape.h,v 1.10 1994/10/28 13:19:34 jkh Exp */ #ifndef SCSI_SCSI_TAPE_H #define SCSI_SCSI_TAPE_H 1 diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index bd5776c68ba37..103983fdaad61 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsiconf.c,v 1.14 1994/11/14 23:39:32 ats Exp $ + * scsiconf.c,v 1.15 1994/11/17 23:22:22 ats Exp */ #include <sys/types.h> diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index eb3c3c4eae93c..c29c3f9f69768 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsiconf.h,v 1.13 1994/10/23 21:27:56 wollman Exp $ + * scsiconf.h,v 1.14 1994/11/14 23:39:33 ats Exp */ #ifndef SCSI_SCSICONF_H #define SCSI_SCSICONF_H 1 diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 4dbe09d56dff2..7b64783cafbac 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992 * - * $Id: sd.c,v 1.41 1994/11/07 20:09:35 joerg Exp $ + * sd.c,v 1.42 1994/11/15 14:47:49 bde Exp */ #define SPLSD splbio diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 24a330320d240..6dfc284459d80 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: st.c,v 1.21 1994/10/23 21:27:59 wollman Exp $ + * st.c,v 1.22 1994/10/28 13:19:36 jkh Exp */ /* diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c index 06fa1d7e27227..e7dee454b8dea 100644 --- a/sys/scsi/uk.c +++ b/sys/scsi/uk.c @@ -2,7 +2,7 @@ * Dummy driver for a device we can't identify. * by Julian Elischer (julian@tfs.com) * - * $Id: uk.c,v 1.3 1993/12/19 00:55:01 wollman Exp $ + * uk.c,v 1.4 1994/08/13 03:50:31 wollman Exp */ #include <sys/param.h> diff --git a/sys/sys/acct.h b/sys/sys/acct.h index 0ea88d8ea1120..15c27a80034fc 100644 --- a/sys/sys/acct.h +++ b/sys/sys/acct.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)acct.h 8.2 (Berkeley) 1/21/94 - * $Id: acct.h,v 1.3 1994/08/21 04:41:31 paul Exp $ + * acct.h,v 1.4 1994/09/26 21:09:15 davidg Exp */ #ifndef _SYS_ACCT_H_ diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 86554e66d1543..ba4d19dfc568b 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.7 (Berkeley) 1/21/94 - * $Id: buf.h,v 1.9 1994/10/10 00:58:31 phk Exp $ + * buf.h,v 1.10 1994/10/18 06:55:57 davidg Exp */ #ifndef _SYS_BUF_H_ diff --git a/sys/sys/callout.h b/sys/sys/callout.h index 81380b33f4ed5..85adda0ce186e 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)callout.h 8.2 (Berkeley) 1/21/94 - * $Id: callout.h,v 1.3 1994/08/18 22:35:41 wollman Exp $ + * callout.h,v 1.4 1994/08/21 04:41:33 paul Exp */ #ifndef _SYS_CALLOUT_H_ diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 8b83d76a57d92..f14b620431cce 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)cdefs.h 8.7 (Berkeley) 1/21/94 - * $Id: cdefs.h,v 1.5 1994/08/21 04:41:34 paul Exp $ + * cdefs.h,v 1.6 1994/08/22 13:44:39 bde Exp */ #ifndef _SYS_CDEFS_H_ diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h index c49dfed2b34b9..4dfa741c056bb 100644 --- a/sys/sys/cdio.h +++ b/sys/sys/cdio.h @@ -1,7 +1,7 @@ /* * 16 Feb 93 Julian Elischer (julian@dialix.oz.au) * - * $Id: cdio.h,v 1.5 1994/01/29 10:31:20 rgrimes Exp $ + * cdio.h,v 1.6 1994/02/05 09:14:24 swallace Exp */ /* Shared between kernel & process */ #ifndef _SYS_CDIO_H_ diff --git a/sys/sys/chio.h b/sys/sys/chio.h index 10fa51d35144f..c0243256f52ee 100644 --- a/sys/sys/chio.h +++ b/sys/sys/chio.h @@ -1,7 +1,7 @@ /* * 16 Feb 93 Julian Elischer ADDED for SCSI system * - * $Id: chio.h,v 1.3 1993/10/16 17:16:27 rgrimes Exp $ + * chio.h,v 1.4 1993/11/18 05:03:24 rgrimes Exp */ /* This is a "convertet" mtio.h from 386BSD diff --git a/sys/sys/clist.h b/sys/sys/clist.h index 626be316d6d5e..b25c2590f954c 100644 --- a/sys/sys/clist.h +++ b/sys/sys/clist.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clist.h 8.1 (Berkeley) 6/4/93 - * $Id: clist.h,v 1.3 1994/08/02 07:52:43 davidg Exp $ + * clist.h,v 1.4 1994/08/21 04:41:35 paul Exp */ #ifndef _SYS_CLIST_H_ diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 7aba080bbcef4..18cf171bef1c7 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.3 (Berkeley) 1/21/94 - * $Id: conf.h,v 1.3 1994/08/21 04:41:36 paul Exp $ + * conf.h,v 1.4 1994/10/08 22:22:56 phk Exp */ #ifndef _SYS_CONF_H_ diff --git a/sys/sys/devconf.h b/sys/sys/devconf.h index 1413af6260edc..c058bd4133878 100644 --- a/sys/sys/devconf.h +++ b/sys/sys/devconf.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devconf.h,v 1.2 1994/10/19 00:10:10 wollman Exp $ + * devconf.h,v 1.3 1994/10/23 21:28:03 wollman Exp */ /* diff --git a/sys/sys/device.h b/sys/sys/device.h index 2fe1d6a70b3cb..cbf059b5e42f7 100644 --- a/sys/sys/device.h +++ b/sys/sys/device.h @@ -40,7 +40,7 @@ * SUCH DAMAGE. * * @(#)device.h 8.2 (Berkeley) 2/17/94 - * $Id$ + * device.h,v 1.2 1994/08/02 07:52:45 davidg Exp */ #ifndef _SYS_DEVICE_H_ diff --git a/sys/sys/dir.h b/sys/sys/dir.h index c0347c1ec5547..b834ba2602ee2 100644 --- a/sys/sys/dir.h +++ b/sys/sys/dir.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dir.h 8.2 (Berkeley) 1/4/94 - * $Id$ + * dir.h,v 1.2 1994/08/02 07:52:46 davidg Exp */ /* diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h index 80c519ec816b4..45185cc6d86c6 100644 --- a/sys/sys/dirent.h +++ b/sys/sys/dirent.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.1 (Berkeley) 6/2/93 - * $Id: dirent.h,v 1.2 1994/08/02 07:52:47 davidg Exp $ + * dirent.h,v 1.3 1994/08/21 04:41:38 paul Exp */ #ifndef _SYS_DIRENT_H_ diff --git a/sys/sys/disk.h b/sys/sys/disk.h index c90eca5b0d32e..6bede8188e952 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -41,7 +41,7 @@ * * @(#)disk.h 8.1 (Berkeley) 6/2/93 * - * $Id: disk.h,v 1.2 1994/08/02 07:52:48 davidg Exp $ + * disk.h,v 1.3 1994/08/21 04:41:39 paul Exp */ #ifndef _SYS_DISK_H_ diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 859192e7e374d..f9dbb707a360f 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)disklabel.h 8.1 (Berkeley) 6/2/93 - * $Id: disklabel.h,v 1.7 1994/10/31 06:31:14 phk Exp $ + * disklabel.h,v 1.8 1994/11/14 13:08:44 bde Exp */ #ifndef _SYS_DISKLABEL_H_ diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h index 5daecded032fb..0c81ef60a13ab 100644 --- a/sys/sys/dkbad.h +++ b/sys/sys/dkbad.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dkbad.h 8.1 (Berkeley) 6/2/93 - * $Id: dkbad.h,v 1.2 1994/08/02 07:52:50 davidg Exp $ + * dkbad.h,v 1.3 1994/08/21 04:41:40 paul Exp */ #ifndef _SYS_DKBAD_H_ diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h index 72899070f8a30..b125abe9e8f64 100644 --- a/sys/sys/dkstat.h +++ b/sys/sys/dkstat.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)dkstat.h 8.2 (Berkeley) 1/21/94 - * $Id: dkstat.h,v 1.3 1994/08/18 22:35:42 wollman Exp $ + * dkstat.h,v 1.5 1994/10/16 05:03:05 wollman Exp */ #ifndef _SYS_DKSTAT_H_ diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h index b9ca5a1e55c61..eee8b657b610e 100644 --- a/sys/sys/dmap.h +++ b/sys/sys/dmap.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dmap.h 8.2 (Berkeley) 1/4/94 - * $Id$ + * dmap.h,v 1.2 1994/08/02 07:52:52 davidg Exp */ #ifndef _SYS_DMAP_H_ diff --git a/sys/sys/domain.h b/sys/sys/domain.h index dbafc9d13c6d8..e950a61b88784 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)domain.h 8.1 (Berkeley) 6/2/93 - * $Id: domain.h,v 1.2 1994/08/02 07:52:53 davidg Exp $ + * domain.h,v 1.3 1994/08/21 04:41:41 paul Exp */ #ifndef _SYS_DOMAIN_H_ diff --git a/sys/sys/errno.h b/sys/sys/errno.h index 3bac4ed751de2..fb6b60c9a49cb 100644 --- a/sys/sys/errno.h +++ b/sys/sys/errno.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)errno.h 8.5 (Berkeley) 1/21/94 - * $Id: errno.h,v 1.2 1994/08/02 07:52:54 davidg Exp $ + * errno.h,v 1.3 1994/08/21 04:41:42 paul Exp */ #ifndef _SYS_ERRNO_H_ diff --git a/sys/sys/exec.h b/sys/sys/exec.h index 28941b0f71033..d1d7ae66099dd 100644 --- a/sys/sys/exec.h +++ b/sys/sys/exec.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 1/21/94 - * $Id: exec.h,v 1.8 1994/10/02 17:24:41 phk Exp $ + * exec.h,v 1.9 1994/10/09 21:50:57 sos Exp */ #ifndef _SYS_EXEC_H_ diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h index b38522f57f3ce..938aabbc0e70b 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -36,7 +36,7 @@ * * @(#)fbio.h 8.2 (Berkeley) 10/30/93 * - * $Id: fbio.h,v 1.2 1994/08/02 07:52:56 davidg Exp $ + * fbio.h,v 1.3 1994/08/21 04:41:44 paul Exp */ #ifndef _SYS_FBIO_H_ diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 33afa9a454d5b..0229e286abbc6 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)fcntl.h 8.3 (Berkeley) 1/21/94 - * $Id$ + * fcntl.h,v 1.2 1994/08/02 07:52:57 davidg Exp */ #ifndef _SYS_FCNTL_H_ diff --git a/sys/sys/file.h b/sys/sys/file.h index f70f47aba7d32..c1598e4f9f718 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)file.h 8.1 (Berkeley) 6/2/93 - * $Id: file.h,v 1.2 1994/08/02 07:52:58 davidg Exp $ + * file.h,v 1.3 1994/08/21 04:41:45 paul Exp */ #ifndef _SYS_FILE_H_ diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index abaf880f16b7a..f86fab629657b 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)filedesc.h 8.1 (Berkeley) 6/2/93 - * $Id: filedesc.h,v 1.3 1994/08/21 04:41:46 paul Exp $ + * filedesc.h,v 1.4 1994/10/02 17:24:44 phk Exp */ #ifndef _SYS_FILEDESC_H_ diff --git a/sys/sys/filio.h b/sys/sys/filio.h index b82a649c0feb1..6723d3c4b14de 100644 --- a/sys/sys/filio.h +++ b/sys/sys/filio.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)filio.h 8.1 (Berkeley) 3/28/94 - * $Id$ + * filio.h,v 1.2 1994/08/02 07:53:01 davidg Exp */ #ifndef _SYS_FILIO_H_ diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h index bd1c9004893c0..855702e01c44c 100644 --- a/sys/sys/gmon.h +++ b/sys/sys/gmon.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)gmon.h 8.2 (Berkeley) 1/4/94 - * $Id$ + * gmon.h,v 1.2 1994/08/02 07:53:02 davidg Exp */ #ifndef _SYS_GMON_H_ diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h index 320794bcfa68d..97b5da2cbab74 100644 --- a/sys/sys/imgact.h +++ b/sys/sys/imgact.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact.h,v 1.7 1994/08/21 04:41:47 paul Exp $ + * imgact.h,v 1.8 1994/10/02 17:24:45 phk Exp */ #ifndef _SYS_IMGACT_H_ diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h index 9f40821133cb4..3a1f8481ae0e0 100644 --- a/sys/sys/imgact_aout.h +++ b/sys/sys/imgact_aout.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)exec.h 8.1 (Berkeley) 6/11/93 - * $Id$ + * imgact_aout.h,v 1.1 1994/09/24 21:09:18 davidg Exp */ #ifndef _IMGACT_AOUT_H_ diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h index 4ced71e4df958..f8fe94f30d60d 100644 --- a/sys/sys/inflate.h +++ b/sys/sys/inflate.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id$ + * inflate.h,v 1.4 1994/10/22 11:40:38 phk Exp * */ #ifndef _SYS_INFLATE_H_ diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h index 9958ac77d344a..6ad747df62287 100644 --- a/sys/sys/ioccom.h +++ b/sys/sys/ioccom.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ioccom.h 8.2 (Berkeley) 3/28/94 - * $Id$ + * ioccom.h,v 1.2 1994/08/02 07:53:03 davidg Exp */ #ifndef _SYS_IOCCOM_H_ diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h index abe902f57825d..39a0b81a188ab 100644 --- a/sys/sys/ioctl.h +++ b/sys/sys/ioctl.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ioctl.h 8.6 (Berkeley) 3/28/94 - * $Id$ + * ioctl.h,v 1.2 1994/08/02 07:53:04 davidg Exp */ #ifndef _SYS_IOCTL_H_ diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h index ab067b97e42ba..e12a3f6fd6028 100644 --- a/sys/sys/ioctl_compat.h +++ b/sys/sys/ioctl_compat.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ioctl_compat.h 8.4 (Berkeley) 1/21/94 - * $Id$ + * ioctl_compat.h,v 1.2 1994/08/02 07:53:05 davidg Exp */ #ifndef _SYS_IOCTL_COMPAT_H_ diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h index bc63d69924dd5..f6169df74e5ed 100644 --- a/sys/sys/ipc.h +++ b/sys/sys/ipc.h @@ -41,7 +41,7 @@ * SUCH DAMAGE. * * @(#)ipc.h 8.3 (Berkeley) 1/21/94 - * $Id: ipc.h,v 1.3 1994/09/13 14:47:33 dfr Exp $ + * ipc.h,v 1.4 1994/10/02 17:24:47 phk Exp */ /* diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 97f374a9eebe2..d49055f75eff6 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kernel.h 8.3 (Berkeley) 1/21/94 - * $Id: kernel.h,v 1.5 1994/09/23 19:07:41 wollman Exp $ + * kernel.h,v 1.6 1994/10/05 21:23:38 wollman Exp */ #ifndef _SYS_KERNEL_H_ diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h index 469f8726bb24a..953b12893bd48 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ktrace.h 8.1 (Berkeley) 6/2/93 - * $Id: ktrace.h,v 1.5 1994/09/27 21:26:56 phk Exp $ + * ktrace.h,v 1.6 1994/10/02 17:24:48 phk Exp */ #ifndef _SYS_KTRACE_H_ diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h deleted file mode 100644 index 3a5b6aabac67e..0000000000000 --- a/sys/sys/link_aout.h +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Copyright (c) 1993 Paul Kranenburg - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Paul Kranenburg. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ - */ - -/* - * RRS section definitions. - * - * The layout of some data structures defined in this header file is - * such that we can provide compatibility with the SunOS 4.x shared - * library scheme. - */ - -#ifndef _LINK_H_ -#define _LINK_H_ - -/* - * A `Shared Object Descriptor' descibes a shared object that is needed - * to complete the link edit process of the object containing it. - * A list of such objects (chained through `sod_next') is pointed at - * by `sdt_sods' in the section_dispatch_table structure. - */ - -struct sod { /* Shared Object Descriptor */ - long sod_name; /* name (relative to load address) */ - u_int sod_library : 1, /* Searched for by library rules */ - sod_reserved : 31; - short sod_major; /* major version number */ - short sod_minor; /* minor version number */ - long sod_next; /* next sod */ -}; - -/* - * `Shared Object Map's are used by the run-time link editor (ld.so) to - * keep track of all shared objects loaded into a process' address space. - * These structures are only used at run-time and do not occur within - * the text or data segment of an executable or shared library. - */ -struct so_map { /* Shared Object Map */ - caddr_t som_addr; /* Address at which object mapped */ - char *som_path; /* Path to mmap'ed file */ - struct so_map *som_next; /* Next map in chain */ - struct sod *som_sod; /* Sod responsible for this map */ - caddr_t som_sodbase; /* Base address of this sod */ - u_int som_write : 1; /* Text is currently writable */ - struct _dynamic *som_dynamic; /* _dynamic structure */ - caddr_t som_spd; /* Private data */ -}; - -/* - * Symbol description with size. This is simply an `nlist' with - * one field (nz_size) added. - * Used to convey size information on items in the data segment - * of shared objects. An array of these live in the shared object's - * text segment and is addressed by the `sdt_nzlist' field. - */ -struct nzlist { - struct nlist nlist; - u_long nz_size; -#define nz_un nlist.n_un -#define nz_strx nlist.n_un.n_strx -#define nz_name nlist.n_un.n_name -#define nz_type nlist.n_type -#define nz_value nlist.n_value -#define nz_desc nlist.n_desc -#define nz_other nlist.n_other -}; - -#define N_AUX(p) ((p)->n_other & 0xf) -#define N_RESERVED(p) (((unsigned int)(p)->n_other >> 4) & 0xf) -#define N_OTHER(r, v) (((unsigned int)(r) << 4) | ((v) & 0xf)) - -#define AUX_OBJECT 1 -#define AUX_FUNC 2 - - -/* - * The `section_dispatch_table' structure contains offsets to various data - * structures needed to do run-time relocation. - */ -struct section_dispatch_table { - struct so_map *sdt_loaded; /* List of loaded objects */ - long sdt_sods; /* List of shared objects descriptors */ - long sdt_filler1; /* Unused (was: search rules) */ - long sdt_got; /* Global offset table */ - long sdt_plt; /* Procedure linkage table */ - long sdt_rel; /* Relocation table */ - long sdt_hash; /* Symbol hash table */ - long sdt_nzlist; /* Symbol table itself */ - long sdt_filler2; /* Unused (was: stab_hash) */ - long sdt_buckets; /* Number of hash buckets */ - long sdt_strings; /* Symbol strings */ - long sdt_str_sz; /* Size of symbol strings */ - long sdt_text_sz; /* Size of text area */ - long sdt_plt_sz; /* Size of procedure linkage table */ -}; - -/* - * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table. - * Used to quickly lookup symbols of the shared object by hashing - * on the symbol's name. `rh_symbolnum' is the index of the symbol - * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is - * the next symbol in the hash bucket (in case of collisions). - */ -struct rrs_hash { - int rh_symbolnum; /* Symbol number */ - int rh_next; /* Next hash entry */ -}; - -/* - * `rt_symbols' is used to keep track of run-time allocated commons - * and data items copied from shared objects. - */ -struct rt_symbol { - struct nzlist *rt_sp; /* The symbol */ - struct rt_symbol *rt_next; /* Next in linear list */ - struct rt_symbol *rt_link; /* Next in bucket */ - caddr_t rt_srcaddr; /* Address of "master" copy */ - struct so_map *rt_smp; /* Originating map */ -}; - -/* - * Debugger interface structure. - */ -struct so_debug { - int dd_version; /* Version # of interface */ - int dd_in_debugger; /* Set when run by debugger */ - int dd_sym_loaded; /* Run-time linking brought more - symbols into scope */ - char *dd_bpt_addr; /* Address of rtld-generated bpt */ - int dd_bpt_shadow; /* Original contents of bpt */ - struct rt_symbol *dd_cc; /* Allocated commons/copied data */ -}; - -/* - * Entry points into ld.so - user interface to the run-time linker. - */ -struct ld_entry { - void *(*dlopen) __P((char *, int)); - int (*dlclose) __P((void *)); - void *(*dlsym) __P((void *, char *)); - int (*dlctl) __P((void *, int, void *)); -}; - -/* - * dlctl() commands - */ -#define DL_GETERRNO 1 - -/* - * dl*() prototypes. - */ -extern void *dlopen __P((char *, int)); -extern int dlclose __P((void *)); -extern void *dlsym __P((void *, char *)); -extern int dlctl __P((void *, int, void *)); - - -/* - * This is the structure pointed at by the __DYNAMIC symbol if an - * executable requires the attention of the run-time link editor. - * __DYNAMIC is given the value zero if no run-time linking needs to - * be done (it is always present in shared objects). - * The union `d_un' provides for different versions of the dynamic - * linking mechanism (switched on by `d_version'). The last version - * used by Sun is 3. We leave some room here and go to version number - * 8 for NetBSD, the main difference lying in the support for the - * `nz_list' type of symbols. - */ - -struct _dynamic { - int d_version; /* version # of this interface */ - struct so_debug *d_debug; - union { - struct section_dispatch_table *d_sdt; - } d_un; - struct ld_entry *d_entry; -}; - -#define LD_VERSION_SUN (3) -#define LD_VERSION_BSD (8) -#define LD_VERSION_NZLIST_P(v) ((v) >= 8) - -#define LD_GOT(x) ((x)->d_un.d_sdt->sdt_got) -#define LD_PLT(x) ((x)->d_un.d_sdt->sdt_plt) -#define LD_REL(x) ((x)->d_un.d_sdt->sdt_rel) -#define LD_SYMBOL(x) ((x)->d_un.d_sdt->sdt_nzlist) -#define LD_HASH(x) ((x)->d_un.d_sdt->sdt_hash) -#define LD_STRINGS(x) ((x)->d_un.d_sdt->sdt_strings) -#define LD_NEED(x) ((x)->d_un.d_sdt->sdt_sods) -#define LD_BUCKETS(x) ((x)->d_un.d_sdt->sdt_buckets) - -#define LD_GOTSZ(x) ((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got) -#define LD_RELSZ(x) ((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel) -#define LD_HASHSZ(x) ((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash) -#define LD_STABSZ(x) ((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist) -#define LD_PLTSZ(x) ((x)->d_un.d_sdt->sdt_plt_sz) -#define LD_STRSZ(x) ((x)->d_un.d_sdt->sdt_str_sz) -#define LD_TEXTSZ(x) ((x)->d_un.d_sdt->sdt_text_sz) - -/* - * Interface to ld.so - */ -struct crt_ldso { - int crt_ba; /* Base address of ld.so */ - int crt_dzfd; /* "/dev/zero" file decriptor (SunOS) */ - int crt_ldfd; /* ld.so file descriptor */ - struct _dynamic *crt_dp; /* Main's __DYNAMIC */ - char **crt_ep; /* environment strings */ - caddr_t crt_bp; /* Breakpoint if run from debugger */ - char *crt_prog; /* Program name */ -}; - -/* - * Version passed from crt0 to ld.so (1st argument to _rtld()). - */ -#define CRT_VERSION_SUN 1 -#define CRT_VERSION_BSD 2 -#define CRT_VERSION_BSD_2 2 -#define CRT_VERSION_BSD_3 3 - - -/* - * Maximum number of recognized shared object version numbers. - */ -#define MAXDEWEY 8 - -/* - * Header of the hints file. - */ -struct hints_header { - long hh_magic; -#define HH_MAGIC 011421044151 - long hh_version; /* Interface version number */ -#define LD_HINTS_VERSION_1 1 - long hh_hashtab; /* Location of hash table */ - long hh_nbucket; /* Number of buckets in hashtab */ - long hh_strtab; /* Location of strings */ - long hh_strtab_sz; /* Size of strings */ - long hh_ehints; /* End of hints (max offset in file) */ -}; - -#define HH_BADMAG(hdr) ((hdr).hh_magic != HH_MAGIC) - -/* - * Hash table element in hints file. - */ -struct hints_bucket { - /* namex and pathx are indices into the string table */ - int hi_namex; /* Library name */ - int hi_pathx; /* Full path */ - int hi_dewey[MAXDEWEY]; /* The versions */ - int hi_ndewey; /* Number of version numbers */ -#define hi_major hi_dewey[0] -#define hi_minor hi_dewey[1] - int hi_next; /* Next in this bucket */ -}; - -#define _PATH_LD_HINTS "/var/run/ld.so.hints" - -#endif /* _LINK_H_ */ - diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h deleted file mode 100644 index 3a5b6aabac67e..0000000000000 --- a/sys/sys/link_elf.h +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Copyright (c) 1993 Paul Kranenburg - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Paul Kranenburg. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ - */ - -/* - * RRS section definitions. - * - * The layout of some data structures defined in this header file is - * such that we can provide compatibility with the SunOS 4.x shared - * library scheme. - */ - -#ifndef _LINK_H_ -#define _LINK_H_ - -/* - * A `Shared Object Descriptor' descibes a shared object that is needed - * to complete the link edit process of the object containing it. - * A list of such objects (chained through `sod_next') is pointed at - * by `sdt_sods' in the section_dispatch_table structure. - */ - -struct sod { /* Shared Object Descriptor */ - long sod_name; /* name (relative to load address) */ - u_int sod_library : 1, /* Searched for by library rules */ - sod_reserved : 31; - short sod_major; /* major version number */ - short sod_minor; /* minor version number */ - long sod_next; /* next sod */ -}; - -/* - * `Shared Object Map's are used by the run-time link editor (ld.so) to - * keep track of all shared objects loaded into a process' address space. - * These structures are only used at run-time and do not occur within - * the text or data segment of an executable or shared library. - */ -struct so_map { /* Shared Object Map */ - caddr_t som_addr; /* Address at which object mapped */ - char *som_path; /* Path to mmap'ed file */ - struct so_map *som_next; /* Next map in chain */ - struct sod *som_sod; /* Sod responsible for this map */ - caddr_t som_sodbase; /* Base address of this sod */ - u_int som_write : 1; /* Text is currently writable */ - struct _dynamic *som_dynamic; /* _dynamic structure */ - caddr_t som_spd; /* Private data */ -}; - -/* - * Symbol description with size. This is simply an `nlist' with - * one field (nz_size) added. - * Used to convey size information on items in the data segment - * of shared objects. An array of these live in the shared object's - * text segment and is addressed by the `sdt_nzlist' field. - */ -struct nzlist { - struct nlist nlist; - u_long nz_size; -#define nz_un nlist.n_un -#define nz_strx nlist.n_un.n_strx -#define nz_name nlist.n_un.n_name -#define nz_type nlist.n_type -#define nz_value nlist.n_value -#define nz_desc nlist.n_desc -#define nz_other nlist.n_other -}; - -#define N_AUX(p) ((p)->n_other & 0xf) -#define N_RESERVED(p) (((unsigned int)(p)->n_other >> 4) & 0xf) -#define N_OTHER(r, v) (((unsigned int)(r) << 4) | ((v) & 0xf)) - -#define AUX_OBJECT 1 -#define AUX_FUNC 2 - - -/* - * The `section_dispatch_table' structure contains offsets to various data - * structures needed to do run-time relocation. - */ -struct section_dispatch_table { - struct so_map *sdt_loaded; /* List of loaded objects */ - long sdt_sods; /* List of shared objects descriptors */ - long sdt_filler1; /* Unused (was: search rules) */ - long sdt_got; /* Global offset table */ - long sdt_plt; /* Procedure linkage table */ - long sdt_rel; /* Relocation table */ - long sdt_hash; /* Symbol hash table */ - long sdt_nzlist; /* Symbol table itself */ - long sdt_filler2; /* Unused (was: stab_hash) */ - long sdt_buckets; /* Number of hash buckets */ - long sdt_strings; /* Symbol strings */ - long sdt_str_sz; /* Size of symbol strings */ - long sdt_text_sz; /* Size of text area */ - long sdt_plt_sz; /* Size of procedure linkage table */ -}; - -/* - * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table. - * Used to quickly lookup symbols of the shared object by hashing - * on the symbol's name. `rh_symbolnum' is the index of the symbol - * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is - * the next symbol in the hash bucket (in case of collisions). - */ -struct rrs_hash { - int rh_symbolnum; /* Symbol number */ - int rh_next; /* Next hash entry */ -}; - -/* - * `rt_symbols' is used to keep track of run-time allocated commons - * and data items copied from shared objects. - */ -struct rt_symbol { - struct nzlist *rt_sp; /* The symbol */ - struct rt_symbol *rt_next; /* Next in linear list */ - struct rt_symbol *rt_link; /* Next in bucket */ - caddr_t rt_srcaddr; /* Address of "master" copy */ - struct so_map *rt_smp; /* Originating map */ -}; - -/* - * Debugger interface structure. - */ -struct so_debug { - int dd_version; /* Version # of interface */ - int dd_in_debugger; /* Set when run by debugger */ - int dd_sym_loaded; /* Run-time linking brought more - symbols into scope */ - char *dd_bpt_addr; /* Address of rtld-generated bpt */ - int dd_bpt_shadow; /* Original contents of bpt */ - struct rt_symbol *dd_cc; /* Allocated commons/copied data */ -}; - -/* - * Entry points into ld.so - user interface to the run-time linker. - */ -struct ld_entry { - void *(*dlopen) __P((char *, int)); - int (*dlclose) __P((void *)); - void *(*dlsym) __P((void *, char *)); - int (*dlctl) __P((void *, int, void *)); -}; - -/* - * dlctl() commands - */ -#define DL_GETERRNO 1 - -/* - * dl*() prototypes. - */ -extern void *dlopen __P((char *, int)); -extern int dlclose __P((void *)); -extern void *dlsym __P((void *, char *)); -extern int dlctl __P((void *, int, void *)); - - -/* - * This is the structure pointed at by the __DYNAMIC symbol if an - * executable requires the attention of the run-time link editor. - * __DYNAMIC is given the value zero if no run-time linking needs to - * be done (it is always present in shared objects). - * The union `d_un' provides for different versions of the dynamic - * linking mechanism (switched on by `d_version'). The last version - * used by Sun is 3. We leave some room here and go to version number - * 8 for NetBSD, the main difference lying in the support for the - * `nz_list' type of symbols. - */ - -struct _dynamic { - int d_version; /* version # of this interface */ - struct so_debug *d_debug; - union { - struct section_dispatch_table *d_sdt; - } d_un; - struct ld_entry *d_entry; -}; - -#define LD_VERSION_SUN (3) -#define LD_VERSION_BSD (8) -#define LD_VERSION_NZLIST_P(v) ((v) >= 8) - -#define LD_GOT(x) ((x)->d_un.d_sdt->sdt_got) -#define LD_PLT(x) ((x)->d_un.d_sdt->sdt_plt) -#define LD_REL(x) ((x)->d_un.d_sdt->sdt_rel) -#define LD_SYMBOL(x) ((x)->d_un.d_sdt->sdt_nzlist) -#define LD_HASH(x) ((x)->d_un.d_sdt->sdt_hash) -#define LD_STRINGS(x) ((x)->d_un.d_sdt->sdt_strings) -#define LD_NEED(x) ((x)->d_un.d_sdt->sdt_sods) -#define LD_BUCKETS(x) ((x)->d_un.d_sdt->sdt_buckets) - -#define LD_GOTSZ(x) ((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got) -#define LD_RELSZ(x) ((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel) -#define LD_HASHSZ(x) ((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash) -#define LD_STABSZ(x) ((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist) -#define LD_PLTSZ(x) ((x)->d_un.d_sdt->sdt_plt_sz) -#define LD_STRSZ(x) ((x)->d_un.d_sdt->sdt_str_sz) -#define LD_TEXTSZ(x) ((x)->d_un.d_sdt->sdt_text_sz) - -/* - * Interface to ld.so - */ -struct crt_ldso { - int crt_ba; /* Base address of ld.so */ - int crt_dzfd; /* "/dev/zero" file decriptor (SunOS) */ - int crt_ldfd; /* ld.so file descriptor */ - struct _dynamic *crt_dp; /* Main's __DYNAMIC */ - char **crt_ep; /* environment strings */ - caddr_t crt_bp; /* Breakpoint if run from debugger */ - char *crt_prog; /* Program name */ -}; - -/* - * Version passed from crt0 to ld.so (1st argument to _rtld()). - */ -#define CRT_VERSION_SUN 1 -#define CRT_VERSION_BSD 2 -#define CRT_VERSION_BSD_2 2 -#define CRT_VERSION_BSD_3 3 - - -/* - * Maximum number of recognized shared object version numbers. - */ -#define MAXDEWEY 8 - -/* - * Header of the hints file. - */ -struct hints_header { - long hh_magic; -#define HH_MAGIC 011421044151 - long hh_version; /* Interface version number */ -#define LD_HINTS_VERSION_1 1 - long hh_hashtab; /* Location of hash table */ - long hh_nbucket; /* Number of buckets in hashtab */ - long hh_strtab; /* Location of strings */ - long hh_strtab_sz; /* Size of strings */ - long hh_ehints; /* End of hints (max offset in file) */ -}; - -#define HH_BADMAG(hdr) ((hdr).hh_magic != HH_MAGIC) - -/* - * Hash table element in hints file. - */ -struct hints_bucket { - /* namex and pathx are indices into the string table */ - int hi_namex; /* Library name */ - int hi_pathx; /* Full path */ - int hi_dewey[MAXDEWEY]; /* The versions */ - int hi_ndewey; /* Number of version numbers */ -#define hi_major hi_dewey[0] -#define hi_minor hi_dewey[1] - int hi_next; /* Next in this bucket */ -}; - -#define _PATH_LD_HINTS "/var/run/ld.so.hints" - -#endif /* _LINK_H_ */ - diff --git a/sys/sys/lkm.h b/sys/sys/lkm.h index 7e26e47420fc8..db2332d365fbb 100644 --- a/sys/sys/lkm.h +++ b/sys/sys/lkm.h @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lkm.h,v 1.2 1994/09/21 03:47:30 wollman Exp $ + * lkm.h,v 1.3 1994/09/27 20:39:48 phk Exp */ #ifndef _SYS_LKM_H_ diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h index 09b2b68af90df..0c6308bd4e214 100644 --- a/sys/sys/lockf.h +++ b/sys/sys/lockf.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)lockf.h 8.1 (Berkeley) 6/11/93 - * $Id: lockf.h,v 1.1 1994/08/08 17:30:58 davidg Exp $ + * lockf.h,v 1.2 1994/08/21 04:41:50 paul Exp */ #ifndef _SYS_LOCKF_H_ diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index f9a1597ed2641..0db974bffeace 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)malloc.h 8.3 (Berkeley) 1/12/94 - * $Id: malloc.h,v 1.4 1994/09/19 15:41:55 dfr Exp $ + * malloc.h,v 1.5 1994/10/04 06:51:36 phk Exp */ #ifndef _SYS_MALLOC_H_ diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 3f888a6261355..4573339c39d37 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.3 (Berkeley) 1/21/94 - * $Id: mbuf.h,v 1.8 1994/11/04 00:28:38 davidg Exp $ + * mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp */ #ifndef _SYS_MBUF_H_ diff --git a/sys/sys/mman.h b/sys/sys/mman.h index bb77cda74f513..26d8334a4ca3b 100644 --- a/sys/sys/mman.h +++ b/sys/sys/mman.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mman.h 8.1 (Berkeley) 6/2/93 - * $Id: mman.h,v 1.3 1994/08/02 15:06:58 davidg Exp $ + * mman.h,v 1.4 1994/08/21 04:41:52 paul Exp */ #ifndef _SYS_MMAN_H_ diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 4b3e6e5c6b909..56e2a32e70440 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mount.h 8.13 (Berkeley) 3/27/94 - * $Id: mount.h,v 1.11 1994/09/27 20:39:50 phk Exp $ + * mount.h,v 1.12 1994/10/20 00:48:21 wollman Exp */ #ifndef _SYS_MOUNT_H_ diff --git a/sys/sys/msg.h b/sys/sys/msg.h index 8f559a9e9a23d..b769923f28846 100644 --- a/sys/sys/msg.h +++ b/sys/sys/msg.h @@ -1,4 +1,4 @@ -/* $Id: msg.h,v 1.1 1994/09/13 14:47:34 dfr Exp $ */ +/* msg.h,v 1.2 1994/09/17 13:24:27 davidg Exp */ /* $NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $ */ /* diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h index 3d2f4b00c3ca4..06ccd97b677e4 100644 --- a/sys/sys/msgbuf.h +++ b/sys/sys/msgbuf.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)msgbuf.h 8.1 (Berkeley) 6/2/93 - * $Id: msgbuf.h,v 1.3 1994/08/18 22:35:44 wollman Exp $ + * msgbuf.h,v 1.4 1994/08/21 04:41:54 paul Exp */ #ifndef _SYS_MSGBUF_H_ diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h index 0474239534f5b..13231fbacfa0a 100644 --- a/sys/sys/mtio.h +++ b/sys/sys/mtio.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mtio.h 8.1 (Berkeley) 6/2/93 - * $Id: mtio.h,v 1.3 1994/08/02 07:53:17 davidg Exp $ + * mtio.h,v 1.4 1994/10/28 13:19:42 jkh Exp */ #ifndef _SYS_MTIO_H_ diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 1088ede803419..9609ec91e3eea 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)namei.h 8.2 (Berkeley) 1/4/94 - * $Id: namei.h,v 1.2 1994/08/02 07:53:18 davidg Exp $ + * namei.h,v 1.3 1994/09/27 20:33:41 phk Exp */ #ifndef _SYS_NAMEI_H_ diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h deleted file mode 100644 index 11e0a43848f6b..0000000000000 --- a/sys/sys/nlist_aout.h +++ /dev/null @@ -1,85 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)nlist.h 8.2 (Berkeley) 1/21/94 - */ - -#ifndef _NLIST_H_ -#define _NLIST_H_ - -/* - * Symbol table entry format. The #ifdef's are so that programs including - * nlist.h can initialize nlist structures statically. - */ -struct nlist { -#ifdef _AOUT_INCLUDE_ - union { - char *n_name; /* symbol name (in memory) */ - long n_strx; /* file string table offset (on disk) */ - } n_un; -#else - char *n_name; /* symbol name (in memory) */ -#endif - -#define N_UNDF 0x00 /* undefined */ -#define N_ABS 0x02 /* absolute address */ -#define N_TEXT 0x04 /* text segment */ -#define N_DATA 0x06 /* data segment */ -#define N_BSS 0x08 /* bss segment */ -#define N_COMM 0x12 /* common reference */ -#define N_FN 0x1e /* file name */ - -#define N_EXT 0x01 /* external (global) bit, OR'ed in */ -#define N_TYPE 0x1e /* mask for all the type bits */ - unsigned char n_type; /* type defines */ - - char n_other; /* spare */ -#define n_hash n_desc /* used internally by ld(1); XXX */ - short n_desc; /* used by stab entries */ - unsigned long n_value; /* address/value of the symbol */ -}; - -#define N_FORMAT "%08x" /* namelist value format; XXX */ -#define N_STAB 0x0e0 /* mask for debugger symbols -- stab(5) */ - -#include <sys/cdefs.h> - -__BEGIN_DECLS -int nlist __P((const char *, struct nlist *)); -__END_DECLS - -#endif /* !_NLIST_H_ */ diff --git a/sys/sys/param.h b/sys/sys/param.h index bf190de7b11ea..87ad87320894c 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.2 (Berkeley) 1/21/94 - * $Id: param.h,v 1.4 1994/08/21 04:41:55 paul Exp $ + * param.h,v 1.5 1994/09/01 05:12:51 davidg Exp */ #ifndef _SYS_PARAM_H_ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 468c49f8e3d26..8e17b57055858 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.8 (Berkeley) 1/21/94 - * $Id: proc.h,v 1.13 1994/11/13 12:46:08 davidg Exp $ + * proc.h,v 1.14 1994/11/15 14:37:39 bde Exp */ #ifndef _SYS_PROC_H_ diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index c3749acded6e9..e06b211d37fef 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $Id: protosw.h,v 1.4 1994/10/08 01:45:27 phk Exp $ + * protosw.h,v 1.5 1994/10/08 22:22:57 phk Exp */ #ifndef _SYS_PROTOSW_H_ diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index db29a9be67e8c..cc1d355bb602a 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ptrace.h 8.2 (Berkeley) 1/4/94 - * $Id: ptrace.h,v 1.2 1994/08/02 07:53:24 davidg Exp $ + * ptrace.h,v 1.3 1994/08/08 13:00:27 davidg Exp */ #ifndef _SYS_PTRACE_H_ diff --git a/sys/sys/queue.h b/sys/sys/queue.h index 2a257e096de06..6062b4f42688d 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)queue.h 8.4 (Berkeley) 1/4/94 - * $Id$ + * queue.h,v 1.2 1994/08/02 07:53:25 davidg Exp */ #ifndef _SYS_QUEUE_H_ diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h index 1ab9ac50f08b4..a2e8e2cb5ede8 100644 --- a/sys/sys/reboot.h +++ b/sys/sys/reboot.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)reboot.h 8.1 (Berkeley) 6/2/93 - * $Id: reboot.h,v 1.5 1994/10/26 13:38:23 jkh Exp $ + * reboot.h,v 1.6 1994/10/26 13:45:52 jkh Exp */ #ifndef _SYS_REBOOT_H_ diff --git a/sys/sys/resource.h b/sys/sys/resource.h index 398acea6660b0..5857bb731b513 100644 --- a/sys/sys/resource.h +++ b/sys/sys/resource.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)resource.h 8.2 (Berkeley) 1/4/94 - * $Id$ + * resource.h,v 1.2 1994/08/02 07:53:28 davidg Exp */ #ifndef _SYS_RESOURCE_H_ diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h index f03d3085dee5a..a04599cde601f 100644 --- a/sys/sys/resourcevar.h +++ b/sys/sys/resourcevar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)resourcevar.h 8.3 (Berkeley) 2/22/94 - * $Id: resourcevar.h,v 1.5 1994/10/10 00:58:33 phk Exp $ + * resourcevar.h,v 1.6 1994/11/14 14:09:38 bde Exp */ #ifndef _SYS_RESOURCEVAR_H_ diff --git a/sys/sys/rlist.h b/sys/sys/rlist.h index 4c85b717b592e..da3b2586b34df 100644 --- a/sys/sys/rlist.h +++ b/sys/sys/rlist.h @@ -16,7 +16,7 @@ * rlist_alloc(&swapmap, 100, &loc); obtain 100 sectors from swap * * from: unknown? - * $Id: rlist.h,v 1.6 1993/11/25 01:38:01 wollman Exp $ + * rlist.h,v 1.7 1994/10/09 07:35:10 davidg Exp */ #ifndef _SYS_RLIST_H_ diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h index 9a22a34806b75..0ef378009e06d 100644 --- a/sys/sys/rtprio.h +++ b/sys/sys/rtprio.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rtprio.h,v 1.1 1994/09/01 05:12:53 davidg Exp $ + * rtprio.h,v 1.2 1994/10/02 04:45:59 davidg Exp */ #ifndef _SYS_RTPRIO_H_ diff --git a/sys/sys/scsiio.h b/sys/sys/scsiio.h index 2b7b24250c69c..d697c8b27f518 100644 --- a/sys/sys/scsiio.h +++ b/sys/sys/scsiio.h @@ -1,5 +1,5 @@ /* - * $Id$ + * scsiio.h,v 1.2 1994/08/02 07:53:30 davidg Exp */ #ifndef _SYS_SCSIIO_H_ #define _SYS_SCSIIO_H_ diff --git a/sys/sys/select.h b/sys/sys/select.h index e69971e3b6845..8f699efd3b61e 100644 --- a/sys/sys/select.h +++ b/sys/sys/select.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)select.h 8.2 (Berkeley) 1/4/94 - * $Id$ + * select.h,v 1.2 1994/08/02 07:53:31 davidg Exp */ #ifndef _SYS_SELECT_H_ diff --git a/sys/sys/sem.h b/sys/sys/sem.h index c931dcd26f6da..1fe76e6e113dc 100644 --- a/sys/sys/sem.h +++ b/sys/sys/sem.h @@ -1,4 +1,4 @@ -/* $Id: sem.h,v 1.1 1994/09/13 14:47:35 dfr Exp $ */ +/* sem.h,v 1.2 1994/09/17 13:24:28 davidg Exp */ /* $NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $ */ /* diff --git a/sys/sys/shm.h b/sys/sys/shm.h index 710ad4475dca9..52ea50bc18b15 100644 --- a/sys/sys/shm.h +++ b/sys/sys/shm.h @@ -1,4 +1,4 @@ -/* $Id: shm.h,v 1.2 1994/09/17 13:24:29 davidg Exp $ */ +/* shm.h,v 1.3 1994/10/02 17:24:54 phk Exp */ /* $NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $ */ /* diff --git a/sys/sys/signal.h b/sys/sys/signal.h index a116e9bc7362b..2d686f7b825d0 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.2 (Berkeley) 1/21/94 - * $Id$ + * signal.h,v 1.2 1994/08/02 07:53:32 davidg Exp */ #ifndef _SYS_SIGNAL_H_ diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h index 0d980d90b28d5..5b38b653ab770 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.3 (Berkeley) 1/4/94 - * $Id: signalvar.h,v 1.3 1994/09/25 19:34:01 phk Exp $ + * signalvar.h,v 1.4 1994/10/02 17:24:55 phk Exp */ #ifndef _SYS_SIGNALVAR_H_ /* tmp for user.h */ diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 30711ffd2826e..25e74328c737e 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socket.h 8.4 (Berkeley) 2/21/94 - * $Id: socket.h,v 1.3 1994/10/02 17:24:56 phk Exp $ + * socket.h,v 1.4 1994/10/08 22:22:59 phk Exp */ #ifndef _SYS_SOCKET_H_ diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index e215e1f651319..3ffaeb59b569d 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.1 (Berkeley) 6/2/93 - * $Id: socketvar.h,v 1.4 1994/08/21 04:41:58 paul Exp $ + * socketvar.h,v 1.5 1994/10/02 17:24:57 phk Exp */ #ifndef _SYS_SOCKETVAR_H_ diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h index d6569de704fb1..6d11db4be70bc 100644 --- a/sys/sys/sockio.h +++ b/sys/sys/sockio.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)sockio.h 8.1 (Berkeley) 3/28/94 - * $Id: sockio.h,v 1.3 1994/08/08 10:49:26 davidg Exp $ + * sockio.h,v 1.4 1994/09/06 22:42:31 wollman Exp */ #ifndef _SYS_SOCKIO_H_ diff --git a/sys/sys/stat.h b/sys/sys/stat.h index 0755faec93522..620684f34da11 100644 --- a/sys/sys/stat.h +++ b/sys/sys/stat.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)stat.h 8.6 (Berkeley) 3/8/94 - * $Id: stat.h,v 1.4 1994/09/20 22:24:26 bde Exp $ + * stat.h,v 1.5 1994/10/02 17:24:57 phk Exp */ #ifndef _SYS_STAT_H_ diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h index df95ef14fc0ab..1047a3d032f88 100644 --- a/sys/sys/syscall-hide.h +++ b/sys/sys/syscall-hide.h @@ -2,7 +2,7 @@ * System call hiders. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: syscalls.master,v 1.11 1994/10/02 04:45:52 davidg Exp $ + * created from syscall-hide.h,v 1.7 1994/11/10 23:59:45 ats Exp */ HIDE_POSIX(fork) diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index ab6178c1011c0..57f506bcc388a 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: syscalls.master,v 1.11 1994/10/02 04:45:52 davidg Exp $ + * created from syscall.h,v 1.13 1994/11/10 23:59:47 ats Exp */ #define SYS_syscall 0 diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index a879b184fb6a7..750254e8af3d6 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $Id: sysctl.h,v 1.18 1994/10/16 03:53:00 wollman Exp $ + * sysctl.h,v 1.19 1994/11/14 13:59:09 bde Exp */ #ifndef _SYS_SYSCTL_H_ diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index 8a0d93923bf7e..64b0c73870367 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sysent.h,v 1.1 1994/08/24 11:47:23 sos Exp $ + * sysent.h,v 1.2 1994/10/09 21:53:05 sos Exp */ #ifndef _SYS_SYSENT_H_ diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h index 2f381e01d3ec3..60f0fd2307406 100644 --- a/sys/sys/syslimits.h +++ b/sys/sys/syslimits.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)syslimits.h 8.1 (Berkeley) 6/2/93 - * $Id: syslimits.h,v 1.4 1994/08/08 09:12:43 davidg Exp $ + * syslimits.h,v 1.5 1994/08/21 04:41:59 paul Exp */ #ifndef _SYS_SYSLIMITS_H_ diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h index 969717b6dd317..adaf6be728326 100644 --- a/sys/sys/syslog.h +++ b/sys/sys/syslog.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)syslog.h 8.1 (Berkeley) 6/2/93 - * $Id: syslog.h,v 1.3 1994/08/18 22:35:46 wollman Exp $ + * syslog.h,v 1.4 1994/08/21 04:42:00 paul Exp */ #ifndef _SYS_SYSLOG_H_ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 9b026e23704dc..3627d7b2dcc0e 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.4 (Berkeley) 2/23/94 - * $Id: systm.h,v 1.12 1994/10/02 17:24:59 phk Exp $ + * systm.h,v 1.13 1994/10/10 00:58:35 phk Exp */ #ifndef _SYS_SYSTM_H_ diff --git a/sys/sys/tablet.h b/sys/sys/tablet.h index f9aefc0cac975..474631d77ef27 100644 --- a/sys/sys/tablet.h +++ b/sys/sys/tablet.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tablet.h 8.3 (Berkeley) 1/4/94 - * $Id$ + * tablet.h,v 1.2 1994/08/02 07:53:45 davidg Exp */ #ifndef _SYS_TABLET_H_ diff --git a/sys/sys/termios.h b/sys/sys/termios.h index 5abe2d916b84a..ac9102a6c32a1 100644 --- a/sys/sys/termios.h +++ b/sys/sys/termios.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)termios.h 8.3 (Berkeley) 3/28/94 - * $Id$ + * termios.h,v 1.3 1994/08/02 07:53:46 davidg Exp */ #ifndef _SYS_TERMIOS_H_ diff --git a/sys/sys/time.h b/sys/sys/time.h index fa7aecc935b86..ee7756aa44960 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)time.h 8.1 (Berkeley) 6/2/93 - * $Id: time.h,v 1.4 1994/10/02 17:25:01 phk Exp $ + * time.h,v 1.5 1994/10/10 00:58:36 phk Exp */ #ifndef _SYS_TIME_H_ diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h index 8759a7ca4f8dc..3ecec8db5fe1f 100644 --- a/sys/sys/timeb.h +++ b/sys/sys/timeb.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)timeb.h 8.2 (Berkeley) 1/21/94 - * $Id: timeb.h,v 1.2 1994/08/02 07:53:49 davidg Exp $ + * timeb.h,v 1.3 1994/08/21 04:42:02 paul Exp */ #ifndef _SYS_TIMEB_H_ diff --git a/sys/sys/times.h b/sys/sys/times.h index 961ebfd182644..cbb73dfde3637 100644 --- a/sys/sys/times.h +++ b/sys/sys/times.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)times.h 8.4 (Berkeley) 1/21/94 - * $Id$ + * times.h,v 1.2 1994/08/02 07:53:50 davidg Exp */ #ifndef _SYS_TIMES_H_ diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h index 5ef2934ced7b6..10d8f4c555f0d 100644 --- a/sys/sys/tprintf.h +++ b/sys/sys/tprintf.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tprintf.h 8.1 (Berkeley) 6/2/93 - * $Id: tprintf.h,v 1.2 1994/08/02 07:53:51 davidg Exp $ + * tprintf.h,v 1.3 1994/08/21 04:42:03 paul Exp */ #ifndef _SYS_TPRINTF_H_ diff --git a/sys/sys/trace.h b/sys/sys/trace.h index 85b47592635b0..d726308894e94 100644 --- a/sys/sys/trace.h +++ b/sys/sys/trace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)trace.h 8.1 (Berkeley) 6/2/93 - * $Id: trace.h,v 1.2 1994/08/02 07:53:52 davidg Exp $ + * trace.h,v 1.3 1994/08/21 04:42:04 paul Exp */ #ifndef _SYS_TRACE_H_ diff --git a/sys/sys/tty.h b/sys/sys/tty.h index 58996255cfe01..9eb4e2c359f38 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.h 8.6 (Berkeley) 1/21/94 - * $Id: tty.h,v 1.5 1994/09/13 16:03:35 davidg Exp $ + * tty.h,v 1.6 1994/10/02 17:25:02 phk Exp */ #ifndef _SYS_TTY_H_ diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h index 7146f600c714b..aa2eb8d6da7dc 100644 --- a/sys/sys/ttychars.h +++ b/sys/sys/ttychars.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ttychars.h 8.2 (Berkeley) 1/4/94 - * $Id: ttychars.h,v 1.3 1994/08/21 04:42:06 paul Exp $ + * ttychars.h,v 1.4 1994/08/22 19:34:03 csgr Exp */ #ifndef _SYS_TTYCHARS_H_ diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h index 5d221f15a35f9..3eb7e5cc89df0 100644 --- a/sys/sys/ttycom.h +++ b/sys/sys/ttycom.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ttycom.h 8.1 (Berkeley) 3/28/94 - * $Id: ttycom.h,v 1.4 1994/08/18 09:16:37 davidg Exp $ + * ttycom.h,v 1.5 1994/09/13 03:19:19 phk Exp */ #ifndef _SYS_TTYCOM_H_ diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h index b110389a4015e..4b625928f7db2 100644 --- a/sys/sys/ttydefaults.h +++ b/sys/sys/ttydefaults.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ttydefaults.h 8.4 (Berkeley) 1/21/94 - * $Id: ttydefaults.h,v 1.5 1994/09/22 19:51:43 ache Exp $ + * ttydefaults.h,v 1.6 1994/10/11 00:16:28 wollman Exp */ /* diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h index 5f41b471d6c2d..a89db68bb7085 100644 --- a/sys/sys/ttydev.h +++ b/sys/sys/ttydev.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ttydev.h 8.2 (Berkeley) 1/4/94 - * $Id: ttydev.h,v 1.2 1994/08/02 07:53:58 davidg Exp $ + * ttydev.h,v 1.3 1994/08/26 12:07:31 jkh Exp */ /* COMPATABILITY HEADER FILE */ diff --git a/sys/sys/types.h b/sys/sys/types.h index 1a4e48b97db2d..844162db48960 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.4 (Berkeley) 1/21/94 - * $Id: types.h,v 1.3 1994/09/16 11:44:45 paul Exp $ + * types.h,v 1.4 1994/09/25 15:56:25 davidg Exp */ #ifndef _SYS_TYPES_H_ diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index ebdfaee18f57a..29effd9f18fe4 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ucred.h 8.2 (Berkeley) 1/4/94 - * $Id: ucred.h,v 1.3 1994/08/18 22:35:51 wollman Exp $ + * ucred.h,v 1.4 1994/10/08 22:23:00 phk Exp */ #ifndef _SYS_UCRED_H_ diff --git a/sys/sys/uio.h b/sys/sys/uio.h index 941464a124062..780e7101d1862 100644 --- a/sys/sys/uio.h +++ b/sys/sys/uio.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uio.h 8.5 (Berkeley) 2/22/94 - * $Id: uio.h,v 1.2 1994/08/02 07:54:02 davidg Exp $ + * uio.h,v 1.3 1994/09/15 20:24:28 bde Exp */ #ifndef _SYS_UIO_H_ diff --git a/sys/sys/un.h b/sys/sys/un.h index a2de0eed12608..275847223d946 100644 --- a/sys/sys/un.h +++ b/sys/sys/un.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)un.h 8.1 (Berkeley) 6/2/93 - * $Id: un.h,v 1.4 1994/08/21 04:42:09 paul Exp $ + * un.h,v 1.5 1994/10/02 17:25:03 phk Exp */ #ifndef _SYS_UN_H_ diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index 9d434b44dfb0f..51311bef51d4d 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.2 (Berkeley) 1/7/94 - * $Id$ + * unistd.h,v 1.2 1994/08/02 07:54:04 davidg Exp */ #ifndef _SYS_UNISTD_H_ diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h index 41d8cfc09b7c3..6e0e8602c2ac6 100644 --- a/sys/sys/unpcb.h +++ b/sys/sys/unpcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unpcb.h 8.1 (Berkeley) 6/2/93 - * $Id: unpcb.h,v 1.2 1994/08/02 07:54:05 davidg Exp $ + * unpcb.h,v 1.3 1994/08/21 04:42:09 paul Exp */ #ifndef _SYS_UNPCB_H_ diff --git a/sys/sys/user.h b/sys/sys/user.h index 607acddcb4963..28df6d8bcc916 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)user.h 8.2 (Berkeley) 9/23/93 - * $Id: user.h,v 1.2 1994/08/02 07:54:06 davidg Exp $ + * user.h,v 1.3 1994/08/21 04:42:10 paul Exp */ #ifndef _SYS_USER_H_ diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h index 0387cc1d206ec..dc0586e182447 100644 --- a/sys/sys/utsname.h +++ b/sys/sys/utsname.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)utsname.h 8.1 (Berkeley) 1/4/94 - * $Id$ + * utsname.h,v 1.3 1994/08/02 07:54:07 davidg Exp */ #ifndef _SYS_UTSNAME_H diff --git a/sys/sys/vadvise.h b/sys/sys/vadvise.h index e8ed7235f520a..d95cbfe77c734 100644 --- a/sys/sys/vadvise.h +++ b/sys/sys/vadvise.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vadvise.h 8.1 (Berkeley) 6/2/93 - * $Id: vadvise.h,v 1.2 1994/08/02 07:54:08 davidg Exp $ + * vadvise.h,v 1.3 1994/08/21 04:42:11 paul Exp */ #ifndef _SYS_VADVISE_H_ diff --git a/sys/sys/vcmd.h b/sys/sys/vcmd.h index 4d59e36dd2415..566b29f0f086f 100644 --- a/sys/sys/vcmd.h +++ b/sys/sys/vcmd.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vcmd.h 8.1 (Berkeley) 6/2/93 - * $Id: vcmd.h,v 1.2 1994/08/02 07:54:09 davidg Exp $ + * vcmd.h,v 1.3 1994/08/21 04:42:12 paul Exp */ #ifndef _SYS_VCMD_H_ diff --git a/sys/sys/vlimit.h b/sys/sys/vlimit.h index 9cd1bf56084c4..2d6bf2ea8a5e1 100644 --- a/sys/sys/vlimit.h +++ b/sys/sys/vlimit.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vlimit.h 8.1 (Berkeley) 6/2/93 - * $Id: vlimit.h,v 1.2 1994/08/02 07:54:11 davidg Exp $ + * vlimit.h,v 1.3 1994/08/21 04:42:13 paul Exp */ #ifndef _SYS_VLIMIT_H_ diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h index d70c6b30c8cb6..c719531cb01eb 100644 --- a/sys/sys/vmmeter.h +++ b/sys/sys/vmmeter.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vmmeter.h 8.1 (Berkeley) 6/2/93 - * $Id: vmmeter.h,v 1.5 1994/10/15 13:33:02 davidg Exp $ + * vmmeter.h,v 1.6 1994/10/18 14:59:13 davidg Exp */ #ifndef _SYS_VMMETER_H_ diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 45cd6eb1862ac..a310ecae55f48 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $Id: vnode.h,v 1.13 1994/10/21 01:19:23 wollman Exp $ + * vnode.h,v 1.14 1994/11/14 13:51:53 bde Exp */ #ifndef _SYS_VNODE_H_ diff --git a/sys/sys/vsio.h b/sys/sys/vsio.h index 3d67cd6a65294..80bf2d513279b 100644 --- a/sys/sys/vsio.h +++ b/sys/sys/vsio.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vsio.h 8.1 (Berkeley) 6/2/93 - * $Id: vsio.h,v 1.2 1994/08/02 07:54:14 davidg Exp $ + * vsio.h,v 1.3 1994/08/21 04:42:16 paul Exp */ #ifndef _SYS_VSIO_H_ diff --git a/sys/sys/wait.h b/sys/sys/wait.h index 85ae401d173c8..4e01d9866f295 100644 --- a/sys/sys/wait.h +++ b/sys/sys/wait.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)wait.h 8.1 (Berkeley) 6/2/93 - * $Id: wait.h,v 1.2 1994/08/02 07:54:15 davidg Exp $ + * wait.h,v 1.3 1994/08/21 04:42:17 paul Exp */ #ifndef _SYS_WAIT_H_ diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 9830e4fd0ad62..6d6fa700f84ff 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $Id: ffs_alloc.c,v 1.4 1994/09/20 05:53:24 bde Exp $ + * ffs_alloc.c,v 1.5 1994/10/10 01:04:34 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c index fbbbc436a7f88..86db68f8d66ce 100644 --- a/sys/ufs/ffs/ffs_balloc.c +++ b/sys/ufs/ffs/ffs_balloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93 - * $Id: ffs_balloc.c,v 1.3 1994/08/02 07:54:18 davidg Exp $ + * ffs_balloc.c,v 1.4 1994/10/10 01:04:36 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index b4986ab8c3241..99d171e88d80a 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.3 (Berkeley) 4/16/94 - * $Id: ffs_extern.h,v 1.4 1994/08/18 22:35:53 wollman Exp $ + * ffs_extern.h,v 1.5 1994/09/22 19:38:32 wollman Exp */ struct buf; diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 89873835c5e15..4b3ccc092b473 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: ffs_inode.c,v 1.8 1994/10/10 01:04:37 phk Exp $ + * ffs_inode.c,v 1.9 1994/10/22 02:27:32 davidg Exp */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 4a02c4b2a262e..a6414d9b2575b 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93 - * $Id: ffs_subr.c,v 1.2 1994/08/02 07:54:22 davidg Exp $ + * ffs_subr.c,v 1.3 1994/10/10 01:04:38 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c index cc70ee17841a3..18d166f477d99 100644 --- a/sys/ufs/ffs/ffs_tables.c +++ b/sys/ufs/ffs/ffs_tables.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_tables.c 8.1 (Berkeley) 6/11/93 - * $Id$ + * ffs_tables.c,v 1.2 1994/08/02 07:54:22 davidg Exp */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 6ba504002de22..a91ff315076cc 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $Id: ffs_vfsops.c,v 1.11 1994/10/28 12:42:03 jkh Exp $ + * ffs_vfsops.c,v 1.12 1994/11/14 13:21:42 bde Exp */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 35c905750919c..52106cb9b8da6 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vnops.c 8.7 (Berkeley) 2/3/94 - * $Id: ffs_vnops.c,v 1.6 1994/10/06 21:06:59 davidg Exp $ + * ffs_vnops.c,v 1.7 1994/10/10 01:04:40 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index a7ad0e05f5889..93eb2bf8fa1b3 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fs.h 8.7 (Berkeley) 4/19/94 - * $Id: fs.h,v 1.2 1994/08/02 07:54:26 davidg Exp $ + * fs.h,v 1.3 1994/08/21 07:03:56 paul Exp */ #ifndef _UFS_FFS_FS_H_ diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h index 3a072a88c304f..36c09baac97c6 100644 --- a/sys/ufs/lfs/lfs.h +++ b/sys/ufs/lfs/lfs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs.h 8.3 (Berkeley) 9/23/93 - * $Id: lfs.h,v 1.4 1994/10/10 01:04:47 phk Exp $ + * lfs.h,v 1.5 1994/11/17 01:30:47 gibbs Exp */ #ifndef _UFS_LFS_LFS_H_ diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c index feaa8d22eb85f..39dad9100069d 100644 --- a/sys/ufs/lfs/lfs_alloc.c +++ b/sys/ufs/lfs/lfs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_alloc.c 8.4 (Berkeley) 1/4/94 - * $Id: lfs_alloc.c,v 1.4 1994/08/29 06:09:14 davidg Exp $ + * lfs_alloc.c,v 1.5 1994/10/10 01:04:48 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c index b7cf75502c434..24b46fd3ecb80 100644 --- a/sys/ufs/lfs/lfs_balloc.c +++ b/sys/ufs/lfs/lfs_balloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_balloc.c 8.1 (Berkeley) 6/11/93 - * $Id$ + * lfs_balloc.c,v 1.2 1994/08/02 07:54:30 davidg Exp */ #include <sys/param.h> #include <sys/buf.h> diff --git a/sys/ufs/lfs/lfs_bio.c b/sys/ufs/lfs/lfs_bio.c index 9344dbb590f54..680584e9bba67 100644 --- a/sys/ufs/lfs/lfs_bio.c +++ b/sys/ufs/lfs/lfs_bio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_bio.c 8.4 (Berkeley) 12/30/93 - * $Id: lfs_bio.c,v 1.4 1994/08/20 03:49:01 davidg Exp $ + * lfs_bio.c,v 1.5 1994/10/10 01:04:49 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_cksum.c b/sys/ufs/lfs/lfs_cksum.c index 8b70a40c6463e..699336098818d 100644 --- a/sys/ufs/lfs/lfs_cksum.c +++ b/sys/ufs/lfs/lfs_cksum.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_cksum.c 8.1 (Berkeley) 6/11/93 - * $Id$ + * lfs_cksum.c,v 1.2 1994/08/02 07:54:32 davidg Exp */ #include <sys/types.h> diff --git a/sys/ufs/lfs/lfs_debug.c b/sys/ufs/lfs/lfs_debug.c index 5816c89c9a339..1a13703b2f3f8 100644 --- a/sys/ufs/lfs/lfs_debug.c +++ b/sys/ufs/lfs/lfs_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_debug.c 8.1 (Berkeley) 6/11/93 - * $Id$ + * lfs_debug.c,v 1.2 1994/08/02 07:54:33 davidg Exp */ #ifdef DEBUG diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h index 59f19a6205c4a..ba6f5893c1ac4 100644 --- a/sys/ufs/lfs/lfs_extern.h +++ b/sys/ufs/lfs/lfs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_extern.h 8.2 (Berkeley) 4/16/94 - * $Id: lfs_extern.h,v 1.3 1994/08/21 07:16:09 paul Exp $ + * lfs_extern.h,v 1.4 1994/09/22 19:38:34 wollman Exp */ #ifndef _UFS_LFS_LFS_EXTERN_H_ diff --git a/sys/ufs/lfs/lfs_inode.c b/sys/ufs/lfs/lfs_inode.c index 0df3366831bff..d43fe9dc83eae 100644 --- a/sys/ufs/lfs/lfs_inode.c +++ b/sys/ufs/lfs/lfs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: lfs_inode.c,v 1.3 1994/08/29 06:09:15 davidg Exp $ + * lfs_inode.c,v 1.4 1994/10/10 01:04:50 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c index 1b1c86d4baf68..4e50c5ec81a20 100644 --- a/sys/ufs/lfs/lfs_segment.c +++ b/sys/ufs/lfs/lfs_segment.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_segment.c 8.5 (Berkeley) 1/4/94 - * $Id: lfs_segment.c,v 1.4 1994/08/20 03:49:02 davidg Exp $ + * lfs_segment.c,v 1.5 1994/11/17 01:30:49 gibbs Exp */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_subr.c b/sys/ufs/lfs/lfs_subr.c index 6aef996d46897..9adcbdca06abb 100644 --- a/sys/ufs/lfs/lfs_subr.c +++ b/sys/ufs/lfs/lfs_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_subr.c 8.2 (Berkeley) 9/21/93 - * $Id: lfs_subr.c,v 1.3 1994/08/02 07:54:37 davidg Exp $ + * lfs_subr.c,v 1.4 1994/11/17 01:30:51 gibbs Exp */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c index 0cf221d99e0b9..861d25e6e4e4e 100644 --- a/sys/ufs/lfs/lfs_syscalls.c +++ b/sys/ufs/lfs/lfs_syscalls.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_syscalls.c 8.5 (Berkeley) 4/20/94 - * $Id: lfs_syscalls.c,v 1.3 1994/08/02 07:54:38 davidg Exp $ + * lfs_syscalls.c,v 1.4 1994/11/17 01:30:52 gibbs Exp */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c index 6c9f55f971382..484becb8bfc92 100644 --- a/sys/ufs/lfs/lfs_vfsops.c +++ b/sys/ufs/lfs/lfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_vfsops.c 8.7 (Berkeley) 4/16/94 - * $Id: lfs_vfsops.c,v 1.8 1994/11/14 13:21:53 bde Exp $ + * lfs_vfsops.c,v 1.9 1994/11/17 01:30:53 gibbs Exp */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index fccabaaeff68c..a42dc2c10de5c 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_vnops.c 8.5 (Berkeley) 12/30/93 - * $Id: lfs_vnops.c,v 1.4 1994/09/21 03:47:40 wollman Exp $ + * lfs_vnops.c,v 1.5 1994/09/22 19:38:39 wollman Exp */ #include <sys/param.h> diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h index fa51177ac9fe0..408a6909da945 100644 --- a/sys/ufs/mfs/mfs_extern.h +++ b/sys/ufs/mfs/mfs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_extern.h 8.1 (Berkeley) 6/11/93 - * $Id: mfs_extern.h,v 1.2 1994/08/02 07:54:42 davidg Exp $ + * mfs_extern.h,v 1.3 1994/08/21 07:16:10 paul Exp */ #ifndef _UFS_MFS_MFS_EXTERN_H_ diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index d145208a616ab..0b969a41f9aba 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vfsops.c 8.4 (Berkeley) 4/16/94 - * $Id: mfs_vfsops.c,v 1.4 1994/08/18 22:35:55 wollman Exp $ + * mfs_vfsops.c,v 1.5 1994/09/21 03:47:42 wollman Exp */ #include <sys/param.h> diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index ba882d9618107..ab44780c407da 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vnops.c 8.3 (Berkeley) 9/21/93 - * $Id: mfs_vnops.c,v 1.6 1994/09/25 22:31:08 davidg Exp $ + * mfs_vnops.c,v 1.7 1994/10/09 07:35:12 davidg Exp */ #include <sys/param.h> diff --git a/sys/ufs/mfs/mfsiom.h b/sys/ufs/mfs/mfsiom.h index a420aa3210c4b..c6a224bae7b99 100644 --- a/sys/ufs/mfs/mfsiom.h +++ b/sys/ufs/mfs/mfsiom.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfsiom.h 8.1 (Berkeley) 6/11/93 - * $Id: mfsiom.h,v 1.2 1994/08/02 07:54:45 davidg Exp $ + * mfsiom.h,v 1.3 1994/08/21 07:16:11 paul Exp */ #ifndef _UFS_MFS_MFSIOM_H_ diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h index 28d9254265cf5..42c6ab3d898f4 100644 --- a/sys/ufs/mfs/mfsnode.h +++ b/sys/ufs/mfs/mfsnode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfsnode.h 8.2 (Berkeley) 8/11/93 - * $Id: mfsnode.h,v 1.2 1994/08/02 07:54:46 davidg Exp $ + * mfsnode.h,v 1.3 1994/08/21 07:16:12 paul Exp */ #ifndef _UFS_MFS_MFSNODE_H_ diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index b91843b7a79ed..3c3e70bc936a2 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)dinode.h 8.3 (Berkeley) 1/21/94 - * $Id: dinode.h,v 1.2 1994/08/02 07:54:47 davidg Exp $ + * dinode.h,v 1.3 1994/08/21 07:16:13 paul Exp */ #ifndef _UFS_UFS_DINODE_H_ diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h index f18eca8dc8aa6..5996471f2e09e 100644 --- a/sys/ufs/ufs/dir.h +++ b/sys/ufs/ufs/dir.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)dir.h 8.2 (Berkeley) 1/21/94 - * $Id: dir.h,v 1.2 1994/08/02 07:54:48 davidg Exp $ + * dir.h,v 1.3 1994/08/21 07:16:14 paul Exp */ #ifndef _UFS_UFS_DIR_H_ diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index cda8fb44b8623..45065e549898e 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)inode.h 8.4 (Berkeley) 1/21/94 - * $Id: inode.h,v 1.2 1994/08/02 07:54:49 davidg Exp $ + * inode.h,v 1.3 1994/08/21 07:16:15 paul Exp */ #ifndef _UFS_UFS_INODE_H_ diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h index 35dafa934cf36..c48ef202e975a 100644 --- a/sys/ufs/ufs/quota.h +++ b/sys/ufs/ufs/quota.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)quota.h 8.1 (Berkeley) 6/11/93 - * $Id: quota.h,v 1.2 1994/08/02 07:54:51 davidg Exp $ + * quota.h,v 1.3 1994/08/21 07:16:16 paul Exp */ #ifndef _UFS_UFS_QUOTA_ diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index f3009bd305844..1404416098e4e 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 - * $Id: ufs_bmap.c,v 1.3 1994/08/02 07:54:52 davidg Exp $ + * ufs_bmap.c,v 1.4 1994/10/08 06:57:21 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c index 484914632dc95..7284dd44fa2b7 100644 --- a/sys/ufs/ufs/ufs_disksubr.c +++ b/sys/ufs/ufs/ufs_disksubr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94 - * $Id: ufs_disksubr.c,v 1.5 1994/10/17 02:31:33 phk Exp $ + * ufs_disksubr.c,v 1.6 1994/10/27 20:45:12 jkh Exp */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index b2ae74d2d56ca..d408d9a6af99d 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_extern.h 8.3 (Berkeley) 4/16/94 - * $Id: ufs_extern.h,v 1.5 1994/10/27 20:45:13 jkh Exp $ + * ufs_extern.h,v 1.6 1994/11/14 13:50:15 bde Exp */ #ifndef _UFS_UFS_EXTERN_H_ diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c index ce5b0f8d8e106..834f4e08da090 100644 --- a/sys/ufs/ufs/ufs_ihash.c +++ b/sys/ufs/ufs/ufs_ihash.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.4 (Berkeley) 12/30/93 - * $Id: ufs_ihash.c,v 1.3 1994/10/06 21:07:01 davidg Exp $ + * ufs_ihash.c,v 1.4 1994/10/08 06:57:23 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c index 8c2d07d7f6cea..282ac7ac9431c 100644 --- a/sys/ufs/ufs/ufs_inode.c +++ b/sys/ufs/ufs/ufs_inode.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_inode.c 8.4 (Berkeley) 1/21/94 - * $Id: ufs_inode.c,v 1.4 1994/10/08 06:57:24 phk Exp $ + * ufs_inode.c,v 1.5 1994/10/15 04:08:44 ache Exp */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index b8de08b3de159..7088f2241e55a 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_lookup.c 8.6 (Berkeley) 4/1/94 - * $Id: ufs_lookup.c,v 1.2 1994/08/02 07:54:58 davidg Exp $ + * ufs_lookup.c,v 1.3 1994/10/08 06:57:26 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index e1ba55cdf41ee..49a1a1bedae64 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)ufs_quota.c 8.2 (Berkeley) 12/30/93 - * $Id: ufs_quota.c,v 1.3 1994/10/06 21:07:02 davidg Exp $ + * ufs_quota.c,v 1.4 1994/10/08 06:57:27 phk Exp */ #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c index 058af53f4d66c..a617f13463f78 100644 --- a/sys/ufs/ufs/ufs_readwrite.c +++ b/sys/ufs/ufs/ufs_readwrite.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_readwrite.c 8.7 (Berkeley) 1/21/94 - * $Id: ufs_readwrite.c,v 1.4 1994/08/08 09:11:44 davidg Exp $ + * ufs_readwrite.c,v 1.5 1994/10/10 01:04:55 phk Exp */ #ifdef LFS_READWRITE diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c index c7adf84319d43..6e28bd81c66dc 100644 --- a/sys/ufs/ufs/ufs_vfsops.c +++ b/sys/ufs/ufs/ufs_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vfsops.c 8.4 (Berkeley) 4/16/94 - * $Id: ufs_vfsops.c,v 1.2 1994/08/02 07:55:01 davidg Exp $ + * ufs_vfsops.c,v 1.3 1994/10/08 06:57:28 phk Exp */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 4651b8767bb54..d6709f9d9ce43 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vnops.c 8.10 (Berkeley) 4/1/94 - * $Id: ufs_vnops.c,v 1.11 1994/10/15 04:14:23 ache Exp $ + * ufs_vnops.c,v 1.12 1994/10/21 01:19:25 wollman Exp */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h index 02fdff2eb3faa..ae182e79d7cad 100644 --- a/sys/ufs/ufs/ufsmount.h +++ b/sys/ufs/ufs/ufsmount.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufsmount.h 8.2 (Berkeley) 1/12/94 - * $Id: ufsmount.h,v 1.2 1994/08/02 07:55:04 davidg Exp $ + * ufsmount.h,v 1.3 1994/08/21 07:16:18 paul Exp */ #ifndef _UFS_UFS_UFSMOUNT_H_ diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index f5eb3d33e2637..6d610e8db0cdc 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)device_pager.c 8.1 (Berkeley) 6/11/93 - * $Id: device_pager.c,v 1.3 1994/08/02 07:55:06 davidg Exp $ + * device_pager.c,v 1.4 1994/10/02 17:48:58 phk Exp */ /* diff --git a/sys/vm/device_pager.h b/sys/vm/device_pager.h index 677017f997ef3..3e7dfc11002dd 100644 --- a/sys/vm/device_pager.h +++ b/sys/vm/device_pager.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)device_pager.h 8.3 (Berkeley) 12/13/93 - * $Id$ + * device_pager.h,v 1.2 1994/08/02 07:55:07 davidg Exp */ #ifndef _DEVICE_PAGER_ diff --git a/sys/vm/kern_lock.c b/sys/vm/kern_lock.c index d87d321b7e46c..157f941e4ce35 100644 --- a/sys/vm/kern_lock.c +++ b/sys/vm/kern_lock.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id$ + * kern_lock.c,v 1.2 1994/08/02 07:55:08 davidg Exp */ /* diff --git a/sys/vm/lock.h b/sys/vm/lock.h index 308d9411c96c9..400b002488625 100644 --- a/sys/vm/lock.h +++ b/sys/vm/lock.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id$ + * lock.h,v 1.2 1994/08/02 07:55:11 davidg Exp */ /* diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index 7e65489cbd265..aa4eec150da01 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: pmap.h,v 1.3 1994/08/06 10:25:49 davidg Exp $ + * pmap.h,v 1.4 1994/09/02 04:12:26 davidg Exp */ /* diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 9819f7e4685be..6c34dab9ef6b9 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ * * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 - * $Id: swap_pager.c,v 1.17 1994/11/06 09:55:28 davidg Exp $ + * swap_pager.c,v 1.18 1994/11/13 15:36:48 davidg Exp */ /* diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h index 848039c9f9613..943f801ffc754 100644 --- a/sys/vm/swap_pager.h +++ b/sys/vm/swap_pager.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)swap_pager.h 7.1 (Berkeley) 12/5/90 - * $Id: swap_pager.h,v 1.2 1994/05/25 09:18:39 rgrimes Exp $ + * swap_pager.h,v 1.3 1994/10/09 01:52:06 phk Exp */ /* diff --git a/sys/vm/vm.h b/sys/vm/vm.h index 9f51c9481ac91..ca43e24f86621 100644 --- a/sys/vm/vm.h +++ b/sys/vm/vm.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm.h 8.2 (Berkeley) 12/13/93 - * $Id$ + * vm.h,v 1.3 1994/08/02 07:55:16 davidg Exp */ #ifndef VM_H diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index eb16dae9511b5..cfdeb438b216e 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $Id: vm_extern.h,v 1.5 1994/09/02 15:06:50 davidg Exp $ + * vm_extern.h,v 1.6 1994/09/27 18:00:26 davidg Exp */ #ifndef _VM_VM_EXTERN_H_ diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 31a69c2a47d36..1aace31dc9b6f 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -66,7 +66,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_fault.c,v 1.12 1994/11/06 09:55:29 davidg Exp $ + * vm_fault.c,v 1.13 1994/11/13 22:48:53 davidg Exp */ /* diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index d35ec701132cf..943ed8dec0e58 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -59,7 +59,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_glue.c,v 1.8 1994/10/09 01:52:08 phk Exp $ + * vm_glue.c,v 1.9 1994/11/13 12:47:07 davidg Exp */ #include <sys/param.h> diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h index b4691b4ac562b..8f56084881ca7 100644 --- a/sys/vm/vm_inherit.h +++ b/sys/vm/vm_inherit.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id$ + * vm_inherit.h,v 1.2 1994/08/02 07:55:20 davidg Exp */ /* diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 34ae5735790d0..878a19121947e 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -62,7 +62,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_init.c,v 1.3 1994/08/02 07:55:21 davidg Exp $ + * vm_init.c,v 1.4 1994/10/09 01:52:09 phk Exp */ /* diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 072c90685207d..81a71f75b764d 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_kern.c,v 1.6 1994/08/07 14:53:26 davidg Exp $ + * vm_kern.c,v 1.7 1994/08/18 22:36:02 wollman Exp */ /* diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h index 087dd378bb645..3fddef61dc043 100644 --- a/sys/vm/vm_kern.h +++ b/sys/vm/vm_kern.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_kern.h,v 1.3 1994/08/02 07:55:23 davidg Exp $ + * vm_kern.h,v 1.4 1994/08/18 22:36:03 wollman Exp */ #ifndef _VM_VM_KERN_H_ diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 69d316467e700..3acfde7d341a0 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.5 1994/08/18 22:36:04 wollman Exp $ + * vm_map.c,v 1.6 1994/10/09 01:52:10 phk Exp */ /* diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 4f5b64533c4e8..f328b81c803e8 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id$ + * vm_map.h,v 1.3 1994/08/02 07:55:26 davidg Exp */ /* diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index e1f0072650e2d..0c4a3369aab91 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_meter.c 8.4 (Berkeley) 1/4/94 - * $Id: vm_meter.c,v 1.3 1994/08/02 07:55:27 davidg Exp $ + * vm_meter.c,v 1.4 1994/09/12 11:38:31 davidg Exp */ #include <sys/param.h> diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 5afece8350334..00272cce49cf8 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $Id: vm_mmap.c,v 1.6 1994/09/02 15:06:51 davidg Exp $ + * vm_mmap.c,v 1.7 1994/10/09 01:52:11 phk Exp */ /* diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 66159af953c48..c3668decc3e72 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.c,v 1.9 1994/10/15 10:28:46 davidg Exp $ + * vm_object.c,v 1.10 1994/11/06 05:07:50 davidg Exp */ /* diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index cec90ae425444..c067eb2af8502 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.h,v 1.2 1994/08/02 07:55:31 davidg Exp $ + * vm_object.h,v 1.3 1994/11/06 05:07:52 davidg Exp */ /* diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 757d4fd640aeb..c18935ab97fbb 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $Id: vm_page.c,v 1.11 1994/10/18 14:59:19 davidg Exp $ + * vm_page.c,v 1.12 1994/10/23 06:15:04 davidg Exp */ /* diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 25d8d4fcf63e0..a9fcb77b3df53 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_page.h,v 1.9 1994/10/21 01:19:28 wollman Exp $ + * vm_page.h,v 1.10 1994/11/14 08:19:08 bde Exp */ /* diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 37267d3c4970c..a946a9787805c 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -65,7 +65,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pageout.c,v 1.25 1994/11/14 02:57:40 davidg Exp $ + * vm_pageout.c,v 1.26 1994/11/17 06:24:25 davidg Exp */ /* diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h index 77c43739f31b2..6f0f671482fe7 100644 --- a/sys/vm/vm_pageout.h +++ b/sys/vm/vm_pageout.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pageout.h,v 1.5 1994/08/21 07:19:45 paul Exp $ + * vm_pageout.h,v 1.6 1994/10/09 01:52:16 phk Exp */ #ifndef _VM_VM_PAGEOUT_H_ diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index caf1306b108c5..bafe5851faa5e 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pager.c,v 1.7 1994/08/18 22:36:09 wollman Exp $ + * vm_pager.c,v 1.8 1994/10/09 01:52:16 phk Exp */ /* diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h index ea204a1b03bf2..af7eada40910f 100644 --- a/sys/vm/vm_pager.h +++ b/sys/vm/vm_pager.h @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)vm_pager.h 8.4 (Berkeley) 1/12/94 - * $Id: vm_pager.h,v 1.3 1994/08/02 07:55:36 davidg Exp $ + * vm_pager.h,v 1.4 1994/10/09 01:52:17 phk Exp */ /* diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h index 4fc3449452e77..eb68e6667a22e 100644 --- a/sys/vm/vm_param.h +++ b/sys/vm/vm_param.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id$ + * vm_param.h,v 1.3 1994/08/02 07:55:37 davidg Exp */ /* diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h index e34dc0e695452..0ebf211faf4ab 100644 --- a/sys/vm/vm_prot.h +++ b/sys/vm/vm_prot.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id$ + * vm_prot.h,v 1.3 1994/08/02 07:55:38 davidg Exp */ /* diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index be750b1480597..7f1ef5f6ea1e9 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id: vm_swap.c,v 1.11 1994/10/22 17:53:35 phk Exp $ + * vm_swap.c,v 1.12 1994/11/22 08:47:20 davidg Exp */ #include <sys/param.h> diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c index d9216deef5717..f1215eead8c32 100644 --- a/sys/vm/vm_unix.c +++ b/sys/vm/vm_unix.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_unix.c 1.1 89/11/07$ * * @(#)vm_unix.c 8.1 (Berkeley) 6/11/93 - * $Id$ + * vm_unix.c,v 1.3 1994/08/02 07:55:41 davidg Exp */ /* diff --git a/sys/vm/vm_user.c b/sys/vm/vm_user.c index d8c8e136780a1..ef05e279e1fcc 100644 --- a/sys/vm/vm_user.c +++ b/sys/vm/vm_user.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_user.c,v 1.3 1994/08/02 07:55:42 davidg Exp $ + * vm_user.c,v 1.4 1994/10/15 10:28:47 davidg Exp */ /* diff --git a/sys/vm/vm_vmio.c b/sys/vm/vm_vmio.c index 8450c92bdfe34..2b14c1eb0a713 100644 --- a/sys/vm/vm_vmio.c +++ b/sys/vm/vm_vmio.c @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id$ + * vm_vmio.c,v 1.1 1994/10/04 07:32:08 davidg Exp */ /* * THIS IS PRELIMINARY, BUGGY AND NON-WORKING CODE diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index c5f20adb5b568..7c795189f4381 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91 - * $Id: vnode_pager.c,v 1.16 1994/11/13 22:48:55 davidg Exp $ + * vnode_pager.c,v 1.17 1994/11/17 01:22:45 gibbs Exp */ /* diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h index 9270b2c153cae..acb00689378fc 100644 --- a/sys/vm/vnode_pager.h +++ b/sys/vm/vnode_pager.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vnode_pager.h 8.1 (Berkeley) 6/11/93 - * $Id$ + * vnode_pager.h,v 1.3 1994/08/02 07:55:43 davidg Exp */ #ifndef _VNODE_PAGER_ |