More comment typos from Diego Casati. Including winners like funtion, allmost,

oustside, seqencer, toghether, nessissary, etc.

15 files changed, 68 insertions, 68 deletions

diff --git a/sys/arch/hp300/dev/sti_sgc.c b/sys/arch/hp300/dev/sti_sgc.c
index c17500431ce..5b0806b0e31 100644
--- a/sys/arch/hp300/dev/sti_sgc.c
+++ b/sys/arch/hp300/dev/sti_sgc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti_sgc.c,v 1.13 2007/01/11 21:58:04 miod Exp $	*/
+/*	$OpenBSD: sti_sgc.c,v 1.14 2007/05/26 00:36:03 krw Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -64,7 +64,7 @@ sti_sgc_match(struct device *parent, void *match, void *aux)
 	struct sgc_attach_args *saa = aux;
 
 	/*
-	 * If we already probed it succesfully as a console device, go ahead,
+	 * If we already probed it successfully as a console device, go ahead,
 	 * since we will not be able to bus_space_map() again.
 	 */
 	if (SGC_SLOT_TO_CONSCODE(saa->saa_slot) == conscode)
@@ -84,7 +84,7 @@ sti_sgc_attach(struct device *parent, struct device *self, void *aux)
 	int i;
 
 	/*
-	 * If we already probed it succesfully as a console device, go ahead,
+	 * If we already probed it successfully as a console device, go ahead,
 	 * since we will not be able to bus_space_map() again.
 	 */
 	if (SGC_SLOT_TO_CONSCODE(saa->saa_slot) == conscode) {
diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S
index 27dba434bcd..758867b0455 100644
--- a/sys/arch/hppa/hppa/locore.S
+++ b/sys/arch/hppa/hppa/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.153 2007/05/14 19:54:21 martin Exp $	*/
+/*	$OpenBSD: locore.S,v 1.154 2007/05/26 00:36:03 krw Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -936,7 +936,7 @@ hpmc_v
 	STRAP(itlbna,T_ITLBMISSNA,DTLBPRE)/* 16. ITLB non-access miss fault */
 	STRAP(dtlbna,T_DTLBMISSNA,DTLBPRE)/* 17. DTLB non-access miss fault */
 	ATRAP(dprot,T_DPROT)		/* 18. data protection trap
-					      unalligned data reference trap */
+					      unaligned data reference trap */
 	ATRAP(dbrk,T_DBREAK)		/* 19. data break trap */
 	STRAP(tlbd,T_TLB_DIRTY,DTLBPRE)	/* 20. TLB dirty bit trap */
 	ATRAP(pgref,T_PAGEREF)		/* 21. page reference trap */
diff --git a/sys/arch/hppa64/hppa64/locore.S b/sys/arch/hppa64/hppa64/locore.S
index 33c36eb6b3b..27dfb273007 100644
--- a/sys/arch/hppa64/hppa64/locore.S
+++ b/sys/arch/hppa64/hppa64/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.5 2006/01/10 19:22:45 martin Exp $	*/
+/*	$OpenBSD: locore.S,v 1.6 2007/05/26 00:36:03 krw Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -463,7 +463,7 @@ hpmc_v
 	TRAP(itlbna,T_ITLBMISSNA,DTLBPRE)/* 16. ITLB non-access miss fault */
 	TRAP(dtlbna,T_DTLBMISSNA,DTLBPRE)/* 17. DTLB non-access miss fault */
 	TRAP(all,T_DPROT,)		/* 18. data protection trap
-					      unalligned data reference trap */
+					      unaligned data reference trap */
 	TRAP(all,T_DBREAK,)		/* 19. data break trap */
 	TRAP(tlbd,T_TLB_DIRTY,DTLBPRE)	/* 20. TLB dirty bit trap */
 	TRAP(all,T_PAGEREF,)		/* 21. page reference trap */
diff --git a/sys/arch/sparc64/include/pcb.h b/sys/arch/sparc64/include/pcb.h
index 2a7e93f8440..fe2c4ea6b03 100644
--- a/sys/arch/sparc64/include/pcb.h
+++ b/sys/arch/sparc64/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.6 2007/05/02 18:46:06 kettenis Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.7 2007/05/26 00:36:03 krw Exp $	*/
 /*	$NetBSD: pcb.h,v 1.7 2000/12/29 17:12:05 eeh Exp $ */
 
 /*
@@ -133,7 +133,7 @@ struct pcb {
 
 	/* The rest is probably not needed except for pcb_rw */
 	char	pcb_cwp;	/* %cwp when switch() was called */
-	char	pcb_pil;	/* %pil when switch() was called -- prolly not needed */
+	char	pcb_pil;	/* %pil when switch() was called -- probably not needed */
 
 	const char *lastcall;	/* DEBUG -- name of last system call */
 	u_int64_t	pcb_wcookie;
diff --git a/sys/dev/microcode/aic7xxx/aic79xx.reg b/sys/dev/microcode/aic7xxx/aic79xx.reg
index caaaec46a6e..962ec56604b 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx.reg
+++ b/sys/dev/microcode/aic7xxx/aic79xx.reg
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.reg,v 1.6 2007/05/25 21:27:15 krw Exp $	*/
+/*	$OpenBSD: aic79xx.reg,v 1.7 2007/05/26 00:36:03 krw Exp $	*/
 /*
  * Aic79xx register and scratch ram definitions.
  *
@@ -40,7 +40,7 @@
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.reg,v 1.18 2004/08/04 17:55:34 gibbs Exp $
  */
-VERSION = "$Id: aic79xx.reg,v 1.6 2007/05/25 21:27:15 krw Exp $"
+VERSION = "$Id: aic79xx.reg,v 1.7 2007/05/26 00:36:03 krw Exp $"
 
 /*
  * This file is processed by the aic7xxx_asm utility for use in assembling
@@ -2425,7 +2425,7 @@ register IOPDNCTL {
 }
 
 /*
- * Shaddow Host Address.
+ * Shadow Host Address.
  */
 register SHADDR {
 	address			0x060
diff --git a/sys/dev/microcode/aic7xxx/aic79xx.seq b/sys/dev/microcode/aic7xxx/aic79xx.seq
index 54417d055d3..f6cb527411c 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx.seq
+++ b/sys/dev/microcode/aic7xxx/aic79xx.seq
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.seq,v 1.7 2007/04/10 17:47:55 miod Exp $	*/
+/*	$OpenBSD: aic79xx.seq,v 1.8 2007/05/26 00:36:03 krw Exp $	*/
 /*
  * Adaptec U320 device driver firmware for Linux and FreeBSD.
  *
@@ -41,7 +41,7 @@
  * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.17 2004/08/04 17:55:34 gibbs Exp $
  */
 
-VERSION = "$Id: aic79xx.seq,v 1.7 2007/04/10 17:47:55 miod Exp $"
+VERSION = "$Id: aic79xx.seq,v 1.8 2007/05/26 00:36:03 krw Exp $"
 PATCH_ARG_LIST = "struct ahd_softc *ahd"
 PREFIX = "ahd_"
 
@@ -168,7 +168,7 @@ gsfifo_complete_normally:
 
 	/*
 	 * Since this status did not consume a FIFO, we have to
-	 * be a bit more dilligent in how we check for FIFOs pertaining
+	 * be a bit more diligent in how we check for FIFOs pertaining
 	 * to this transaction.  There are two states that a FIFO still
 	 * transferring data may be in.
 	 *
@@ -218,7 +218,7 @@ BEGIN_CRITICAL;
 scbdma_tohost_done:
 	test	CCSCBCTL, CCARREN jz fill_qoutfifo_dmadone;
 	/*
-	 * An SCB has been succesfully uploaded to the host.
+	 * An SCB has been successfully uploaded to the host.
 	 * If the SCB was uploaded for some reason other than
 	 * bad SCSI status (currently only for underruns), we
 	 * queue the SCB for normal completion.  Otherwise, we
@@ -481,10 +481,10 @@ dma_complete_scb:
  * Either post or fetch an SCB from host memory.  The caller
  * is responsible for polling for transfer completion.
  *
- * Prerequisits: Mode == M_CCHAN
- *		 SINDEX contains CCSCBCTL flags
- *		 SCBHADDR set to Host SCB address
- *		 SCBPTR set to SCB src location on "push" operations
+ * Prerequisites: Mode == M_CCHAN
+ *		  SINDEX contains CCSCBCTL flags
+ *		  SCBHADDR set to Host SCB address
+ *		  SCBPTR set to SCB src location on "push" operations
  */
 SET_SRC_MODE	M_CCHAN;
 SET_DST_MODE	M_CCHAN;
@@ -704,7 +704,7 @@ BEGIN_CRITICAL;
 		test	LQOSTAT1, LQOBUSFREE jnz idle_loop;
 
 		/*
-		 * On a phase change oustside of packet boundaries,
+		 * On a phase change outside of packet boundaries,
 		 * LASTSCB points to the currently active SCB context
 		 * on the bus.
 		 */
@@ -949,7 +949,7 @@ p_status_okay:
 
 /*
  * Message out phase.  If MSG_OUT is MSG_IDENTIFYFLAG, build a full
- * indentify message sequence and send it to the target.  The host may
+ * identify message sequence and send it to the target.  The host may
  * override this behavior by setting the MK_MESSAGE bit in the SCB
  * control byte.  This will cause us to interrupt the host and allow
  * it to handle the message phase completely on its own.  If the bit
@@ -959,9 +959,9 @@ p_status_okay:
  * 
  * If MSG_OUT is == HOST_MSG, also interrupt the host and take a message.
  * This is done to allow the host to send messages outside of an identify
- * sequence while protecting the seqencer from testing the MK_MESSAGE bit
+ * sequence while protecting the sequencer from testing the MK_MESSAGE bit
  * on an SCB that might not be for the current nexus. (For example, a
- * BDR message in responce to a bad reselection would leave us pointed to
+ * BDR message in response to a bad reselection would leave us pointed to
  * an SCB that doesn't have anything to do with the current target).
  *
  * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
@@ -1201,7 +1201,7 @@ mesgin_complete:
 	test	SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation;
 
 	/*
-	 * If we recevied good status but never successfully sent the
+	 * If we received good status but never successfully sent the
 	 * cdb, abort the command.
 	 */
 	test	SCB_SCSI_STATUS,0xff	jnz complete_accepted;
@@ -1282,7 +1282,7 @@ END_CRITICAL;
  * Is it a disconnect message?  Set a flag in the SCB to remind us
  * and await the bus going free.  If this is an untagged transaction
  * store the SCB id for it in our untagged target table for lookup on
- * a reselction.
+ * a reselection.
  */
 mesgin_disconnect:
 	/*
@@ -1508,7 +1508,7 @@ service_fifo:
 		 * If the other FIFO needs loading, then it
 		 * must not have claimed the S/G cache yet
 		 * (SG_CACHE_AVAIL would have been cleared in
-		 * the orginal FIFO mode and we test this above).
+		 * the original FIFO mode and we test this above).
 		 * Return to the idle loop so we can process the
 		 * FIFO not currently on the bus first.
 		 */
@@ -1552,7 +1552,7 @@ idle_sg_avail:
 	test	DFSTATUS, PRELOAD_AVAIL jz return;
 	/*
 	 * On the A, preloading a segment before HDMAENACK
-	 * comes true can clobber the shaddow address of the
+	 * comes true can clobber the shadow address of the
 	 * first segment in the S/G FIFO.  Wait until it is
 	 * safe to proceed.
 	 */
@@ -1909,7 +1909,7 @@ main_isr:
 /*
  * There are two types of save pointers interrupts:
  * The first is a snapshot save pointers where the current FIFO is not
- * active and contains a snapshot of the current poniter information.
+ * active and contains a snapshot of the current pointer information.
  * This happens between packets in a stream for a single L_Q.  Since we
  * are not performing a pointer save, we can safely clear the channel
  * so it can be used for other transactions.  On RTI capable controllers,
@@ -2005,10 +2005,10 @@ pkt_handle_xfer:
 	 * Defer handling of this NONPACKREQ until we
 	 * can be sure it pertains to this FIFO.  SAVEPTRS
 	 * will not be asserted if the NONPACKREQ is for us,
-	 * so we must simulate it if shaddow is valid.  If
-	 * shaddow is not valid, keep running this FIFO until we
+	 * so we must simulate it if shadow is valid.  If
+	 * shadow is not valid, keep running this FIFO until we
 	 * have satisfied the transfer by loading segments and
-	 * waiting for either shaddow valid or last_seg_done.
+	 * waiting for either shadow valid or last_seg_done.
 	 */
 	test	MDFFSTAT, SHVALID jnz pkt_saveptrs;
 pkt_service_fifo:
@@ -2140,7 +2140,7 @@ BEGIN_CRITICAL;
 END_CRITICAL;
 pkt_status_check_overrun:
 	/*
-	 * Status PKT overruns are uncerimoniously recovered with a
+	 * Status PKT overruns are unceremoniously recovered with a
 	 * bus reset.  If we've overrun, let the host know so that
 	 * recovery can be performed.
 	 *
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.reg b/sys/dev/microcode/aic7xxx/aic7xxx.reg
index d64c61aea7c..d026d6b95ed 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.reg
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.reg
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx.reg,v 1.10 2004/08/01 01:36:23 krw Exp $ */
+/* $OpenBSD: aic7xxx.reg,v 1.11 2007/05/26 00:36:03 krw Exp $ */
 /*
  * Aic7xxx register and scratch ram definitions.
  *
@@ -40,7 +40,7 @@
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.reg,v 1.46 2003/12/17 00:02:09 gibbs Exp $
  */
-VERSION = "$Id: aic7xxx.reg,v 1.10 2004/08/01 01:36:23 krw Exp $"
+VERSION = "$Id: aic7xxx.reg,v 1.11 2007/05/26 00:36:03 krw Exp $"
 
 /*
  * This file is processed by the aic7xxx_asm utility for use in assembling
@@ -330,7 +330,7 @@ register SSTAT2 {
 	address			0x00d
 	access_mode RO
 	field	OVERRUN		0x80
-	field	SHVALID		0x40	/* Shaddow Layer non-zero */
+	field	SHVALID		0x40	/* Shadow Layer non-zero */
 	field	EXP_ACTIVE	0x10	/* SCSI Expander Active */
 	field	CRCVALERR	0x08	/* CRC doesn't match (U3 only) */
 	field	CRCENDERR	0x04	/* No terminal CRC packet (U3 only) */
@@ -950,7 +950,7 @@ register SCBCNT {
 
 /*
  * Queue In FIFO (p. 3-60)
- * Input queue for queued SCBs (commands that the seqencer has yet to start)
+ * Input queue for queued SCBs (commands that the sequencer has yet to start)
  */
 register QINFIFO {
 	address			0x09b
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.seq b/sys/dev/microcode/aic7xxx/aic7xxx.seq
index c1f1d18f4db..0bd3c8cd78e 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.seq
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.seq
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx.seq,v 1.20 2007/04/10 17:47:55 miod Exp $ */
+/* $OpenBSD: aic7xxx.seq,v 1.21 2007/05/26 00:36:03 krw Exp $ */
 /*-
  * Adaptec 274x/284x/294x device driver firmware for Linux and FreeBSD.
  *
@@ -41,7 +41,7 @@
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.seq,v 1.128 2005/01/06 01:42:26 imp Exp $
  */
 
-VERSION = "$Id: aic7xxx.seq,v 1.20 2007/04/10 17:47:55 miod Exp $"
+VERSION = "$Id: aic7xxx.seq,v 1.21 2007/05/26 00:36:03 krw Exp $"
 PATCH_ARG_LIST = "struct ahc_softc *ahc"
 PREFIX = "ahc_"
 
@@ -1478,7 +1478,7 @@ p_status_okay:
 
 /*
  * Message out phase.  If MSG_OUT is MSG_IDENTIFYFLAG, build a full
- * indentify message sequence and send it to the target.  The host may
+ * identify message sequence and send it to the target.  The host may
  * override this behavior by setting the MK_MESSAGE bit in the SCB
  * control byte.  This will cause us to interrupt the host and allow
  * it to handle the message phase completely on its own.  If the bit
@@ -1488,9 +1488,9 @@ p_status_okay:
  * 
  * If MSG_OUT is == HOST_MSG, also interrupt the host and take a message.
  * This is done to allow the host to send messages outside of an identify
- * sequence while protecting the seqencer from testing the MK_MESSAGE bit
+ * sequence while protecting the sequencer from testing the MK_MESSAGE bit
  * on an SCB that might not be for the current nexus. (For example, a
- * BDR message in responce to a bad reselection would leave us pointed to
+ * BDR message in response to a bad reselection would leave us pointed to
  * an SCB that doesn't have anything to do with the current target).
  *
  * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
@@ -1642,7 +1642,7 @@ mesgin_complete:
 	test	SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation;
 
 	/*
-	 * If we recevied good status but never successfully sent the
+	 * If we received good status but never successfully sent the
 	 * cdb, abort the command.
 	 */
 	test	SCB_SCSI_STATUS,0xff	jnz complete_accepted;
@@ -1698,7 +1698,7 @@ if ((ahc->flags & AHC_INITIATORROLE) != 0) {
  * Is it a disconnect message?  Set a flag in the SCB to remind us
  * and await the bus going free.  If this is an untagged transaction
  * store the SCB id for it in our untagged target table for lookup on
- * a reselction.
+ * a reselection.
  */
 mesgin_disconnect:
 	/*
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index f092e49e439..fe768466f4e 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.9 2007/05/25 21:27:15 krw Exp $ */
+/* $OpenBSD: auixp.c,v 1.10 2007/05/26 00:36:03 krw Exp $ */
 /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
 
 /*
@@ -346,7 +346,7 @@ auixp_commit_settings(void *hdl)
 		value &= ~ATI_REG_CMD_SPDF_CONFIG_MASK;
 		value |=  ATI_REG_CMD_SPDF_CONFIG_34; /* NetBSD AC'97 default */
 
-		/* XXX this prolly is not nessisary unless splitted XXX */
+		/* XXX this is probably not necessary unless splitted XXX */
 		value &= ~ATI_REG_CMD_INTERLEAVE_SPDF;
 		if (params->precision <= 16)
 			value |= ATI_REG_CMD_INTERLEAVE_SPDF;
@@ -816,7 +816,7 @@ auixp_program_dma_chain(struct auixp_softc *sc, struct auixp_dma *dma)
 	iot = sc->sc_iot;
 	ioh = sc->sc_ioh;
 	/* get hardware start address of DMA chain and set valid-flag in it */
-	/* XXX allways at start? XXX */
+	/* XXX always at start? XXX */
 	value = DMAADDR(dma);
 	value = value | ATI_REG_LINKPTR_EN;
 
@@ -880,7 +880,7 @@ auixp_update_busbusy(struct auixp_softc *sc)
  * audio is refilled by calling the intr() function when space is available
  * again.
  */
-/* XXX allmost literaly a copy of trigger-input; could be factorised XXX */
+/* XXX almost literally a copy of trigger-input; could be factorised XXX */
 int
 auixp_trigger_output(void *hdl, void *start, void *end, int blksize,
     void (*intr)(void *), void *intrarg, struct audio_params *param)
@@ -955,7 +955,7 @@ auixp_halt_output(void *hdl)
 }
 
 
-/* XXX allmost literaly a copy of trigger-output; could be factorised XXX */
+/* XXX almost literally a copy of trigger-output; could be factorised XXX */
 int
 auixp_trigger_input(void *hdl, void *start, void *end, int blksize,
     void (*intr)(void *), void *intrarg, struct audio_params *param)
@@ -1034,8 +1034,8 @@ auixp_halt_input(void *hdl)
  * IXP audio interrupt handler
  *
  * note that we return the number of bits handled; the return value is not
- * documentated but i saw it implemented in other drivers. Prolly returning a
- * value > 0 means "i've dealt with it"
+ * documented but I saw it implemented in other drivers. Probably returning a
+ * value > 0 means "I've dealt with it"
  *
  */
 int
@@ -1662,7 +1662,7 @@ auixp_disable_dma(struct auixp_softc *sc, struct auixp_dma *dma)
 
 	iot = sc->sc_iot;
 	ioh = sc->sc_ioh;
-	/* lets not stress the DMA engine more than nessisary */
+	/* lets not stress the DMA engine more than necessary */
 	value = bus_space_read_4(iot, ioh, ATI_REG_CMD);
 	if (value & dma->dma_enable_bit) {
 		value &= ~dma->dma_enable_bit;
@@ -1679,7 +1679,7 @@ auixp_enable_dma(struct auixp_softc *sc, struct auixp_dma *dma)
 
 	iot = sc->sc_iot;
 	ioh = sc->sc_ioh;
-	/* lets not stress the DMA engine more than nessisary */
+	/* lets not stress the DMA engine more than necesssary */
 	value = bus_space_read_4(iot, ioh, ATI_REG_CMD);
 	if (!(value & dma->dma_enable_bit)) {
 		value |= dma->dma_enable_bit;
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index c7106132768..0735d78ec4f 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autri.c,v 1.19 2007/05/25 21:27:15 krw Exp $	*/
+/*	$OpenBSD: autri.c,v 1.20 2007/05/26 00:36:03 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -308,7 +308,7 @@ autri_read_codec(sc_, index, data)
 	/* send Read Command to AC97 */
 	TWRITE4(sc, addr, (index & 0x7f) | cmd);
 
-	/* wait for 'Returned data is avalable' */
+	/* wait for 'Returned data is available' */
 	for (count=0; count < 0xffff; count++) {
 		status = TREAD4(sc, addr);
 		if ((status & busy) == 0)
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index 94e054f050e..a486a41ddf7 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wb.c,v 1.37 2007/05/25 21:27:15 krw Exp $	*/
+/*	$OpenBSD: if_wb.c,v 1.38 2007/05/26 00:36:03 krw Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -69,7 +69,7 @@
  * closed ring.
  *
  * For transmission, the driver creates a linked list of 'super descriptors'
- * which each contain several individual descriptors linked toghether.
+ * which each contain several individual descriptors linked together.
  * Each 'super descriptor' contains WB_MAXFRAGS descriptors, which we
  * abuse as fragment pointers. This allows us to use a buffer management
  * scheme very similar to that used in the ThunderLAN and Etherlink XL
@@ -80,7 +80,7 @@
  *
  * Note: the author of the Linux driver for the Winbond chip alludes
  * to some sort of flaw in the chip's design that seems to mandate some
- * drastic workaround which signigicantly impairs transmit performance.
+ * drastic workaround which significantly impairs transmit performance.
  * I have no idea what he's on about: transmit performance with all
  * three of my test boards seems fine.
  */
diff --git a/sys/dev/tc/tcdsreg.h b/sys/dev/tc/tcdsreg.h
index e402f4db8e1..6fc4040795b 100644
--- a/sys/dev/tc/tcdsreg.h
+++ b/sys/dev/tc/tcdsreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcdsreg.h,v 1.2 2007/05/25 21:27:16 krw Exp $ */
+/* $OpenBSD: tcdsreg.h,v 1.3 2007/05/26 00:36:03 krw Exp $ */
 /* $NetBSD: tcdsreg.h,v 1.1 2000/07/04 02:22:20 nisimura Exp $ */
 
 /*
@@ -138,7 +138,7 @@ void tcds_scsi_reset(int);
  * Start of MACH #defines, minimal changes to port to NetBSD.
  * 
  * The following register is the SCSI control interrupt register.  It
- * starts, stops and resets scsi DMA.  It takes over the SCSI funtions
+ * starts, stops and resets scsi DMA.  It takes over the SCSI functions
  * that were handled by the ASIC on the 3min.
  */
 #define KN15AA_SYS_SCSI		0x1d0000000
@@ -198,14 +198,14 @@ void tcds_scsi_reset(int);
 
 #define KN15AA_REG_SCSI_IMER	(KN15AA_SYS_SCSI + 0x80008)
 
-/* these are the bits that were unalligned at the beginning of the dma */
+/* these are the bits that were unaligned at the beginning of the dma */
 #define KN15AA_REG_SCSI_DUDB0	(KN15AA_SYS_SCSI + 0x82010)
 #define KN15AA_REG_SCSI_DUDB1	(KN15AA_SYS_SCSI + 0x82210)
 #	define SCSI_DUDB_MASK01	0x00000001 /* Mask bit for byte[01] */
 #	define SCSI_DUDB_MASK10	0x00000002 /* Mask bit for byte[10] */
 #	define SCSI_DUDB_MASK11	0x00000004 /* Mask bit for byte[11] */
 
-/* these are the bits that were unalligned at the end of the dma */
+/* these are the bits that were unaligned at the end of the dma */
 #define KN15AA_REG_SCSI_DUDE0	(KN15AA_SYS_SCSI + 0x82018)
 #define KN15AA_REG_SCSI_DUDE1	(KN15AA_SYS_SCSI + 0x82218)
 #	define SCSI_DUDE_MASK00	0x1000000 /* Mask bit for byte[00] */
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index ea97ecc895a..d2003e1c65d 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.86 2007/05/03 21:03:46 mpf Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.87 2007/05/26 00:36:03 krw Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -819,7 +819,7 @@ tunwrite(dev_t dev, struct uio *uio, int ioflag)
 	if (tp->tun_flags & TUN_LAYER2) {
 		/*
 		 * Pad so that IP header is correctly aligned
-		 * this is neccessary for all strict aligned architectures.
+		 * this is necessary for all strict aligned architectures.
 		 */
 		mlen -= ETHER_ALIGN;
 		m->m_data += ETHER_ALIGN;
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index df339ae6f69..93d3e1cd031 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_norm.c,v 1.107 2006/04/16 00:59:52 pascoe Exp $ */
+/*	$OpenBSD: pf_norm.c,v 1.108 2007/05/26 00:36:03 krw Exp $ */
 
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -1658,7 +1658,7 @@ pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd,
 		 *    network conditions that re-order packets and
 		 *    cause our view of them to decrease.  For now the
 		 *    only lowerbound we can safely determine is that
-		 *    the TS echo will never be less than the orginal
+		 *    the TS echo will never be less than the original
 		 *    TS.  XXX There is probably a better lowerbound.
 		 *    Remove TS_MAX_CONN with better lowerbound check.
 		 *        tescr >= other original TS
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index 73e668cf507..2b2e7f85a1f 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.23 2007/01/29 11:33:24 otto Exp $	*/
+/*	$OpenBSD: exec.h,v 1.24 2007/05/26 00:36:03 krw Exp $	*/
 /*	$NetBSD: exec.h,v 1.59 1996/02/09 18:25:09 christos Exp $	*/
 
 /*-
@@ -164,7 +164,7 @@ struct exec_package {
 
 #ifdef _KERNEL
 /*
- * funtions used either by execve() or the various cpu-dependent execve()
+ * functions used either by execve() or the various cpu-dependent execve()
  * hooks.
  */
 int	exec_makecmds(struct proc *, struct exec_package *);