summaryrefslogtreecommitdiff
path: root/sys/dev/ata
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2003-10-21 09:57:05 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2003-10-21 09:57:05 +0000
commitccd94e9d2caa12f446d11f3a1b5c794bde9dcaf6 (patch)
tree4eb7d92d56d57cc42c8def3aeaff7964233cdae4 /sys/dev/ata
parent80c213a7bacbc093d3cd5928606028a4b39a2ad4 (diff)
typos from Tom Cosgrove;
Diffstat (limited to 'sys/dev/ata')
-rw-r--r--sys/dev/ata/atareg.h8
-rw-r--r--sys/dev/ata/atavar.h4
-rw-r--r--sys/dev/ata/wd.c4
-rw-r--r--sys/dev/ata/wdvar.h10
4 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/ata/atareg.h b/sys/dev/ata/atareg.h
index 476599f9e37..dba0d872881 100644
--- a/sys/dev/ata/atareg.h
+++ b/sys/dev/ata/atareg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: atareg.h,v 1.10 2003/10/16 20:03:40 grange Exp $ */
+/* $OpenBSD: atareg.h,v 1.11 2003/10/21 09:57:04 jmc Exp $ */
/* $NetBSD: atareg.h,v 1.5 1999/01/18 20:06:24 bouyer Exp $ */
#ifndef __DEV_ATA_ATAREG_H__
@@ -69,12 +69,12 @@ struct ataparams {
u_int8_t atap_olddmatiming; /* 52: old DMA timing mode (ATA) */
u_int8_t __junk3;
#endif
- u_int16_t atap_extensions; /* 53: extentions supported */
+ u_int16_t atap_extensions; /* 53: extensions supported */
#define WDC_EXT_UDMA_MODES 0x0004
#define WDC_EXT_MODES 0x0002
#define WDC_EXT_GEOM 0x0001
/* words 54-62 are ATA only */
- u_int16_t atap_curcylinders; /* 54: current logical cyliners */
+ u_int16_t atap_curcylinders; /* 54: current logical cylinders */
u_int16_t atap_curheads; /* 55: current logical heads */
u_int16_t atap_cursectors; /* 56: current logical sectors/tracks */
u_int16_t atap_curcapacity[2]; /* 57-58: current capacity */
@@ -95,7 +95,7 @@ struct ataparams {
u_int8_t atap_piomode_supp; /* 64: PIO mode supported */
#endif
u_int16_t atap_dmatiming_mimi; /* 65: minimum DMA cycle time */
- u_int16_t atap_dmatiming_recom; /* 66: recomended DMA cycle time */
+ u_int16_t atap_dmatiming_recom; /* 66: recommended DMA cycle time */
u_int16_t atap_piotiming; /* 67: mini PIO cycle time without FC */
u_int16_t atap_piotiming_iordy; /* 68: mini PIO cycle time with IORDY FC */
u_int16_t __reserved3[2];
diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h
index 63f9620f3b8..1f2e2d474fc 100644
--- a/sys/dev/ata/atavar.h
+++ b/sys/dev/ata/atavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: atavar.h,v 1.16 2003/10/16 20:21:07 grange Exp $ */
+/* $OpenBSD: atavar.h,v 1.17 2003/10/21 09:57:04 jmc Exp $ */
/* $NetBSD: atavar.h,v 1.13 1999/03/10 13:11:43 bouyer Exp $ */
/*
@@ -78,7 +78,7 @@ struct ata_drive_datas {
u_int8_t atapi_cap;
/* Keeps track of the number of resets that have occurred in a row
- without a succesful command completion. */
+ without a successful command completion. */
u_int8_t n_resets;
u_int8_t n_dmaerrs;
u_int32_t n_xfers;
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 93be3fbcee6..ff55a40beda 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wd.c,v 1.33 2003/09/28 21:01:42 grange Exp $ */
+/* $OpenBSD: wd.c,v 1.34 2003/10/21 09:57:04 jmc Exp $ */
/* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
/*
@@ -140,7 +140,7 @@ struct wd_softc {
struct buf *sc_bp; /* buf being transferred */
struct ata_drive_datas *drvp; /* Our controller's infos */
int openings;
- struct ataparams sc_params;/* drive characteistics found */
+ struct ataparams sc_params;/* drive characteristics found */
int sc_flags;
#define WDF_LOCKED 0x01
#define WDF_WANTED 0x02
diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h
index 11731287c45..bc0b6e98d07 100644
--- a/sys/dev/ata/wdvar.h
+++ b/sys/dev/ata/wdvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdvar.h,v 1.9 2003/10/16 20:03:40 grange Exp $ */
+/* $OpenBSD: wdvar.h,v 1.10 2003/10/21 09:57:04 jmc Exp $ */
/* $NetBSD: wdvar.h,v 1.3 1998/11/11 19:38:27 bouyer Exp $ */
/*
@@ -39,10 +39,10 @@ struct ata_bio {
#define ATA_POLL 0x0002 /* poll for completion */
#define ATA_ITSDONE 0x0004 /* the transfer is as done as it gets */
#define ATA_SINGLE 0x0008 /* transfer has to be done in single-sector mode */
-#define ATA_LBA 0x0010 /* tranfert uses LBA adressing */
-#define ATA_READ 0x0020 /* tranfert is a read (otherwise a write) */
+#define ATA_LBA 0x0010 /* transfer uses LBA addressing */
+#define ATA_READ 0x0020 /* transfer is a read (otherwise a write) */
#define ATA_CORR 0x0040 /* transfer had a corrected error */
-#define ATA_LBA48 0x0080 /* transfer uses 48-bit LBA adressing */
+#define ATA_LBA48 0x0080 /* transfer uses 48-bit LBA addressing */
int multi; /* number of blocks to transfer in multi-mode */
struct disklabel *lp; /* pointer to drive's label info */
daddr_t blkno; /* block addr */
@@ -50,7 +50,7 @@ struct ata_bio {
daddr_t nblks; /* number of block currently transfering */
int nbytes; /* number of bytes currently transfering */
long bcount; /* total number of bytes */
- char *databuf; /* data buffer adress */
+ char *databuf; /* data buffer address */
volatile int error;
#define NOERROR 0 /* There was no error (r_error invalid) */
#define ERROR 1 /* check r_error */