aboutsummaryrefslogtreecommitdiff
path: root/sys/i386
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1994-11-22 10:58:58 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1994-11-22 10:58:58 +0000
commit140932d6d85b561ad06abe5006a5e973a7713c45 (patch)
treebe1d2469fd1ab2ab0df6164fbc91fb7bbbdd80f5 /sys/i386
parent324ec40db3d437d18da21aa07a7ae4d4ecd9c157 (diff)
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/Makefile2
-rw-r--r--sys/i386/apm/apm.c2
-rw-r--r--sys/i386/apm/apm_init/Makefile2
-rw-r--r--sys/i386/apm/apm_init/apm_init.S2
-rw-r--r--sys/i386/apm/apm_init/bin2asm.c2
-rw-r--r--sys/i386/apm/apm_init/real_prot.S2
-rw-r--r--sys/i386/apm/apm_init/real_prot.h2
-rw-r--r--sys/i386/apm/apm_init/rmaouthdr2
-rw-r--r--sys/i386/apm/apm_init/table.c2
-rw-r--r--sys/i386/apm/apm_setup.h2
-rw-r--r--sys/i386/apm/apm_setup.s2
-rw-r--r--sys/i386/boot/Makefile2
-rw-r--r--sys/i386/boot/biosboot/Makefile2
-rw-r--r--sys/i386/boot/biosboot/README.386BSD2
-rw-r--r--sys/i386/boot/biosboot/README.MACH2
-rw-r--r--sys/i386/boot/biosboot/asm.S2
-rw-r--r--sys/i386/boot/biosboot/asm.h2
-rw-r--r--sys/i386/boot/biosboot/bios.S2
-rw-r--r--sys/i386/boot/biosboot/boot.c2
-rw-r--r--sys/i386/boot/biosboot/boot.h2
-rw-r--r--sys/i386/boot/biosboot/boot2.S2
-rw-r--r--sys/i386/boot/biosboot/disk.c2
-rw-r--r--sys/i386/boot/biosboot/io.c2
-rw-r--r--sys/i386/boot/biosboot/start.S2
-rw-r--r--sys/i386/boot/biosboot/sys.c2
-rw-r--r--sys/i386/boot/biosboot/table.c2
-rw-r--r--sys/i386/boot/netboot/Makefile2
-rw-r--r--sys/i386/conf/GENERIC2
-rw-r--r--sys/i386/conf/GENERICAH2
-rw-r--r--sys/i386/conf/GENERICBT2
-rw-r--r--sys/i386/conf/IPFIREWALL2
-rw-r--r--sys/i386/conf/LINT2
-rw-r--r--sys/i386/conf/MINI2
-rw-r--r--sys/i386/conf/Makefile.i3862
-rw-r--r--sys/i386/conf/devices.i3862
-rw-r--r--sys/i386/conf/files.i3862
-rw-r--r--sys/i386/i386/autoconf.c2
-rw-r--r--sys/i386/i386/conf.c2
-rw-r--r--sys/i386/i386/cons.c2
-rw-r--r--sys/i386/i386/cons.h2
-rw-r--r--sys/i386/i386/db_disasm.c2
-rw-r--r--sys/i386/i386/db_interface.c2
-rw-r--r--sys/i386/i386/db_trace.c2
-rw-r--r--sys/i386/i386/dkbad.c2
-rw-r--r--sys/i386/i386/exception.s2
-rw-r--r--sys/i386/i386/genassym.c2
-rw-r--r--sys/i386/i386/in_cksum.c2
-rw-r--r--sys/i386/i386/locore.s2
-rw-r--r--sys/i386/i386/machdep.c2
-rw-r--r--sys/i386/i386/math_emu.h2
-rw-r--r--sys/i386/i386/math_emulate.c2
-rw-r--r--sys/i386/i386/mem.c2
-rw-r--r--sys/i386/i386/microtime.s2
-rw-r--r--sys/i386/i386/ns_cksum.c2
-rw-r--r--sys/i386/i386/pmap.c2
-rw-r--r--sys/i386/i386/procfs_machdep.c2
-rw-r--r--sys/i386/i386/support.s2
-rw-r--r--sys/i386/i386/swapgeneric.c2
-rw-r--r--sys/i386/i386/swtch.s2
-rw-r--r--sys/i386/i386/symbols.raw2
-rw-r--r--sys/i386/i386/sys_machdep.c2
-rw-r--r--sys/i386/i386/trap.c2
-rw-r--r--sys/i386/i386/userconfig.c2
-rw-r--r--sys/i386/i386/vm_machdep.c2
-rw-r--r--sys/i386/ibcs2/coff.h2
-rw-r--r--sys/i386/ibcs2/ibcs2.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_dummy.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_file.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_ioctl.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_ipc.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_isc.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_misc.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_signal.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_socksys.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_socksys.h2
-rw-r--r--sys/i386/ibcs2/ibcs2_stats.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_sysent.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_sysi86.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_xenix.c2
-rw-r--r--sys/i386/ibcs2/imgact_coff.c2
-rw-r--r--sys/i386/include/ansi.h2
-rw-r--r--sys/i386/include/apm_bios.h2
-rw-r--r--sys/i386/include/apm_segments.h2
-rw-r--r--sys/i386/include/asmacros.h2
-rw-r--r--sys/i386/include/bootinfo.h2
-rw-r--r--sys/i386/include/cons.h2
-rw-r--r--sys/i386/include/console.h2
-rw-r--r--sys/i386/include/cpu.h2
-rw-r--r--sys/i386/include/cpufunc.h2
-rw-r--r--sys/i386/include/cputypes.h2
-rw-r--r--sys/i386/include/db_machdep.h2
-rw-r--r--sys/i386/include/devconf.h2
-rw-r--r--sys/i386/include/dkio.h2
-rw-r--r--sys/i386/include/endian.h2
-rw-r--r--sys/i386/include/exec.h2
-rw-r--r--sys/i386/include/float.h2
-rw-r--r--sys/i386/include/floatingpoint.h2
-rw-r--r--sys/i386/include/frame.h2
-rw-r--r--sys/i386/include/ieeefp.h2
-rw-r--r--sys/i386/include/ioctl_ctx.h2
-rw-r--r--sys/i386/include/ioctl_fd.h2
-rw-r--r--sys/i386/include/ioctl_pc.h2
-rw-r--r--sys/i386/include/ipl.h2
-rw-r--r--sys/i386/include/limits.h2
-rw-r--r--sys/i386/include/lpt.h2
-rw-r--r--sys/i386/include/mouse.h2
-rw-r--r--sys/i386/include/mtpr.h2
-rw-r--r--sys/i386/include/npx.h2
-rw-r--r--sys/i386/include/param.h2
-rw-r--r--sys/i386/include/pc/display.h2
-rw-r--r--sys/i386/include/pc/msdos.h2
-rw-r--r--sys/i386/include/pcaudioio.h2
-rw-r--r--sys/i386/include/pcb.h2
-rw-r--r--sys/i386/include/pmap.h2
-rw-r--r--sys/i386/include/proc.h2
-rw-r--r--sys/i386/include/profile.h2
-rw-r--r--sys/i386/include/psl.h2
-rw-r--r--sys/i386/include/pte.h2
-rw-r--r--sys/i386/include/ptrace.h2
-rw-r--r--sys/i386/include/reg.h2
-rw-r--r--sys/i386/include/reloc.h2
-rw-r--r--sys/i386/include/segments.h2
-rw-r--r--sys/i386/include/signal.h2
-rw-r--r--sys/i386/include/soundcard.h2
-rw-r--r--sys/i386/include/speaker.h2
-rw-r--r--sys/i386/include/specialreg.h2
-rw-r--r--sys/i386/include/spl.h2
-rw-r--r--sys/i386/include/stdarg.h2
-rw-r--r--sys/i386/include/sysarch.h2
-rw-r--r--sys/i386/include/trap.h2
-rw-r--r--sys/i386/include/tss.h2
-rw-r--r--sys/i386/include/types.h2
-rw-r--r--sys/i386/include/ultrasound.h2
-rw-r--r--sys/i386/include/varargs.h2
-rw-r--r--sys/i386/include/vmparam.h2
-rw-r--r--sys/i386/isa/README.le2
-rw-r--r--sys/i386/isa/aha1542.c2
-rw-r--r--sys/i386/isa/aha1742.c2
-rw-r--r--sys/i386/isa/aic6360.c2
-rw-r--r--sys/i386/isa/aic7770.c2
-rw-r--r--sys/i386/isa/bt742a.c2
-rw-r--r--sys/i386/isa/clock.c2
-rw-r--r--sys/i386/isa/ctx.c2
-rw-r--r--sys/i386/isa/ctxreg.h2
-rw-r--r--sys/i386/isa/elink.c2
-rw-r--r--sys/i386/isa/elink.h2
-rw-r--r--sys/i386/isa/fd.c2
-rw-r--r--sys/i386/isa/fdc.h2
-rw-r--r--sys/i386/isa/fdreg.h2
-rw-r--r--sys/i386/isa/ft.c2
-rw-r--r--sys/i386/isa/ic/i8042.h2
-rw-r--r--sys/i386/isa/ic/i8237.h2
-rw-r--r--sys/i386/isa/ic/i82586.h2
-rw-r--r--sys/i386/isa/ic/lemac.h2
-rw-r--r--sys/i386/isa/ic/ncr_5380.h2
-rw-r--r--sys/i386/isa/ic/nec765.h2
-rw-r--r--sys/i386/isa/ic/ns16450.h2
-rw-r--r--sys/i386/isa/ic/ns16550.h2
-rw-r--r--sys/i386/isa/icu.h2
-rw-r--r--sys/i386/isa/icu.s2
-rw-r--r--sys/i386/isa/if_ed.c2
-rw-r--r--sys/i386/isa/if_edreg.h2
-rw-r--r--sys/i386/isa/if_el.c2
-rw-r--r--sys/i386/isa/if_elreg.h2
-rw-r--r--sys/i386/isa/if_epreg.h2
-rw-r--r--sys/i386/isa/if_ie.c2
-rw-r--r--sys/i386/isa/if_ie507.h2
-rw-r--r--sys/i386/isa/if_iereg.h2
-rw-r--r--sys/i386/isa/if_is.c2
-rw-r--r--sys/i386/isa/if_isreg.h2
-rw-r--r--sys/i386/isa/if_le.c17
-rw-r--r--sys/i386/isa/if_ze.c2
-rw-r--r--sys/i386/isa/isa.c2
-rw-r--r--sys/i386/isa/isa.h2
-rw-r--r--sys/i386/isa/isa_device.h2
-rw-r--r--sys/i386/isa/iso8859.font2
-rw-r--r--sys/i386/isa/kbd.h2
-rw-r--r--sys/i386/isa/kbdtables.h2
-rw-r--r--sys/i386/isa/lpt.c2
-rw-r--r--sys/i386/isa/lptreg.h2
-rw-r--r--sys/i386/isa/mcd.c2
-rw-r--r--sys/i386/isa/mcdreg.h2
-rw-r--r--sys/i386/isa/mse.c2
-rw-r--r--sys/i386/isa/npx.c2
-rw-r--r--sys/i386/isa/pas.c2
-rw-r--r--sys/i386/isa/pcaudio.c2
-rw-r--r--sys/i386/isa/readMBR.c2
-rw-r--r--sys/i386/isa/rtc.h2
-rw-r--r--sys/i386/isa/seagate.c2
-rw-r--r--sys/i386/isa/sio.c2
-rw-r--r--sys/i386/isa/sioreg.h2
-rw-r--r--sys/i386/isa/sound/ad1848.c2
-rw-r--r--sys/i386/isa/sound/adlib_card.c2
-rw-r--r--sys/i386/isa/sound/audio.c2
-rw-r--r--sys/i386/isa/sound/dev_table.c2
-rw-r--r--sys/i386/isa/sound/dev_table.h2
-rw-r--r--sys/i386/isa/sound/dmabuf.c2
-rw-r--r--sys/i386/isa/sound/finetune.h2
-rw-r--r--sys/i386/isa/sound/gus_card.c2
-rw-r--r--sys/i386/isa/sound/gus_hw.h2
-rw-r--r--sys/i386/isa/sound/gus_linearvol.h2
-rw-r--r--sys/i386/isa/sound/gus_midi.c2
-rw-r--r--sys/i386/isa/sound/gus_vol.c2
-rw-r--r--sys/i386/isa/sound/gus_wave.c2
-rw-r--r--sys/i386/isa/sound/ics2101.c2
-rw-r--r--sys/i386/isa/sound/local.h2
-rw-r--r--sys/i386/isa/sound/midi_ctrl.h2
-rw-r--r--sys/i386/isa/sound/midi_synth.c2
-rw-r--r--sys/i386/isa/sound/midi_synth.h2
-rw-r--r--sys/i386/isa/sound/midibuf.c2
-rw-r--r--sys/i386/isa/sound/mpu401.c2
-rw-r--r--sys/i386/isa/sound/opl3.c2
-rw-r--r--sys/i386/isa/sound/os.h2
-rw-r--r--sys/i386/isa/sound/pas.h2
-rw-r--r--sys/i386/isa/sound/pas2_card.c2
-rw-r--r--sys/i386/isa/sound/pas2_midi.c2
-rw-r--r--sys/i386/isa/sound/pas2_mixer.c2
-rw-r--r--sys/i386/isa/sound/pas2_pcm.c2
-rw-r--r--sys/i386/isa/sound/patmgr.c2
-rw-r--r--sys/i386/isa/sound/pss.c2
-rw-r--r--sys/i386/isa/sound/pss.h2
-rw-r--r--sys/i386/isa/sound/sb.h2
-rw-r--r--sys/i386/isa/sound/sb16_dsp.c2
-rw-r--r--sys/i386/isa/sound/sb16_midi.c2
-rw-r--r--sys/i386/isa/sound/sb_card.c2
-rw-r--r--sys/i386/isa/sound/sb_dsp.c2
-rw-r--r--sys/i386/isa/sound/sb_midi.c2
-rw-r--r--sys/i386/isa/sound/sb_mixer.c2
-rw-r--r--sys/i386/isa/sound/sb_mixer.h2
-rw-r--r--sys/i386/isa/sound/sequencer.c2
-rw-r--r--sys/i386/isa/sound/sound_calls.h2
-rw-r--r--sys/i386/isa/sound/sound_config.h2
-rw-r--r--sys/i386/isa/sound/sound_switch.c2
-rw-r--r--sys/i386/isa/sound/sound_timer.c2
-rw-r--r--sys/i386/isa/sound/soundcard.c2
-rw-r--r--sys/i386/isa/sound/sys_timer.c2
-rw-r--r--sys/i386/isa/sound/tuning.h2
-rw-r--r--sys/i386/isa/sound/uart6850.c2
-rw-r--r--sys/i386/isa/spkr.c2
-rw-r--r--sys/i386/isa/syscons.c2
-rw-r--r--sys/i386/isa/timerreg.h2
-rw-r--r--sys/i386/isa/ultra14f.c2
-rw-r--r--sys/i386/isa/vector.s2
-rw-r--r--sys/i386/isa/wd.c2
-rw-r--r--sys/i386/isa/wdreg.h2
-rw-r--r--sys/i386/isa/wt.c2
-rw-r--r--sys/i386/isa/wtreg.h2
-rw-r--r--sys/i386/pci/README.de2
-rw-r--r--sys/i386/pci/README.de-le2
-rw-r--r--sys/i386/pci/dc21040.h9
-rw-r--r--sys/i386/pci/if_de.c2
-rw-r--r--sys/i386/pci/ncr.c6
-rw-r--r--sys/i386/pci/ncrreg.h2
-rw-r--r--sys/i386/pci/pci.c2
-rw-r--r--sys/i386/pci/pci_config.c2
-rw-r--r--sys/i386/pci/pcibios.c2
-rw-r--r--sys/i386/pci/pcireg.h2
-rw-r--r--sys/i386/pci/pcisupport.c2
-rw-r--r--sys/i386/scsi/aic7xxx.c1731
259 files changed, 280 insertions, 1993 deletions
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index 4ad5a34556fb..25589c572a68 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 d419da442b9a..ad90acf4e02b 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 fc6464e07c3b..4c3db270046b 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 527694778c2d..90d2cb3a3ff1 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 557724700f6c..d419b30dbca7 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 d61a394bb763..b56faf9ac5b2 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 bc02200a00a7..fe0e1ba78e20 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 47838b069352..615a829160ee 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 f859bff0f327..f8381ee80120 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 6f564c9c129a..40ca7ca99267 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 d354679a98d1..7ad692861ebd 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 b5d0d462b3cd..2f08b59fe79d 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 15a2e30f63f6..1121f0cb1492 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 cc5cb8fe2fbc..a88982821341 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 cb6232936e28..2ae336914043 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 90f523f4425a..11acf9afa462 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 43242bdec0fa..e1a563c7da68 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 54ccf6ea0ec6..88174a6949bd 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 36afb666e4f1..08a5070ee361 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 20469905fda2..7af930c54e9f 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 5984f836590b..0a6c9be471f2 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 a63ca5a73fe5..d0565a86a1ca 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 25dc3229581e..e2bcd767a525 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 d0bcbf89859a..61db53a4280b 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 daaa7a7f0153..203d7632134c 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 677a12f473c0..29b5d4f90d1e 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 bce4acf3b719..a68dddd59684 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 c3fc809954e7..a01ad9b94e23 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 302234012219..f73096d67563 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 9c1009e03dc1..259bb41f03e0 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 937128692292..45317b87a43b 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 4989e3d79997..0e664c538216 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 e038ee50702a..60007ba39c9b 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 be75bff7d5fe..a8cbb3ef45a8 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 2b3061a89d25..1b0d0a3cd9cd 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 75f7355da820..26b3e1061cec 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 a32f56464910..931fdce76f40 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 5544e035da73..b9dba60d170b 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 9ed6e62ecc08..f022a8131c42 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 1e1b2f239207..1f2ea524a181 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 49014f0a17d4..38187fffb27a 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 8f08cc3ae426..f690b77e054c 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 ae6b98b06e45..694ffdb3719b 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 cc70487ae304..45761b168279 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 d746f12d5fad..2717c92b71d6 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 d3cd26d665a8..2a0b51d0587f 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 2d6d77a13a94..efb55f143f9d 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 7f32a04d9edb..dafae96025bd 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 c6a2c47b9d53..c387cca7035a 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 453a903554a6..977408dd9735 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 e1b826977a71..6cd6bc9dca56 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 0d956888a089..2cee30b6320c 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 19031c727c0b..01405791ea58 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 142c9f827eec..c551a8100829 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 c279f9004f18..d629fd12d8f3 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 d122fc6f3f09..c3454cd375a1 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 415d98d171c8..413728a840f5 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 2bad4b213b8e..d1f117e220bb 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 571d9c9dbc8b..da6077189f71 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 ce017d599801..da3afb5d937e 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 f9b90c51d651..64670f42d645 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 1aa5202f1cfd..9fa13c801ea7 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 31c456f4b685..3885e51600b6 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 9663065f8686..a187d82c0217 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 0a25b84ee584..85a4ed570ca5 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 6d6f3921aa90..e4466ce90835 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 f267e4c98aec..e2d42c468791 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 c39684b1e72b..2bc6a94b0c9d 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 4e3b991c0f92..7f96db840637 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 f760e2ee7872..bdd270e09199 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 83f6be8c2573..846602066c67 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 c4dfe6cabbae..d0776e3522ee 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 7824a0b08754..db3511fff81a 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 08873a933a03..9dc2d418e95a 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 bfce6055cc01..2ca606970d92 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 749c632e4f28..7b4891b8b946 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 1f1422d07e17..0c5a3000b660 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 bca0fe999c5a..fc28aba1613d 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 051ed5801caf..1ba16da6d069 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 5d57d1804eb8..13e82b1d4005 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 77ec887cd6ae..f8936714e807 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 e3afdc109904..8c8bb4020c50 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 f23a6c250e14..29f19fe89f53 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 b2a6dc839f2e..bedf4e552c2e 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 b86a034715f7..f69b1a3d1eb4 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 faa17d12332c..2d3693282414 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 e6159c41738a..9fa9f049c6c5 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 e80564af6fe1..133d53a28716 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 63a521650b0e..d120e8a5db2f 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 52d8e2051224..b23935b363a9 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 7e7bec08ba19..afdbf965959f 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 0eac2b97fe35..c2b978bb3a27 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 c6d78d5aa2fb..3626ad12d2cb 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 f9a2875b4f60..a0534440e731 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 c08283f7384a..8ceb444e99b5 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 fb5967e6eadc..9c0bec18e7b5 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 69cb204c835c..b0642c7edc29 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 db2993e019fb..1eb8fba2f455 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 d36ede3cbd1e..6faaa8fbbe52 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 a7de049f7114..7b0b2466a41d 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 67329399ad84..e058fc2af011 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 bc6a255c8bdd..a8a92ef714f5 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 773fa9c700c6..5da382fad7a6 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 3ae9518597dc..4d32c2400ce8 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 7e3df4224182..08ae815027ad 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 95a66e474c6d..c94d67bb111d 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 e8347e677541..98a04cb2e233 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 98a6ea8d1c06..78423c2ff565 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 fdc550b3fbd2..5ea299778005 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 9e64a3f13307..245f80f03ef4 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 ea221c7954a5..031eb5a64ff1 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 b347c9676ecd..d8fb5150cae6 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 37b76f85832d..8911ec5d8547 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 32990ee56e53..2cb8528c279a 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 92de3af87dcf..262c60075bb6 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 9fe27ec5eda8..ebf1c4af07f1 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 906acd411c96..ae2bd54b72ec 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 5f473d87730a..a2d01c94d6a1 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 0892b83e2606..d14d415db07c 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 5690d43633ff..975e026d0b1c 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 7f9cfad64a27..069e6805fd55 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 0e996e65f31a..64cad8d89999 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 093278f1399a..420517d5258c 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 cd93d1139a02..4d213a4550e8 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 f097e4807cf8..70827290740f 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 d791060400c0..659c89a6e03f 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 640f24982ef8..cab95ec01b3d 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 5880242723b8..0db68f07ecfa 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 746cef1011fe..6d8ac6d8c9bd 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 aa832ffc322c..b742372ab77e 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 1fada6e7145b..45e100321afc 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 78ce8d568ffc..6cd21c7ef243 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 42d968850c14..4a3770ba0851 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 fa6c9a7a9541..3bece1014350 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 482ee5b60874..1969d9bc12fa 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 32dcc280c77c..3ad7b9193a71 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 a09b4ee90168..9fbbd2405f18 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 aaf11c799e66..b81f5cec9115 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 47004a49137c..fbf0a8c201e7 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 58e07318b702..ec142e193403 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 bf8b97e32ec0..d97026ec3772 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 e4a8a44c6695..7b87795cd1a8 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 9d0f6218a9bf..cb1226be341a 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 28b644ad4db9..2ef5d50dc7c5 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 61516bf690a4..ab1f11c1ea31 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 93a5dac6f5ce..86322bc002af 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 045d02ecbdfb..1ed41e0218ec 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 950ef2346e9f..ab04e7615f82 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 aef83574199a..16d3904622c7 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 2ab4a77840bb..d6e79dae8596 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 84ee90f08e62..f94c0e19b7fd 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 722194c5a65d..df27ce8cb3c8 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 577313d81e5a..1b077d206934 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 2c919d818908..4b22794d48de 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 0a05bff2ff2e..aa3bef8b98fa 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 9f93b705efe4..21dc8fcd12cd 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 aa6280df57d1..d5245ca35fb4 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 ff59757a5f73..372672e2e172 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 a68269b0801a..bc24d15f80a9 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 bd0d014c4918..276089d035f0 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 f67d134bcd49..cc192e86d8d5 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 1d56fdc006e3..886d2846bcc0 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 afc51d76896c..a61bf100f194 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 4d7859dd71c6..822239d3054c 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 2dc7a984fa77..f3e5eb9142a0 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 6e3fdedef128..5cd2918ee53f 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 4bf87fcbb597..f861dc1760e5 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 3588b8414058..9a83a889645e 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 1ad368b80257..98ac15abaa09 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 b4b4ece23ab4..34aa6c3dc509 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 d3ab8cf3ab77..6d410994e539 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 31835cc4ff7d..faa3aac93901 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 2246826567b7..8a05f9388ef6 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 cec13f6b5d97..d84361cdc467 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 08a49d0d38e6..cd8d80ba059d 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 0553a6bc2104..ffbe4f8d5a94 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 b7b600989d12..7ec74653b1ee 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 094d01b86042..9fe2a202bd06 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 863514406e96..d68ee6bd5d6c 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 9e10ba91a510..c92971460760 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 93552c53a800..2ef0d86305a1 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 de5ab819aade..2560716d82aa 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 f8e7cc0a824d..9629d85d0346 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 35b3af67ef0f..c7c68a57e04e 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 2bd871810969..d5efa809ac86 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 368c2790a021..b5b0ce18c6e1 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 b6edfcf9bca0..a98e440107a3 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 d374a823d7c2..5144dc0fbdb6 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 cc497478f87e..2321220ee080 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 13db8749eedc..754403dba517 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 4b0f1b6fa5de..60571f219eac 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 4ee4dfa4a080..89582472bf63 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 36c2f5ea2c94..4fd8a719d359 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 0453bececa27..d6c716f31313 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 f313b8cc3ca8..7f0f987de9b2 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 c17aa853f51c..30f27c6dfbc2 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 aefeaf4d87ae..9e9d3363a613 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 59e76fea943f..6c17d74def9c 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 62df65bb57df..bdb8357b1255 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 b3dc32f73a5c..e0932e669cba 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 6e41f092d75c..f6c4f313824e 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 94a856fdf1b3..c10c4ca49924 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 07c2c6ee523a..e2a09fdcb6bb 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 dddb527d9d3b..daf16ab7533c 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 899c94eb3642..310e826bfbb1 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 b7fba6d9ad92..f8f445967480 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 c7fdd0bfb249..75b6fd83c13c 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 98f2672c090f..d63e1ab36689 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 e22bd5e577f0..373cd01c1a70 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 74067b6d277d..d7f4d3c833e0 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 3728de5f4cd6..3932b3100cbb 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 00c27f2e1b92..8c943a247064 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 005b3c201d6a..d35c7f56c0aa 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 415c2bfd173d..e2e98200428b 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 96bf58d53b9a..b846d63ba28b 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 817e7d1412f0..7a2e238c9633 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 7a4ccbd4f418..90f17cc2371f 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 e286215e9e98..3a218c8ff7aa 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 43d0950d41c9..9547c5058461 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 3d7a62060c5f..3649ebdca4dc 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 4676756c172e..2230ea1ccc34 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 c701bc183ac5..0a7dd93e7298 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 a5586ef0855c..f1d74c4869b4 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 7b23b4b813dd..892fa938b5d3 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 e56ebd3f3f73..19a34d7c7c85 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 82087a0e3bd2..4b53278e74d8 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 6431cd76743a..26bf6c5f5329 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 d9bcb1ed320d..40a4b03606d8 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 c7d5ca1bf78c..495b040cf9eb 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 39ab789c0b2e..dcdc4c4bf8a9 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 f67ea05611ee..a504c6b1ceff 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 19386212fd17..42c10202119c 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 de35b0d1f293..129ee3934273 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 79a3ff1d30da..91a9f41efa6e 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 aab352d6efbe..891731cb411e 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 383fe3c73e06..27a333e87c7a 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 23086af15c91..936ff6a5af86 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 f8e23a061d7c..95d88a31f5be 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 aff70522ab4b..dc96e09b1651 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 898c8e1d5a2d..baa41937fa14 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 5742f6601493..b596bbb14dbb 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 9c8b98a5d1c8..8e869191b765 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 1bc2324f62d9..5f9a84b3b0c7 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 bc7dc66ec8e8..9045c7e86f29 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 2694bedf4571..68950910bb69 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 91010868c1ef..b0241166494b 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 e45e51401bca..69da5199ed7a 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 fb81945c4d73..a53ee16c9ac1 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 60cd2e2750e0..2c35928a810c 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 4afa27418865..83cdf58be542 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 9e6a26b56ea7..15fb4f9dfe76 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 80c8a3dae7bc..b9009c9cab40 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 1a22aee38d24..c7eaf59da517 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 6ef71637bf56..40b512a21878 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 0f2259b033ce..47d6537894c7 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 2069387a594c..0cea79edda27 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 dd1f1ccf3280..c96e1a7134ed 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 6b8a9fec38f6..a05be07bf4f9 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 58e07318b702..000000000000
--- 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);
-}
-