Module Name: src
Committed By: msaitoh
Date: Fri Aug 24 09:01:23 UTC 2012
Modified Files:
src/sys/arch/amiga/dev: siopreg.h
src/sys/arch/hpcmips/dev: plumreg.h
src/sys/dev/ic: advlib.h adwlib.h esiopvar.h osiopreg.h siopvar.h
tcic2.c
src/sys/dev/mii: nsphyter.c
src/sys/dev/pci: neo.c
src/sys/dev/pci/bktr: bktr_card.h
src/sys/dev/usb: if_atureg.h if_axe.c if_udavreg.h if_urlreg.h
if_zydreg.h usb.h
Log Message:
Fix typos
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amiga/dev/siopreg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcmips/dev/plumreg.h
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/advlib.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/adwlib.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/esiopvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/osiopreg.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/siopvar.h
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/ic/tcic2.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/mii/nsphyter.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/neo.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/bktr/bktr_card.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_atureg.h \
src/sys/dev/usb/if_udavreg.h src/sys/dev/usb/if_urlreg.h
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/if_zydreg.h
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/usb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/siopreg.h
diff -u src/sys/arch/amiga/dev/siopreg.h:1.14 src/sys/arch/amiga/dev/siopreg.h:1.15
--- src/sys/arch/amiga/dev/siopreg.h:1.14 Wed Mar 8 23:46:22 2006
+++ src/sys/arch/amiga/dev/siopreg.h Fri Aug 24 09:01:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: siopreg.h,v 1.14 2006/03/08 23:46:22 lukem Exp $ */
+/* $NetBSD: siopreg.h,v 1.15 2012/08/24 09:01:22 msaitoh Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -498,7 +498,7 @@ typedef volatile siop_regmap_t *siop_reg
#ifndef ARCH_720
#define SIOP_CTEST7_CDIS 0x80 /* Cache burst disable */
#define SIOP_CTEST7_SC1 0x40 /* Snoop control 1 */
-#define SIOP_CTEST7_SC0 0x20 /* Snoop contorl 0 */
+#define SIOP_CTEST7_SC0 0x20 /* Snoop control 0 */
#define SIOP_CTEST7_STD 0x10 /* Selection timeout disable */
#define SIOP_CTEST7_DFP 0x08 /* DMA FIFO parity bit */
#define SIOP_CTEST7_EVP 0x04 /* Even parity (to host bus) */
Index: src/sys/arch/hpcmips/dev/plumreg.h
diff -u src/sys/arch/hpcmips/dev/plumreg.h:1.3 src/sys/arch/hpcmips/dev/plumreg.h:1.4
--- src/sys/arch/hpcmips/dev/plumreg.h:1.3 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpcmips/dev/plumreg.h Fri Aug 24 09:01:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: plumreg.h,v 1.3 2008/04/28 20:23:21 martin Exp $ */
+/* $NetBSD: plumreg.h,v 1.4 2012/08/24 09:01:22 msaitoh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#define PLUM2_2 0x0102
/*
- * Bus contorller
+ * Bus controller
*/
#define PLUM_BUS_REGBASE 0x0000
#define PLUM_BUS_REGSIZE 0x1000
Index: src/sys/dev/ic/advlib.h
diff -u src/sys/dev/ic/advlib.h:1.17 src/sys/dev/ic/advlib.h:1.18
--- src/sys/dev/ic/advlib.h:1.17 Sun Dec 11 12:21:25 2005
+++ src/sys/dev/ic/advlib.h Fri Aug 24 09:01:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: advlib.h,v 1.17 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: advlib.h,v 1.18 2012/08/24 09:01:22 msaitoh Exp $ */
/*
* Definitions for low level routines and data structures
@@ -324,7 +324,7 @@ struct adv_ccb;
/*
- * SCSI Iquiry structure
+ * SCSI Inquiry structure
*/
typedef struct
Index: src/sys/dev/ic/adwlib.h
diff -u src/sys/dev/ic/adwlib.h:1.19 src/sys/dev/ic/adwlib.h:1.20
--- src/sys/dev/ic/adwlib.h:1.19 Sun Dec 11 12:21:25 2005
+++ src/sys/dev/ic/adwlib.h Fri Aug 24 09:01:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: adwlib.h,v 1.19 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: adwlib.h,v 1.20 2012/08/24 09:01:22 msaitoh Exp $ */
/*
* Definitions for low level routines and data structures
@@ -817,7 +817,7 @@ typedef struct adw_scsi_req_q {
u_int8_t sg_working_ix; /* ,uCode working SG variable. */
u_int8_t cdb[12]; /* SCSI CDB bytes 0-11. */
u_int32_t sg_real_addr; /* SG list physical address. */
- u_int32_t scsiq_rptr; /* Iternal pointer to ADW_SCSI_REQ_Q */
+ u_int32_t scsiq_rptr; /* Internal pointer to ADW_SCSI_REQ_Q */
u_int8_t cdb16[4]; /* SCSI CDB bytes 12-15. */
u_int32_t ccb_ptr; /* CCB Physical Address */
u_int32_t carr_va; /* Carrier v-address (unused) */
Index: src/sys/dev/ic/esiopvar.h
diff -u src/sys/dev/ic/esiopvar.h:1.20 src/sys/dev/ic/esiopvar.h:1.21
--- src/sys/dev/ic/esiopvar.h:1.20 Mon Oct 19 18:41:13 2009
+++ src/sys/dev/ic/esiopvar.h Fri Aug 24 09:01:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: esiopvar.h,v 1.20 2009/10/19 18:41:13 bouyer Exp $ */
+/* $NetBSD: esiopvar.h,v 1.21 2012/08/24 09:01:22 msaitoh Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -55,7 +55,7 @@ struct esiop_xfer {
/*
* This describes a command handled by the SCSI controller
- * These are chained in either a free list or a active list
+ * These are chained in either a free list or an active list
* We have one queue per target
*/
Index: src/sys/dev/ic/osiopreg.h
diff -u src/sys/dev/ic/osiopreg.h:1.5 src/sys/dev/ic/osiopreg.h:1.6
--- src/sys/dev/ic/osiopreg.h:1.5 Sun Dec 11 12:21:28 2005
+++ src/sys/dev/ic/osiopreg.h Fri Aug 24 09:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: osiopreg.h,v 1.5 2005/12/11 12:21:28 christos Exp $ */
+/* $NetBSD: osiopreg.h,v 1.6 2012/08/24 09:01:23 msaitoh Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -305,7 +305,7 @@
#define OSIOP_CTEST7_CDIS 0x80 /* Cache burst disable */
#define OSIOP_CTEST7_SC1 0x40 /* Snoop control 1 */
-#define OSIOP_CTEST7_SC0 0x20 /* Snoop contorl 0 */
+#define OSIOP_CTEST7_SC0 0x20 /* Snoop control 0 */
#define OSIOP_CTEST7_STD 0x10 /* Selection timeout disable */
#define OSIOP_CTEST7_DFP 0x08 /* DMA FIFO parity bit */
#define OSIOP_CTEST7_EVP 0x04 /* Even parity (to host bus) */
Index: src/sys/dev/ic/siopvar.h
diff -u src/sys/dev/ic/siopvar.h:1.28 src/sys/dev/ic/siopvar.h:1.29
--- src/sys/dev/ic/siopvar.h:1.28 Mon Oct 19 18:41:13 2009
+++ src/sys/dev/ic/siopvar.h Fri Aug 24 09:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: siopvar.h,v 1.28 2009/10/19 18:41:13 bouyer Exp $ */
+/* $NetBSD: siopvar.h,v 1.29 2012/08/24 09:01:23 msaitoh Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -42,7 +42,7 @@ struct siop_xfer {
/*
* This describes a command handled by the SCSI controller
- * These are chained in either a free list or a active list
+ * These are chained in either a free list or an active list
* We have one queue per target
*/
Index: src/sys/dev/ic/tcic2.c
diff -u src/sys/dev/ic/tcic2.c:1.36 src/sys/dev/ic/tcic2.c:1.37
--- src/sys/dev/ic/tcic2.c:1.36 Tue Jul 26 22:21:02 2011
+++ src/sys/dev/ic/tcic2.c Fri Aug 24 09:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2.c,v 1.36 2011/07/26 22:21:02 dyoung Exp $ */
+/* $NetBSD: tcic2.c,v 1.37 2012/08/24 09:01:23 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.36 2011/07/26 22:21:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.37 2012/08/24 09:01:23 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,7 +125,7 @@ tcic_check_reserved_bits(bus_space_tag_t
return 0;
DPRINTF(("tcic: chkrsvd 4\n"));
- /* R_IENA bits 7,2 are reserverd. */
+ /* R_IENA bits 7,2 are reserved. */
val = bus_space_read_1(iot, ioh, TCIC_R_IENA);
if (val & TCIC_IENA_RSVD)
return 0;
Index: src/sys/dev/mii/nsphyter.c
diff -u src/sys/dev/mii/nsphyter.c:1.36 src/sys/dev/mii/nsphyter.c:1.37
--- src/sys/dev/mii/nsphyter.c:1.36 Fri Nov 25 23:31:53 2011
+++ src/sys/dev/mii/nsphyter.c Fri Aug 24 09:01:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphyter.c,v 1.36 2011/11/25 23:31:53 jakllsch Exp $ */
+/* $NetBSD: nsphyter.c,v 1.37 2012/08/24 09:01:22 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.36 2011/11/25 23:31:53 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.37 2012/08/24 09:01:22 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -243,7 +243,7 @@ nsphyter_status(struct mii_softc *sc)
if (bmcr & BMCR_AUTOEN) {
/*
- * The media status bits are only valid of autonegotiation
+ * The media status bits are only valid if autonegotiation
* has completed (or it's disabled).
*/
if ((bmsr & BMSR_ACOMP) == 0) {
Index: src/sys/dev/pci/neo.c
diff -u src/sys/dev/pci/neo.c:1.47 src/sys/dev/pci/neo.c:1.48
--- src/sys/dev/pci/neo.c:1.47 Thu Nov 24 03:35:59 2011
+++ src/sys/dev/pci/neo.c Fri Aug 24 09:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: neo.c,v 1.47 2011/11/24 03:35:59 mrg Exp $ */
+/* $NetBSD: neo.c,v 1.48 2012/08/24 09:01:23 msaitoh Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <gand...@vilnya.demon.co.uk>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.47 2011/11/24 03:35:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.48 2012/08/24 09:01:23 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.47
*
* The Neomagic 256 AV/ZX have 2 PCI I/O region descriptors. Both of
* them describe a memory region. The frame buffer is the first region
- * and the register set is the secodn region.
+ * and the register set is the second region.
*
* The register manipulation logic is taken from the Linux driver,
* which is in the public domain.
Index: src/sys/dev/pci/bktr/bktr_card.h
diff -u src/sys/dev/pci/bktr/bktr_card.h:1.5 src/sys/dev/pci/bktr/bktr_card.h:1.6
--- src/sys/dev/pci/bktr/bktr_card.h:1.5 Tue Dec 6 23:43:57 2005
+++ src/sys/dev/pci/bktr/bktr_card.h Fri Aug 24 09:01:23 2012
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_card.h,v 1.3 2003/03/11 23:11:22 thomasklausner Exp $ */
-/* $NetBSD: bktr_card.h,v 1.5 2005/12/06 23:43:57 wiz Exp $ */
+/* $NetBSD: bktr_card.h,v 1.6 2012/08/24 09:01:23 msaitoh Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.4 2000/06/26 09:41:31 roger Exp$ */
/*
@@ -56,7 +56,7 @@
* options BKTR_OVERRIDE_CARD <card type>
* eg options BKTR_OVERRIDE CARD=1
*
- * or using the sysclt hw.bt848.card
+ * or using the sysctl hw.bt848.card
* eg sysctl -w hw.bt848.card=1
*
* where <card type> is one of the following card defines.
Index: src/sys/dev/usb/if_atureg.h
diff -u src/sys/dev/usb/if_atureg.h:1.8 src/sys/dev/usb/if_atureg.h:1.9
--- src/sys/dev/usb/if_atureg.h:1.8 Fri Sep 4 18:10:08 2009
+++ src/sys/dev/usb/if_atureg.h Fri Aug 24 09:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atureg.h,v 1.8 2009/09/04 18:10:08 dyoung Exp $ */
+/* $NetBSD: if_atureg.h,v 1.9 2012/08/24 09:01:23 msaitoh Exp $ */
/* $OpenBSD: if_atureg.h,v 1.21 2004/12/23 13:19:38 dlg Exp $ */
/*
* Copyright (c) 2003
@@ -36,11 +36,11 @@
#define ATU_CONFIG_NO 1
#define ATU_IFACE_IDX 0
-/* the number of simultaniuously requested RX transfers */
+/* the number of simultaneously requested RX transfers */
#define ATU_RX_LIST_CNT 1
/*
- * the number of simultaniously started TX transfers
+ * the number of simultaneously started TX transfers
* my measurements :
* 1 430.82 KB/sec
* 2 534.66 KB/sec
Index: src/sys/dev/usb/if_udavreg.h
diff -u src/sys/dev/usb/if_udavreg.h:1.8 src/sys/dev/usb/if_udavreg.h:1.9
--- src/sys/dev/usb/if_udavreg.h:1.8 Thu Feb 2 19:43:07 2012
+++ src/sys/dev/usb/if_udavreg.h Fri Aug 24 09:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udavreg.h,v 1.8 2012/02/02 19:43:07 tls Exp $ */
+/* $NetBSD: if_udavreg.h,v 1.9 2012/08/24 09:01:23 msaitoh Exp $ */
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -156,7 +156,7 @@ struct udav_cdata {
struct udav_chain udav_tx_chain[UDAV_TX_LIST_CNT];
struct udav_chain udav_rx_chain[UDAV_TX_LIST_CNT];
#if 0
- /* XXX: Intrrupt Endpoint is not yet supported! */
+ /* XXX: Interrupt Endpoint is not yet supported! */
struct udav_intrpkg udav_ibuf;
#endif
int udav_tx_prod;
Index: src/sys/dev/usb/if_urlreg.h
diff -u src/sys/dev/usb/if_urlreg.h:1.8 src/sys/dev/usb/if_urlreg.h:1.9
--- src/sys/dev/usb/if_urlreg.h:1.8 Thu Feb 2 19:43:07 2012
+++ src/sys/dev/usb/if_urlreg.h Fri Aug 24 09:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urlreg.h,v 1.8 2012/02/02 19:43:07 tls Exp $ */
+/* $NetBSD: if_urlreg.h,v 1.9 2012/08/24 09:01:23 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <n...@nabechan.org>. All rights reserved.
@@ -142,7 +142,7 @@ struct url_cdata {
struct url_chain url_tx_chain[URL_TX_LIST_CNT];
struct url_chain url_rx_chain[URL_TX_LIST_CNT];
#if 0
- /* XXX: Intrrupt Endpoint is not yet supported! */
+ /* XXX: Interrupt Endpoint is not yet supported! */
struct url_intrpkg url_ibuf;
#endif
int url_tx_prod;
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.56 src/sys/dev/usb/if_axe.c:1.57
--- src/sys/dev/usb/if_axe.c:1.56 Sun Jul 22 14:33:05 2012
+++ src/sys/dev/usb/if_axe.c Fri Aug 24 09:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.56 2012/07/22 14:33:05 matt Exp $ */
+/* $NetBSD: if_axe.c,v 1.57 2012/08/24 09:01:23 msaitoh Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -77,7 +77,7 @@
* to send any packets.
*
* Note that this device appears to only support loading the station
- * address via autload from the EEPROM (i.e. there's no way to manaully
+ * address via autoload from the EEPROM (i.e. there's no way to manaully
* set it).
*
* (Adam Weinberger wanted me to name this driver if_gir.c.)
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.56 2012/07/22 14:33:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.57 2012/08/24 09:01:23 msaitoh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
Index: src/sys/dev/usb/if_zydreg.h
diff -u src/sys/dev/usb/if_zydreg.h:1.6 src/sys/dev/usb/if_zydreg.h:1.7
--- src/sys/dev/usb/if_zydreg.h:1.6 Sun Jan 16 09:08:29 2011
+++ src/sys/dev/usb/if_zydreg.h Fri Aug 24 09:01:23 2012
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */
-/* $NetBSD: if_zydreg.h,v 1.6 2011/01/16 09:08:29 tsutsui Exp $ */
+/* $NetBSD: if_zydreg.h,v 1.7 2012/08/24 09:01:23 msaitoh Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -110,7 +110,7 @@
#define ZYD_MACB_MAX_RETRY 0x9b28
/*
- * Miscellanous registers.
+ * Miscellaneous registers.
*/
#define ZYD_FIRMWARE_START_ADDR 0xee00
#define ZYD_FIRMWARE_BASE_ADDR 0xee1d /* Firmware base address */
Index: src/sys/dev/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.95 src/sys/dev/usb/usb.h:1.96
--- src/sys/dev/usb/usb.h:1.95 Thu Jun 14 05:14:41 2012
+++ src/sys/dev/usb/usb.h Fri Aug 24 09:01:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.95 2012/06/14 05:14:41 blymn Exp $ */
+/* $NetBSD: usb.h,v 1.96 2012/08/24 09:01:23 msaitoh Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
/*
@@ -124,7 +124,7 @@ typedef u_int8_t uDWord[4];
(w)[3] = (u_int8_t)((v) >> 24))
#else
/*
- * On little-endian machines that can handle unanliged accesses
+ * On little-endian machines that can handle unaligned accesses
* (e.g. i386) these macros can be replaced by the following.
*/
#define UGETW(w) (*(u_int16_t *)(w))
