diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-10 11:45:44 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-10 11:45:44 +0000 |
commit | 26b49252bc211525260917c42643d9248d585eab (patch) | |
tree | 882179908bb5cc85649eea2e37ee159d69c6cf25 /sys/dev/ic | |
parent | ffed13d3fcd68b927e18f8d6b8c9f3103ef56138 (diff) |
{en,re}trys -> {en,re}tries; eyeballed by jmc@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r-- | sys/dev/ic/aic79xx_openbsd.h | 4 | ||||
-rw-r--r-- | sys/dev/ic/aic7xxx_openbsd.h | 4 | ||||
-rw-r--r-- | sys/dev/ic/mpt.c | 8 | ||||
-rw-r--r-- | sys/dev/ic/wdcreg.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ic/aic79xx_openbsd.h b/sys/dev/ic/aic79xx_openbsd.h index 0b4e60aecca..e34879a091c 100644 --- a/sys/dev/ic/aic79xx_openbsd.h +++ b/sys/dev/ic/aic79xx_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx_openbsd.h,v 1.15 2004/12/30 17:29:55 krw Exp $ */ +/* $OpenBSD: aic79xx_openbsd.h,v 1.16 2005/12/10 11:45:43 miod Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -122,7 +122,7 @@ typedef struct pci_attach_args * ahd_dev_softc_t; /************************ Tunable Driver Parameters **************************/ /* * The number of dma segments supported. The sequencer can handle any number - * of physically contiguous S/G entrys. To reduce the driver's memory + * of physically contiguous S/G entries. To reduce the driver's memory * consumption, we limit the number supported to be sufficient to handle * the largest mapping supported by the kernel, MAXPHYS. Assuming the * transfer is as fragmented as possible and unaligned, this turns out to diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h index 88c101b88fa..c2bb2cb4dd2 100644 --- a/sys/dev/ic/aic7xxx_openbsd.h +++ b/sys/dev/ic/aic7xxx_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.h,v 1.15 2005/06/01 21:49:54 miod Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.h,v 1.16 2005/12/10 11:45:43 miod Exp $ */ /* $NetBSD: aic7xxx_osm.h,v 1.7 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -112,7 +112,7 @@ typedef struct pci_attach_args * ahc_dev_softc_t; /************************ Tunable Driver Parameters **************************/ /* * The number of DMA segments supported. The sequencer can handle any number - * of physically contiguous S/G entrys. To reduce the driver's memory + * of physically contiguous S/G entries. To reduce the driver's memory * consumption, we limit the number supported to be sufficient to handle * the largest mapping supported by the kernel, MAXPHYS. Assuming the * transfer is as fragmented as possible and unaligned, this turns out to diff --git a/sys/dev/ic/mpt.c b/sys/dev/ic/mpt.c index b0e9c3571cc..054af56fadc 100644 --- a/sys/dev/ic/mpt.c +++ b/sys/dev/ic/mpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpt.c,v 1.20 2005/12/03 04:00:08 marco Exp $ */ +/* $OpenBSD: mpt.c,v 1.21 2005/12/10 11:45:43 miod Exp $ */ /* $NetBSD: mpt.c,v 1.4 2003/11/02 11:07:45 wiz Exp $ */ /* @@ -43,7 +43,7 @@ #include <dev/ic/mpt.h> -#define MPT_MAX_TRYS 3 +#define MPT_MAX_TRIES 3 #define MPT_MAX_WAIT 300000 static int maxwait_ack = 0; @@ -1542,7 +1542,7 @@ mpt_init(struct mpt_softc *mpt, u_int32_t who) break; } - for (try = 0; try < MPT_MAX_TRYS; try++) { + for (try = 0; try < MPT_MAX_TRIES; try++) { /* * No need to reset if the IOC is already in the READY state. * @@ -1744,7 +1744,7 @@ mpt_init(struct mpt_softc *mpt, u_int32_t who) break; } - if (try >= MPT_MAX_TRYS) { + if (try >= MPT_MAX_TRIES) { mpt_prt(mpt, "failed to initialize IOC"); return (EIO); } diff --git a/sys/dev/ic/wdcreg.h b/sys/dev/ic/wdcreg.h index ae85d181049..a50b53ae2ff 100644 --- a/sys/dev/ic/wdcreg.h +++ b/sys/dev/ic/wdcreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdcreg.h,v 1.14 2005/08/27 14:08:38 jsg Exp $ */ +/* $OpenBSD: wdcreg.h,v 1.15 2005/12/10 11:45:43 miod Exp $ */ /* $NetBSD: wdcreg.h,v 1.22 1999/03/07 14:02:54 bouyer Exp $ */ /*- @@ -80,7 +80,7 @@ #define WDCC_READ 0x20 /* disk read code */ #define WDCC_WRITE 0x30 /* disk write code */ #define WDCC__LONG 0x02 /* modifier -- access ecc bytes */ -#define WDCC__NORETRY 0x01 /* modifier -- no retrys */ +#define WDCC__NORETRY 0x01 /* modifier -- no entries */ #define WDCC_FORMAT 0x50 /* disk format code */ #define WDCC_DIAGNOSE 0x90 /* controller diagnostic */ |