Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/

Add FreeBSD Id tag where missing.

14 files changed, 28 insertions, 28 deletions

diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 0f5831a..a95e78b 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -1754,7 +1754,7 @@ amr_describe_controller(struct amr_softc *sc)
 	/* this looks like we have an HP NetRaid version of the MegaRaid */
 
     	if(ae->ae_signature == AMR_SIG_438) {
-    		/* the AMI 438 is an NetRaid 3si in HP-land */
+    		/* the AMI 438 is a NetRaid 3si in HP-land */
     		prod = "HP NetRaid 3si";
     	}
     	
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 888ae9d..c9f9650 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -569,7 +569,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 	ccg->ccg_ncylinders = cs->sc_size / ccg->ccg_nsectors;
 
 	/*
-	 * Add an devstat entry for this device.
+	 * Add a devstat entry for this device.
 	 */
 	devstat_add_entry(&cs->device_stats, "ccd", cs->sc_unit,
 			  ccg->ccg_secsize, DEVSTAT_ALL_SUPPORTED,
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index c12b016..73f0523 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -1049,7 +1049,7 @@ cm_ioctl(ifp, command, data)
  * software has not enabled the Receiver, would make our hardware wait forever
  * Discovered this after 20 times reading the docs.
  *
- * Only thing we do is disable transmitter. We'll get an transmit timeout,
+ * Only thing we do is disable transmitter. We'll get a transmit timeout,
  * and the int handler will have to decide not to retransmit (in case
  * retransmission is implemented).
  *
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index a943556..531af30 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1628,7 +1628,7 @@ isp_fclink_test(struct ispsoftc *isp, int usdelay)
 	 * Check to see if we're on a fabric by trying to see if we
 	 * can talk to the fabric name server. This can be a bit
 	 * tricky because if we're a 2100, we should check always
-	 * (in case we're connected to an server doing aliasing).
+	 * (in case we're connected to a server doing aliasing).
 	 */
 	fcp->isp_onfabric = 0;
 
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index bb5b23b..f599052 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -763,7 +763,7 @@ isp_handle_atio(struct ispsoftc *isp, at_entry_t *aep)
 
 	case AT_RESET:
 		/*
-		 * A bus reset came along an blew away this command. Why
+		 * A bus reset came along and blew away this command. Why
 		 * they do this in addition the async event code stuff,
 		 * I dunno.
 		 *
diff --git a/sys/dev/isp/isp_tpublic.h b/sys/dev/isp/isp_tpublic.h
index 548dea7..5074af5 100644
--- a/sys/dev/isp/isp_tpublic.h
+++ b/sys/dev/isp/isp_tpublic.h
@@ -82,7 +82,7 @@ typedef struct {
  *
  * The cd_private tag should be used by the MD layer to keep a free list
  * of these structures. Code outside of this driver can then use this
- * as an to identify it's own unit structures. That is, when not on the MD
+ * to identify it's own unit structures. That is, when not on the MD
  * layer's freelist, the MD layer should shove into it the identifier
  * that the outer layer has for it- passed in on an initial QIN_HBA_REG
  * call (see below).
@@ -294,7 +294,7 @@ typedef enum {
  */
 
 /*
- * A word about ENABLE/DISABLE: the argument is a pointer to an tmd_cmd_t
+ * A word about ENABLE/DISABLE: the argument is a pointer to a tmd_cmd_t
  * with cd_hba, cd_bus, cd_tgt and cd_lun filled out. If an error occurs
  * in either enabling or disabling the described lun, cd_lflags is set
  * with CDFL_ERROR.
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index c95aeee..67fa7bd 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -791,7 +791,7 @@ nge_reset(sc)
 }
 
 /*
- * Probe for an NatSemi chip. Check the PCI vendor and device
+ * Probe for a NatSemi chip. Check the PCI vendor and device
  * IDs against our list and return a device name if we find a match.
  */
 static int
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 6f72096..5ba4dc3 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -35,7 +35,7 @@
  * This driver sends two bytes (0x08, 0x00) in front of each packet,
  * to allow us to distinguish another format later.
  *
- * Now added an Linux/Crynwr compatibility mode which is enabled using
+ * Now added a Linux/Crynwr compatibility mode which is enabled using
  * IF_LINK0 - Tim Wilkinson.
  *
  * TODO:
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index d2cf4fd..e1bc241 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -207,13 +207,13 @@ ppiintr(void *arg)
 
 	switch (ppb_1284_get_state(ppbus)) {
 
-	/* accept IEEE1284 negociation then wakeup an waiting process to
-	 * continue negociation at process level */
+	/* accept IEEE1284 negotiation then wakeup a waiting process to
+	 * continue negotiation at process level */
 	case PPB_FORWARD_IDLE:
 		/* Event 1 */
 		if ((ppb_rstr(ppbus) & (SELECT | nBUSY)) ==
 							(SELECT | nBUSY)) {
-			/* IEEE1284 negociation */
+			/* IEEE1284 negotiation */
 #ifdef DEBUG_1284
 			printf("N");
 #endif
@@ -231,7 +231,7 @@ ppiintr(void *arg)
 			break;
 		}
 
-		/* wake up any process waiting for negociation from
+		/* wake up any process waiting for negotiation from
 		 * remote master host */
 
 		/* XXX should set a variable to warn the process about
@@ -326,7 +326,7 @@ ppiclose(dev_t dev, int flags, int fmt, struct thread *td)
  *
  * IEEE1284 compliant read.
  *
- * First, try negociation to BYTE then NIBBLE mode
+ * First, try negotiation to BYTE then NIBBLE mode
  * If no data is available, wait for it otherwise transfer as much as possible
  */
 static int
@@ -345,7 +345,7 @@ ppiread(dev_t dev, struct uio *uio, int ioflag)
 		/* FALLTHROUGH */
 
 	case PPB_FORWARD_IDLE:
-		/* if can't negociate NIBBLE mode then try BYTE mode,
+		/* if can't negotiate NIBBLE mode then try BYTE mode,
 		 * the peripheral may be a computer
 		 */
 		if ((ppb_1284_negociate(ppbus,
@@ -407,11 +407,11 @@ error:
  *
  * Actually, this is the peripheral side of a remote IEEE1284 read
  *
- * The first part of the negociation (IEEE1284 device detection) is
+ * The first part of the negotiation (IEEE1284 device detection) is
  * done at interrupt level, then the remaining is done by the writing
  * process
  *
- * Once negociation done, transfer data
+ * Once negotiation done, transfer data
  */
 static int
 ppiwrite(dev_t dev, struct uio *uio, int ioflag)
@@ -434,9 +434,9 @@ ppiwrite(dev_t dev, struct uio *uio, int ioflag)
 		  MS_RET(0)
 	};
 
-	/* negociate ECP mode */
+	/* negotiate ECP mode */
 	if (ppb_1284_negociate(ppbus, PPB_ECP, 0)) {
-		printf("ppiwrite: ECP negociation failed\n");
+		printf("ppiwrite: ECP negotiation failed\n");
 	}
 
 	while (!error && (len = min(uio->uio_resid, BUFSIZE))) {
@@ -462,12 +462,12 @@ ppiwrite(dev_t dev, struct uio *uio, int ioflag)
 
 		ppi_enable_intr(ppidev);
 
-		/* sleep until IEEE1284 negociation starts */
+		/* sleep until IEEE1284 negotiation starts */
 		error = tsleep(ppi, PCATCH | PPBPRI, "ppiwrite", 0);
 
 		switch (error) {
 		case 0:
-			/* negociate peripheral side with BYTE mode */
+			/* negotiate peripheral side with BYTE mode */
 			ppb_peripheral_negociate(ppbus, PPB_BYTE, 0);
 			break;
 		case EWOULDBLOCK:
@@ -480,7 +480,7 @@ ppiwrite(dev_t dev, struct uio *uio, int ioflag)
 	printf("N");
 #endif
 
-	/* negociation done, write bytes to master host */
+	/* negotiation done, write bytes to master host */
 	while ((len = min(uio->uio_resid, BUFSIZE)) != 0) {
 		uiomove(ppi->ppi_buffer, len, uio);
 		if ((error = byte_peripheral_write(ppbus,
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index 06106b9..3bce20b 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -302,7 +302,7 @@ puc_attach(device_t dev, const struct puc_device_description *desc)
 }
 
 /*
- * This is just an brute force interrupt handler. It just calls all the
+ * This is just a brute force interrupt handler. It just calls all the
  * registered handlers sequencially.
  *
  * Later on we should maybe have a different handler for boards that can
diff --git a/sys/dev/sym/sym_fw1.h b/sys/dev/sym/sym_fw1.h
index 8799283..96ae523 100644
--- a/sys/dev/sym/sym_fw1.h
+++ b/sys/dev/sym/sym_fw1.h
@@ -821,7 +821,7 @@ static struct SYM_FWA_SCR SYM_FWA_SCR = {
 		HADDR_1 (ccb_head.status),
 	/*
 	 *  If QUIRK_AUTOSAVE is set,
-	 *  do an "save pointer" operation.
+	 *  do a "save pointer" operation.
 	 */
 	SCR_FROM_REG (QU_REG),
 		0,
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index 600bcf1..77f8df3 100644
--- a/sys/dev/sym/sym_fw2.h
+++ b/sys/dev/sym/sym_fw2.h
@@ -779,7 +779,7 @@ static struct SYM_FWA_SCR SYM_FWA_SCR = {
 		offsetof (struct sym_ccb, phys.head.status),
 	/*
 	 *  If QUIRK_AUTOSAVE is set,
-	 *  do an "save pointer" operation.
+	 *  do a "save pointer" operation.
 	 */
 	SCR_FROM_REG (QU_REG),
 		0,
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 31e8b9c..d15a1ff 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -4028,7 +4028,7 @@ static void sym_log_hard_error(hcb_p np, u_short sist, u_char dstat)
  *  the following situations:
  *
  *  - SCSI parity error + Phase mismatch  (PAR|MA)
- *    When an parity error is detected in input phase 
+ *    When a parity error is detected in input phase 
  *    and the device switches to msg-in phase inside a 
  *    block MOV.
  *  - SCSI parity error + Unexpected disconnect (PAR|UDC)
@@ -6118,7 +6118,7 @@ static void sym_wide_nego(hcb_p np, tcb_p tp, ccb_p cp)
 	};
 
 	/*
-	 * Is it an request from the device?
+	 * Is it a request from the device?
 	 */
 	if (INB (HS_PRT) == HS_NEGOTIATE) {
 		OUTB (HS_PRT, HS_BUSY);
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 925d64d..f3b29ce 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -915,7 +915,7 @@ wlstart(struct ifnet *ifp)
  *	the local buffer, the contents are copied to an mbuf chain that
  *	is then enqueued onto the appropriate "if" queue.
  *
- * input	: board number, and an frame descriptor address
+ * input	: board number, and a frame descriptor address
  * output	: the packet is put into an mbuf chain, and passed up
  * assumes	: if any errors occur, packet is "dropped on the floor"
  *