summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2004-02-13 11:36:08 +0000
committerwiz <wiz@NetBSD.org>2004-02-13 11:36:08 +0000
commitd20841bb642898112fe68f0ad3f7b26dddf56f07 (patch)
tree364375441e88088a6af9bc8a11f59e98432cac6e /sys/dev
parentbabebaa9f9ddde1392e6dac741b25cd4dfe3b722 (diff)
Uppercase CPU, plural is CPUs.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_madt.c6
-rw-r--r--sys/dev/bi/bireg.h6
-rw-r--r--sys/dev/dec/clockvar.h4
-rw-r--r--sys/dev/ic/advmcode.c6
-rw-r--r--sys/dev/ic/adwmcode.c6
-rw-r--r--sys/dev/ic/aic79xx.c6
-rw-r--r--sys/dev/ic/aic7xxx.c8
-rw-r--r--sys/dev/ic/lancevar.h4
-rw-r--r--sys/dev/ic/vga_subr.c8
-rw-r--r--sys/dev/marvell/gtintrreg.h8
-rw-r--r--sys/dev/mvme/memcreg.h4
-rw-r--r--sys/dev/mvme/mvmebus.c8
-rw-r--r--sys/dev/mvme/osiop_pcctwo.c8
-rw-r--r--sys/dev/pci/agp.c6
-rw-r--r--sys/dev/sun/cgsix.c6
15 files changed, 47 insertions, 47 deletions
diff --git a/sys/dev/acpi/acpi_madt.c b/sys/dev/acpi/acpi_madt.c
index a7be7415c3f..0987b23f4b3 100644
--- a/sys/dev/acpi/acpi_madt.c
+++ b/sys/dev/acpi/acpi_madt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_madt.c,v 1.9 2003/12/11 17:46:23 christos Exp $ */
+/* $NetBSD: acpi_madt.c,v 1.10 2004/02/13 11:36:20 wiz Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.9 2003/12/11 17:46:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.10 2004/02/13 11:36:20 wiz Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -172,7 +172,7 @@ acpi_print_iosapic(MADT_IO_SAPIC *p)
static void
acpi_print_local_sapic(MADT_LOCAL_SAPIC *p)
{
- printf("local sapic: cpu %u sapid %u sapeid %u enabled: %s\n",
+ printf("local sapic: CPU %u sapid %u sapeid %u enabled: %s\n",
p->ProcessorId, p->LocalSapicId, p->LocalSapicEid,
p->ProcessorEnabled ? "yes" : "no");
}
diff --git a/sys/dev/bi/bireg.h b/sys/dev/bi/bireg.h
index a56726e561e..6e703d94120 100644
--- a/sys/dev/bi/bireg.h
+++ b/sys/dev/bi/bireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bireg.h,v 1.8 2003/08/07 16:30:53 agc Exp $ */
+/* $NetBSD: bireg.h,v 1.9 2004/02/13 11:36:20 wiz Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -88,7 +88,7 @@ struct bi_node {
};
/*
- * A cpu node.
+ * A CPU node.
*/
struct bi_cpu {
struct biiregs biic; /* interface chip */
@@ -120,7 +120,7 @@ struct bi_cpu {
#define BIDT_DWBUA 0x0102 /* DWBUA Unibus adapter */
#define BIDT_KLESI 0x0103 /* KLESI-B (DWBLA) adapter */
#define BIDT_HSB70 0x4104 /* HSB70 */
-#define BIDT_KA820 0x0105 /* KA820 cpu */
+#define BIDT_KA820 0x0105 /* KA820 CPU */
#define BIDT_DB88 0x0106 /* DB88 (NBI) adapter */
#define BIDT_DWMBA 0x2107 /* XMI-BI (XBI) adapter */
#define BIDT_DWMBB 0x0107 /* XMI-BI (XBI) adapter */
diff --git a/sys/dev/dec/clockvar.h b/sys/dev/dec/clockvar.h
index 3e679ad64eb..e960559b5bb 100644
--- a/sys/dev/dec/clockvar.h
+++ b/sys/dev/dec/clockvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: clockvar.h,v 1.4 1997/06/22 08:02:18 jonathan Exp $ */
+/* $NetBSD: clockvar.h,v 1.5 2004/02/13 11:36:21 wiz Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
/*
- * Definitions for cpu-independent clock handling for the alpha and pmax.
+ * Definitions for CPU-independent clock handling for the alpha and pmax.
*/
/*
diff --git a/sys/dev/ic/advmcode.c b/sys/dev/ic/advmcode.c
index 677a3a809c6..9f7d62c3fea 100644
--- a/sys/dev/ic/advmcode.c
+++ b/sys/dev/ic/advmcode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advmcode.c,v 1.6 2003/11/02 11:07:44 wiz Exp $ */
+/* $NetBSD: advmcode.c,v 1.7 2004/02/13 11:36:21 wiz Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -55,13 +55,13 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advmcode.c,v 1.6 2003/11/02 11:07:44 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advmcode.c,v 1.7 2004/02/13 11:36:21 wiz Exp $");
#include <sys/param.h>
/*
- * This is the uCode for the Narrow board RISC cpu.
+ * This is the uCode for the Narrow board RISC CPU.
* This code is loaded into Lram during initialization procedure.
*/
diff --git a/sys/dev/ic/adwmcode.c b/sys/dev/ic/adwmcode.c
index cecf92b1996..55ccfe5ce63 100644
--- a/sys/dev/ic/adwmcode.c
+++ b/sys/dev/ic/adwmcode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adwmcode.c,v 1.11 2003/10/21 00:57:47 fvdl Exp $ */
+/* $NetBSD: adwmcode.c,v 1.12 2004/02/13 11:36:21 wiz Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adwmcode.c,v 1.11 2003/10/21 00:57:47 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adwmcode.c,v 1.12 2004/02/13 11:36:21 wiz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@ AdwInitCarriers(carr_dmap, carriers)
/******************************************************************************/
/*
- * This is the uCode for the Wide board RISC cpu.
+ * This is the uCode for the Wide board RISC CPU.
* This code is loaded into Lram during initialization procedure.
*/
const u_int8_t adw_asc3550_mcode[] = {
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index 9673f0aaebc..b3907101203 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.c,v 1.26 2003/11/02 11:07:44 wiz Exp $ */
+/* $NetBSD: aic79xx.c,v 1.27 2004/02/13 11:36:21 wiz Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.26 2003/11/02 11:07:44 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.27 2004/02/13 11:36:21 wiz Exp $");
#include <dev/ic/aic79xx_osm.h>
#include <dev/ic/aic79xx_inline.h>
@@ -8520,7 +8520,7 @@ ahd_download_instr(struct ahd_softc *ahd, u_int instrptr, uint8_t *dconsts)
if ((count & 0x01) == 0)
instr.format1.parity = 1;
- /* The sequencer is a little endian cpu */
+ /* The sequencer is a little endian CPU */
instr.integer = ahd_htole32(instr.integer);
ahd_outsb(ahd, SEQRAM, instr.bytes, 4);
break;
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index df2f0849d50..82be502683e 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.109 2004/02/13 11:36:22 wiz Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $
+ * $Id: aic7xxx.c,v 1.109 2004/02/13 11:36:22 wiz Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.109 2004/02/13 11:36:22 wiz Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -6517,7 +6517,7 @@ ahc_download_instr(struct ahc_softc *ahc, u_int instrptr, uint8_t *dconsts)
| (fmt1_ins->opcode << 25);
}
}
- /* The sequencer is a little endian cpu */
+ /* The sequencer is a little endian CPU */
instr.integer = ahc_htole32(instr.integer);
ahc_outsb(ahc, SEQRAM, instr.bytes, 4);
break;
diff --git a/sys/dev/ic/lancevar.h b/sys/dev/ic/lancevar.h
index 58134d29ea6..69134fab896 100644
--- a/sys/dev/ic/lancevar.h
+++ b/sys/dev/ic/lancevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lancevar.h,v 1.6 2003/06/29 22:30:12 fvdl Exp $ */
+/* $NetBSD: lancevar.h,v 1.7 2004/02/13 11:36:22 wiz Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -141,7 +141,7 @@ void lance_read __P((struct lance_softc *, int, int));
void lance_setladrf __P((struct ethercom *, u_int16_t *));
/*
- * The following functions are only useful on certain cpu/bus
+ * The following functions are only useful on certain CPU/bus
* combinations. They should be written in assembly language for
* maximum efficiency, but machine-independent versions are provided
* for drivers that have not yet been optimized.
diff --git a/sys/dev/ic/vga_subr.c b/sys/dev/ic/vga_subr.c
index b9d4afda705..636470bf337 100644
--- a/sys/dev/ic/vga_subr.c
+++ b/sys/dev/ic/vga_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_subr.c,v 1.15 2003/02/09 10:29:36 jdolecek Exp $ */
+/* $NetBSD: vga_subr.c,v 1.16 2004/02/13 11:36:22 wiz Exp $ */
/*
* Copyright (c) 1998
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.15 2003/02/09 10:29:36 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.16 2004/02/13 11:36:22 wiz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@ fontram(struct vga_handle *vh)
/* program graphics controller to access character generator */
- vga_gdc_write(vh, rdplanesel, 0x02); /* select map 2 for cpu reads */
+ vga_gdc_write(vh, rdplanesel, 0x02); /* select map 2 for CPU reads */
vga_gdc_write(vh, mode, 0x00); /* disable odd-even addressing */
vga_gdc_write(vh, misc, 0x04); /* map starts at 0xA000 */
}
@@ -86,7 +86,7 @@ textram(struct vga_handle *vh)
/* program graphics controller for text mode */
- vga_gdc_write(vh, rdplanesel, 0x00); /* select map 0 for cpu reads */
+ vga_gdc_write(vh, rdplanesel, 0x00); /* select map 0 for CPU reads */
vga_gdc_write(vh, mode, 0x10); /* enable odd-even addressing */
/* map starts at 0xb800 or 0xb000 (mono) */
vga_gdc_write(vh, misc, (vh->vh_mono ? 0x0a : 0x0e));
diff --git a/sys/dev/marvell/gtintrreg.h b/sys/dev/marvell/gtintrreg.h
index a69b4d3012a..1f640728418 100644
--- a/sys/dev/marvell/gtintrreg.h
+++ b/sys/dev/marvell/gtintrreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtintrreg.h,v 1.1 2003/03/05 22:08:21 matt Exp $ */
+/* $NetBSD: gtintrreg.h,v 1.2 2004/02/13 11:36:22 wiz Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -65,9 +65,9 @@
*/
#define ICR_MIC_LO 0xc18 /* main interrupt cause low */
#define ICR_MIC_HI 0xc68 /* main interrupt cause high */
-#define ICR_CIM_LO 0xc1c /* cpu interrupt mask low */
-#define ICR_CIM_HI 0xc6c /* cpu interrupt mask high */
-#define ICR_CSC 0xc70 /* cpu select cause */
+#define ICR_CIM_LO 0xc1c /* CPU interrupt mask low */
+#define ICR_CIM_HI 0xc6c /* CPU interrupt mask high */
+#define ICR_CSC 0xc70 /* CPU select cause */
#define ICR_P0IM_LO 0xc24 /* PCI_0 interrupt mask low */
#define ICR_P0IM_HI 0xc64 /* PCI_0 interrupt mask high */
#define ICR_P0SC 0xc74 /* PCI_0 select cause */
diff --git a/sys/dev/mvme/memcreg.h b/sys/dev/mvme/memcreg.h
index e75bb013f91..4fa4cd91cd3 100644
--- a/sys/dev/mvme/memcreg.h
+++ b/sys/dev/mvme/memcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: memcreg.h,v 1.1 2002/02/12 20:38:46 scw Exp $ */
+/* $NetBSD: memcreg.h,v 1.2 2004/02/13 11:36:22 wiz Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#define MEMC040_MEMORY_CONFIG_WPB (1u << 4) /* Write Per Bit mode */
#define MEMC_MEMORY_CONFIG_FSTRD (1u << 5) /* Fast RAM Read enabled */
-/* Where, in the cpu's address space, does this memory appear? */
+/* Where, in the CPU's address space, does this memory appear? */
#define MEMC_REG_BASE_ADDRESS_HI 0x14
#define MEMC_REG_BASE_ADDRESS_LO 0x18
#define MEMC_BASE_ADDRESS(hi,lo) (((hi) << 24) | (((lo) & 0xc0) << 22))
diff --git a/sys/dev/mvme/mvmebus.c b/sys/dev/mvme/mvmebus.c
index 1804bf2ff9e..594308a3dcc 100644
--- a/sys/dev/mvme/mvmebus.c
+++ b/sys/dev/mvme/mvmebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mvmebus.c,v 1.6 2003/11/26 14:27:15 scw Exp $ */
+/* $NetBSD: mvmebus.c,v 1.7 2004/02/13 11:36:22 wiz Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.6 2003/11/26 14:27:15 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.7 2004/02/13 11:36:22 wiz Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -596,7 +596,7 @@ mvmebus_dmamap_load_common(sc, map)
/*
* Traverse the list of segments which make up this map, and
- * convert the cpu-relative addresses therein to VMEbus addresses.
+ * convert the CPU-relative addresses therein to VMEbus addresses.
*/
for (ds = &map->dm_segs[0]; ds < &map->dm_segs[map->dm_nsegs]; ds++) {
/*
@@ -843,7 +843,7 @@ mvmebus_dmamem_alloc(vsc, len, am, datasize, swap, segs, nsegs, rsegs, flags)
/*
* Allocate physical memory.
*
- * Note: This fills in the segments with cpu-relative physical
+ * Note: This fills in the segments with CPU-relative physical
* addresses. A further call to bus_dmamap_load_raw() (with a
* DMA map which specifies the same VMEbus address space and
* constraints as the call to here) must be made. The segments
diff --git a/sys/dev/mvme/osiop_pcctwo.c b/sys/dev/mvme/osiop_pcctwo.c
index a6f78e77ad1..e5882660258 100644
--- a/sys/dev/mvme/osiop_pcctwo.c
+++ b/sys/dev/mvme/osiop_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop_pcctwo.c,v 1.6 2003/11/26 14:29:37 scw Exp $ */
+/* $NetBSD: osiop_pcctwo.c,v 1.7 2004/02/13 11:36:22 wiz Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.6 2003/11/26 14:29:37 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.7 2004/02/13 11:36:22 wiz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,8 +125,8 @@ osiop_pcctwo_attach(parent, self, args)
sc = (struct osiop_pcctwo_softc *) self;
/*
- * On the '17x the siop's clock is the same as the cpu clock.
- * On the other boards, the siop runs at twice the cpu clock.
+ * On the '17x the siop's clock is the same as the CPU clock.
+ * On the other boards, the siop runs at twice the CPU clock.
* Also, the 17x cannot do proper bus-snooping (the 68060 is
* lame in this repspect) so don't enable it on that board.
*/
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index f90c4ad1dfe..45bb3bd3dff 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp.c,v 1.31 2003/08/26 17:33:23 tron Exp $ */
+/* $NetBSD: agp.c,v 1.32 2004/02/13 11:36:22 wiz Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -65,7 +65,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.31 2003/08/26 17:33:23 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.32 2004/02/13 11:36:22 wiz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -609,7 +609,7 @@ agp_generic_bind_memory(struct agp_softc *sc, struct agp_memory *mem,
}
/*
- * Flush the cpu cache since we are providing a new mapping
+ * Flush the CPU cache since we are providing a new mapping
* for these pages.
*/
agp_flush_cache();
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index 2c40807e72d..e8239a9e151 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.16 2003/11/13 03:09:29 chs Exp $ */
+/* $NetBSD: cgsix.c,v 1.17 2004/02/13 11:36:22 wiz Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.16 2003/11/13 03:09:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.17 2004/02/13 11:36:22 wiz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -760,7 +760,7 @@ cg6_reset(sc)
/* take care of hardware bugs in old revisions */
if (sc->sc_fhcrev < 5) {
/*
- * Keep current resolution; set cpu to 68020, set test
+ * Keep current resolution; set CPU to 68020, set test
* window (size 1Kx1K), and for rev 1, disable dest cache.
*/
fhc = (*sc->sc_fhc & FHC_RES_MASK) | FHC_CPU_68020 |