typos from Tom Cosgrove;

Tom: I did not commit a couple of your changes.

i did not include some punctuation fixes (full stops, etc.)
mnemorable -> mnemonic: i decided memorable was probably better
instrunctions -> instruction: i kept the plural

94 files changed, 318 insertions, 319 deletions

diff --git a/sys/dev/ic/aacvar.h b/sys/dev/ic/aacvar.h
index ed11048518b..e654d7595d6 100644
--- a/sys/dev/ic/aacvar.h
+++ b/sys/dev/ic/aacvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aacvar.h,v 1.3 2002/06/11 08:55:12 espie Exp $	*/
+/*	$OpenBSD: aacvar.h,v 1.4 2003/10/21 18:58:48 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -32,7 +32,7 @@
 
 /*
  * This driver would not have rewritten for OpenBSD if it was not for the
- * hardware dontion from Nocom.  I want to thank them for their support.
+ * hardware donation from Nocom.  I want to thank them for their support.
  * Of course, credit should go to Mike Smith for the original work he did
  * in the FreeBSD driver where I found lots of inspiration.
  * - Niklas Hallqvist
@@ -100,7 +100,7 @@ struct aac_softc;
 /*
  * We gather a number of adapter-visible items into a single structure.
  *
- * The ordering of this strucure may be important; we copy the Linux driver:
+ * The ordering of this structure may be important; we copy the Linux driver:
  *
  * Adapter FIBs
  * Init struct
diff --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c
index 1ef22ed9763..a3074aac6e2 100644
--- a/sys/dev/ic/advlib.c
+++ b/sys/dev/ic/advlib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advlib.c,v 1.8 2002/03/14 01:26:53 millert Exp $	*/
+/*	$OpenBSD: advlib.c,v 1.9 2003/10/21 18:58:48 jmc Exp $	*/
 /*      $NetBSD: advlib.c,v 1.7 1998/10/28 20:39:46 dante Exp $        */
 
 /*
@@ -80,7 +80,7 @@
 /*                                Static functions                            */
 /******************************************************************************/
 
-/* Initializzation routines */
+/* Initialization routines */
 static u_int32_t AscLoadMicroCode(bus_space_tag_t, bus_space_handle_t,
 					u_int16_t, u_int16_t *, u_int16_t);
 static void AscInitLram(ASC_SOFTC *);
@@ -239,7 +239,7 @@ static void DvcDelayNanoSecond(u_int32_t);
 
 
 /******************************************************************************/
-/*                            Initializzation routines                        */
+/*                            Initialization routines                         */
 /******************************************************************************/
 
 /*
@@ -576,7 +576,7 @@ AscInitFromASC_SOFTC(sc)
 
 /*
  * - Initialize RISC chip
- * - Intialize Lram
+ * - Initialize Lram
  * - Load uCode into Lram
  * - Enable Interrupts
  */
diff --git a/sys/dev/ic/advmcode.c b/sys/dev/ic/advmcode.c
index b52a27d4f53..3be611b090f 100644
--- a/sys/dev/ic/advmcode.c
+++ b/sys/dev/ic/advmcode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advmcode.c,v 1.3 2003/06/25 23:20:03 mickey Exp $	*/
+/*	$OpenBSD: advmcode.c,v 1.4 2003/10/21 18:58:48 jmc Exp $	*/
 /*      $NetBSD: advmcode.c,v 1.3 1998/09/26 16:02:57 dante Exp $        */
 
 /*
@@ -60,7 +60,7 @@
 
 /*
  * This is the uCode for the Narrow board RISC cpu.
- * This code is loaded into Lram during initializzation procedure.
+ * This code is loaded into Lram during initialization procedure.
  */
 
 const u_int8_t asc_mcode[] =
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 45c3e49e626..111c2aa142a 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adw.c,v 1.26 2002/03/14 01:26:53 millert Exp $ */
+/*	$OpenBSD: adw.c,v 1.27 2003/10/21 18:58:48 jmc Exp $ */
 /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $	 */
 
 /*
@@ -1043,7 +1043,7 @@ adw_timeout(arg)
 #endif
 		/*
 		 * waiting for multishot callout_reset() let's restart it
-		 * by hand so the next time a timeout event will occour
+		 * by hand so the next time a timeout event will occur
 		 * we will reset the bus.
 		 */
 		timeout_add(&xs->stimeout, (ccb->timeout * hz) / 1000);
@@ -1215,7 +1215,7 @@ adw_isr_callback(sc, scsiq)
 
 	/*
 	 * 'done_status' contains the command's ending status.
-	 * 'host_status' conatins the host adapter status.
+	 * 'host_status' contains the host adapter status.
 	 * 'scsi_status' contains the scsi peripheral status.
 	 */
 
diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c
index 8c3464b0a48..151b09627c5 100644
--- a/sys/dev/ic/adwlib.c
+++ b/sys/dev/ic/adwlib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adwlib.c,v 1.17 2003/02/11 19:20:27 mickey Exp $ */
+/*	$OpenBSD: adwlib.c,v 1.18 2003/10/21 18:58:48 jmc Exp $ */
 /* $NetBSD: adwlib.c,v 1.20 2000/07/04 04:17:03 itojun Exp $        */
 
 /*
@@ -1461,8 +1461,8 @@ AdwASC38C1600Cabling(iot, ioh, cfg)
 
 	/*
 	 * Each ASC-38C1600 function has two connectors. Only an HVD device
-	 * can not be connected to either connector. An LVD device or SE device
-	 * may be connected to either connecor. If an SE device is connected,
+	 * cannot be connected to either connector. An LVD device or SE device
+	 * may be connected to either connector. If an SE device is connected,
 	 * then at most Ultra speed (20 MHz) can be used on both connectors.
 	 *
 	 * If an HVD device is attached, return an error.
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index 4a9bd055548..55f29c49252 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360.c,v 1.5 2003/02/11 19:20:27 mickey Exp $	*/
+/*	$OpenBSD: aic6360.c,v 1.6 2003/10/21 18:58:48 jmc Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 #ifdef DDB
@@ -735,7 +735,7 @@ abort:
 /*
  * Schedule a SCSI operation.  This has now been pulled out of the interrupt
  * handler so that we may call it from aic_scsi_cmd and aic_done.  This may
- * save us an unecessary interrupt just to get things going.  Should only be
+ * save us an unnecessary interrupt just to get things going.  Should only be
  * called when state == AIC_IDLE and at bio pl.
  */
 void
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index fb62849d8a7..0c9ff90bbbd 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -28,10 +28,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: aic7xxx.c,v 1.50 2003/09/29 19:28:15 mickey Exp $
+ * $Id: aic7xxx.c,v 1.51 2003/10/21 18:58:48 jmc Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.80 2001/12/16 17:38:30 gibbs Exp $
- * $OpenBSD: aic7xxx.c,v 1.50 2003/09/29 19:28:15 mickey Exp $
+ * $OpenBSD: aic7xxx.c,v 1.51 2003/10/21 18:58:48 jmc Exp $
  */
 
 #ifdef __OpenBSD__
@@ -109,7 +109,7 @@ static const u_int num_phases = NUM_ELEMENTS(ahc_phase_table) - 1;
 
 /*
  * Valid SCSIRATE values.  (p. 3-17)
- * Provides a mapping of tranfer periods in ns to the proper value to
+ * Provides a mapping of transfer periods in ns to the proper value to
  * stick in the scsixfer reg.
  */
 static struct ahc_syncrate ahc_syncrates[] =
@@ -387,7 +387,7 @@ ahc_handle_brkadrint(struct ahc_softc *ahc)
 
 	ahc_dump_card_state(ahc);
 
-	/* Tell everyone that this HBA is no longer availible */
+	/* Tell everyone that this HBA is no longer available */
 	ahc_abort_scbs(ahc, CAM_TARGET_WILDCARD, ALL_CHANNELS,
 		       CAM_LUN_WILDCARD, SCB_LIST_NULL, ROLE_UNKNOWN,
 		       CAM_NO_HBA);
@@ -527,7 +527,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 			 * We can't allow the target to disconnect.
 			 * This will be an untagged transaction and
 			 * having the target disconnect will make this
-			 * transaction indestinguishable from outstanding
+			 * transaction indistinguishable from outstanding
 			 * tagged transactions.
 			 */
 			hscb->control = 0;
@@ -707,7 +707,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 		 * that requires host assistance for completion.
 		 * While handling the message phase(s), we will be
 		 * notified by the sequencer after each byte is
-		 * transfered so we can track bus phase changes.
+		 * transferred so we can track bus phase changes.
 		 *
 		 * If this is the first time we've seen a HOST_MSG_LOOP
 		 * interrupt, initialize the state of the host message
@@ -1736,7 +1736,7 @@ ahc_validate_width(struct ahc_softc *ahc, struct ahc_initiator_tinfo *tinfo,
 
 /*
  * Update the bitmask of targets for which the controller should
- * negotiate with at the next convenient oportunity.  This currently
+ * negotiate with at the next convenient opportunity.  This currently
  * means the next time we send the initial identify messages for
  * a new transaction.
  */
@@ -2141,7 +2141,7 @@ ahc_assert_atn(struct ahc_softc *ahc)
 /*
  * When an initiator transaction with the MK_MESSAGE flag either reconnects
  * or enters the initial message out phase, we are interrupted.  Fill our
- * outgoing message buffer with the appropriate message and beging handing
+ * outgoing message buffer with the appropriate message and begin handling
  * the message phase(s) manually.
  */
 static void
@@ -2332,7 +2332,7 @@ ahc_construct_sdtr(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
 }
 
 /*
- * Build a wide negotiateion message in our message
+ * Build a wide negotiation message in our message
  * buffer based on the input parameters.
  */
 static void
@@ -2585,7 +2585,7 @@ reswitch:
 
 		/*
 		 * Read the latched byte, but turn off SPIOEN first
-		 * so that we don't inadvertantly cause a REQ for the
+		 * so that we don't inadvertently cause a REQ for the
 		 * next byte.
 		 */
 		ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) & ~SPIOEN);
@@ -2716,7 +2716,7 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 	targ_scsirate = tinfo->scsirate;
 
 	/*
-	 * Parse as much of the message as is availible,
+	 * Parse as much of the message as is available,
 	 * rejecting it if we don't support it.  When
 	 * the entire message is availible and has been
 	 * handled, return MSGLOOP_MSGCOMPLETE, indicating
@@ -3226,7 +3226,7 @@ ahc_handle_msg_reject(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 
 		/*
 		 * Requeue all tagged commands for this target
-		 * currently in our posession so they can be
+		 * currently in our possession so they can be
 		 * converted to untagged commands.
 		 */
 		ahc_search_qinfifo(ahc, SCB_GET_TARGET(ahc, scb),
@@ -3492,7 +3492,7 @@ ahc_setup_target_msgin(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
 /**************************** Initialization **********************************/
 /*
  * Allocate a controller structure for a new device
- * and perform initial initializion.
+ * and perform initial initialization.
  */
 struct ahc_softc *
 ahc_alloc(void *platform_arg, char *name)
@@ -3722,7 +3722,7 @@ ahc_shutdown(void *arg)
 
 /*
  * Reset the controller and record some information about it
- * that is only availabel just after a reset.
+ * that is only available just after a reset.
  */
 int
 ahc_reset(struct ahc_softc *ahc)
@@ -4680,7 +4680,7 @@ ahc_init(struct ahc_softc *ahc)
 		/*
 		 * Wait for up to 500ms for our transceivers
 		 * to settle.  If the adapter does not have
-		 * a cable attached, the tranceivers may
+		 * a cable attached, the transceivers may
 		 * never settle, so don't complain if we
 		 * fail here.
 		 */
diff --git a/sys/dev/ic/aic7xxx.h b/sys/dev/ic/aic7xxx.h
index 9a689e2c205..7a0a4c423fb 100644
--- a/sys/dev/ic/aic7xxx.h
+++ b/sys/dev/ic/aic7xxx.h
@@ -1,5 +1,5 @@
 /*
- * $OpenBSD: aic7xxx.h,v 1.7 2003/04/27 11:22:52 ho Exp $
+ * $OpenBSD: aic7xxx.h,v 1.8 2003/10/21 18:58:48 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.7 2003/04/27 11:22:52 ho Exp $
+ * $Id: aic7xxx.h,v 1.8 2003/10/21 18:58:48 jmc Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.40 2001/07/18 21:39:47 gibbs Exp $
  */
@@ -344,7 +344,7 @@ typedef enum {
 
 /*
  * The driver keeps up to MAX_SCB scb structures per card in memory.  The SCB
- * consists of a "hardware SCB" mirroring the fields availible on the card
+ * consists of a "hardware SCB" mirroring the fields available on the card
  * and additional information the kernel stores for each transaction.
  *
  * To minimize space utilization, a portion of the hardware scb stores
@@ -359,7 +359,7 @@ typedef enum {
  */
 
 /*
- * Status information embedded in the shared poriton of
+ * Status information embedded in the shared portion of
  * an SCB after passing the cdb to the target.  The kernel
  * driver will only read this data for transactions that
  * complete abnormally (non-zero status byte).
@@ -411,9 +411,9 @@ struct hardware_scb {
  * each S/G element is expired, its datacnt field is checked to see
  * if the LAST_SEG flag is set.  If so, SG_LIST_NULL is set in the
  * residual sg ptr and the transfer is considered complete.  If the
- * sequencer determines that there is a residual in the tranfer, it
+ * sequencer determines that there is a residual in the transfer, it
  * will set the SG_RESID_VALID flag in sgptr and dma the scb back into
- * host memory.  To sumarize:
+ * host memory.  To summarize:
  *
  * Sequencer:
  *	o A residual has occurred if SG_FULL_RESID is set in sgptr,
@@ -473,7 +473,7 @@ struct hardware_scb {
  */
 
 /*
- * Definition of a scatter/gather element as transfered to the controller.
+ * Definition of a scatter/gather element as transferred to the controller.
  * The aic7xxx chips only support a 24bit length.  We use the top byte of
  * the length to store additional address bits and a flag to indicate
  * that a given segment terminates the transfer.  This gives us an
@@ -643,7 +643,7 @@ struct ahc_tmode_lstate;
 #endif
 
 /******************** Transfer Negotiation Datastructures *********************/
-#define AHC_TRANS_CUR		0x01	/* Modify current neogtiation status */
+#define AHC_TRANS_CUR		0x01	/* Modify current negotiation status */
 #define AHC_TRANS_ACTIVE	0x03	/* Assume this target is on the bus */
 #define AHC_TRANS_GOAL		0x04	/* Modify negotiation goal */
 #define AHC_TRANS_USER		0x08	/* Modify user negotiation settings */
@@ -703,7 +703,7 @@ struct ahc_syncrate {
 };
 
 /*
- * The synchronouse transfer rate table.
+ * The synchronous transfer rate table.
  */
 extern struct ahc_syncrate ahc_syncrates[];
 
@@ -922,7 +922,7 @@ struct ahc_softc {
 
 	/*
 	 * Device instance currently on the bus awaiting a continue TIO
-	 * for a command that was not given the disconnect priveledge.
+	 * for a command that was not given the disconnect privilege.
 	 */
 	struct ahc_tmode_lstate  *pending_device;
 
diff --git a/sys/dev/ic/aic7xxx_inline.h b/sys/dev/ic/aic7xxx_inline.h
index 862f3fc6ae3..e0820d0467f 100644
--- a/sys/dev/ic/aic7xxx_inline.h
+++ b/sys/dev/ic/aic7xxx_inline.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: aic7xxx_inline.h,v 1.5 2003/09/29 19:28:16 mickey Exp $
+ * $Id: aic7xxx_inline.h,v 1.6 2003/10/21 18:58:48 jmc Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_inline.h,v 1.17 2001/07/18 21:39:47 gibbs Exp $
  */
@@ -220,7 +220,7 @@ ahc_name(struct ahc_softc *ahc)
 	return (ahc->name);
 }
 
-/*********************** Miscelaneous Support Functions ***********************/
+/*********************** Miscellaneous Support Functions **********************/
 
 static __inline void	ahc_update_residual(struct scb *scb);
 static __inline struct ahc_initiator_tinfo *
@@ -385,7 +385,7 @@ ahc_queue_scb(struct ahc_softc *ahc, struct scb *scb)
 	ahc->qinfifonext++;
 
 	/*
-	 * Make sure our data is consistant from the
+	 * Make sure our data is consistent from the
 	 * perspective of the adapter.
 	 */
 	ahc_sync_scb(ahc, scb, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c
index 533cf6c2c35..f61bd2f1370 100644
--- a/sys/dev/ic/aic7xxx_openbsd.c
+++ b/sys/dev/ic/aic7xxx_openbsd.c
@@ -29,10 +29,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: aic7xxx_openbsd.c,v 1.13 2003/09/29 19:28:16 mickey Exp $
+ * $Id: aic7xxx_openbsd.c,v 1.14 2003/10/21 18:58:48 jmc Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_freebsd.c,v 1.26 2001/07/18 21:39:47 gibbs Exp $
- * $OpenBSD: aic7xxx_openbsd.c,v 1.13 2003/09/29 19:28:16 mickey Exp $
+ * $OpenBSD: aic7xxx_openbsd.c,v 1.14 2003/10/21 18:58:48 jmc Exp $
  */
 
 #include <dev/ic/aic7xxx_openbsd.h>
@@ -731,7 +731,7 @@ ahc_done(ahc, scb)
 		 *
 		 * Zero the sense data before having
 		 * the drive fill it.  The SCSI spec mandates
-		 * that any untransfered data should be
+		 * that any untransferred data should be
 		 * assumed to be zero.  Complete the 'bounce'
 		 * of sense information through buffers accessible
 		 * via bus-space by copying it into the clients
@@ -792,7 +792,7 @@ ahc_minphys(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
+	 * discontinuous physically, hence the "page per segment" limit
 	 * enforced here.
 	 */
 	if (bp->b_bcount > ((AHC_NSEG - 1) * PAGE_SIZE)) {
@@ -1386,7 +1386,7 @@ bus_reset:
 		 * The target/initiator that is holding up the bus may not
 		 * be the same as the one that triggered this timeout
 		 * (different commands have different timeout lengths).
-		 * If the bus is idle and we are actiing as the initiator
+		 * If the bus is idle and we are acting as the initiator
 		 * for this request, queue a BDR message to the timed out
 		 * target.  Otherwise, if the timed out transaction is
 		 * active:
diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h
index 1bee8d7bb32..617845f47c8 100644
--- a/sys/dev/ic/aic7xxx_openbsd.h
+++ b/sys/dev/ic/aic7xxx_openbsd.h
@@ -30,10 +30,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: aic7xxx_openbsd.h,v 1.7 2002/07/05 05:41:03 smurph Exp $
+ * $Id: aic7xxx_openbsd.h,v 1.8 2003/10/21 18:58:48 jmc Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_freebsd.h,v 1.12 2001/07/18 21:39:47 gibbs Exp $
- * $OpenBSD: aic7xxx_openbsd.h,v 1.7 2002/07/05 05:41:03 smurph Exp $
+ * $OpenBSD: aic7xxx_openbsd.h,v 1.8 2003/10/21 18:58:48 jmc Exp $
  */
 
 #ifndef _AIC7XXX_OPENBSD_H_
@@ -326,7 +326,7 @@ static __inline void ahc_lockinit(struct ahc_softc *);
 static __inline void ahc_lock(struct ahc_softc *, int *flags);
 static __inline void ahc_unlock(struct ahc_softc *, int *flags);
 
-/* Lock held during command compeletion to the upper layer */
+/* Lock held during command completion to the upper layer */
 static __inline void ahc_done_lockinit(struct ahc_softc *);
 static __inline void ahc_done_lock(struct ahc_softc *, int *flags);
 static __inline void ahc_done_unlock(struct ahc_softc *, int *flags);
@@ -354,7 +354,7 @@ ahc_unlock(ahc, flags)
 	splx(*flags);
 }
 
-/* Lock held during command compeletion to the upper layer */
+/* Lock held during command completion to the upper layer */
 static __inline void
 ahc_done_lockinit(ahc)
 	struct ahc_softc *ahc;
diff --git a/sys/dev/ic/am7990reg.h b/sys/dev/ic/am7990reg.h
index 97f7ebd8f0d..b3f7748b18b 100644
--- a/sys/dev/ic/am7990reg.h
+++ b/sys/dev/ic/am7990reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am7990reg.h,v 1.5 2003/06/02 23:28:02 millert Exp $	*/
+/*	$OpenBSD: am7990reg.h,v 1.6 2003/10/21 18:58:48 jmc Exp $	*/
 /*	$NetBSD: am7990reg.h,v 1.1 1995/04/11 04:17:50 mycroft Exp $	*/
 
 /*-
@@ -129,7 +129,7 @@ struct leinit {
 #define	LE_C3_ACON	0x0002		/* ALE control, eh? */
 #define	LE_C3_BCON	0x0001		/* byte control */
 
-/* Initialzation block (mode) */
+/* Initialization block (mode) */
 #define	LE_MODE_PROM	0x8000		/* promiscuous mode */
 /*			0x7f80		   reserved, must be zero */
 #define	LE_MODE_INTL	0x0040		/* internal loopback */
@@ -159,7 +159,7 @@ struct leinit {
 #define	LE_T1_ERR	0x40		/* error summary */
 #define	LE_T1_MORE	0x10		/* multiple collisions */
 #define	LE_T1_ONE	0x08		/* single collision */
-#define	LE_T1_DEF	0x04		/* defferred transmit */
+#define	LE_T1_DEF	0x04		/* deferred transmit */
 #define	LE_T1_STP	0x02		/* start of packet */
 #define	LE_T1_ENP	0x01		/* end of packet */
 
diff --git a/sys/dev/ic/am79c930reg.h b/sys/dev/ic/am79c930reg.h
index 5139951cc81..421e8b1a13b 100644
--- a/sys/dev/ic/am79c930reg.h
+++ b/sys/dev/ic/am79c930reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: am79c930reg.h,v 1.4 2002/06/03 20:01:36 deraadt Exp $ */
+/* $OpenBSD: am79c930reg.h,v 1.5 2003/10/21 18:58:48 jmc Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
 #define AM79C930_LMA_HI_ISAPWRDWN	0x80	
  
 /*
- * mmm, inconsistancy in chip documentation:
+ * mmm, inconsistency in chip documentation:
  * According to page 79--80, all four of the following are equivalent
  * and address the single byte pointed at by BSS_{FS,MBS} | LMA_{HI,LO}
  * According to tables on p63 and p67, they're the LSB through MSB
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index ab2ea1db922..f80d8c7e49a 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: an.c,v 1.33 2003/10/05 01:26:11 mickey Exp $	*/
+/*	$OpenBSD: an.c,v 1.34 2003/10/21 18:58:48 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -1284,7 +1284,7 @@ an_start(ifp)
 		an_write_data(sc, id, 0x44, (caddr_t)&sc->an_txbuf, len);
 
 		/*
-		 * If there's a BPF listner, bounce a copy of
+		 * If there's a BPF listener, bounce a copy of
 		 * this frame to him.
 		 */
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/anreg.h b/sys/dev/ic/anreg.h
index 4560ec017c1..33c2fb9014d 100644
--- a/sys/dev/ic/anreg.h
+++ b/sys/dev/ic/anreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: anreg.h,v 1.8 2001/09/29 21:54:00 mickey Exp $	*/
+/*	$OpenBSD: anreg.h,v 1.9 2003/10/21 18:58:48 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -185,7 +185,7 @@
 #define AN_EV_CMD		0x0010	/* command completed */
 #define AN_EV_ALLOC		0x0008	/* async alloc/reclaim completed */
 #define AN_EV_TX_EXC		0x0004	/* async xmit completed with failure */
-#define AN_EV_TX		0x0002	/* async xmit completed succesfully */
+#define AN_EV_TX		0x0002	/* async xmit completed successfully */
 #define AN_EV_RX		0x0001	/* async rx completed */
 
 #define AN_INTRS	\
diff --git a/sys/dev/ic/anvar.h b/sys/dev/ic/anvar.h
index 50906ee759d..b239574d4c8 100644
--- a/sys/dev/ic/anvar.h
+++ b/sys/dev/ic/anvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: anvar.h,v 1.14 2003/09/26 01:29:55 mickey Exp $	*/
+/*	$OpenBSD: anvar.h,v 1.15 2003/10/21 18:58:48 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -592,7 +592,7 @@ struct an_ltv_wepkey {
 
 /*
  * These are all the LTV record types that we can read or write
- * from the Aironet. Not all of them are temendously useful, but I
+ * from the Aironet. Not all of them are tremendously useful, but I
  * list as many as I know about here for completeness.
  */
 
diff --git a/sys/dev/ic/awivar.h b/sys/dev/ic/awivar.h
index 0bb13b1f431..754938e8697 100644
--- a/sys/dev/ic/awivar.h
+++ b/sys/dev/ic/awivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: awivar.h,v 1.5 2002/06/09 03:14:18 todd Exp $ */
+/* $OpenBSD: awivar.h,v 1.6 2003/10/21 18:58:49 jmc Exp $ */
 /* $NetBSD: awivar.h,v 1.12 2000/07/21 04:48:56 onoe Exp $ */
 
 /*-
@@ -186,7 +186,7 @@ struct awi_softc
 	awi_write_1(sc, AWI_DRIVERSTATE, \
 	    ((state) | AWI_DRV_AUTORXLED|AWI_DRV_AUTOTXLED))
 
-/* unalligned little endian access */
+/* unaligned little endian access */
 #define	LE_READ_2(p)							\
 	(((u_int8_t *)(p))[0] | (((u_int8_t *)(p))[1] << 8))
 #define	LE_READ_4(p)							\
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index d90dbf5dbc4..877a0ac5505 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bha.c,v 1.5 2003/04/27 11:22:52 ho Exp $	*/
+/*	$OpenBSD: bha.c,v 1.6 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $	*/
 
 #undef BHADEBUG
@@ -431,7 +431,7 @@ AGAIN:
 		case BHA_MBI_UNKNOWN:
 			/*
 			 * Even if the CCB wasn't found, we clear it anyway.
-			 * See preceeding comment.
+			 * See preceding comment.
 			 */
 			break;
 
@@ -475,7 +475,7 @@ bha_intr(arg)
 #endif /* BHADEBUG */
 
 	/*
-	 * First acknowlege the interrupt, Then if it's not telling about
+	 * First acknowledge the interrupt, Then if it's not telling about
 	 * a completed operation just return.
 	 */
 	sts = bus_space_read_1(iot, ioh, BHA_INTR_PORT);
diff --git a/sys/dev/ic/bhareg.h b/sys/dev/ic/bhareg.h
index 11ff58cbda9..c2df79e28e8 100644
--- a/sys/dev/ic/bhareg.h
+++ b/sys/dev/ic/bhareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bhareg.h,v 1.1 2002/01/24 22:38:03 mickey Exp $	*/
+/*	$OpenBSD: bhareg.h,v 1.2 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: bhareg.h,v 1.12 1998/08/17 00:26:33 mycroft Exp $	*/
 
 /*-
@@ -436,7 +436,7 @@ struct bha_setup_reply {
 	u_int8_t	disc_sts;
 };
 
-/* additional reply data supplied by wide controlers */
+/* additional reply data supplied by wide controllers */
 struct bha_setup_reply_wide {
 	u_int8_t	signature;
 	u_int8_t	letter_d;
diff --git a/sys/dev/ic/cd1190reg.h b/sys/dev/ic/cd1190reg.h
index 1e8898086c6..8d844258302 100644
--- a/sys/dev/ic/cd1190reg.h
+++ b/sys/dev/ic/cd1190reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd1190reg.h,v 1.2 2001/07/04 09:03:00 niklas Exp $	*/
+/*	$OpenBSD: cd1190reg.h,v 1.3 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 1998 Iain Hibbert.
@@ -89,7 +89,7 @@
 
 /* Interrupt Status Register */
 #define CD1190_ISR		0x0c
-#define CD1190_ISR_INTERRUPT	(1<<7) /* Interrupt Has Occured */
+#define CD1190_ISR_INTERRUPT	(1<<7) /* Interrupt Has Occurred */
 #define CD1190_ISR_ACK		(1<<3) /* Unsolicited ACK */
 #define CD1190_ISR_FIFO		(1<<2) /* FIFO Thresh/Time */
 #define CD1190_ISR_SIGNAL	(1<<1) /* Signal Status */
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index b6b9316e101..16d93f04a15 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.64 2003/09/29 18:53:58 mickey Exp $	*/
+/*	$OpenBSD: dc.c,v 1.65 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2109,7 +2109,7 @@ dc_rx_resync(sc)
 	if (i == DC_RX_LIST_CNT)
 		return (0);
 
-	/* We've fallen behing the chip: catch it. */
+	/* We've fallen behind the chip: catch it. */
 	sc->dc_cdata.dc_rx_prod = pos;
 
 	return (EAGAIN);
diff --git a/sys/dev/ic/dc21040reg.h b/sys/dev/ic/dc21040reg.h
index aa83eb21b3d..0e1fd04524d 100644
--- a/sys/dev/ic/dc21040reg.h
+++ b/sys/dev/ic/dc21040reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc21040reg.h,v 1.11 2002/11/29 09:27:35 deraadt Exp $	*/
+/*	$OpenBSD: dc21040reg.h,v 1.12 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: dc21040reg.h,v 1.11 1997/06/08 18:44:02 thorpej Exp $	*/
 
 /*-
@@ -172,7 +172,7 @@ typedef struct {
 #define	TULIP_STS_FULDPLXSHRT	0x00000800L		/* (RW)  Full Duplex Short Fram Rcvd (21040) */
 #define	TULIP_STS_GPTIMEOUT	0x00000800L		/* (RW)  General Purpose Timeout (21140) */
 #define	TULIP_STS_AUI		0x00000400L		/* (RW)  AUI/TP Switch (21040) */
-#define	TULIP_STS_RXTIMEOUT	0x00000200L		/* (RW)  Receive Watchbog Timeout */
+#define	TULIP_STS_RXTIMEOUT	0x00000200L		/* (RW)  Receive Watchdog Timeout */
 #define	TULIP_STS_RXSTOPPED	0x00000100L		/* (RW)  Receive Process Stopped */
 #define	TULIP_STS_RXNOBUF	0x00000080L		/* (RW)  Receive Buffer Unavailable */
 #define	TULIP_STS_RXINTR	0x00000040L		/* (RW)  Receive Interrupt */
@@ -193,7 +193,7 @@ typedef struct {
 #define	TULIP_CMD_STOREFWD	0x00200000L		/* (RW)  Store and Forward (21140) */
 #define	TULIP_CMD_NOHEARTBEAT	0x00080000L		/* (RW)  No Heartbeat (21140) */
 #define	TULIP_CMD_PORTSELECT	0x00040000L		/* (RW)  Post Select (100Mb) (21140) */
-#define	TULIP_CMD_ENHCAPTEFFCT	0x00040000L		/* (RW)  Enhanced Capture Effecty (21041) */
+#define	TULIP_CMD_ENHCAPTEFFCT	0x00040000L		/* (RW)  Enhanced Capture Effect (21041) */
 #define	TULIP_CMD_CAPTREFFCT	0x00020000L		/* (RW)  Capture Effect (!802.3) */
 #define	TULIP_CMD_BACKPRESSURE	0x00010000L		/* (RW)  Back Pressure (!802.3) (21040) */
 #define	TULIP_CMD_THRESHOLDCTL	0x0000C000L		/* (RW)  Threshold Control */
@@ -344,7 +344,7 @@ typedef struct {
 
 #define	TULIP_GP_PINSET			0x00000100L
 /*
- * These are the defintitions used for the DEC 21140
+ * These are the definitions used for the DEC 21140
  * evaluation board.
  */
 #define	TULIP_GP_EB_PINS		0x0000001F	/* General Purpose Pin directions */
@@ -353,7 +353,7 @@ typedef struct {
 #define	TULIP_GP_EB_INIT		0x0000000B	/* No loopback --- point-to-point */
 
 /*
- * These are the defintitions used for the SMC9332 (21140) board.
+ * These are the definitions used for the SMC9332 (21140) board.
  */
 #define	TULIP_GP_SMC_9332_PINS		0x0000003F	/* General Purpose Pin directions */
 #define	TULIP_GP_SMC_9332_OK10		0x00000080	/* 10 Mb/sec Signal Detect gep<7> */
@@ -379,7 +379,7 @@ typedef struct {
 #define	TULIP_GP_DE500_FORCE_100	0x00000001L
 
 /*
- * These are the defintitions used for the Cogent EM100
+ * These are the definitions used for the Cogent EM100
  * 21140 board.
  */
 #define	TULIP_GP_EM100_PINS		0x0000003F	/* General Purpose Pin directions */
@@ -392,7 +392,7 @@ typedef struct {
 
 
 /*
- * These are the defintitions used for the Znyx ZX342
+ * These are the definitions used for the Znyx ZX342
  * 10/100 board
  */
 #define	TULIP_OUI_ZNYX_0		0x00
diff --git a/sys/dev/ic/dcreg.h b/sys/dev/ic/dcreg.h
index 15c6a02cd07..63d0e7584fb 100644
--- a/sys/dev/ic/dcreg.h
+++ b/sys/dev/ic/dcreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dcreg.h,v 1.32 2003/09/29 18:53:58 mickey Exp $ */
+/*	$OpenBSD: dcreg.h,v 1.33 2003/10/21 18:58:49 jmc Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -869,7 +869,7 @@ struct dc_softc {
 #define DC_CSID_VENDOR		0x0000FFFF
 #define DC_CSID_DEVICE		0xFFFF0000
 
-/* PCI cababilities pointer */
+/* PCI capabilities pointer */
 #define DC_CCAP_OFFSET		0x000000FF
 
 /* PCI interrupt config register */
diff --git a/sys/dev/ic/dp8390reg.h b/sys/dev/ic/dp8390reg.h
index daaeccb7aeb..b3e84c50927 100644
--- a/sys/dev/ic/dp8390reg.h
+++ b/sys/dev/ic/dp8390reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp8390reg.h,v 1.8 2000/05/29 17:08:51 fgsch Exp $	*/
+/*	$OpenBSD: dp8390reg.h,v 1.9 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: dp8390reg.h,v 1.3 1997/04/29 04:32:08 scottr Exp $	*/
 
 /*
@@ -512,7 +512,7 @@
 #define ED_RSR_PHY	0x20
 
 /*
- * DIS: Receiver Disabled.  Set to indicate that the receiver has enetered
+ * DIS: Receiver Disabled.  Set to indicate that the receiver has entered
  * monitor mode.  Cleared when the receiver exits monitor mode.
  */
 #define ED_RSR_DIS	0x40
diff --git a/sys/dev/ic/dp8390var.h b/sys/dev/ic/dp8390var.h
index 8a009ca7e7b..8c104034933 100644
--- a/sys/dev/ic/dp8390var.h
+++ b/sys/dev/ic/dp8390var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp8390var.h,v 1.8 2002/06/03 20:01:36 deraadt Exp $	*/
+/*	$OpenBSD: dp8390var.h,v 1.9 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: dp8390var.h,v 1.8 1998/08/12 07:19:09 scottr Exp $	*/
 
 /*
@@ -106,7 +106,7 @@ struct dp8390_softc {
  * Compile-time config flags
  */
 /*
- * This sets the default for enabling/disablng the transceiver.
+ * This sets the default for enabling/disabling the transceiver.
  */
 #define DP8390_DISABLE_TRANSCEIVER	0x0001
 
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index 31bb891f67a..7de7ffd8d6d 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dpt.c,v 1.8 2002/12/11 18:43:14 henning Exp $	*/
+/*	$OpenBSD: dpt.c,v 1.9 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: dpt.c,v 1.12 1999/10/23 16:26:33 ad Exp $	*/
 
 /*-
@@ -366,7 +366,7 @@ dpt_init(sc, intrstr)
 		model[i++] = ei->ei_suffix[j];
 	model[i] = '\0';
 
-	/* Find the cannonical name for the board */
+	/* Find the canonical name for the board */
 	for (i = 0; dpt_cname[i] != NULL; i += 2)
 		if (memcmp(ei->ei_model, dpt_cname[i], 6) == 0)
 			break;
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 430b331d930..c92700e54e4 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.60 2003/07/08 20:17:05 mickey Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.61 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $	*/
 
 /*
@@ -463,7 +463,7 @@ ep_detach(self)
  * Use the config_cntrl register  in window 0 instead.
  * Used on original, 10Mbit ISA (3c509), 3c509B, and pre-Demon EISA cards
  * that implement  CONFIG_CTRL.  We don't have a good way to set the
- * default active mediuim; punt to ifconfig  instead.
+ * default active medium; punt to ifconfig instead.
  *
  * XXX what about 3c515, pcmcia 10/100?
  */
diff --git a/sys/dev/ic/elink3reg.h b/sys/dev/ic/elink3reg.h
index 7dcfbe7d95f..e53452137b7 100644
--- a/sys/dev/ic/elink3reg.h
+++ b/sys/dev/ic/elink3reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3reg.h,v 1.13 2000/09/17 00:06:02 aaron Exp $	*/
+/*	$OpenBSD: elink3reg.h,v 1.14 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: elink3reg.h,v 1.13 1997/04/27 09:42:34 veego Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 
 /*
  * These define the EEPROM data structure.  They are used in the probe
- * function to verify the existance of the adapter after having sent
+ * function to verify the existence of the adapter after having sent
  * the ID_Sequence.
  *
  * There are others but only the ones we use are defined here.
@@ -368,7 +368,7 @@
  *     20-22:   selected media type
  *        21:   unused
  *        24:  (nonvolatile) driver should autoselect media
- *     25-31: reseerved
+ *     25-31: reserved
  *
  * The low-order 16 bits should generally not be changed by software.
  * Offsets defined for two 16-bit words, to help out 16-bit busses.
@@ -411,7 +411,7 @@
 #define	CONFIG_AUTOSELECT_SHIFT	(u_short)      8
 
 /*
- * RESET_OPTIONS (Window 4, on Demon/Vortex/Bomerang only)
+ * RESET_OPTIONS (Window 4, on Demon/Vortex/Boomerang only)
  * also mapped to PCI configuration space on PCI adaptors.
  *
  * (same register as  Vortex EP_W3_RESET_OPTIONS, mapped to pci-config space)
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index 01e146fb97b..ad0f1e2e0f6 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxp.c,v 1.42 2003/05/28 11:23:19 henric Exp $	*/
+/*	$OpenBSD: fxp.c,v 1.43 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -144,7 +144,7 @@ static u_char fxp_cb_config_template[] = {
 	0x60,	/* 12 interfrm_spacing */
 	0x00,	/* 13 void31 */
 	0xf2,	/* 14 void32 */
-	0x48,	/* 15 promiscous */
+	0x48,	/* 15 promiscuous */
 	0x00,	/* 16 void41 */
 	0x40,	/* 17 void42 */
 	0xf3,	/* 18 stripping */
@@ -483,7 +483,7 @@ fxp_detach(sc)
  *
  * 559's can have either 64-word or 256-word EEPROMs, the 558
  * datasheet only talks about 64-word EEPROMs, and the 557 datasheet
- * talks about the existance of 16 to 256 word EEPROMs.
+ * talks about the existence of 16 to 256 word EEPROMs.
  *
  * The only known sizes are 64 and 256, where the 256 version is used
  * by CardBus cards to store CIS information.
diff --git a/sys/dev/ic/fxpreg.h b/sys/dev/ic/fxpreg.h
index 312e0901994..2f814614a00 100644
--- a/sys/dev/ic/fxpreg.h
+++ b/sys/dev/ic/fxpreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxpreg.h,v 1.4 2002/10/17 15:12:12 drahn Exp $	*/
+/*	$OpenBSD: fxpreg.h,v 1.5 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 1995, David Greenman
@@ -160,9 +160,8 @@ struct fxp_cb_mcs {
 /*
  * Number of DMA segments in a TxCB. Note that this is carefully
  * chosen to make the total struct size an even power of two. It's
- * critical that no TxCB be split across a page boundry since
+ * critical that no TxCB be split across a page boundary since
  * no attempt is made to allocate physically contiguous memory.
- * 
  */
 #define	SZ_TXCB		16	/* TX control block head size = 4 32 bit words */
 #define	SZ_TBD		8	/* Fragment ptr/size block size */
diff --git a/sys/dev/ic/gemreg.h b/sys/dev/ic/gemreg.h
index 6d17aaa7e71..52b80d15e8d 100644
--- a/sys/dev/ic/gemreg.h
+++ b/sys/dev/ic/gemreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gemreg.h,v 1.8 2002/06/07 23:44:05 drahn Exp $	*/
+/*	$OpenBSD: gemreg.h,v 1.9 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: gemreg.h,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -56,8 +56,8 @@
 
 
 /* Bits in GEM_CONFIG register */
-#define	GEM_CONFIG_BURST_64	0x000000000	/* 0->infininte, 1->64KB */
-#define	GEM_CONFIG_BURST_INF	0x000000001	/* 0->infininte, 1->64KB */
+#define	GEM_CONFIG_BURST_64	0x000000000	/* 0->infinity, 1->64KB */
+#define	GEM_CONFIG_BURST_INF	0x000000001	/* 0->infinity, 1->64KB */
 #define	GEM_CONFIG_TXDMA_LIMIT	0x00000003e
 #define	GEM_CONFIG_RXDMA_LIMIT	0x0000007c0
 
@@ -332,7 +332,7 @@
 /* GEM_MAC_TX_CONFIG register bits */
 #define	GEM_MAC_TX_ENABLE	0x00000001	/* TX enable */
 #define	GEM_MAC_TX_IGN_CARRIER	0x00000002	/* Ignore carrier sense */
-#define	GEM_MAC_TX_IGN_COLLIS	0x00000004	/* ignore collitions */
+#define	GEM_MAC_TX_IGN_COLLIS	0x00000004	/* ignore collisions */
 #define	GEM_MAC_TX_ENA_IPG0	0x00000008	/* extend Rx-to-TX IPG */
 #define	GEM_MAC_TX_NGU		0x00000010	/* Never give up */
 #define	GEM_MAC_TX_NGU_LIMIT	0x00000020	/* Never give up limit */
@@ -401,7 +401,7 @@
 #define	GEM_MIF_CONFIG_MDI0	0x00000100	/* MDIO_0 Data/MDIO_0 atached */
 #define	GEM_MIF_CONFIG_MDI1	0x00000200	/* MDIO_1 Data/MDIO_1 atached */
 #define	GEM_MIF_CONFIG_PHY_ADR	0x00007c00	/* poll PHY address */
-/* MDI0 is onboard tranciever MID1 is external, PHYAD for both is 0 */
+/* MDI0 is onboard transceiver MID1 is external, PHYAD for both is 0 */
 
 
 /* GEM_MIF_BASIC_STATUS and GEM_MIF_INTERRUPT_MASK bits */
@@ -439,7 +439,7 @@
 #define	GEM_MII_CONTROL_AUTONEG	0x00001000	/* auto negotiation enabled */
 #define	GEM_MII_CONTROL_POWERDN	0x00000800
 #define	GEM_MII_CONTROL_ISOLATE	0x00000400	/* isolate phy from mii */
-#define	GEM_MII_CONTROL_RAN	0x00000200	/* restart auto negotioation */
+#define	GEM_MII_CONTROL_RAN	0x00000200	/* restart auto negotiation */
 #define	GEM_MII_CONTROL_FDUPLEX	0x00000100	/* full duplex, always 0 */
 #define	GEM_MII_CONTROL_COL_TST	0x00000080	/* collision test */
 
diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h
index f3e8b8f17e4..ca1a584c66b 100644
--- a/sys/dev/ic/gemvar.h
+++ b/sys/dev/ic/gemvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gemvar.h,v 1.8 2002/06/07 23:44:05 drahn Exp $	*/
+/*	$OpenBSD: gemvar.h,v 1.9 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: gemvar.h,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -111,7 +111,7 @@ struct gem_txthresh_tab {
 struct gem_stats {
 	u_long		ts_tx_uf;	/* transmit underflow errors */
 	u_long		ts_tx_to;	/* transmit jabber timeouts */
-	u_long		ts_tx_ec;	/* excessve collision count */
+	u_long		ts_tx_ec;	/* excessive collision count */
 	u_long		ts_tx_lc;	/* late collision count */
 };
 
diff --git a/sys/dev/ic/hmereg.h b/sys/dev/ic/hmereg.h
index 69f688aad83..5a256ef2341 100644
--- a/sys/dev/ic/hmereg.h
+++ b/sys/dev/ic/hmereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hmereg.h,v 1.5 2003/03/05 20:46:26 jason Exp $	*/
+/*	$OpenBSD: hmereg.h,v 1.6 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: hmereg.h,v 1.8 2001/04/30 12:22:42 bouyer Exp $	*/
 
 /*-
@@ -215,7 +215,7 @@
 /* Receive config register. */
 #define HME_MAC_RXCFG_ENABLE	0x00000001 /* Enable the receiver */
 #define HME_MAC_RXCFG_PSTRIP	0x00000020 /* Pad byte strip enable */
-#define HME_MAC_RXCFG_PMISC	0x00000040 /* Enable promiscous mode */
+#define HME_MAC_RXCFG_PMISC	0x00000040 /* Enable promiscuous mode */
 #define HME_MAC_RXCFG_DERR	0x00000080 /* Disable error checking */
 #define HME_MAC_RXCFG_DCRCS	0x00000100 /* Disable CRC stripping */
 #define HME_MAC_RXCFG_ME	0x00000200 /* Receive packets addressed to me */
@@ -239,10 +239,10 @@
 #define HME_MIF_CFG_PHY		0x00000001	/* PHY select */
 #define HME_MIF_CFG_PE		0x00000002	/* Poll enable */
 #define HME_MIF_CFG_BBMODE	0x00000004	/* Bit-bang mode */
-#define HME_MIF_CFG_PRADDR	0x000000f8	/* Poll register adddress */
+#define HME_MIF_CFG_PRADDR	0x000000f8	/* Poll register address */
 #define HME_MIF_CFG_MDI0	0x00000100	/* MDI_0 (ro) */
 #define HME_MIF_CFG_MDI1	0x00000200	/* MDI_1 (ro) */
-#define HME_MIF_CFG_PPADDR	0x00007c00	/* Poll phy adddress */
+#define HME_MIF_CFG_PPADDR	0x00007c00	/* Poll phy address */
 
 /* MIF Frame/Output register */
 #define HME_MIF_FO_ST		0xc0000000	/* Start of frame */
diff --git a/sys/dev/ic/i82586reg.h b/sys/dev/ic/i82586reg.h
index ca6b92e3772..b6525dc295e 100644
--- a/sys/dev/ic/i82586reg.h
+++ b/sys/dev/ic/i82586reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82586reg.h,v 1.2 1996/10/31 01:01:32 niklas Exp $	*/
+/*	$OpenBSD: i82586reg.h,v 1.3 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: i82586reg.h,v 1.5 1995/04/04 01:59:34 mycroft Exp $	*/
 
 /*-
@@ -128,7 +128,7 @@ struct ie_sys_ctl_block {
 #define IE_RU_STATUS	0x70	/* mask for receiver unit status */
 #define IE_RU_SUSPEND	0x10	/* receiver is suspended */
 #define IE_RU_NOSPACE	0x20	/* receiver has no resources */
-#define IE_RU_READY	0x40	/* reveiver is ready */
+#define IE_RU_READY	0x40	/* receiver is ready */
 
 /*
  * This is filled in partially by the chip, partially by us.
diff --git a/sys/dev/ic/i82595reg.h b/sys/dev/ic/i82595reg.h
index 61d0b54dc52..2898af9bd76 100644
--- a/sys/dev/ic/i82595reg.h
+++ b/sys/dev/ic/i82595reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82595reg.h,v 1.2 1996/10/31 01:01:32 niklas Exp $	*/
+/*	$OpenBSD: i82595reg.h,v 1.3 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: i82595reg.h,v 1.1 1996/05/06 21:36:51 is Exp $	*/
 
 /*
@@ -123,7 +123,7 @@
 
 /* reg1, apparently */
 
-#define		XMT_CHAIN_INT	0x20	/* interupt at end of xmt chain */
+#define		XMT_CHAIN_INT	0x20	/* interrupt at end of xmt chain */
 #define		XMT_CHAIN_ERRSTOP 0x40	/* int at end of chain even if err */
 #define		RCV_DISCARD_BAD	0x80	/* Throw bad frames away and continue */
 
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index 189cc71a92a..6cbd4a51251 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82596.c,v 1.21 2003/08/09 03:11:47 mickey Exp $	*/
+/*	$OpenBSD: i82596.c,v 1.22 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $	*/
 
 /*-
@@ -1527,7 +1527,7 @@ i82596_setup_bufs(sc)
 
 	sc->nrxbuf = sc->nframes * B_PER_F;
 
-	/* The receice frame descriptors */
+	/* The receive frame descriptors */
 	ptr += cl;
 	sc->rframes = ptr - 2;
 	ptr += sc->nframes * 64;
diff --git a/sys/dev/ic/i82596var.h b/sys/dev/ic/i82596var.h
index fea89780500..015d91297d2 100644
--- a/sys/dev/ic/i82596var.h
+++ b/sys/dev/ic/i82596var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82596var.h,v 1.10 2002/12/19 01:24:03 mickey Exp $	*/
+/*	$OpenBSD: i82596var.h,v 1.11 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: i82586var.h,v 1.10 1998/08/15 04:42:42 mycroft Exp $	*/
 
 /*-
@@ -148,7 +148,7 @@
  *
  * The front-end is required to manage the SCP and ISCP structures. i.e.
  * allocate room for them on the board's memory, and arrange to point the
- * chip at the SCB stucture, the offset of which is passed to the MI
+ * chip at the SCB structure, the offset of which is passed to the MI
  * driver in `sc_scb'.
  *
  * The following functions provide the glue necessary to deal with
@@ -186,7 +186,7 @@ struct ie_softc {
 	bus_space_handle_t bh;	/* bus-space handle of card memory */
 
 	const char *sc_type;	/* (MD) hardware type */
-	int	sc_vers;	/* (MD) hardvare version */
+	int	sc_vers;	/* (MD) hardware version */
 	int	sc_irq;		/* (MD) irq in md format */
 	void	*sc_iobase;	/* (MD) KVA of base of 24 bit addr space */
 	u_long	sc_maddr;	/* (MD) base of chip's RAM (16bit addr space) */
diff --git a/sys/dev/ic/i82802reg.h b/sys/dev/ic/i82802reg.h
index 22b56fdabd7..4e6fa961d86 100644
--- a/sys/dev/ic/i82802reg.h
+++ b/sys/dev/ic/i82802reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82802reg.h,v 1.2 2003/06/02 19:24:22 mickey Exp $	*/
+/*	$OpenBSD: i82802reg.h,v 1.3 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -34,7 +34,7 @@
  */
 
 /*
- * unfortunatelly FWH does not show up in the pci device scan, 10x intel.
+ * unfortunately FWH does not show up in the pci device scan, 10x intel.
  * so all we do is probe for it in the pchb driver at the following address.
  */
 #define	I82802_IOBASE	0xffb00000
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 85cc901c26e..f1ece1d0899 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi.c,v 1.99 2003/10/07 07:08:45 markus Exp $	*/
+/*	$OpenBSD: if_wi.c,v 1.100 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -50,7 +50,7 @@
  * without an NDA (if at all). What they do release is an API library
  * called the HCF (Hardware Control Functions) which is supposed to
  * do the device-specific operations of a device driver for you. The
- * publically available version of the HCF library (the 'HCF Light') is
+ * publicly available version of the HCF library (the 'HCF Light') is
  * a) extremely gross, b) lacks certain features, particularly support
  * for 802.11 frames, and c) is contaminated by the GNU Public License.
  *
@@ -126,7 +126,7 @@ u_int32_t	widebug = WIDEBUG;
 
 #if !defined(lint) && !defined(__OpenBSD__)
 static const char rcsid[] =
-	"$OpenBSD: if_wi.c,v 1.99 2003/10/07 07:08:45 markus Exp $";
+	"$OpenBSD: if_wi.c,v 1.100 2003/10/21 18:58:49 jmc Exp $";
 #endif	/* lint */
 
 #ifdef foo
@@ -2249,7 +2249,7 @@ nextpkt:
 
 #if NBPFILTER > 0
 	/*
-	 * If there's a BPF listner, bounce a copy of
+	 * If there's a BPF listener, bounce a copy of
 	 * this frame to him.
 	 */
 	if (ifp->if_bpf)
diff --git a/sys/dev/ic/if_wi_hostap.h b/sys/dev/ic/if_wi_hostap.h
index 86bc943e9d6..c12825be3a6 100644
--- a/sys/dev/ic/if_wi_hostap.h
+++ b/sys/dev/ic/if_wi_hostap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_hostap.h,v 1.8 2003/01/21 20:09:39 millert Exp $	*/
+/*	$OpenBSD: if_wi_hostap.h,v 1.9 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -64,7 +64,7 @@ struct hostap_sta {
 #define WIHAPFL_ACTIVE		0x0001
 #define WIHAPFL_MAC_FILT	0x0002
 
-/* Flags set inernally only: */
+/* Flags set internally only: */
 #define WIHAPFL_CANTCHANGE	(WIHAPFL_ACTIVE)
 
 struct hostap_getall {
diff --git a/sys/dev/ic/if_wi_ieee.h b/sys/dev/ic/if_wi_ieee.h
index 6ba345f6b46..e134293c4a8 100644
--- a/sys/dev/ic/if_wi_ieee.h
+++ b/sys/dev/ic/if_wi_ieee.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_ieee.h,v 1.17 2003/08/24 12:23:57 fgsch Exp $	*/
+/*	$OpenBSD: if_wi_ieee.h,v 1.18 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -166,7 +166,7 @@ struct wi_counters {
 
 /*
  * These are all the LTV record types that we can read or write
- * from the WaveLAN. Not all of them are temendously useful, but I
+ * from the WaveLAN. Not all of them are tremendously useful, but I
  * list as many as I know about here for completeness.
  */
 
@@ -293,7 +293,7 @@ struct wi_ltv_keys {
 #define WI_RID_CARD_ID		0xFD0B /* card identification */
 #define WI_RID_MFI_SUP_RANGE	0xFD0C /* modem supplier compatibility */
 #define WI_RID_CFI_SUP_RANGE	0xFD0D /* controller sup. compatibility */
-#define WI_RID_CHANNEL_LIST	0xFD10 /* allowd comm. frequencies. */
+#define WI_RID_CHANNEL_LIST	0xFD10 /* allowed comm. frequencies. */
 #define WI_RID_REG_DOMAINS	0xFD11 /* list of intendted regulatory doms */
 #define WI_RID_TEMP_TYPE	0xFD12 /* hw temp range code */
 #define WI_RID_CIS		0xFD13 /* PC card info struct */
@@ -320,7 +320,7 @@ struct wi_ltv_keys {
 #define WI_RID_MAX_RX_LIFE	0xFD4B /* max rx frame handling duration */
 #define WI_RID_CF_POLL		0xFD4C /* contention free pollable ind */
 #define WI_RID_AUTH_ALGS	0xFD4D /* auth algorithms available */
-#define WI_RID_AUTH_TYPE	0xFD4E /* availanle auth types */
+#define WI_RID_AUTH_TYPE	0xFD4E /* available auth types */
 #define WI_RID_WEP_AVAIL	0xFD4F /* WEP privacy option available */
 #define WI_RID_CUR_TX_RATE1	0xFD80
 #define WI_RID_CUR_TX_RATE2	0xFD81
@@ -454,7 +454,7 @@ struct wi_rx_frame {
 
 /*
  * all data packets have a snap (sub-network access protocol) header that
- * isn't entirely definied, but added for ethernet compatibility.
+ * isn't entirely defined, but added for ethernet compatibility.
  */
 struct wi_snap_frame {
 	u_int16_t	wi_dat[3];
diff --git a/sys/dev/ic/if_wireg.h b/sys/dev/ic/if_wireg.h
index 8fb60205cd5..89cbb3f8757 100644
--- a/sys/dev/ic/if_wireg.h
+++ b/sys/dev/ic/if_wireg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wireg.h,v 1.32 2003/06/25 17:38:55 miod Exp $	*/
+/*	$OpenBSD: if_wireg.h,v 1.33 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -139,7 +139,7 @@
  * - Lucent has created a library called HCF (Hardware Control Functions)
  *   though which it wants developers to interact with the card. The HCF
  *   is needlessly complex, ill conceived and badly documented. Actually,
- *   the comments in the HCP code itself aren't bad, but the publically
+ *   the comments in the HCP code itself aren't bad, but the publicly
  *   available manual that comes with it is awful, probably due largely to
  *   the fact that it has been emasculated in order to hide information
  *   that Lucent wants to keep proprietary. The purpose of the HCF seems
@@ -264,7 +264,7 @@
 #define WI_EV_CMD		0x0010	/* command completed */
 #define WI_EV_ALLOC		0x0008	/* async alloc/reclaim completed */
 #define WI_EV_TX_EXC		0x0004	/* async xmit completed with failure */
-#define WI_EV_TX		0x0002	/* async xmit completed succesfully */
+#define WI_EV_TX		0x0002	/* async xmit completed successfully */
 #define WI_EV_RX		0x0001	/* async rx completed */
 
 #define WI_INTRS	\
@@ -466,7 +466,7 @@ struct wi_ltv_pcf {
 /*
  * Connection control characteristics (0xFC00 == WI_RID_PORTTYPE).
  * 1 == Basic Service Set (BSS)
- * 2 == Wireless Distribudion System (WDS)
+ * 2 == Wireless Distribution System (WDS)
  * 3 == Pseudo IBSS (aka ad-hoc demo)
  * 4 == IBSS
  */
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index a7cf935908b..041b4152ed2 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iha.c,v 1.21 2003/03/30 00:32:48 krw Exp $ */
+/*	$OpenBSD: iha.c,v 1.22 2003/10/21 18:58:49 jmc Exp $ */
 /*-------------------------------------------------------------------------
  *
  * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
@@ -1120,7 +1120,7 @@ iha_data_over_run(pScb)
 	case 0x59: /* Read Master CUE                 MMC   */
 	case 0x5a: /* Mode Sense (10 byte version)    SPC-2 */
 	case 0x5c: /* Read Buffer Capacity            MMC   */
-	case 0x5e: /* Persistant Reserve In           SPC-2 */
+	case 0x5e: /* Persistent Reserve In           SPC-2 */
 	case 0x84: /* Receive Copy Results            SPC-2 */
 	case 0xa0: /* Report LUNs                     SPC-2 */
 	case 0xa3: /* Various Report requests         SBC-2/SCC-2*/
@@ -1144,7 +1144,7 @@ iha_data_over_run(pScb)
 }
 
 /*
- * iha_next_state - prcess the current SCB as requested in it's 
+ * iha_next_state - process the current SCB as requested in it's 
  *                  SCB_NxtStat member.
  */
 int
diff --git a/sys/dev/ic/iha.h b/sys/dev/ic/iha.h
index 04eb9043744..e44c962663f 100644
--- a/sys/dev/ic/iha.h
+++ b/sys/dev/ic/iha.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iha.h,v 1.13 2003/03/30 00:32:48 krw Exp $ */
+/*	$OpenBSD: iha.h,v 1.14 2003/10/21 18:58:49 jmc Exp $ */
 /*-------------------------------------------------------------------------
  *
  * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
@@ -347,17 +347,17 @@ struct iha_nvram {
 #define TUL_SCMD	0x91	       /* R/W SCSI Command		     */
 #define	    NO_OP	    0x00       /*     Place Holder for tulip_wait()  */
 #define	    SEL_NOATN	    0x01       /*     Select w/o ATN Sequence	     */
-#define	    XF_FIFO_OUT	    0x03       /*     FIFO Xfer Infomation out	     */
+#define	    XF_FIFO_OUT	    0x03       /*     FIFO Xfer Information out	     */
 #define	    MSG_ACCEPT	    0x0F       /*     Message Accept		     */
 #define	    SEL_ATN	    0x11       /*     Select w ATN Sequence	     */
 #define	    SEL_ATNSTOP	    0x12       /*     Select w ATN & Stop Sequence   */
 #define	    SELATNSTOP	    0x1E       /*     Select w ATN & Stop Sequence   */
 #define	    SEL_ATN3	    0x31       /*     Select w ATN3 Sequence	     */
-#define	    XF_DMA_OUT	    0x43       /*     DMA Xfer Infomation out	     */
+#define	    XF_DMA_OUT	    0x43       /*     DMA Xfer Information out	     */
 #define	    EN_RESEL	    0x80       /*     Enable Reselection	     */
-#define	    XF_FIFO_IN	    0x83       /*     FIFO Xfer Infomation in	     */
+#define	    XF_FIFO_IN	    0x83       /*     FIFO Xfer Information in	     */
 #define	    CMD_COMP	    0x84       /*     Command Complete Sequence	     */
-#define	    XF_DMA_IN	    0xC3       /*     DMA Xfer Infomation in	     */
+#define	    XF_DMA_IN	    0xC3       /*     DMA Xfer Information in	     */
 #define TUL_STEST0	0x92	       /* R/W Test0			     */
 #define TUL_STEST1	0x93	       /* R/W Test1			     */
 
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index 2f42f3efbf4..2f5d2de8634 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: isp.c,v 1.33 2003/04/23 20:13:07 mickey Exp $ */
+/* 	$OpenBSD: isp.c,v 1.34 2003/10/21 18:58:49 jmc Exp $ */
 /*
  * Machine and OS Independent (well, as best as possible)
  * code for the Qlogic ISP SCSI adapters.
@@ -2012,7 +2012,7 @@ isp_pdb_sync(struct ispsoftc *isp)
 		}
 
 		/*
-		 * Make sure we can get the approriate port information.
+		 * Make sure we can get the appropriate port information.
 		 */
 		if (isp_getpdb(isp, lp->loopid, &pdb) != 0) {
 			isp_prt(isp, ISP_LOGWARN, nopdb, lp->portid);
@@ -3377,7 +3377,7 @@ isp_control(struct ispsoftc *isp, ispctl_t ctl, void *arg)
 		}
 		/*
 		 * XXX: Look for command in the REQUEST QUEUE. That is,
-		 * XXX: It hasen't been picked up by firmware yet.
+		 * XXX: It hasn't been picked up by firmware yet.
 		 */
 		break;
 
@@ -3898,7 +3898,7 @@ again:
 	if (nlooked) {
 		WRITE_RESPONSE_QUEUE_OUT_POINTER(isp, optr);
 		/*
-		 * While we're at it, read the requst queue out pointer.
+		 * While we're at it, read the request queue out pointer.
 		 */
 		isp->isp_reqodx = READ_REQUEST_QUEUE_OUT_POINTER(isp);
 		if (isp->isp_rscchiwater < ndone)
@@ -4105,7 +4105,7 @@ isp_parse_async(struct ispsoftc *isp, u_int16_t mbox)
 			rval = -1;
 #endif
 		/*
-		 * We've had problems with data corruption occuring on
+		 * We've had problems with data corruption occurring on
 		 * commands that complete (with no apparent error) after
 		 * we receive a LIP. This has been observed mostly on
 		 * Local Loop topologies. To be safe, let's just mark
diff --git a/sys/dev/ic/isp_openbsd.c b/sys/dev/ic/isp_openbsd.c
index b6803c896d2..d5400f07e92 100644
--- a/sys/dev/ic/isp_openbsd.c
+++ b/sys/dev/ic/isp_openbsd.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: isp_openbsd.c,v 1.25 2003/08/06 21:08:06 millert Exp $ */
+/* 	$OpenBSD: isp_openbsd.c,v 1.26 2003/10/21 18:58:49 jmc Exp $ */
 /*
  * Platform (OpenBSD) dependent common attachment code for Qlogic adapters.
  *
@@ -517,7 +517,7 @@ isp_wdog(void *arg)
 			(void) isp_control(isp, ISPCTL_ABORT_CMD, arg);
 
 			/*
-			 * After this point, the comamnd is really dead.
+			 * After this point, the command is really dead.
 			 */
 			if (XS_XFRLEN(xs)) {
 				ISP_DMAFREE(isp, xs, handle);
@@ -621,8 +621,8 @@ isp_requeue(void *arg)
 }
 
 /*
- * Restart function after a LOOP UP event or a commmand completing,
- * somtimes done as a timeout for some hysteresis.
+ * Restart function after a LOOP UP event or a command completing,
+ * sometimes done as a timeout for some hysteresis.
  */
 static void
 isp_trestart(void *arg)
diff --git a/sys/dev/ic/isp_target.c b/sys/dev/ic/isp_target.c
index 346b1afb6f5..9e0b09f50d4 100644
--- a/sys/dev/ic/isp_target.c
+++ b/sys/dev/ic/isp_target.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_target.c,v 1.12 2003/09/18 09:44:18 jmc Exp $ */
+/* $OpenBSD: isp_target.c,v 1.13 2003/10/21 18:58:49 jmc Exp $ */
 /*
  * Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters.
  *
@@ -107,8 +107,8 @@ static void isp_handle_ctio2(struct ispsoftc *, ct2_entry_t *);
  * has already swizzled it into the platform dependent from canonical form.
  *
  * Because of the way this driver is designed, unfortunately most of the
- * actual synchronization work has to be done in the platform specific
- * code- we have no synchroniation primitives in the common code.
+ * actual synchronization work has to be done in the platform-specific
+ * code - we have no synchronization primitives in the common code.
  */
 
 int
@@ -714,7 +714,7 @@ isp_handle_atio(struct ispsoftc *isp, at_entry_t *aep)
 	 * The firmware status (except for the QLTM_SVALID bit) indicates
 	 * why this ATIO was sent to us.
 	 *
-	 * If QLTM_SVALID is set, the firware has recommended Sense Data.
+	 * If QLTM_SVALID is set, the firmware has recommended Sense Data.
 	 *
 	 * If the DISCONNECTS DISABLED bit is set in the flags field,
 	 * we're still connected on the SCSI bus - i.e. the initiator
@@ -801,7 +801,7 @@ isp_handle_atio2(struct ispsoftc *isp, at2_entry_t *aep)
 	 * The firmware status (except for the QLTM_SVALID bit) indicates
 	 * why this ATIO was sent to us.
 	 *
-	 * If QLTM_SVALID is set, the firware has recommended Sense Data.
+	 * If QLTM_SVALID is set, the firmware has recommended Sense Data.
 	 *
 	 * If the DISCONNECTS DISABLED bit is set in the flags field,
 	 * we're still connected on the SCSI bus - i.e. the initiator
@@ -911,7 +911,7 @@ isp_handle_ctio(struct ispsoftc *isp, ct_entry_t *ct)
 		 * Bus Device Reset message received or the SCSI Bus has
 		 * been Reset; the firmware has gone to Bus Free.
 		 *
-		 * The firmware generates an async mailbox interupt to
+		 * The firmware generates an async mailbox interrupt to
 		 * notify us of this and returns outstanding CTIOs with this
 		 * status. These CTIOs are handled in that same way as
 		 * CT_ABORTED ones, so just fall through here.
@@ -1064,7 +1064,7 @@ isp_handle_ctio2(struct ispsoftc *isp, ct2_entry_t *ct)
 		/*
 		 * Target Reset function received.
 		 *
-		 * The firmware generates an async mailbox interupt to
+		 * The firmware generates an async mailbox interrupt to
 		 * notify us of this and returns outstanding CTIOs with this
 		 * status. These CTIOs are handled in that same way as
 		 * CT_ABORTED ones, so just fall through here.
diff --git a/sys/dev/ic/isp_tpublic.h b/sys/dev/ic/isp_tpublic.h
index 96454065d88..ce01bbcd308 100644
--- a/sys/dev/ic/isp_tpublic.h
+++ b/sys/dev/ic/isp_tpublic.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_tpublic.h,v 1.6 2003/03/03 18:35:45 mjacob Exp $ */
+/* $OpenBSD: isp_tpublic.h,v 1.7 2003/10/21 18:58:49 jmc Exp $ */
 /*
  * Qlogic ISP Host Adapter Public Target Interface Structures && Routines
  *---------------------------------------
@@ -146,7 +146,7 @@ typedef struct {
  * layer should set it to the amount expected to be moved.
  *
  * The tag cd_resid should be the total residual of data not transferred.
- * The outer layers need to set this at the begining of command processing
+ * The outer layers need to set this at the beginning of command processing
  * to equal cd_totlen. As data is successfully moved, this value is decreased.
  * At the end of a command, any nonzero residual indicates the number of bytes
  * requested but not moved. XXXXXXXXXXXXXXXXXXXXXXX TOO VAGUE!!! 
@@ -318,7 +318,7 @@ typedef enum {
 /*
  * This structure is used to register to other software modules the
  * binding of an HBA identifier, driver name and instance and the
- * lun width capapbilities of this target driver. It's up to each
+ * lun width capabilities of this target driver. It's up to each
  * platform to figure out how it wants to do this, but a typical
  * sequence would be for the MD layer to find some external module's
  * entry point and start by sending a QOUT_HBA_REG with info filled
diff --git a/sys/dev/ic/ispreg.h b/sys/dev/ic/ispreg.h
index c7b271a25a6..206a11bdbc4 100644
--- a/sys/dev/ic/ispreg.h
+++ b/sys/dev/ic/ispreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ispreg.h,v 1.12 2002/05/17 01:35:19 mjacob Exp $ */
+/*	$OpenBSD: ispreg.h,v 1.13 2003/10/21 18:58:49 jmc Exp $ */
 /*
  * Machine Independent (well, as best as possible) register
  * definitions for Qlogic ISP SCSI adapters.
@@ -427,7 +427,7 @@
 #define	SXP_FIFO_STATUS	(SXP_BLOCK+0x5C)	/* RW*: SCSI FIFO Status */
 #define	SXP_FIFO_TOP	(SXP_BLOCK+0x5E)	/* RW*: SCSI FIFO Top Resid */
 #define	SXP_FIFO_BOTTOM	(SXP_BLOCK+0x60)	/* RW*: SCSI FIFO Bot Resid */
-#define	SXP_TRAN_REG	(SXP_BLOCK+0x64)	/* RW*: SCSI Transferr Reg */
+#define	SXP_TRAN_REG	(SXP_BLOCK+0x64)	/* RW*: SCSI Transfer Reg */
 #define	SXP_TRAN_CNT_LO	(SXP_BLOCK+0x68)	/* RW*: SCSI Trans Count */
 #define	SXP_TRAN_CNT_HI	(SXP_BLOCK+0x6A)	/* RW*: SCSI Trans Count */
 #define	SXP_TRAN_CTR_LO	(SXP_BLOCK+0x6C)	/* RW*: SCSI Trans Counter */
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index 4d0a70559b3..1c50e0b28bf 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lemac.c,v 1.3 2002/05/07 19:28:59 nate Exp $ */
+/* $OpenBSD: lemac.c,v 1.4 2003/10/21 18:58:49 jmc Exp $ */
 /* $NetBSD: lemac.c,v 1.20 2001/06/13 10:46:02 wiz Exp $ */
 
 /*-
@@ -153,7 +153,7 @@ lemac_rxd_intr(struct lemac_softc *sc, unsigned cs_value)
 	}
 
 	/*
-	 *  Error during initializion.  Mark card as disabled.
+	 *  Error during initialization.  Mark card as disabled.
 	 */
 	printf("%s: recovery failed -- board disabled\n", sc->sc_if.if_xname);
 }
@@ -410,7 +410,7 @@ lemac_read_macaddr(unsigned char *hwaddr, const bus_space_tag_t iot,
 	hwaddr[0] = bus_space_read_1(iot, ioh, ioreg);
 	hwaddr[1] = bus_space_read_1(iot, ioh, ioreg);
 
-	/* hardware adddress can't be multicast */
+	/* hardware address can't be multicast */
 	if (hwaddr[0] & 1)
 		return (-1);
 
diff --git a/sys/dev/ic/lemacreg.h b/sys/dev/ic/lemacreg.h
index 045b8cb5878..59403015cbd 100644
--- a/sys/dev/ic/lemacreg.h
+++ b/sys/dev/ic/lemacreg.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: lemacreg.h,v 1.1 2001/07/13 17:26:44 niklas Exp $ */
+/*      $OpenBSD: lemacreg.h,v 1.2 2003/10/21 18:58:49 jmc Exp $ */
 /*      $NetBSD: lemacreg.h,v 1.2 2001/06/13 10:46:03 wiz Exp $ */
 
 /*
@@ -121,7 +121,7 @@
 
 #define LEMAC_TX_ISA		0x01	/* Insert Source Address (no) */
 #define LEMAC_TX_IFC		0x02	/* Insert Frame Check (yes) */
-#define LEMAC_TX_PAD		0x04	/* Zero PAD to mininum length (yes) */
+#define LEMAC_TX_PAD		0x04	/* Zero PAD to minimum length (yes) */
 #define LEMAC_TX_LAB		0x08	/* Less Agressive Backoff (no) */
 #define LEMAC_TX_QMD		0x10	/* Q-Mode (yes) */
 #define LEMAC_TX_STP		0x20	/* Stop on Error (no) */
@@ -137,7 +137,7 @@
 #define	LEMAC_TDQ_NOCOL		0x00	/*   No Collisions */
 #define	LEMAC_TDQ_ONECOL	0x01	/*   One Collision */
 #define	LEMAC_TDQ_MULCOL	0x02	/*   Multiple Collisions */
-#define	LEMAC_TDQ_EXCCOL	0x03	/*   Excesive Collisions */
+#define	LEMAC_TDQ_EXCCOL	0x03	/*   Excessive Collisions */
 #define	LEMAC_TDQ_ID		0x04	/* Initially Deferred */
 #define	LEMAC_TDQ_LCL		0x08	/* Late Collision (will TX_STP) */
 #define	LEMAC_TDQ_NCL		0x10	/* No carrier loopback */
diff --git a/sys/dev/ic/lemacvar.h b/sys/dev/ic/lemacvar.h
index c3aac8cce9f..2cf7e0bd2cb 100644
--- a/sys/dev/ic/lemacvar.h
+++ b/sys/dev/ic/lemacvar.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: lemacvar.h,v 1.1 2001/07/13 17:26:44 niklas Exp $ */
+/*      $OpenBSD: lemacvar.h,v 1.2 2003/10/21 18:58:49 jmc Exp $ */
 /*      $NetBSD: lemacvar.h,v 1.6 2001/06/13 10:46:03 wiz Exp $ */
 
 /*
@@ -62,11 +62,11 @@ struct lemac_softc {
 	u_int16_t sc_mctbl[LEMAC_MCTBL_SIZE/sizeof(u_int16_t)];
 					/* local copy of multicast table */
 	struct {
-		unsigned cntr_txnospc;	/* total # of no trnasmit memory */
-		unsigned cntr_txfull;	/* total # of tranmitter full */
-		unsigned cntr_tne_intrs;/* total # of tranmit done intrs */
+		unsigned cntr_txnospc;	/* total # of no transmit memory */
+		unsigned cntr_txfull;	/* total # of transmitter full */
+		unsigned cntr_tne_intrs;/* total # of transmit done intrs */
 		unsigned cntr_rne_intrs;/* total # of receive done intrs */
-		unsigned cntr_txd_intrs;/* total # of tranmit error intrs */
+		unsigned cntr_txd_intrs;/* total # of transmit error intrs */
 		unsigned cntr_rxd_intrs;/* total # of receive error intrs */
 	} sc_cntrs;
 
diff --git a/sys/dev/ic/mb86960reg.h b/sys/dev/ic/mb86960reg.h
index dd58184469a..93af344566e 100644
--- a/sys/dev/ic/mb86960reg.h
+++ b/sys/dev/ic/mb86960reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mb86960reg.h,v 1.2 1996/10/31 01:01:33 niklas Exp $	*/
+/*	$OpenBSD: mb86960reg.h,v 1.3 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
 /*
  * Notes on register naming:
  *
- * Fujitsu documents for MB86960A/MB86965A uses no mnemorable names
+ * Fujitsu documents for MB86960A/MB86965A use no memorable names
  * for their registers.  They defined only three names for 32
  * registers and appended numbers to distinguish registers of
  * same name.  Surprisingly, the numbers represent I/O address
@@ -46,7 +46,7 @@
  * documents..
  */
 
-/* Data Link Control Registrs, on invaliant port addresses.  */
+/* Data Link Control Registers, on invaliant port addresses.  */
 #define FE_DLCR0	0
 #define FE_DLCR1	1
 #define FE_DLCR2	2
@@ -66,7 +66,7 @@
 #define FE_DLCR14	14
 #define FE_DLCR15	15
 
-/* Malticast Address Registers.  On register bank #1.  */
+/* Multicast Address Registers.  On register bank #1.  */
 #define FE_MAR8		8
 #define FE_MAR9		9
 #define FE_MAR10	10
@@ -97,9 +97,9 @@
 /*
  * Definitions of registers.
  * I don't have Fujitsu documents of MB86960A/MB86965A, so I don't
- * know the official names for each flags and fields.  The following
- * names are assigned by me (the author of this file,) since I cannot
- * mnemorize hexadecimal constants for all of these functions.
+ * know the official names for the flags and fields.  The following
+ * names are assigned by me (the author of this file), since I cannot
+ * memorize hexadecimal constants for all of these functions.
  * Comments?  FIXME.
  */
 
@@ -109,7 +109,7 @@
 #define FE_D0_COLLID	0x04	/* Collision on last transmission	*/
 #define FE_D0_JABBER	0x08	/* Jabber				*/
 #define FE_D0_CRLOST	0x10	/* Carrier lost on last transmission	*/
-#define FE_D0_PKTRCD	0x20	/* No corrision on last transmission	*/
+#define FE_D0_PKTRCD	0x20	/* No collision on last transmission	*/
 #define FE_D0_NETBSY	0x40	/* Network Busy (Carrier Detected)	*/
 #define FE_D0_TXDONE	0x80	/* Transmission complete		*/
 
@@ -172,7 +172,7 @@
 #define FE_D6_BBW	0x10	/* Buffer SRAM bus width		*/
 #define FE_D6_SBW	0x20	/* System bus width			*/
 #define FE_D6_SRAM	0x40	/* Buffer SRAM access time		*/
-#define FE_D6_DLC	0x80	/* Disable DLC (recever/transmitter)	*/
+#define FE_D6_DLC	0x80	/* Disable DLC (receiver/transmitter)	*/
 
 #define FE_D6_BUFSIZ_8KB	0x00	/* The board has  8KB SRAM	*/
 #define FE_D6_BUFSIZ_16KB	0x01	/* The board has 16KB SRAM	*/
diff --git a/sys/dev/ic/mc146818reg.h b/sys/dev/ic/mc146818reg.h
index 8a7c2785a9c..5bca19f0515 100644
--- a/sys/dev/ic/mc146818reg.h
+++ b/sys/dev/ic/mc146818reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mc146818reg.h,v 1.6 2002/03/14 01:26:54 millert Exp $	*/
+/*	$OpenBSD: mc146818reg.h,v 1.7 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: mc146818reg.h,v 1.1 1995/05/04 19:31:18 cgd Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
 
 /*
  * Definitions for the Motorola MC146818A Real Time Clock.
- * They also apply for the (compatible) Dallas Semicontuctor DS1287A RTC.
+ * They also apply for the (compatible) Dallas Semiconductor DS1287A RTC.
  *
  * Though there are undoubtedly other (better) sources, this material was
  * culled from the DEC "KN121 System Module Programmer's Reference
diff --git a/sys/dev/ic/mc6845.h b/sys/dev/ic/mc6845.h
index 328f8a4e387..c0b5782378b 100644
--- a/sys/dev/ic/mc6845.h
+++ b/sys/dev/ic/mc6845.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mc6845.h,v 1.3 2002/07/02 19:38:55 nate Exp $	*/
+/*	$OpenBSD: mc6845.h,v 1.4 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -69,7 +69,7 @@
 
 #define CRTC_RASCAS	0x32		/* ras/cas configuration */
 #define CRTC_EXTSTART	0x33		/* extended start address */
-#define CRTC_COMPAT6845	0x34		/* 6845 comatibility control */
+#define CRTC_COMPAT6845	0x34		/* 6845 compatibility control */
 #define CRTC_OVFLHIGH	0x35		/* overflow high */
 #define CRTC_SYSCONF1	0x36		/* video system configuration 1 */
 #define CRTC_SYSCONF2	0x36		/* video system configuration 2 */
diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index 0d7a0ae6874..e2e096f62fe 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midway.c,v 1.31 2003/10/04 01:03:48 deraadt Exp $	*/
+/*	$OpenBSD: midway.c,v 1.32 2003/10/21 18:58:49 jmc Exp $	*/
 /*	(sync'd to midway.c 1.68)	*/
 
 /*
@@ -198,7 +198,7 @@
 #define RX_NONE		0xffff	/* recv VC not in use */
 
 #define EN_OBHDR	ATM_PH_DRIVER7  /* TBD in first mbuf ! */
-#define EN_OBTRL	ATM_PH_DRIVER8  /* PDU trailier in last mbuf ! */
+#define EN_OBTRL	ATM_PH_DRIVER8  /* PDU trailer in last mbuf ! */
 
 #define ENOTHER_FREE	0x01		/* free rxslot */
 #define ENOTHER_DRAIN	0x02		/* almost free (drain DRQ dma) */
@@ -418,7 +418,7 @@ STATIC INLINE	void en_write(struct en_softc *, u_int32_t,
  * [1] short/inline functions
  * [2] autoconfig stuff
  * [3] ioctl stuff
- * [4] reset -> init -> trasmit -> intr -> receive functions
+ * [4] reset -> init -> transmit -> intr -> receive functions
  *
  */
 
@@ -1753,7 +1753,7 @@ struct mbuf **mm, *prev;
 
 
 /*
- * en_txdma: start trasmit DMA, if possible
+ * en_txdma: start transmit DMA, if possible
  */
 
 STATIC void en_txdma(sc, chan)
@@ -1817,7 +1817,7 @@ again:
 
   if ((launch.atm_flags & EN_OBHDR) == 0) {
     dtqneed = 1;		/* header still needs to be added */
-    launch.need = MID_TBD_SIZE;	/* not includeded with mbuf */
+    launch.need = MID_TBD_SIZE;	/* not included with mbuf */
   } else {
     dtqneed = 0;		/* header on-board, dma with mbuf */
     launch.need = 0;
@@ -2020,7 +2020,7 @@ struct en_launch *l;
 
 #ifdef EN_DIAG
   if ((need - MID_TBD_SIZE) % MID_ATMDATASZ) 
-    printf("%s: tx%d: bogus trasmit needs (%d)\n", sc->sc_dev.dv_xname, chan,
+    printf("%s: tx%d: bogus transmit needs (%d)\n", sc->sc_dev.dv_xname, chan,
 		need);
 #endif
 #ifdef EN_DEBUG
@@ -2315,7 +2315,7 @@ struct en_launch *l;
   }
 
   if (addtail || dma != cur) {
-   /* write final descritor  */
+   /* write final descriptor  */
     EN_DTQADD(sc, WORD_IDX(start,cur), chan, MIDDMA_JK, 0, 
 				l->mlen, MID_DMA_END);
     /* dma = cur; */ 	/* not necessary since we are done */
@@ -2399,7 +2399,7 @@ void *arg;
 	else
 	  sc->txslot[lcv].bfree = (val + (EN_TXSZ*1024)) - sc->txslot[lcv].cur;
 #ifdef EN_DEBUG
-	printf("%s: tx%d: trasmit done.   %d bytes now free in buffer\n",
+	printf("%s: tx%d: transmit done.   %d bytes now free in buffer\n",
 		sc->sc_dev.dv_xname, lcv, sc->txslot[lcv].bfree);
 #endif
       }
@@ -3077,7 +3077,7 @@ int unit, level;
       printf("    %d times we ran out of mbufs *and* DRQs\n", sc->rxoutboth);
       printf("    %d times we ran out of DRQs\n", sc->rxdrqout);
 
-      printf("    %d trasmit packets dropped due to mbsize\n", sc->txmbovr);
+      printf("    %d transmit packets dropped due to mbsize\n", sc->txmbovr);
       printf("    %d cells trashed due to turned off rxvc\n", sc->vtrash);
       printf("    %d cells trashed due to totally full buffer\n", sc->otrash);
       printf("    %d cells trashed due almost full buffer\n", sc->ttrash);
diff --git a/sys/dev/ic/midwayreg.h b/sys/dev/ic/midwayreg.h
index e18aca797c1..47cd4c9c670 100644
--- a/sys/dev/ic/midwayreg.h
+++ b/sys/dev/ic/midwayreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midwayreg.h,v 1.8 1999/06/06 15:39:16 deraadt Exp $	*/
+/*	$OpenBSD: midwayreg.h,v 1.9 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * m i d w a y r e g . h
@@ -208,7 +208,7 @@ typedef caddr_t bus_addr_t;
 				/* convert byte offset to reg value */
 #define MID_DRQ_REG2A(N)	(((N) << 3) + MID_DRQOFF) /* and back */
 
-/* note: format of word 1 of RXQ is different beween ENI and ADP cards */
+/* note: format of word 1 of RXQ is different between ENI and ADP cards */
 #define MID_MK_RXQ_ENI(CNT,VC,END,TYPE) \
 	( ((CNT) << 16)|((VC) << 6)|(END)|(TYPE) )
 
@@ -224,7 +224,7 @@ typedef caddr_t bus_addr_t;
 #define MID_DTQ_REG2A(N)	(((N) << 3) + MID_DTQOFF) /* and back */
 
 
-/* note: format of word 1 of TXQ is different beween ENI and ADP cards */
+/* note: format of word 1 of TXQ is different between ENI and ADP cards */
 #define MID_MK_TXQ_ENI(CNT,CHN,END,TYPE) \
 	( ((CNT) << 16)|((CHN) << 6)|(END)|(TYPE) )
 
diff --git a/sys/dev/ic/midwayvar.h b/sys/dev/ic/midwayvar.h
index 026ca46d4fb..a4a4e920e25 100644
--- a/sys/dev/ic/midwayvar.h
+++ b/sys/dev/ic/midwayvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midwayvar.h,v 1.11 2002/03/15 01:20:04 millert Exp $	*/
+/*	$OpenBSD: midwayvar.h,v 1.12 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  *
@@ -50,7 +50,7 @@
 #define EN_NTX          8       /* number of tx bufs to use */
 #endif
 #ifndef EN_TXSZ
-#define EN_TXSZ         32      /* trasmit buf size in KB */
+#define EN_TXSZ         32      /* transmit buf size in KB */
 #endif
 #ifndef EN_RXSZ
 #define EN_RXSZ         32      /* recv buf size in KB */
diff --git a/sys/dev/ic/mtd8xx.c b/sys/dev/ic/mtd8xx.c
index dc65aed9c1a..bc985ffbfa9 100644
--- a/sys/dev/ic/mtd8xx.c
+++ b/sys/dev/ic/mtd8xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtd8xx.c,v 1.1 2003/09/25 22:05:59 mickey Exp $	*/
+/*	$OpenBSD: mtd8xx.c,v 1.2 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru>
@@ -1010,7 +1010,7 @@ mtd_rx_resync(sc)
 	if (i == MTD_RX_LIST_CNT)
 		return (0);
 
-	/* We've fallen behing the chip: catch it. */
+	/* We've fallen behind the chip: catch it. */
 	sc->mtd_cdata.mtd_rx_prod = pos;
 
 	return (EAGAIN);
diff --git a/sys/dev/ic/mtd8xxreg.h b/sys/dev/ic/mtd8xxreg.h
index ee8ef7ea075..f1a18f3990d 100644
--- a/sys/dev/ic/mtd8xxreg.h
+++ b/sys/dev/ic/mtd8xxreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtd8xxreg.h,v 1.1 2003/09/25 22:05:59 mickey Exp $	*/
+/*	$OpenBSD: mtd8xxreg.h,v 1.2 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru>
@@ -108,7 +108,7 @@
 
 
 /*
- * Bus confiruration register.
+ * Bus configuration register.
  */
 #define BCR_PROG	0x00000200U	/* Programming */
 #define BCR_RLE		0x00000100U	/* Read line cmd enable */
@@ -133,7 +133,7 @@
 #define ISR_RFCON	0x00020000U	/* Receive flow control XON */
 #define ISR_RFCOFF	0x00010000U	/* Receive flow control XOFF */
 #define ISR_LSC		0x00008000U	/* Link status change */
-#define ISR_ANC		0x00004000U	/* Auto-negatiation completed */
+#define ISR_ANC		0x00004000U	/* Auto-negotiation completed */
 #define ISR_FBE		0x00002000U	/* Fatal bus error */
 #define ISR_ETMASK	0x00001800U	/* Error type mask */
 #define ISR_ET(x)	((x) & ISR_ETMASK)
@@ -161,7 +161,7 @@
 #define IMR_MRFCON	0x00020000U	/* Receive flow control XON */
 #define IMR_MRFCOFF	0x00010000U	/* Receive flow control XOFF */
 #define IMR_MLSC	0x00008000U	/* Link status change */
-#define IMR_MANC	0x00004000U	/* Auto-negatiation completed */
+#define IMR_MANC	0x00004000U	/* Auto-negotiation completed */
 #define IMR_MFBE	0x00002000U	/* Fatal bus error */
 #define IMR_MTUNF	0x00000400U	/* Transmit underflow */
 #define IMR_MROVF	0x00000200U	/* Receive overflow */
diff --git a/sys/dev/ic/mtd8xxvar.h b/sys/dev/ic/mtd8xxvar.h
index 959e85c8f3e..022563c2a24 100644
--- a/sys/dev/ic/mtd8xxvar.h
+++ b/sys/dev/ic/mtd8xxvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtd8xxvar.h,v 1.1 2003/09/25 22:05:59 mickey Exp $	*/
+/*	$OpenBSD: mtd8xxvar.h,v 1.2 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru>
@@ -47,7 +47,7 @@ struct mtd_tx_desc {
 #define TSW_CSL		0x00001000U	/* Carrier sense lost */
 #define TSW_LC		0x00000800U	/* Late collision occurs */
 #define TSW_EC		0x00000400U	/* Excessive collisions */
-#define TSW_DFR		0x00000200U	/* Deffered */
+#define TSW_DFR		0x00000200U	/* Deferred */
 #define TSW_HF		0x00000100U	/* Heart beat failure */
 #define TSW_NCR_MASK	0x000000FFU
 #define TSW_NCR_SHIFT	0
@@ -80,7 +80,7 @@ struct mtd_tx_desc {
  */
 struct mtd_rx_desc {
 	u_int32_t	rd_rsr;		/* Receive status register */
-#define RSR_OWN		0x80000000U	/* Decriptor owned by NIC */
+#define RSR_OWN		0x80000000U	/* Descriptor owned by NIC */
 #define RSR_FLNG_MASK	0x0FFF0000U
 #define RSR_FLNG_SHIFT	16
 #define RSR_FLNG_GET(x)	(((x) & RSR_FLNG_MASK) >> RSR_FLNG_SHIFT)
diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index 68c81ee8e09..e39361e5ef8 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380sbc.c,v 1.16 2002/06/14 21:34:59 todd Exp $	*/
+/*	$OpenBSD: ncr5380sbc.c,v 1.17 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $	*/
 
 /*
@@ -1100,7 +1100,7 @@ ncr5380_reselect(sc)
 	 * then raise SEL, and finally drop BSY.  Only then is the
 	 * data bus required to have valid selection ID bits set.
 	 * Wait for: SEL==1, BSY==0 before reading the data bus.
-	 * While this theoretically can happen, we are aparently
+	 * While this theoretically can happen, we are apparently
 	 * never fast enough to get here before BSY drops.
 	 */
 	timo = ncr5380_wait_nrq_timo;
diff --git a/sys/dev/ic/ncr5380var.h b/sys/dev/ic/ncr5380var.h
index 280ca090477..adb27b51ab1 100644
--- a/sys/dev/ic/ncr5380var.h
+++ b/sys/dev/ic/ncr5380var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380var.h,v 1.9 2003/02/24 00:41:51 miod Exp $	*/
+/*	$OpenBSD: ncr5380var.h,v 1.10 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: ncr5380var.h,v 1.6 1996/05/10 18:04:06 gwr Exp $	*/
 
 /*
@@ -35,7 +35,7 @@
 
 /*
  * This file defines the interface between the machine-dependent
- * module and the machine-indepenedent ncr5380sbc.c module.
+ * module and the machine-independent ncr5380sbc.c module.
  */
 
 #define SCI_CLR_INTR(sc)	(*(sc)->sci_iack)
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index ce7fe181ec0..54d78b9dd67 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9x.c,v 1.20 2003/07/25 03:35:13 jason Exp $	*/
+/*	$OpenBSD: ncr53c9x.c,v 1.21 2003/10/21 18:58:49 jmc Exp $	*/
 /*     $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $    */
 
 /*
@@ -149,7 +149,7 @@ struct cfdriver esp_cd = {
 };
 
 /*
- * Names for the NCR53c9x variants, correspnding to the variant tags
+ * Names for the NCR53c9x variants, corresponding to the variant tags
  * in ncr53c9xvar.h.
  */
 const char *ncr53c9x_variant_names[] = {
@@ -869,7 +869,7 @@ ncr53c9x_poll(sc, xs, count)
 /*
  * Schedule a scsi operation.  This has now been pulled out of the interrupt
  * handler so that we may call it from ncr53c9x_scsi_cmd and ncr53c9x_done.
- * This may save us an unecessary interrupt just to get things going.
+ * This may save us an unnecessary interrupt just to get things going.
  * Should only be called when state == NCR_IDLE and at bio pl.
  */
 void
@@ -1682,7 +1682,7 @@ gotit:
 
 	case NCR_IDENTIFIED:
 		/*
-		 * IDENTIFY message was recived and queue tag is expected now
+		 * IDENTIFY message was received and queue tag is expected now
 		 */
 		if ((sc->sc_imess[0] != MSG_SIMPLE_Q_TAG) ||
 		    (sc->sc_msgify == 0)) {
diff --git a/sys/dev/ic/ncr53c9xreg.h b/sys/dev/ic/ncr53c9xreg.h
index ee33491ee48..e889999dbaa 100644
--- a/sys/dev/ic/ncr53c9xreg.h
+++ b/sys/dev/ic/ncr53c9xreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9xreg.h,v 1.8 2003/06/05 12:27:02 deraadt Exp $	*/
+/*	$OpenBSD: ncr53c9xreg.h,v 1.9 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: ncr53c9xreg.h,v 1.4 1997/05/17 20:56:55 pk Exp $	*/
 
 /*
@@ -235,9 +235,9 @@
 #define  NCRCFG5_AADDR	0x20		/*	Auto Address		*/
 #define  NCRCFG5_PTRINC	0x10		/*	Pointer Increment	*/
 #define  NCRCFG5_LOWPWR	0x08		/*	Low Power Mode		*/
-#define  NCRCFG5_SINT	0x04		/*	SCSI Interupt Enable	*/
+#define  NCRCFG5_SINT	0x04		/*	SCSI Interrupt Enable	*/
 #define  NCRCFG5_INTP	0x02		/*	INT Polarity		*/
-#define  NCRCFG5_AINT	0x01		/*	ATA Interupt Enable	*/
+#define  NCRCFG5_AINT	0x01		/*	ATA Interrupt Enable	*/
 
 #define	NCR_SIGNTR	0x0e		/* RO - Signature		*/
 
diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h
index eec49ca9aac..8c7cba97abf 100644
--- a/sys/dev/ic/ncr53c9xvar.h
+++ b/sys/dev/ic/ncr53c9xvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9xvar.h,v 1.13 2003/06/05 12:27:02 deraadt Exp $	*/
+/*	$OpenBSD: ncr53c9xvar.h,v 1.14 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: ncr53c9xvar.h,v 1.13 1998/05/26 23:17:34 thorpej Exp $	*/
 
 /*-
@@ -424,7 +424,7 @@ struct ncr53c9x_softc {
 
 /*
  * Macro to convert the chip register Clock Per Byte value to
- * Sunchronous Transfer Period.
+ * Synchronous Transfer Period.
  */
 #define	ncr53c9x_cpb2stp(sc, cpb)	\
 	((250 * (cpb)) / (sc)->sc_freq)
diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c
index 4534e741c57..cbeb87f127c 100644
--- a/sys/dev/ic/ne2000.c
+++ b/sys/dev/ic/ne2000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ne2000.c,v 1.12 2002/03/14 01:26:55 millert Exp $	*/
+/*	$OpenBSD: ne2000.c,v 1.13 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: ne2000.c,v 1.12 1998/06/10 01:15:50 thorpej Exp $	*/
 
 /*-
@@ -342,7 +342,7 @@ ne2000_detect(nsc)
 	delay(5000);
 
 	/*
-	 * Generic probe routine for testing for the existance of a DS8390.
+	 * Generic probe routine for testing for the existence of a DS8390.
 	 * Must be performed  after the NIC has just been reset.  This
 	 * works by looking at certain register values that are guaranteed
 	 * to be initialized a certain way after power-up or reset.
diff --git a/sys/dev/ic/nslm7xvar.h b/sys/dev/ic/nslm7xvar.h
index 02f3e92ddd4..f0433b1d30b 100644
--- a/sys/dev/ic/nslm7xvar.h
+++ b/sys/dev/ic/nslm7xvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nslm7xvar.h,v 1.3 2003/08/05 13:42:36 couderc Exp $	*/
+/*	$OpenBSD: nslm7xvar.h,v 1.4 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: nslm7xvar.h,v 1.10 2002/11/15 14:55:42 ad Exp $ */
 
 /*-
@@ -70,7 +70,7 @@
 #define LM_ID_MASK	0xFE
 
 /*
- * additionnal registers for the Winbond chips:
+ * additional registers for the Winbond chips:
  * WB83781D: mostly lm7x compatible; extra temp sensors in bank1 & 2
  * WB83782D & WB83627HF: voltage sensors needs different handling, more FAN
  *                       dividers; mode voltage sensors, more temp sensors.
diff --git a/sys/dev/ic/opl.c b/sys/dev/ic/opl.c
index 390615b9f0b..02704e044e7 100644
--- a/sys/dev/ic/opl.c
+++ b/sys/dev/ic/opl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opl.c,v 1.5 2003/08/11 10:34:06 mickey Exp $	*/
+/*	$OpenBSD: opl.c,v 1.6 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: opl.c,v 1.7 1998/12/08 14:26:56 augustss Exp $	*/
 
 /*
@@ -205,7 +205,7 @@ opl_find(sc)
 	u_int8_t status1, status2;
 
 	DPRINTFN(2,("opl_find: ioh=0x%x\n", (int)sc->ioh));
-	sc->model = OPL_2;	/* worst case assumtion */
+	sc->model = OPL_2;	/* worst case assumption */
 
 	/* Reset timers 1 and 2 */
 	opl_command(sc, OPL_L, OPL_TIMER_CONTROL, 
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index 8811c786a43..4c25b584e3c 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop.c,v 1.17 2003/09/29 09:08:19 miod Exp $	*/
+/*	$OpenBSD: osiop.c,v 1.18 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $	*/
 
 /*
@@ -114,7 +114,7 @@ void osiop_update_xfer_mode(struct osiop_softc *, int);
 void scsi_period_to_osiop(struct osiop_softc *, int);
 void osiop_timeout(void *);
 
-int osiop_reset_delay = 250;	/* delay after reset, in milleseconds */
+int osiop_reset_delay = 250;	/* delay after reset, in milliseconds */
 
 /* #define OSIOP_DEBUG */
 #ifdef OSIOP_DEBUG
@@ -1010,7 +1010,7 @@ osiop_start(sc)
 	/*
 	 * Negotiate wide is the initial negotiation state;  since the 53c710
 	 * doesn't do wide transfers, just begin the synchronous transfer
-	 * negotation here.
+	 * negotiation here.
 	 */
 	if (ti->state == NEG_INIT) {
 		if ((ti->flags & TI_NOSYNC) != 0) {
diff --git a/sys/dev/ic/osiopreg.h b/sys/dev/ic/osiopreg.h
index 18eb7bcf777..e8a1a103c54 100644
--- a/sys/dev/ic/osiopreg.h
+++ b/sys/dev/ic/osiopreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiopreg.h,v 1.3 2003/06/02 23:28:02 millert Exp $	*/
+/*	$OpenBSD: osiopreg.h,v 1.4 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: osiopreg.h,v 1.1 2001/04/30 04:47:51 tsutsui Exp $	*/
 
 /*
@@ -283,7 +283,7 @@
 #define OSIOP_CTEST4_MUX	0x80	/* Host bus multiplex mode */
 #define OSIOP_CTEST4_ZMOD	0x40	/* High-impedance outputs */
 #define OSIOP_CTEST4_SZM	0x20	/* ditto, SCSI "outputs" */
-#define OSIOP_CTEST4_SLBE	0x10	/* SCSI loobpack enable */
+#define OSIOP_CTEST4_SLBE	0x10	/* SCSI loopback enable */
 #define OSIOP_CTEST4_SFWR	0x08	/* SCSI FIFO write enable (from sodl) */
 #define OSIOP_CTEST4_FBL	0x07	/* DMA FIFO Byte Lane select
 					   (from ctest6) 4->0, .. 7->3 */
diff --git a/sys/dev/ic/osiopvar.h b/sys/dev/ic/osiopvar.h
index c2b8ae6e683..1c47f8249f9 100644
--- a/sys/dev/ic/osiopvar.h
+++ b/sys/dev/ic/osiopvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiopvar.h,v 1.7 2003/06/26 00:40:53 mickey Exp $	*/
+/*	$OpenBSD: osiopvar.h,v 1.8 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: osiopvar.h,v 1.3 2002/05/14 02:58:35 matt Exp $	*/
 
 /*
@@ -116,7 +116,7 @@ struct osiop_ds {
 	u_int32_t pad[1+4];		/* pad to 256 bytes */
 } __attribute__((__packed__));
 
-/* status can hold the SCSI_* status values, and 2 additionnal values: */
+/* status can hold the SCSI_* status values, and 2 additional values: */
 #define SCSI_OSIOP_NOCHECK	0xfe	/* don't check the scsi status */
 #define SCSI_OSIOP_NOSTATUS	0xff	/* device didn't report status */
 
@@ -245,8 +245,8 @@ struct osiop_softc {
 /* negotiation states */
 #define NEG_INIT	0	/* Initial negotiate state */
 #define NEG_SYNC	NEG_INIT /* Negotiate synch transfers */
-#define NEG_WAITS	1	/* Waiting for synch negoation response */
-#define NEG_DONE	2	/* Wide and/or sync negotation done */
+#define NEG_WAITS	1	/* Waiting for synch negotiation response */
+#define NEG_DONE	2	/* Wide and/or sync negotiation done */
 
 void osiop_attach(struct osiop_softc *);
 void osiop_intr(struct osiop_softc *);
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index 8656055b285..8863689ac89 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc.c,v 1.6 2003/03/13 01:06:58 drahn Exp $ */
+/* $OpenBSD: pckbc.c,v 1.7 2003/10/21 18:58:49 jmc Exp $ */
 /* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
 
 /*
@@ -743,7 +743,7 @@ pckbc_start(t, slot)
 }
 
 /*
- * Handle command responses coming in asynchonously,
+ * Handle command responses coming in asynchronously,
  * return nonzero if valid response.
  * to be called at spltty()
  */
diff --git a/sys/dev/ic/rtl80x9reg.h b/sys/dev/ic/rtl80x9reg.h
index fdc75bc39d8..67f047c977a 100644
--- a/sys/dev/ic/rtl80x9reg.h
+++ b/sys/dev/ic/rtl80x9reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl80x9reg.h,v 1.1 1998/11/06 06:34:36 fgsch Exp $	*/
+/*	$OpenBSD: rtl80x9reg.h,v 1.2 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: rtl80x9reg.h,v 1.2 1998/10/31 00:31:43 thorpej Exp $	*/
 
 /*-
@@ -73,7 +73,7 @@
 #define	RTL3_EECR_EEDI		0x02	/* EEPROM Data In */
 #define	RTL3_EECR_EEDO		0x01	/* EEPROM Data Out */
 
-#define	NERTL_RTL3_BPAGE	0x02	/* BROM Page Regiseter (8019) */
+#define	NERTL_RTL3_BPAGE	0x02	/* BROM Page Register (8019) */
 
 #define	NERTL_RTL3_CONFIG0	0x03	/* Configuration 0 (ro) */
 #define	RTL3_CONFIG0_JP		0x08	/* jumper mode (8019) */
@@ -141,7 +141,7 @@
 #define	RTL3_CONFIG3_LEDS1	0x20	/* LED1/2 pin configuration */
 					/* 0 LED1 == LED_RX, LED2 == LED_TX */
 					/* 1 LED1 == LED_CRS, LED2 == MCSB */
-#define	RTL3_CONFIG3_LEDS0	0x10	/* LED0 pin configration */
+#define	RTL3_CONFIG3_LEDS0	0x10	/* LED0 pin configuration */
 					/* 0 LED0 pin == LED_COL */
 					/* 1 LED0 pin == LED_LINK */
 #define	RTL3_CONFIG3_SLEEP	0x04	/* Sleep mode */
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 6d4844ce1ac..8d5649ba8f6 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl81x9.c,v 1.21 2003/10/01 23:37:12 fgsch Exp $ */
+/*	$OpenBSD: rtl81x9.c,v 1.22 2003/10/21 18:58:49 jmc Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -594,7 +594,7 @@ rl_list_tx_init(sc)
  * attempt to document it here. The driver provides a buffer area and
  * places its base address in the RX buffer start address register.
  * The chip then begins copying frames into the RX buffer. Each frame
- * is preceeded by a 32-bit RX status word which specifies the length
+ * is preceded by a 32-bit RX status word which specifies the length
  * of the frame and certain other status bits. Each frame (starting with
  * the status word) is also 32-bit aligned. The frame length is in the
  * first 16 bits of the status word; the lower 15 bits correspond with
@@ -607,7 +607,7 @@ rl_list_tx_init(sc)
  * The reason we do this is because m_devget() doesn't let us specify an
  * offset into the mbuf storage space, so we have to artificially create
  * one. The ring is allocated in such a way that there are a few unused
- * bytes of space preceecing it so that it will be safe for us to do the
+ * bytes of space preceding it so that it will be safe for us to do the
  * 2-byte backstep even if reading from the ring at offset 0.
  */
 void
@@ -871,7 +871,7 @@ int rl_encap(sc, m_head)
 	/* Pad frames to at least 60 bytes. */
 	if (m_head->m_pkthdr.len < RL_MIN_FRAMELEN) {
 		/*
-		 * Make security concious people happy: zero out the
+		 * Make security-conscious people happy: zero out the
 		 * bytes in the pad area, since we don't know what
 		 * this mbuf cluster buffer's previous user might
 		 * have left in it.
@@ -1362,7 +1362,7 @@ rl_miibus_readreg(self, phy, reg)
 
 	if (sc->rl_type == RL_8139) {
 		/*
-		* The RTL8139 PHY is mapped into PCI registers, unforunately
+		* The RTL8139 PHY is mapped into PCI registers, unfortunately
 		* it has no phyid, or phyaddr, so assume it is phyaddr 0.
 		*/
 		if (phy != 0)
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index 1994b9a6593..733b1b4128d 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop.c,v 1.30 2003/10/09 17:32:42 mickey Exp $ */
+/*	$OpenBSD: siop.c,v 1.31 2003/10/21 18:58:49 jmc Exp $ */
 /*	$NetBSD: siop.c,v 1.65 2002/11/08 22:04:41 bouyer Exp $	*/
 
 /*
@@ -456,7 +456,7 @@ siop_intr(v)
 		if (istat & ISTAT_DIP)
 			delay(10);
 		/*
-		 * Can't read sist0 & sist1 independantly, or we have to
+		 * Can't read sist0 & sist1 independently, or we have to
 		 * insert delay
 		 */
 		sist = bus_space_read_2(sc->sc_c.sc_rt, sc->sc_c.sc_rh,
@@ -599,7 +599,7 @@ siop_intr(v)
 			    SIOP_DSP) - 8);
 			return 1;
 		}
-		/* Else it's an unhandled exeption (for now). */
+		/* Else it's an unhandled exception (for now). */
 		printf("%s: unhandled scsi interrupt, sist=0x%x sstat1=0x%x "
 		    "DSA=0x%x DSP=0x%x\n", sc->sc_c.sc_dev.dv_xname,
 		    sist, sstat1,
@@ -1172,7 +1172,7 @@ siop_handle_qtag_reject(siop_cmd)
 
 /*
  * handle a bus reset: reset chip, unqueue all active commands, free all
- * target struct and report loosage to upper layer.
+ * target struct and report lossage to upper layer.
  * As the upper layer may requeue immediatly we have to first store
  * all active commands in a temporary queue.
  */
@@ -1193,7 +1193,7 @@ siop_handle_reset(sc)
 	siop_reset(sc);
 	TAILQ_INIT(&reset_list);
 	/*
-	 * Process all commands: first commmands being executed
+	 * Process all commands: first commands being executed
 	 */
 	for (target = 0; target < sc->sc_c.sc_link.adapter_buswidth;
 	    target++) {
@@ -1989,7 +1989,7 @@ siop_add_dev(sc, target, lun)
 	ntargets =  (sc->sc_c.sc_link.adapter_buswidth - 1) - 1 - sc->sc_ntargets;
 
 	/*
-	 * we need 8 bytes for the lun sw additionnal entry, and
+	 * we need 8 bytes for the lun sw additional entry, and
 	 * eventually sizeof(tag_switch) for the tag switch entry.
 	 * Keep enough free space for the free targets that could be
 	 * probed later.
diff --git a/sys/dev/ic/siopreg.h b/sys/dev/ic/siopreg.h
index 632982be484..57bc43536f7 100644
--- a/sys/dev/ic/siopreg.h
+++ b/sys/dev/ic/siopreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siopreg.h,v 1.6 2003/02/11 19:20:27 mickey Exp $ */
+/*	$OpenBSD: siopreg.h,v 1.7 2003/10/21 18:58:49 jmc Exp $ */
 /*	$NetBSD: siopreg.h,v 1.13 2002/08/29 16:43:23 bouyer Exp $	*/
 
 /*
@@ -117,7 +117,7 @@ static const struct scf_period dt_scf_period[] __attribute__((__unused__)) = {
 #define SXFER_MO_SHIFT  0
 #define SXFER_MO_MASK  0x3f
 
-#define SIOP_SDID	0x06 /* SCSI destiation ID, R/W */
+#define SIOP_SDID	0x06 /* SCSI destination ID, R/W */
 #define SDID_ENCID_SHIFT 0
 #define SDID_ENCID_MASK	0x07
 
@@ -299,7 +299,7 @@ static const struct scf_period dt_scf_period[] __attribute__((__unused__)) = {
 #define SIST0_RST	0x02
 #define SIST0_PAR	0x01
 
-#define SIOP_SIST1	0x43 /* SCSI interrut status 1, RO */
+#define SIOP_SIST1	0x43 /* SCSI interrupt status 1, RO */
 #define SIST1_SBMC	0x10 /* 895 only */
 #define SIST1_STO	0x04
 #define SIST1_GEN	0x02
diff --git a/sys/dev/ic/siopvar.h b/sys/dev/ic/siopvar.h
index 99d7497c05d..746a3dd3249 100644
--- a/sys/dev/ic/siopvar.h
+++ b/sys/dev/ic/siopvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siopvar.h,v 1.8 2003/10/14 22:37:48 krw Exp $ */
+/*	$OpenBSD: siopvar.h,v 1.9 2003/10/21 18:58:49 jmc Exp $ */
 /*	$NetBSD: siopvar.h,v 1.18 2002/04/23 20:41:15 bouyer Exp $ */
 
 /*
@@ -48,8 +48,8 @@ struct siop_xfer {
 } __attribute__((__packed__));
 
 /*
- * This decribes a command handled by the SCSI controller
- * These are chained in either a free list or a active list
+ * This describes a command handled by the SCSI controller
+ * These are chained in either a free list or an active list
  * We have one queue per target
  */
 
@@ -137,7 +137,7 @@ struct siop_softc {
 };
 
 /* defs for sc_flags */
-#define SCF_CHAN_NOSLOT	0x0001		/* channel out of sheduler slot */
+#define SCF_CHAN_NOSLOT	0x0001		/* channel out of scheduler slot */
 
 void    siop_attach(struct siop_softc *);
 int	siop_intr(void *);
diff --git a/sys/dev/ic/siopvar_common.h b/sys/dev/ic/siopvar_common.h
index 36fc6f74fb3..9c3762c1245 100644
--- a/sys/dev/ic/siopvar_common.h
+++ b/sys/dev/ic/siopvar_common.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siopvar_common.h,v 1.16 2003/10/14 22:37:48 krw Exp $ */
+/*	$OpenBSD: siopvar_common.h,v 1.17 2003/10/21 18:58:49 jmc Exp $ */
 /*	$NetBSD: siopvar_common.h,v 1.22 2002/10/23 02:32:36 christos Exp $ */
 
 /*
@@ -68,12 +68,12 @@ struct siop_common_xfer {
 	scr_table_t data[SIOP_NSG]; 	/* 104 */
 } __attribute__((__packed__));
 
-/* status can hold the SCSI_* status values, and 2 additionnal values: */
+/* status can hold the SCSI_* status values, and 2 additional values: */
 #define SCSI_SIOP_NOCHECK	0xfe	/* don't check the scsi status */
 #define SCSI_SIOP_NOSTATUS	0xff	/* device didn't report status */
 
 /*
- * This decribes a command handled by the SCSI controller
+ * This describes a command handled by the SCSI controller
  */
 struct siop_common_cmd {
 	struct siop_common_softc *siop_sc; /* points back to our adapter */
@@ -141,13 +141,13 @@ struct siop_common_softc {
 	int mode;			/* current SE/LVD/HVD mode */
 	bus_space_tag_t sc_rt;		/* bus_space registers tag */
 	bus_space_handle_t sc_rh;	/* bus_space registers handle */
-	bus_addr_t sc_raddr;		/* register adresses */
+	bus_addr_t sc_raddr;		/* register addresses */
 	bus_space_tag_t sc_ramt;	/* bus_space ram tag */
 	bus_space_handle_t sc_ramh;	/* bus_space ram handle */
 	bus_dma_tag_t sc_dmat;		/* bus DMA tag */
 	void (*sc_reset)(struct siop_common_softc*); /* reset callback */
 	bus_dmamap_t  sc_scriptdma;	/* DMA map for script */
-	bus_addr_t sc_scriptaddr;	/* on-board ram or physical adress */
+	bus_addr_t sc_scriptaddr;	/* on-board ram or physical address */
 	u_int32_t *sc_script;		/* script location in memory */
 	struct siop_common_target *targets[16]; /* per-target states */
 };
@@ -164,7 +164,7 @@ struct siop_common_softc {
 #define SF_CHIP_DBLR	0x00000400 /* clock doubler or quadrupler */
 #define SF_CHIP_QUAD	0x00000800 /* clock quadrupler, with PPL */
 #define SF_CHIP_FIFO	0x00001000 /* large fifo */
-#define SF_CHIP_PF	0x00002000 /* Intructions prefetch */
+#define SF_CHIP_PF	0x00002000 /* Instructions prefetch */
 #define SF_CHIP_RAM	0x00004000 /* on-board RAM */
 #define SF_CHIP_LS	0x00008000 /* load/store instruction */
 #define SF_CHIP_10REGS	0x00010000 /* 10 scratch registers */
diff --git a/sys/dev/ic/smc90cx6.c b/sys/dev/ic/smc90cx6.c
index 0071c53e2ca..3f37f7c967e 100644
--- a/sys/dev/ic/smc90cx6.c
+++ b/sys/dev/ic/smc90cx6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc90cx6.c,v 1.5 2002/03/14 01:26:55 millert Exp $ */
+/*	$OpenBSD: smc90cx6.c,v 1.6 2003/10/21 18:58:49 jmc Exp $ */
 /*	$NetBSD: smc90cx6.c,v 1.17 1996/05/07 01:43:18 thorpej Exp $ */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 /*
- * Driver for the Commodore Busines Machines ARCnet card.
+ * Driver for the Commodore Business Machines ARCnet card.
  */
 
 #define BAHASMCOPY /**/
@@ -524,7 +524,7 @@ movepout(from, to, len)
 /*
  * Start output on interface. Get another datagram to send
  * off the interface queue, and copy it to the
- * interface becore starting the output
+ * interface before starting the output.
  *
  * this assumes that it is called inside a critical section...
  * XXX hm... does it still?
@@ -900,7 +900,7 @@ cleanup:
 		sc->sc_rx_act = buffer;
 		sc->sc_intmask |= ARC_RI;
 
-		/* this also clears the RI flag interupt: */
+		/* this also clears the RI flag interrupt: */
 		sc->sc_base->command = ARC_RXBC(buffer);
 		sc->sc_base->status = sc->sc_intmask;
 
@@ -929,7 +929,7 @@ bah_tint(sc, isr)
 
 	/*
 	 * retransmit code:  
-	 * Normal situtations first for fast path:
+	 * Normal situations first for fast path:
 	 * If acknowledgement received ok or broadcast, we're ok.
 	 * else if 
 	 */ 
@@ -1110,7 +1110,7 @@ bahintr(sc)
 
 			/*
 			 * Start receiver on other receive buffer.
-			 * This also clears the RI interupt flag.
+			 * This also clears the RI interrupt flag.
 			 */
 			sc->sc_base->command = ARC_RXBC(buffer);
 			/* we are in the RX intr, so mask is ok for RX */
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index 5206c4bf907..bc30a516f52 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc91cxx.c,v 1.16 2002/06/07 01:07:22 itojun Exp $	*/
+/*	$OpenBSD: smc91cxx.c,v 1.17 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $	*/
 
 /*-
@@ -357,7 +357,7 @@ smc91cxx_init(sc)
 	s = splnet();
 
 	/*
-	 * This resets the registersmostly to defaults, but doesn't
+	 * This resets the registers mostly to defaults, but doesn't
 	 * affect the EEPROM.  After the reset cycle, we pause briefly
 	 * for the chip to recover.
 	 *
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index 310442f4f01..804813876a6 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti.c,v 1.33 2003/08/21 18:06:56 mickey Exp $	*/
+/*	$OpenBSD: sti.c,v 1.34 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
@@ -343,7 +343,7 @@ sti_attach_common(sc)
 	 * parse screen descriptions:
 	 *	figure number of fonts supported;
 	 *	allocate wscons structures;
-	 *	calculate dimentions.
+	 *	calculate dimensions.
 	 */
 
 	sti_default_screen.ncols = cfg.width / sc->sc_curfont.width;
diff --git a/sys/dev/ic/tc921x.c b/sys/dev/ic/tc921x.c
index 62e0519e9e0..b72cbe61108 100644
--- a/sys/dev/ic/tc921x.c
+++ b/sys/dev/ic/tc921x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc921x.c,v 1.1 2002/04/25 04:56:59 mickey Exp $	*/
+/*	$OpenBSD: tc921x.c,v 1.2 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Vladimir Popov <jumbo@narod.ru>.
@@ -29,7 +29,7 @@
  *
  * TC9216P, TC9217P, TC9217F are a high speed PLL-LSI with built-in 2 modulus
  * prescaler. Each function is controlled through 3 serial bus lines and high
- * performance digital tuning system can be constitued.
+ * performance digital tuning system can be constituted.
  *
  * Each function is controlled by the data setting to a pair of 24-bit
  * registers. Each data of these registers is exchanged with controller side
diff --git a/sys/dev/ic/tc921x.h b/sys/dev/ic/tc921x.h
index 21980e6c132..107d5522a80 100644
--- a/sys/dev/ic/tc921x.h
+++ b/sys/dev/ic/tc921x.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc921x.h,v 1.1 2002/04/25 04:56:59 mickey Exp $	*/
+/*	$OpenBSD: tc921x.h,v 1.2 2003/10/21 18:58:49 jmc Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Vladimir Popov <jumbo@narod.ru>.
@@ -29,7 +29,7 @@
  *
  * TC9216P, TC9217P, TC9217F are a high speed PLL-LSI with built-in 2 modulus
  * prescaler. Each function is controlled through 3 serial bus lines and high
- * performance digital tuning system can be constitued.
+ * performance digital tuning system can be constituted.
  *
  */
 
diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c
index f8d49f440b5..e412ec5e76e 100644
--- a/sys/dev/ic/tcic2.c
+++ b/sys/dev/ic/tcic2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcic2.c,v 1.3 2002/03/14 01:26:55 millert Exp $	*/
+/*	$OpenBSD: tcic2.c,v 1.4 2003/10/21 18:58:49 jmc Exp $	*/
 /*	$NetBSD: tcic2.c,v 1.3 2000/01/13 09:38:17 joda Exp $	*/
 
 #undef	TCICDEBUG
@@ -322,7 +322,7 @@ tcic_attach(sc)
 {
 	int i, reg;
 
-	/* set more chipset dependend parameters in the softc. */
+	/* set more chipset-dependent parameters in the softc. */
 	switch (sc->chipid) {
 	case TCIC_CHIPID_DB86084_1:
 	case TCIC_CHIPID_DB86084A:
diff --git a/sys/dev/ic/tcic2reg.h b/sys/dev/ic/tcic2reg.h
index 567c4708228..7139c6d7e10 100644
--- a/sys/dev/ic/tcic2reg.h
+++ b/sys/dev/ic/tcic2reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcic2reg.h,v 1.1 2000/05/15 04:17:28 jason Exp $	*/
+/*	$OpenBSD: tcic2reg.h,v 1.2 2003/10/21 18:58:50 jmc Exp $	*/
 /*	$NetBSD: tcic2reg.h,v 1.1 1999/03/23 20:04:14 bad Exp $	*/
 
 /*-
@@ -62,7 +62,7 @@
 /*
  * TCIC auxiliary registers.
  * These are all 16 bit registers.
- * They are accessed by selecting the approriate index in
+ * They are accessed by selecting the appropriate index in
  * bits 7:5 of the mode register.
  */
 #define	TCIC_AR_MASK		0xe0		/* for masking the mode reg. */
@@ -160,7 +160,7 @@
 #define	TCIC_SSTAT_BATLO	(2<<3)		/* battery is getting low */
 #define	TCIC_SSTAT_BATBAD2	(3<<3)		/* battery is low */
 #define	TCIC_SSTAT_RDY		(1<<5)		/* card is ready (not busy) */
-#define	TCIC_SSTAT_WP		(1<<6)		/* card is write-proteced */
+#define	TCIC_SSTAT_WP		(1<<6)		/* card is write-protected */
 #define	TCIC_SSTAT_CD		(1<<7)		/* card present */
 #define	TCIC_SSTAT_STAT_MASK	0xf8
 
@@ -196,7 +196,7 @@
 #define	TCIC_PWR_CLIMENA	(1 << 6)	/* the current-limit enable */
 #define	TCIC_PWR_CLIMSTAT	(1 << 7)	/* current limit sense (r/o) */
 
-/* Bits in the icsr reqister. */
+/* Bits in the icsr register. */
 #define	TCIC_ICSR_IOCHK		(1<<7)		/* I/O check */
 #define	TCIC_ICSR_CDCHG		(1<<6)		/* card status change, see SSTAT */
 #define	TCIC_ICSR_ERR		(1<<5)		/* error condition */
diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c
index 5e0e9224974..ab0450d8dd7 100644
--- a/sys/dev/ic/trm.c
+++ b/sys/dev/ic/trm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trm.c,v 1.1 2002/02/18 01:55:30 krw Exp $
+/*	$OpenBSD: trm.c,v 1.2 2003/10/21 18:58:50 jmc Exp $
  * ------------------------------------------------------------
  *   O.S       : OpenBSD
  *   File Name : trm.c
@@ -804,7 +804,7 @@ trm_StartSRB(struct trm_softc *sc, struct trm_scsi_req_q *pSRB)
  * Function : trm_Interrupt
  * Purpose  : Catch an interrupt from the adapter           
  *            Process pending device interrupts.        
- * Inputs   : void * - struct trm_softc * strucutre pointer
+ * Inputs   : void * - struct trm_softc * structure pointer
  * ------------------------------------------------------------
  */
 int
@@ -863,7 +863,7 @@ trm_Interrupt(void *vsc)
 		stateV = trm_SCSI_phase0[phase];
 		stateV(sc, pSRB, &scsi_status);
 		/* 
-		 * if any exception occured
+		 * if any exception occurred
 		 * scsi_status will be modified to bus free phase
 		 * new scsi_status transfer out from previous stateV
 		 */ 
@@ -1055,7 +1055,7 @@ trm_DataOutPhase0(struct trm_softc *sc, struct trm_scsi_req_q *pSRB, u_int8_t *p
 			}
 		}
 		/*
-		 * caculate all the residue data that not yet tranfered
+		 * calculate all the residue data that not yet transferred
 		 * SCSI transfer counter + left in SCSI FIFO data
 		 *
 		 * .....TRM_S1040_SCSI_COUNTER (24bits)
@@ -1894,7 +1894,7 @@ trm_Reselect(struct trm_softc *sc)
 	 * Read Reselected Target Id and LUN
 	 */
 	RselTarLunId = bus_space_read_2(iot, ioh, TRM_S1040_SCSI_TARGETID) & 0x1FFF;
-	/* TODO XXXX: Make endian independant! */
+	/* TODO XXXX: Make endian independent! */
 	target = RselTarLunId & 0xff;
 	lun    = (RselTarLunId >> 8) & 0xff;
 
@@ -2722,7 +2722,7 @@ trm_write_cmd( bus_space_tag_t iot, bus_space_handle_t ioh, u_int8_t bCmd,
  * ------------------------------------------------------------
  * Function     : trm_check_eeprom                
  * Description  : read eeprom 128 bytes to pEEpromBuf and check
- *                  checksum. If it is worong, updated with default value
+ *                  checksum. If it is wrong, updated with default value.
  * Input        : eeprom, iot, ioh - chip's base address        
  * Output       : none                    
  * ------------------------------------------------------------
diff --git a/sys/dev/ic/tropic.c b/sys/dev/ic/tropic.c
index db9ea1e3d03..a70329796c2 100644
--- a/sys/dev/ic/tropic.c
+++ b/sys/dev/ic/tropic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tropic.c,v 1.6 2002/03/14 01:26:55 millert Exp $	*/
+/*	$OpenBSD: tropic.c,v 1.7 2003/10/21 18:58:50 jmc Exp $	*/
 /*	$NetBSD: tropic.c,v 1.6 1999/12/17 08:26:31 fvdl Exp $	*/
 
 /* 
@@ -1436,7 +1436,7 @@ struct tr_softc *sc;
 
 
 /*
- * copy out the packet byte-by-byte in resonably optimal fashion
+ * copy out the packet byte-by-byte in reasonably optimal fashion
  */
 int
 tr_mbcopy(sc, dhb, m0)
@@ -1470,7 +1470,7 @@ struct mbuf *m0;
  * We copy the trailer information and then all the normal
  * data into mbufs.
  *
- * called from tr_rint - receive interupt routine
+ * called from tr_rint - receive interrupt routine
  */
 struct mbuf *
 tr_get(sc, totlen, ifp)
diff --git a/sys/dev/ic/tropicreg.h b/sys/dev/ic/tropicreg.h
index 0de1b7c0e9e..adfd10df95d 100644
--- a/sys/dev/ic/tropicreg.h
+++ b/sys/dev/ic/tropicreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tropicreg.h,v 1.1 1999/12/27 21:51:35 fgsch Exp $	*/
+/*	$OpenBSD: tropicreg.h,v 1.2 2003/10/21 18:58:50 jmc Exp $	*/
 /*	$NetBSD: tropicreg.h,v 1.3 1999/10/17 23:53:45 cgd Exp $	*/
 
 /* 
@@ -480,7 +480,7 @@ struct param_addr {
 #define	OPEN_OK			0x00	/* Open completed successfully */
 #define	OPEN_BAD_COMMAND	0x01	/* Invalid command code */
 #define	OPEN_ALREADY		0x03	/* Adapter is ALREADY open */
-#define	OPEN_MISSING_PARAMS	0x05	/* Required paramaters missing */
+#define	OPEN_MISSING_PARAMS	0x05	/* Required parameters missing */
 #define	OPEN_UNRECOV_FAIL	0x07	/* Unrecoverable failure occurred */
 #define	OPEN_INAD_REC_BUFS	0x30	/* Inadequate receive buffers */
 #define	OPEN_BAD_NODE_ADDR	0x32	/* Invalid NODE address */
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 7df34c1650a..1b983191af7 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdc.c,v 1.69 2003/10/20 07:12:39 grange Exp $     */
+/*      $OpenBSD: wdc.c,v 1.70 2003/10/21 18:58:50 jmc Exp $     */
 /*	$NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
 
 
@@ -544,7 +544,7 @@ wdc_ata_present(chp, drive)
 
 	   The 10 seconds wait is sub-optimal because, according
 	   to the ATA standard, the master should reply with 00
-	   for any reads to a non-existant slave.
+	   for any reads to a non-existent slave.
 	*/
 	time_to_done = wdc_wait_for_status(chp,
 	    (WDCS_DRDY | WDCS_DSC | WDCS_DRQ),
@@ -829,7 +829,7 @@ wdcattach(chp)
 		 */
 		if (ata_get_params(&chp->ch_drive[i], at_poll, &drvp->id) ==
 		    CMD_OK) {
-			/* If IDENTIFY succeded, this is not an OLD ctrl */
+			/* If IDENTIFY succeeded, this is not an OLD ctrl */
 			drvp->drive_flags &= ~DRIVE_OLD;
 		} else {
 			drvp->drive_flags &=
@@ -871,7 +871,7 @@ wdcattach(chp)
 	}
 
 	/*
-	 * reset drive_flags for unnatached devices, reset state for attached
+	 * reset drive_flags for unattached devices, reset state for attached
 	 *  ones
 	 */
 	for (i = 0; i < 2; i++) {
@@ -1239,7 +1239,7 @@ wdctimeout(arg)
 }
 
 /*
- * Probe drive's capabilites, for use by the controller later
+ * Probe drive's capabilities, for use by the controller later.
  * Assumes drvp points to an existing drive.
  * XXX this should be a controller-indep function
  */
diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h
index d093cd94193..87fbb305cf6 100644
--- a/sys/dev/ic/wdcvar.h
+++ b/sys/dev/ic/wdcvar.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdcvar.h,v 1.31 2003/10/17 08:14:09 grange Exp $     */
+/*      $OpenBSD: wdcvar.h,v 1.32 2003/10/21 18:58:50 jmc Exp $     */
 /*	$NetBSD: wdcvar.h,v 1.17 1999/04/11 20:50:29 bouyer Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@ struct channel_softc { /* Per channel data */
 
 	/*
 	 * channel queues. May be the same for all channels, if hw channels
-	 * are not independants
+	 * are not independent.
 	 */
 	struct channel_queue *ch_queue;
 	struct timeout ch_timo;
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index 9728d593af8..0ba5754423c 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xl.c,v 1.50 2003/06/29 16:39:02 jason Exp $	*/
+/*	$OpenBSD: xl.c,v 1.51 2003/10/21 18:58:50 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -1814,7 +1814,7 @@ void xl_start(ifp)
 	 * Place the request for the upload interrupt
 	 * in the last descriptor in the chain. This way, if
 	 * we're chaining several packets at once, we'll only
-	 * get an interupt once for the whole chain rather than
+	 * get an interrupt once for the whole chain rather than
 	 * once for each packet.
 	 */
 	cur_tx->xl_ptr->xl_status |= htole32(XL_TXSTAT_DL_INTR);
@@ -1996,7 +1996,7 @@ xl_start_90xB(ifp)
 	 * Place the request for the upload interrupt
 	 * in the last descriptor in the chain. This way, if
 	 * we're chaining several packets at once, we'll only
-	 * get an interupt once for the whole chain rather than
+	 * get an interrupt once for the whole chain rather than
 	 * once for each packet.
 	 */
 	cur_tx->xl_ptr->xl_status |= htole32(XL_TXSTAT_DL_INTR);
diff --git a/sys/dev/ic/xlreg.h b/sys/dev/ic/xlreg.h
index 25b200bbf7d..ec527326285 100644
--- a/sys/dev/ic/xlreg.h
+++ b/sys/dev/ic/xlreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xlreg.h,v 1.16 2003/06/29 16:39:02 jason Exp $	*/
+/*	$OpenBSD: xlreg.h,v 1.17 2003/10/21 18:58:50 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -482,7 +482,7 @@ struct xl_chain_data {
 	struct xl_chain		*xl_tx_tail;
 	struct xl_chain		*xl_tx_free;
 
-	/* 3c90xB "cyclone/hurricane/tornade" stuff */
+	/* 3c90xB "cyclone/hurricane/tornado" stuff */
 	int			xl_tx_prod;
 	int			xl_tx_cons;
 	int			xl_tx_cnt;
diff --git a/sys/dev/ic/z8530reg.h b/sys/dev/ic/z8530reg.h
index 70fba0b8a02..b07c6249914 100644
--- a/sys/dev/ic/z8530reg.h
+++ b/sys/dev/ic/z8530reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530reg.h,v 1.5 2003/06/02 23:28:02 millert Exp $ */
+/*	$OpenBSD: z8530reg.h,v 1.6 2003/10/21 18:58:50 jmc Exp $ */
 /*	$NetBSD: z8530reg.h,v 1.7 1996/10/23 00:32:31 gwr Exp $ */
 
 /*
@@ -327,7 +327,7 @@
  *	2 bps
  *
  * rounded down to an integer.  This can be computed entirely
- * in integer arithemtic as:
+ * in integer arithmetic as:
  *
  *	f + bps
  *	------- - 2