summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorMartynas Venckus <martynas@cvs.openbsd.org>2007-11-26 09:28:35 +0000
committerMartynas Venckus <martynas@cvs.openbsd.org>2007-11-26 09:28:35 +0000
commit04b4ef9c75ed734905ee1bdf681657395bf1dd08 (patch)
tree7afd3082a841d290022885a5e94f2226628afa31 /sys/dev/pci
parentc8bcb9eaf1366f287c7c29562467558769a87f3c (diff)
typos; ok jmc@
sys/netinet/in_pcb.c and sys/net/bridgestp.c ok henning@ sys/dev/pci/bktr/* ok jakemsr@
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/bktr/bktr_core.c8
-rw-r--r--sys/dev/pci/bktr/bktr_os.c4
-rw-r--r--sys/dev/pci/bktr/bktr_reg.h8
-rw-r--r--sys/dev/pci/if_bce.c4
-rw-r--r--sys/dev/pci/if_lge.c4
-rw-r--r--sys/dev/pci/if_nge.c4
-rw-r--r--sys/dev/pci/if_san_te1.c4
-rw-r--r--sys/dev/pci/if_vgereg.h10
-rw-r--r--sys/dev/pci/if_vr.c4
-rw-r--r--sys/dev/pci/musycc.c4
10 files changed, 27 insertions, 27 deletions
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index 138414d5a5e..fa412985c1f 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_core.c,v 1.25 2007/09/15 10:10:37 martin Exp $ */
+/* $OpenBSD: bktr_core.c,v 1.26 2007/11/26 09:28:34 martynas Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */
/*
@@ -399,7 +399,7 @@ common_bktr_attach( bktr_ptr_t bktr, int unit, u_int pci_id, u_int rev )
bktr->alloc_pages = 0;
}
- bktr->flags = METEOR_INITALIZED | METEOR_AUTOMODE |
+ bktr->flags = METEOR_INITIALIZED | METEOR_AUTOMODE |
METEOR_DEV0 | METEOR_RGB16;
bktr->dma_prog_loaded = FALSE;
bktr->cols = 640;
@@ -439,7 +439,7 @@ common_bktr_attach( bktr_ptr_t bktr, int unit, u_int pci_id, u_int rev )
bktr->clr_on_start = FALSE;
/* defaults for the tuner section of the card */
- bktr->tflags = TUNER_INITALIZED;
+ bktr->tflags = TUNER_INITIALIZED;
bktr->tuner.frequency = 0;
bktr->tuner.channel = 0;
bktr->tuner.chnlset = DEFAULT_CHNLSET;
@@ -924,7 +924,7 @@ vbi_open( bktr_ptr_t bktr )
int
tuner_open( bktr_ptr_t bktr )
{
- if ( !(bktr->tflags & TUNER_INITALIZED) ) /* device not found */
+ if ( !(bktr->tflags & TUNER_INITIALIZED) ) /* device not found */
return( ENXIO );
if ( bktr->tflags & TUNER_OPEN ) /* already open */
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index 05d5f766fa0..9e16d0b3ee6 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_os.c,v 1.27 2007/06/18 07:31:14 jakemsr Exp $ */
+/* $OpenBSD: bktr_os.c,v 1.28 2007/11/26 09:28:34 martynas Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */
/*
@@ -359,7 +359,7 @@ bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
bktr = bktr_cd.cd_devs[unit];
- if (!(bktr->flags & METEOR_INITALIZED)) /* device not found */
+ if (!(bktr->flags & METEOR_INITIALIZED)) /* device not found */
return(ENXIO);
switch (FUNCTION(dev)) {
diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h
index d403ba41eee..e21b8a44b9b 100644
--- a/sys/dev/pci/bktr/bktr_reg.h
+++ b/sys/dev/pci/bktr/bktr_reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_reg.h,v 1.10 2007/06/11 08:10:22 robert Exp $ */
+/* $OpenBSD: bktr_reg.h,v 1.11 2007/11/26 09:28:34 martynas Exp $ */
/*
* $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp $
*
@@ -547,7 +547,7 @@ struct bktr_softc {
u_short capcontrol; /* reg 0xdc capture control */
u_short bktr_cap_ctl;
volatile u_int flags;
-#define METEOR_INITALIZED 0x00000001
+#define METEOR_INITIALIZED 0x00000001
#define METEOR_OPEN 0x00000002
#define METEOR_MMAP 0x00000004
#define METEOR_INTR 0x00000008
@@ -587,10 +587,10 @@ struct bktr_softc {
#define METEOR_RGB 0x20000000 /* meteor rgb unit */
#define METEOR_FIELD_MODE 0x80000000
u_char tflags; /* Tuner flags (/dev/tuner) */
-#define TUNER_INITALIZED 0x00000001
+#define TUNER_INITIALIZED 0x00000001
#define TUNER_OPEN 0x00000002
u_char vbiflags; /* VBI flags (/dev/vbi) */
-#define VBI_INITALIZED 0x00000001
+#define VBI_INITIALIZED 0x00000001
#define VBI_OPEN 0x00000002
#define VBI_CAPTURE 0x00000004
u_short fps; /* frames per second */
diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 2a6ce0bec08..af520a0373f 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bce.c,v 1.20 2007/05/21 10:30:10 reyk Exp $ */
+/* $OpenBSD: if_bce.c,v 1.21 2007/11/26 09:28:33 martynas Exp $ */
/* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $ */
/*
@@ -977,7 +977,7 @@ bce_init(struct ifnet *ifp)
bus_space_write_4(sc->bce_btag, sc->bce_bhandle, BCE_DMA_RXADDR,
sc->bce_ring_map->dm_segs[0].ds_addr + 0x40000000); /* MAGIC */
- /* Initalize receive descriptors */
+ /* Initialize receive descriptors */
for (i = 0; i < BCE_NRXDESC; i++) {
if (sc->bce_cdata.bce_rx_chain[i] == NULL) {
if ((error = bce_add_rxbuf(sc, i)) != 0) {
diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c
index 9b0c7142aeb..2050448e419 100644
--- a/sys/dev/pci/if_lge.c
+++ b/sys/dev/pci/if_lge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lge.c,v 1.45 2006/10/25 02:37:50 brad Exp $ */
+/* $OpenBSD: if_lge.c,v 1.46 2007/11/26 09:28:33 martynas Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -1057,7 +1057,7 @@ lge_intr(void *arg)
sc = arg;
ifp = &sc->arpcom.ac_if;
- /* Supress unwanted interrupts */
+ /* Suppress unwanted interrupts */
if (!(ifp->if_flags & IFF_UP)) {
lge_stop(sc);
return (0);
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index 03eaf8828ec..8d20d4127d7 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nge.c,v 1.56 2006/10/25 02:37:50 brad Exp $ */
+/* $OpenBSD: if_nge.c,v 1.57 2007/11/26 09:28:33 martynas Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -1513,7 +1513,7 @@ nge_intr(arg)
sc = arg;
ifp = &sc->arpcom.ac_if;
- /* Supress unwanted interrupts */
+ /* Suppress unwanted interrupts */
if (!(ifp->if_flags & IFF_UP)) {
nge_stop(sc);
return (0);
diff --git a/sys/dev/pci/if_san_te1.c b/sys/dev/pci/if_san_te1.c
index 2b976554501..36adb4bc7bc 100644
--- a/sys/dev/pci/if_san_te1.c
+++ b/sys/dev/pci/if_san_te1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_san_te1.c,v 1.9 2005/07/07 20:58:50 canacar Exp $ */
+/* $OpenBSD: if_san_te1.c,v 1.10 2007/11/26 09:28:33 martynas Exp $ */
/*-
* Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -2026,7 +2026,7 @@ sdla_te_gettimeslot(void* pcard)
unsigned long ts_map = card->fe_te.te_cfg.active_ch;
if (IS_T1(&card->fe_te.te_cfg)) {
- /* See explaination before. */
+ /* See explanation before. */
ts_map = ts_map << 1;
}
return ts_map;
diff --git a/sys/dev/pci/if_vgereg.h b/sys/dev/pci/if_vgereg.h
index 34c26f5f4bb..35d847e2881 100644
--- a/sys/dev/pci/if_vgereg.h
+++ b/sys/dev/pci/if_vgereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vgereg.h,v 1.1 2004/12/01 01:29:00 pvalchev Exp $ */
+/* $OpenBSD: if_vgereg.h,v 1.2 2007/11/26 09:28:33 martynas Exp $ */
/* $FreeBSD: if_vgereg.h,v 1.1 2004/09/10 20:57:45 wpaul Exp $ */
/*
* Copyright (c) 2004
@@ -243,8 +243,8 @@
#define VGE_INTCTL_HC_RELOAD 0x02 /* enable hold timer reload */
#define VGE_INTCTL_STATUS 0x04 /* interrupt pending status */
#define VGE_INTCTL_MASK 0x18 /* multilayer int mask */
-#define VGE_INTCTL_RXINTSUP_DISABLE 0x20 /* disable RX int supression */
-#define VGE_INTCTL_TXINTSUP_DISABLE 0x40 /* disable TX int supression */
+#define VGE_INTCTL_RXINTSUP_DISABLE 0x20 /* disable RX int suppression */
+#define VGE_INTCTL_TXINTSUP_DISABLE 0x40 /* disable TX int suppression */
#define VGE_INTCTL_SOFTINT 0x80 /* request soft interrupt */
#define VGE_INTMASK_LAYER0 0x00
@@ -387,8 +387,8 @@
* the multicast hash filter or the CAM table)
* - The behavior of the interrupt holdoff timer register at offset
* 0x20 (the page select bits allow you to set the interrupt
- * holdoff timer, the TX interrupt supression count or the
- * RX interrupt supression count)
+ * holdoff timer, the TX interrupt suppression count or the
+ * RX interrupt suppression count)
* - The behavior the WOL pattern programming registers at offset
* 0xC0 (controls which pattern is set)
*/
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 93ae423ff5a..8c3a184f238 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vr.c,v 1.70 2007/10/02 07:22:18 brad Exp $ */
+/* $OpenBSD: if_vr.c,v 1.71 2007/11/26 09:28:33 martynas Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -988,7 +988,7 @@ vr_intr(void *arg)
sc = arg;
ifp = &sc->arpcom.ac_if;
- /* Supress unwanted interrupts. */
+ /* Suppress unwanted interrupts. */
if (!(ifp->if_flags & IFF_UP)) {
vr_stop(sc);
return 0;
diff --git a/sys/dev/pci/musycc.c b/sys/dev/pci/musycc.c
index bdc8c0aa83d..caed3ebeeae 100644
--- a/sys/dev/pci/musycc.c
+++ b/sys/dev/pci/musycc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: musycc.c,v 1.17 2007/10/01 15:34:48 krw Exp $ */
+/* $OpenBSD: musycc.c,v 1.18 2007/11/26 09:28:33 martynas Exp $ */
/*
* Copyright (c) 2004,2005 Internet Business Solutions AG, Zurich, Switzerland
@@ -309,7 +309,7 @@ musycc_alloc_group(struct musycc_group *mg)
/* add all descriptors to the freelist */
for (j = 0; j < MUSYCC_DMA_CNT; j++) {
dd = &mg->mg_dma_pool[j];
- /* initalize, same as for spare maps */
+ /* initialize, same as for spare maps */
if (bus_dmamap_create(mg->mg_dmat, MCLBYTES, MUSYCC_DMA_SIZE,
MCLBYTES, 0, BUS_DMA_NOWAIT, &dd->map)) {
musycc_free_group(mg);