From 3f9411f68805e4f4d5f9737e94cb462118ef76b7 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 19 Apr 2004 12:44:09 +0000 Subject: [PATCH] Spell removable with only two es. Inspired by jmc@openbsd. --- distrib/acorn26/instkernel/disktab.preinstall | 4 ++-- distrib/acorn32/ramdisk/disktab.preinstall | 4 ++-- distrib/alpha/instkernel/ramdisk/disktab.preinstall | 4 ++-- distrib/amd64/floppies/ramdisk/disktab.preinstall | 4 ++-- distrib/amiga/floppies/inst/disktab.preinstall | 4 ++-- distrib/amiga/miniroot/disktab.shadow | 4 ++-- distrib/atari/miniroot/disktab.shadow | 4 ++-- distrib/cats/ramdisk/disktab.preinstall | 4 ++-- distrib/evbarm/instkernel/ramdisk/disktab.preinstall | 4 ++-- distrib/evbppc/ramdisk/disktab.preinstall | 4 ++-- distrib/i386/floppies/ramdisk-big/disktab.preinstall | 4 ++-- distrib/ibmnws/netboot/ramdisk/disktab.preinstall | 4 ++-- distrib/mac68k/instkernel/ramdisk/disktab.preinstall | 4 ++-- distrib/macppc/floppies/ramdisk/disktab.preinstall | 4 ++-- distrib/mipsco/ramdisk/disktab.preinstall | 4 ++-- distrib/pc532/floppies/inst/disktab.preinstall | 4 ++-- distrib/pmax/ramdisk/disktab.preinstall | 4 ++-- distrib/pmppc/floppies/ramdisk/disktab.preinstall | 4 ++-- distrib/prep/floppies/ramdisk/disktab.preinstall | 4 ++-- distrib/sandpoint/floppies/ramdisk/disktab.preinstall | 4 ++-- distrib/shark/instkernel/ramdisk/disktab.preinstall | 4 ++-- distrib/sparc64/instfs/disktab.preinstall | 4 ++-- distrib/vax/inst/disktab.preinstall | 4 ++-- distrib/x68k/floppies/ramdisk/disktab.preinstall | 4 ++-- share/examples/disktab/disktab | 4 ++-- sys/arch/hp300/dev/ctreg.h | 4 ++-- sys/arch/hp300/dev/rdreg.h | 4 ++-- sys/arch/sun3/dev/xdreg.h | 4 ++-- sys/arch/sun3/dev/xyreg.h | 4 ++-- sys/dev/gpib/cs80busvar.h | 4 ++-- sys/dev/i2o/i2o.h | 6 +++--- sys/dev/i2o/ld_iop.c | 10 +++++----- sys/dev/ic/aic79xxvar.h | 6 +++--- sys/dev/ic/aic7xxxvar.h | 8 ++++---- sys/dev/vme/xdreg.h | 4 ++-- sys/dev/vme/xyreg.h | 4 ++-- 36 files changed, 79 insertions(+), 79 deletions(-) diff --git a/distrib/acorn26/instkernel/disktab.preinstall b/distrib/acorn26/instkernel/disktab.preinstall index f8959289617d..780408f6fb44 100644 --- a/distrib/acorn26/instkernel/disktab.preinstall +++ b/distrib/acorn26/instkernel/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2002/04/18 23:55:50 bjh21 Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/acorn32/ramdisk/disktab.preinstall b/distrib/acorn32/ramdisk/disktab.preinstall index 01dcca3ec120..780408f6fb44 100644 --- a/distrib/acorn32/ramdisk/disktab.preinstall +++ b/distrib/acorn32/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2002/01/25 15:28:45 reinoud Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/alpha/instkernel/ramdisk/disktab.preinstall b/distrib/alpha/instkernel/ramdisk/disktab.preinstall index 3d9c4dd5dee9..780408f6fb44 100644 --- a/distrib/alpha/instkernel/ramdisk/disktab.preinstall +++ b/distrib/alpha/instkernel/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 1998/02/01 01:58:52 thorpej Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/amd64/floppies/ramdisk/disktab.preinstall b/distrib/amd64/floppies/ramdisk/disktab.preinstall index c43c854b650a..780408f6fb44 100644 --- a/distrib/amd64/floppies/ramdisk/disktab.preinstall +++ b/distrib/amd64/floppies/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2003/04/26 18:55:44 fvdl Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/amiga/floppies/inst/disktab.preinstall b/distrib/amiga/floppies/inst/disktab.preinstall index 5da2cbc3e393..d8c3da7022fb 100644 --- a/distrib/amiga/floppies/inst/disktab.preinstall +++ b/distrib/amiga/floppies/inst/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.2 1998/01/09 18:56:42 perry Exp $ +# $NetBSD: disktab.preinstall,v 1.3 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/amiga/miniroot/disktab.shadow b/distrib/amiga/miniroot/disktab.shadow index 910cec00f3ef..a247f2a56bf0 100644 --- a/distrib/amiga/miniroot/disktab.shadow +++ b/distrib/amiga/miniroot/disktab.shadow @@ -1,10 +1,10 @@ # -# $NetBSD: disktab.shadow,v 1.1 1997/09/09 23:07:04 is Exp $ +# $NetBSD: disktab.shadow,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/atari/miniroot/disktab.shadow b/distrib/atari/miniroot/disktab.shadow index 5b01c7be7d94..a247f2a56bf0 100644 --- a/distrib/atari/miniroot/disktab.shadow +++ b/distrib/atari/miniroot/disktab.shadow @@ -1,10 +1,10 @@ # -# $NetBSD: disktab.shadow,v 1.1.1.1 1996/05/19 19:43:39 leo Exp $ +# $NetBSD: disktab.shadow,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/cats/ramdisk/disktab.preinstall b/distrib/cats/ramdisk/disktab.preinstall index 5628a095dbeb..780408f6fb44 100644 --- a/distrib/cats/ramdisk/disktab.preinstall +++ b/distrib/cats/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2002/04/11 16:33:59 skrll Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/evbarm/instkernel/ramdisk/disktab.preinstall b/distrib/evbarm/instkernel/ramdisk/disktab.preinstall index 5c013376d052..780408f6fb44 100644 --- a/distrib/evbarm/instkernel/ramdisk/disktab.preinstall +++ b/distrib/evbarm/instkernel/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2002/04/13 01:46:33 thorpej Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/evbppc/ramdisk/disktab.preinstall b/distrib/evbppc/ramdisk/disktab.preinstall index 52cc77a086dc..82111c39ef8a 100644 --- a/distrib/evbppc/ramdisk/disktab.preinstall +++ b/distrib/evbppc/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2002/12/09 14:20:55 scw Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/i386/floppies/ramdisk-big/disktab.preinstall b/distrib/i386/floppies/ramdisk-big/disktab.preinstall index 98ef0f029e4e..780408f6fb44 100644 --- a/distrib/i386/floppies/ramdisk-big/disktab.preinstall +++ b/distrib/i386/floppies/ramdisk-big/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2000/09/27 16:04:15 fvdl Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/ibmnws/netboot/ramdisk/disktab.preinstall b/distrib/ibmnws/netboot/ramdisk/disktab.preinstall index 01d3762f26a3..82111c39ef8a 100644 --- a/distrib/ibmnws/netboot/ramdisk/disktab.preinstall +++ b/distrib/ibmnws/netboot/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2003/10/19 03:37:16 matt Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/mac68k/instkernel/ramdisk/disktab.preinstall b/distrib/mac68k/instkernel/ramdisk/disktab.preinstall index f36021c70469..780408f6fb44 100644 --- a/distrib/mac68k/instkernel/ramdisk/disktab.preinstall +++ b/distrib/mac68k/instkernel/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 1999/03/26 08:34:37 ender Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/macppc/floppies/ramdisk/disktab.preinstall b/distrib/macppc/floppies/ramdisk/disktab.preinstall index 14c5dc04915f..82111c39ef8a 100644 --- a/distrib/macppc/floppies/ramdisk/disktab.preinstall +++ b/distrib/macppc/floppies/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 1999/01/27 13:18:30 tsubai Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/mipsco/ramdisk/disktab.preinstall b/distrib/mipsco/ramdisk/disktab.preinstall index 8c1c64fe693c..780408f6fb44 100644 --- a/distrib/mipsco/ramdisk/disktab.preinstall +++ b/distrib/mipsco/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2001/02/19 07:45:40 wdk Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/pc532/floppies/inst/disktab.preinstall b/distrib/pc532/floppies/inst/disktab.preinstall index f9ee998e7d35..d8c3da7022fb 100644 --- a/distrib/pc532/floppies/inst/disktab.preinstall +++ b/distrib/pc532/floppies/inst/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.2 1998/01/09 18:56:47 perry Exp $ +# $NetBSD: disktab.preinstall,v 1.3 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/pmax/ramdisk/disktab.preinstall b/distrib/pmax/ramdisk/disktab.preinstall index 5ae2558f632e..780408f6fb44 100644 --- a/distrib/pmax/ramdisk/disktab.preinstall +++ b/distrib/pmax/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 1998/11/27 23:10:28 jonathan Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/pmppc/floppies/ramdisk/disktab.preinstall b/distrib/pmppc/floppies/ramdisk/disktab.preinstall index f625c709ff32..82111c39ef8a 100644 --- a/distrib/pmppc/floppies/ramdisk/disktab.preinstall +++ b/distrib/pmppc/floppies/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2002/05/30 23:51:04 augustss Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:09 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/prep/floppies/ramdisk/disktab.preinstall b/distrib/prep/floppies/ramdisk/disktab.preinstall index 730577326fdc..c0d93688ade9 100644 --- a/distrib/prep/floppies/ramdisk/disktab.preinstall +++ b/distrib/prep/floppies/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2001/01/16 16:53:58 nonaka Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:10 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/sandpoint/floppies/ramdisk/disktab.preinstall b/distrib/sandpoint/floppies/ramdisk/disktab.preinstall index e28e0f0c70ba..c0d93688ade9 100644 --- a/distrib/sandpoint/floppies/ramdisk/disktab.preinstall +++ b/distrib/sandpoint/floppies/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2001/12/07 05:05:00 briggs Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:10 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/shark/instkernel/ramdisk/disktab.preinstall b/distrib/shark/instkernel/ramdisk/disktab.preinstall index 282cdac0105c..35f7fa4a4d77 100644 --- a/distrib/shark/instkernel/ramdisk/disktab.preinstall +++ b/distrib/shark/instkernel/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2002/02/11 17:49:41 thorpej Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:10 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/sparc64/instfs/disktab.preinstall b/distrib/sparc64/instfs/disktab.preinstall index 18584f8752bf..35f7fa4a4d77 100644 --- a/distrib/sparc64/instfs/disktab.preinstall +++ b/distrib/sparc64/instfs/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.1 2002/05/07 14:41:37 lukem Exp $ +# $NetBSD: disktab.preinstall,v 1.2 2004/04/19 12:44:10 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/vax/inst/disktab.preinstall b/distrib/vax/inst/disktab.preinstall index ba529c5ff17b..1e5df74e166b 100644 --- a/distrib/vax/inst/disktab.preinstall +++ b/distrib/vax/inst/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.2 1998/01/09 18:56:58 perry Exp $ +# $NetBSD: disktab.preinstall,v 1.3 2004/04/19 12:44:10 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/distrib/x68k/floppies/ramdisk/disktab.preinstall b/distrib/x68k/floppies/ramdisk/disktab.preinstall index eb5b6ac8d0eb..df008ad7e551 100644 --- a/distrib/x68k/floppies/ramdisk/disktab.preinstall +++ b/distrib/x68k/floppies/ramdisk/disktab.preinstall @@ -1,9 +1,9 @@ -# $NetBSD: disktab.preinstall,v 1.3 2002/05/13 01:04:23 lukem Exp $ +# $NetBSD: disktab.preinstall,v 1.4 2004/04/19 12:44:10 wiz Exp $ # # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/share/examples/disktab/disktab b/share/examples/disktab/disktab index 21d52bba05eb..cf823b150418 100644 --- a/share/examples/disktab/disktab +++ b/share/examples/disktab/disktab @@ -1,4 +1,4 @@ -# $NetBSD: disktab,v 1.1 2002/12/17 15:16:43 jdolecek Exp $ +# $NetBSD: disktab,v 1.2 2004/04/19 12:44:10 wiz Exp $ # # Example disktab, containing example entries for historic disks # and/or entries showing special features of disktab entries. @@ -7,7 +7,7 @@ # Disk geometry and partition layout tables. # Key: # dt controller type -# ty type of disk (fixed, removeable, simulated) +# ty type of disk (fixed, removable, simulated) # d[0-4] drive-type-dependent parameters # ns #sectors/track # nt #tracks/cylinder diff --git a/sys/arch/hp300/dev/ctreg.h b/sys/arch/hp300/dev/ctreg.h index 7b1dc7fd64d2..9ead064de967 100644 --- a/sys/arch/hp300/dev/ctreg.h +++ b/sys/arch/hp300/dev/ctreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ctreg.h,v 1.8 2003/08/07 16:27:26 agc Exp $ */ +/* $NetBSD: ctreg.h,v 1.9 2004/04/19 12:44:10 wiz Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -113,7 +113,7 @@ struct ct_describe { d_access:16, /* unit: access time param (1/100-sec) */ d_maxint:8, /* unit: maximum interleave */ d_fvbyte:8, /* unit: fixed volume byte */ - d_rvbyte:8, /* unit: removeable volume byte */ + d_rvbyte:8, /* unit: removable volume byte */ d_maxcyl:24, /* volume: maximum cylinder */ d_maxhead:8, /* volume: maximum head */ d_maxsect:16, /* volume: maximum sector on track */ diff --git a/sys/arch/hp300/dev/rdreg.h b/sys/arch/hp300/dev/rdreg.h index 843981212903..dc0ce4842eb5 100644 --- a/sys/arch/hp300/dev/rdreg.h +++ b/sys/arch/hp300/dev/rdreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: rdreg.h,v 1.10 2003/08/07 16:27:34 agc Exp $ */ +/* $NetBSD: rdreg.h,v 1.11 2004/04/19 12:44:10 wiz Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -156,7 +156,7 @@ struct rd_describe { d_access:16, /* unit: access time param (1/100-sec) */ d_maxint:8, /* unit: maximum interleave */ d_fvbyte:8, /* unit: fixed volume byte */ - d_rvbyte:8, /* unit: removeable volume byte */ + d_rvbyte:8, /* unit: removable volume byte */ d_maxcyl:24, /* volume: maximum cylinder */ d_maxhead:8, /* volume: maximum head */ d_maxsect:16, /* volume: maximum sector on track */ diff --git a/sys/arch/sun3/dev/xdreg.h b/sys/arch/sun3/dev/xdreg.h index b916b46f5400..2d745e918f7d 100644 --- a/sys/arch/sun3/dev/xdreg.h +++ b/sys/arch/sun3/dev/xdreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: xdreg.h,v 1.4 2003/05/03 18:11:05 wiz Exp $ */ +/* $NetBSD: xdreg.h,v 1.5 2004/04/19 12:44:10 wiz Exp $ */ /* * @@ -168,7 +168,7 @@ struct xd_iopb { #define XDFUN_DM 0xa0 /* XDCMD_{XWR,XRD}: defect map */ #define XDFUN_DMX 0xa1 /* XDCMD_{XWR,XRD}: defect map extended */ /* section 4.1.6: byte 5 */ - volatile u_char fixd:1; /* fixed media (vs removeable) */ + volatile u_char fixd:1; /* fixed media (vs removable) */ volatile u_char reserved1:4; /* reserved */ volatile u_char unit:3; /* unit number */ /* note: 6 to 13 are overloaded (see below) */ diff --git a/sys/arch/sun3/dev/xyreg.h b/sys/arch/sun3/dev/xyreg.h index 9fa4f1285659..281b69acff36 100644 --- a/sys/arch/sun3/dev/xyreg.h +++ b/sys/arch/sun3/dev/xyreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: xyreg.h,v 1.2 2003/05/03 18:11:05 wiz Exp $ */ +/* $NetBSD: xyreg.h,v 1.3 2004/04/19 12:44:10 wiz Exp $ */ /* * @@ -170,7 +170,7 @@ struct xy_iopb { /* section 2.4.14: byte 11 */ volatile u_char subfn; /* sub-function */ /* section 2.4.13: byte 10 */ - volatile u_char hoff; /* head offset for fixed/removeable drives */ + volatile u_char hoff; /* head offset for fixed/removable drives */ /* section 2.4.15: byte 12,13 */ volatile u_short nxtiopb; /* next iopb address (same relocation) */ /* section 2.4.16: byte 14,15 */ diff --git a/sys/dev/gpib/cs80busvar.h b/sys/dev/gpib/cs80busvar.h index d2c1e94854e8..5a1fff927a3b 100644 --- a/sys/dev/gpib/cs80busvar.h +++ b/sys/dev/gpib/cs80busvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: cs80busvar.h,v 1.1 2003/06/02 03:51:05 gmcgarry Exp $ */ +/* $NetBSD: cs80busvar.h,v 1.2 2004/04/19 12:44:10 wiz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -155,7 +155,7 @@ struct cs80_description { u_int16_t d_access; /* unit: access time (1/100-sec) */ u_int8_t d_maxint; /* unit: max interleave */ u_int8_t d_fvbyte; /* unit: fixed volume byte */ - u_int8_t d_rvbyte; /* unit: removeable volume byte */ + u_int8_t d_rvbyte; /* unit: removable volume byte */ u_int32_t d_maxcylhead; /* volume: max cylinder/head */ u_int16_t d_maxsect; /* volume: max sector on track */ u_int16_t d_maxvsecth; /* volume: max volume block (MSW) */ diff --git a/sys/dev/i2o/i2o.h b/sys/dev/i2o/i2o.h index 4ae7d02fd41a..554d984cdb74 100644 --- a/sys/dev/i2o/i2o.h +++ b/sys/dev/i2o/i2o.h @@ -1,4 +1,4 @@ -/* $NetBSD: i2o.h,v 1.10 2003/11/02 09:58:56 wiz Exp $ */ +/* $NetBSD: i2o.h,v 1.11 2004/04/19 12:44:10 wiz Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -838,8 +838,8 @@ struct i2o_param_rbs_device_info { #define I2O_RBS_CAP_CACHING 0x00000001 #define I2O_RBS_CAP_MULTI_PATH 0x00000002 #define I2O_RBS_CAP_DYNAMIC_CAPACITY 0x00000004 -#define I2O_RBS_CAP_REMOVEABLE_MEDIA 0x00000008 -#define I2O_RBS_CAP_REMOVEABLE_DEVICE 0x00000010 +#define I2O_RBS_CAP_REMOVABLE_MEDIA 0x00000008 +#define I2O_RBS_CAP_REMOVABLE_DEVICE 0x00000010 #define I2O_RBS_CAP_READ_ONLY 0x00000020 #define I2O_RBS_CAP_LOCKOUT 0x00000040 #define I2O_RBS_CAP_BOOT_BYPASS 0x00000080 diff --git a/sys/dev/i2o/ld_iop.c b/sys/dev/i2o/ld_iop.c index 932baf10df63..af3e7339946c 100644 --- a/sys/dev/i2o/ld_iop.c +++ b/sys/dev/i2o/ld_iop.c @@ -1,4 +1,4 @@ -/* $NetBSD: ld_iop.c,v 1.13 2002/10/02 16:33:53 thorpej Exp $ */ +/* $NetBSD: ld_iop.c,v 1.14 2004/04/19 12:44:10 wiz Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.13 2002/10/02 16:33:53 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.14 2004/04/19 12:44:10 wiz Exp $"); #include "opt_i2o.h" #include "rnd.h" @@ -235,10 +235,10 @@ ld_iop_attach(struct device *parent, struct device *self, void *aux) break; } - if ((le32toh(param.p.bdi.capabilities) & I2O_RBS_CAP_REMOVEABLE_MEDIA) + if ((le32toh(param.p.bdi.capabilities) & I2O_RBS_CAP_REMOVABLE_MEDIA) != 0) { - /* ld->sc_flags = LDF_REMOVEABLE; */ - fixedstr = "removeable"; + /* ld->sc_flags = LDF_REMOVABLE; */ + fixedstr = "removable"; enable = 0; } else fixedstr = "fixed"; diff --git a/sys/dev/ic/aic79xxvar.h b/sys/dev/ic/aic79xxvar.h index 5c00291747e9..5789fa3ac4d0 100644 --- a/sys/dev/ic/aic79xxvar.h +++ b/sys/dev/ic/aic79xxvar.h @@ -1,5 +1,5 @@ /* - * Core definitions and data structures shareable across OS platforms. + * Core definitions and data structures sharable across OS platforms. * * Copyright (c) 1994-2002 Justin T. Gibbs. * Copyright (c) 2000-2002 Adaptec Inc. @@ -859,8 +859,8 @@ struct seeprom_config { * BIOS Control Bits */ uint16_t bios_control; /* word 16 */ -#define CFSUPREM 0x0001 /* support all removeable drives */ -#define CFSUPREMB 0x0002 /* support removeable boot drives */ +#define CFSUPREM 0x0001 /* support all removable drives */ +#define CFSUPREMB 0x0002 /* support removable boot drives */ #define CFBIOSSTATE 0x000C /* BIOS Action State */ #define CFBS_DISABLED 0x00 #define CFBS_ENABLED 0x04 diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h index 9e288b54dd6b..6c4b43d091a8 100644 --- a/sys/dev/ic/aic7xxxvar.h +++ b/sys/dev/ic/aic7xxxvar.h @@ -1,5 +1,5 @@ /* - * Core definitions and data structures shareable across OS platforms. + * Core definitions and data structures sharable across OS platforms. * * Copyright (c) 1994-2001 Justin T. Gibbs. * Copyright (c) 2000-2001 Adaptec Inc. @@ -37,7 +37,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxxvar.h,v 1.43 2003/11/02 11:07:44 wiz Exp $ + * $Id: aic7xxxvar.h,v 1.44 2004/04/19 12:44:10 wiz Exp $ * * $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.h,v 1.44 2003/01/20 20:44:55 gibbs Exp $ */ @@ -906,8 +906,8 @@ struct seeprom_config { * BIOS Control Bits */ uint16_t bios_control; /* word 16 */ -#define CFSUPREM 0x0001 /* support all removeable drives */ -#define CFSUPREMB 0x0002 /* support removeable boot drives */ +#define CFSUPREM 0x0001 /* support all removable drives */ +#define CFSUPREMB 0x0002 /* support removable boot drives */ #define CFBIOSEN 0x0004 /* BIOS enabled */ #define CFBIOS_BUSSCAN 0x0008 /* Have the BIOS Scan the Bus */ #define CFSM2DRV 0x0010 /* support more than two drives */ diff --git a/sys/dev/vme/xdreg.h b/sys/dev/vme/xdreg.h index ebe797885cce..648c4b833664 100644 --- a/sys/dev/vme/xdreg.h +++ b/sys/dev/vme/xdreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: xdreg.h,v 1.3 2003/05/03 18:11:42 wiz Exp $ */ +/* $NetBSD: xdreg.h,v 1.4 2004/04/19 12:44:10 wiz Exp $ */ /* * @@ -168,7 +168,7 @@ struct xd_iopb { #define XDFUN_DM 0xa0 /* XDCMD_{XWR,XRD}: defect map */ #define XDFUN_DMX 0xa1 /* XDCMD_{XWR,XRD}: defect map extended */ /* section 4.1.6: byte 5 */ - volatile u_char fixd:1; /* fixed media (vs removeable) */ + volatile u_char fixd:1; /* fixed media (vs removable) */ volatile u_char reserved1:4; /* reserved */ volatile u_char unit:3; /* unit number */ /* note: 6 to 13 are overloaded (see below) */ diff --git a/sys/dev/vme/xyreg.h b/sys/dev/vme/xyreg.h index 0445e70c1e87..0a1134f23bb3 100644 --- a/sys/dev/vme/xyreg.h +++ b/sys/dev/vme/xyreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: xyreg.h,v 1.3 2003/05/03 18:11:43 wiz Exp $ */ +/* $NetBSD: xyreg.h,v 1.4 2004/04/19 12:44:10 wiz Exp $ */ /* * @@ -169,7 +169,7 @@ struct xy_iopb { /* section 2.4.14: byte 11 */ volatile u_char subfn; /* sub-function */ /* section 2.4.13: byte 10 */ - volatile u_char hoff; /* head offset for fixed/removeable drives */ + volatile u_char hoff; /* head offset for fixed/removable drives */ /* section 2.4.15: byte 12,13 */ volatile u_short nxtiopb; /* next iopb address (same relocation) */ /* section 2.4.16: byte 14,15 */