summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/alpha/common/disktab.shadow4
-rw-r--r--distrib/mvme68k/ramdisk/disktab.shadow4
-rw-r--r--sys/arch/hp300/dev/ctreg.h4
-rw-r--r--sys/arch/hp300/dev/hdreg.h4
-rw-r--r--sys/arch/sparc/dev/xdreg.h4
-rw-r--r--sys/arch/sparc/dev/xyreg.h4
-rw-r--r--sys/dev/i2o/i2o.h6
-rw-r--r--sys/dev/i2o/ioprbs.c8
-rw-r--r--sys/dev/ic/aic7xxx.h8
-rw-r--r--sys/dev/ic/aic7xxxvar.h8
10 files changed, 27 insertions, 27 deletions
diff --git a/distrib/alpha/common/disktab.shadow b/distrib/alpha/common/disktab.shadow
index 8d1770b478b..41d413e9d55 100644
--- a/distrib/alpha/common/disktab.shadow
+++ b/distrib/alpha/common/disktab.shadow
@@ -1,10 +1,10 @@
#
-# $OpenBSD: disktab.shadow,v 1.2 2002/06/09 05:53:53 todd Exp $
+# $OpenBSD: disktab.shadow,v 1.3 2004/04/12 22:12:31 jmc 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/mvme68k/ramdisk/disktab.shadow b/distrib/mvme68k/ramdisk/disktab.shadow
index 14325095e21..469305d7661 100644
--- a/distrib/mvme68k/ramdisk/disktab.shadow
+++ b/distrib/mvme68k/ramdisk/disktab.shadow
@@ -1,11 +1,11 @@
#
-# $OpenBSD: disktab.shadow,v 1.3 2002/06/09 05:53:54 todd Exp $
+# $OpenBSD: disktab.shadow,v 1.4 2004/04/12 22:12:32 jmc Exp $
# $NetBSD: disktab.shadow,v 1.1.1.1 1996/05/19 19:43:39 leo 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/sys/arch/hp300/dev/ctreg.h b/sys/arch/hp300/dev/ctreg.h
index 327f827c2c1..8560c8e244e 100644
--- a/sys/arch/hp300/dev/ctreg.h
+++ b/sys/arch/hp300/dev/ctreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctreg.h,v 1.5 2003/06/02 23:27:44 millert Exp $ */
+/* $OpenBSD: ctreg.h,v 1.6 2004/04/12 22:12:32 jmc Exp $ */
/* $NetBSD: ctreg.h,v 1.6 1996/02/09 18:00:35 scottr Exp $ */
/*
@@ -114,7 +114,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/hdreg.h b/sys/arch/hp300/dev/hdreg.h
index ed7868addd3..bef7b7509ae 100644
--- a/sys/arch/hp300/dev/hdreg.h
+++ b/sys/arch/hp300/dev/hdreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hdreg.h,v 1.2 2003/06/02 23:27:44 millert Exp $ */
+/* $OpenBSD: hdreg.h,v 1.3 2004/04/12 22:12:32 jmc Exp $ */
/* $NetBSD: rdreg.h,v 1.7 1996/02/09 18:00:37 scottr Exp $ */
/*
@@ -119,7 +119,7 @@ struct hd_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/sparc/dev/xdreg.h b/sys/arch/sparc/dev/xdreg.h
index c2e19564ced..346b1b3cc8b 100644
--- a/sys/arch/sparc/dev/xdreg.h
+++ b/sys/arch/sparc/dev/xdreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xdreg.h,v 1.3 1997/08/08 08:25:36 downsj Exp $ */
+/* $OpenBSD: xdreg.h,v 1.4 2004/04/12 22:12:32 jmc Exp $ */
/* $NetBSD: xdreg.h,v 1.3 1996/03/31 22:38:54 pk Exp $ */
/*
@@ -169,7 +169,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/sparc/dev/xyreg.h b/sys/arch/sparc/dev/xyreg.h
index 2d8c2704685..7ed62fd07c2 100644
--- a/sys/arch/sparc/dev/xyreg.h
+++ b/sys/arch/sparc/dev/xyreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xyreg.h,v 1.3 1997/08/08 08:25:40 downsj Exp $ */
+/* $OpenBSD: xyreg.h,v 1.4 2004/04/12 22:12:32 jmc Exp $ */
/* $NetBSD: xyreg.h,v 1.3 1996/03/31 22:39:02 pk Exp $ */
/*
@@ -171,7 +171,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/i2o/i2o.h b/sys/dev/i2o/i2o.h
index 5f5451fc3ba..aa10b34708e 100644
--- a/sys/dev/i2o/i2o.h
+++ b/sys/dev/i2o/i2o.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i2o.h,v 1.6 2003/10/21 10:32:08 jmc Exp $ */
+/* $OpenBSD: i2o.h,v 1.7 2004/04/12 22:12:32 jmc Exp $ */
/* $NetBSD: i2o.h,v 1.3 2001/03/20 13:01:48 ad Exp $ */
/*-
@@ -841,8 +841,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/ioprbs.c b/sys/dev/i2o/ioprbs.c
index 4c62cb0143f..2e0aa42d27a 100644
--- a/sys/dev/i2o/ioprbs.c
+++ b/sys/dev/i2o/ioprbs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioprbs.c,v 1.4 2003/04/27 11:22:52 ho Exp $ */
+/* $OpenBSD: ioprbs.c,v 1.5 2004/04/12 22:12:32 jmc Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -301,10 +301,10 @@ ioprbs_attach(struct device *parent, struct device *self, void *aux)
break;
}
- if ((letoh32(param.p.bdi.capabilities) & I2O_RBS_CAP_REMOVEABLE_MEDIA)
+ if ((letoh32(param.p.bdi.capabilities) & I2O_RBS_CAP_REMOVABLE_MEDIA)
!= 0) {
- /* sc->sc_flags = IOPRBS_REMOVEABLE; */
- fixedstr = "removeable";
+ /* sc->sc_flags = IOPRBS_REMOVABLE; */
+ fixedstr = "removable";
enable = 0;
} else
fixedstr = "fixed";
diff --git a/sys/dev/ic/aic7xxx.h b/sys/dev/ic/aic7xxx.h
index 98a131df82e..6545681d2c9 100644
--- a/sys/dev/ic/aic7xxx.h
+++ b/sys/dev/ic/aic7xxx.h
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: aic7xxx.h,v 1.10 2004/02/08 00:38:08 krw Exp $
+ * $OpenBSD: aic7xxx.h,v 1.11 2004/04/12 22:12:32 jmc Exp $
* Core definitions and data structures shareable across OS platforms.
*
* Copyright (c) 1994-2001 Justin T. Gibbs.
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: aic7xxx.h,v 1.10 2004/02/08 00:38:08 krw Exp $
+ * $Id: aic7xxx.h,v 1.11 2004/04/12 22:12:32 jmc Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.40 2001/07/18 21:39:47 gibbs Exp $
*/
@@ -792,8 +792,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/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h
index 4533bf3e0c2..67b2d6cefa9 100644
--- a/sys/dev/ic/aic7xxxvar.h
+++ b/sys/dev/ic/aic7xxxvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxxvar.h,v 1.18 2004/01/17 14:40:55 krw Exp $ */
+/* $OpenBSD: aic7xxxvar.h,v 1.19 2004/04/12 22:12:32 jmc Exp $ */
/*
* Core definitions and data structures shareable across OS platforms.
*
@@ -38,7 +38,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.18 2004/01/17 14:40:55 krw Exp $
+ * $Id: aic7xxxvar.h,v 1.19 2004/04/12 22:12:32 jmc Exp $
*
* $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.h,v 1.44 2003/01/20 20:44:55 gibbs Exp $
*/
@@ -848,8 +848,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 */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 18:24:54 +0000