From 24ad8a984216ddd6cda66a3325a55fe6bd74b88c Mon Sep 17 00:00:00 2001 From: marius Date: Mon, 16 Aug 2004 15:45:27 +0000 Subject: Instead of "OpenFirmware", "openfirmware", etc. use the official spelling "Open Firmware" from IEEE 1275 and OpenFirmware.org (no pun intended). Ok'ed by: tmm --- libexec/tftpd/tftpd.c | 2 +- share/man/man7/hier.7 | 2 +- sys/boot/Makefile | 2 +- sys/boot/ofw/common/main.c | 2 +- sys/boot/ofw/libofw/ofw_console.c | 2 +- sys/boot/ofw/libofw/ofw_net.c | 2 +- sys/boot/ofw/libofw/openfirm.c | 4 ++-- sys/boot/ofw/libofw/openfirm.h | 4 ++-- sys/boot/powerpc/loader/Makefile | 4 ++-- sys/boot/powerpc/ofw/Makefile | 4 ++-- sys/boot/sparc64/boot1/boot1.c | 2 +- sys/boot/sparc64/loader/Makefile | 2 +- sys/boot/sparc64/loader/main.c | 2 +- sys/dev/ofw/ofw_disk.c | 6 +++--- sys/dev/ofw/openfirm.c | 6 +++--- sys/dev/ofw/openfirm.h | 6 +++--- sys/dev/ofw/openfirmio.c | 2 +- sys/dev/ofw/openpromio.c | 4 ++-- sys/powerpc/aim/locore.S | 2 +- sys/powerpc/aim/mmu_oea.c | 2 +- sys/powerpc/aim/nexus.c | 6 +++--- sys/powerpc/aim/ofw_machdep.c | 2 +- sys/powerpc/aim/ofwmagic.S | 2 +- sys/powerpc/conf/GENERIC | 2 +- sys/powerpc/ofw/ofw_pcib_pci.c | 2 +- sys/powerpc/powermac/ata_kauai.c | 2 +- sys/powerpc/powermac/hrowpic.c | 2 +- sys/powerpc/powermac/macio.c | 2 +- sys/powerpc/powermac/uninorth.c | 4 ++-- sys/powerpc/powerpc/locore.S | 2 +- sys/powerpc/powerpc/mmu_oea.c | 2 +- sys/powerpc/powerpc/nexus.c | 6 +++--- sys/powerpc/powerpc/ofw_machdep.c | 2 +- sys/powerpc/powerpc/ofwmagic.S | 2 +- sys/powerpc/powerpc/pmap.c | 2 +- sys/sparc64/include/ofw_bus.h | 4 ++-- sys/sparc64/sparc64/machdep.c | 2 +- sys/sparc64/sparc64/nexus.c | 6 +++--- sys/sparc64/sparc64/ofw_bus.c | 4 ++-- sys/sparc64/sparc64/ofw_machdep.c | 2 +- 40 files changed, 60 insertions(+), 60 deletions(-) diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index d477d36..dd253e4 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -451,7 +451,7 @@ again: /* * Don't reject the request, just stop trying * to parse the option and get on with it. - * Some Apple OpenFirmware versions have + * Some Apple Open Firmware versions have * trailing garbage on the end of otherwise * valid requests. */ diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index d8b16e5..14bfb26 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -209,7 +209,7 @@ devices Various header files describing driver- and bus-independent hardware circuits .It Pa ofw/ -OpenFirmware support +Open Firmware support .It Pa ppbus/ The parallel port bus; see diff --git a/sys/boot/Makefile b/sys/boot/Makefile index aa2c19c..2fc9e02 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -5,7 +5,7 @@ SUBDIR+= ficl .endif -# Build OpenFirmware library. +# Build Open Firmware library. .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" SUBDIR+= ofw .endif diff --git a/sys/boot/ofw/common/main.c b/sys/boot/ofw/common/main.c index 23850eb..2fdd293 100644 --- a/sys/boot/ofw/common/main.c +++ b/sys/boot/ofw/common/main.c @@ -102,7 +102,7 @@ main(int (*openfirm)(void *)) char **bargv; /* - * Initalise the OpenFirmware routines by giving them the entry point. + * Initalise the Open Firmware routines by giving them the entry point. */ OF_init(openfirm); diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c index d10a8c2..a0c9f02 100644 --- a/sys/boot/ofw/libofw/ofw_console.c +++ b/sys/boot/ofw/libofw/ofw_console.c @@ -47,7 +47,7 @@ static ihandle_t stdout; struct console ofwconsole = { "ofw", - "OpenFirmware console", + "Open Firmware console", 0, ofw_cons_probe, ofw_cons_init, diff --git a/sys/boot/ofw/libofw/ofw_net.c b/sys/boot/ofw/libofw/ofw_net.c index 14f02ab..cb85eea 100644 --- a/sys/boot/ofw/libofw/ofw_net.c +++ b/sys/boot/ofw/libofw/ofw_net.c @@ -207,7 +207,7 @@ ofwn_init(struct iodesc *desc, void *machdep_hint) } #if defined(NETIF_DEBUG) - printf("ofwn_init: OpenFirmware instance handle: %08x\n", netinstance); + printf("ofwn_init: Open Firmware instance handle: %08x\n", netinstance); #endif #ifndef __sparc64__ diff --git a/sys/boot/ofw/libofw/openfirm.c b/sys/boot/ofw/libofw/openfirm.c index 41efbf6..b1d2b40 100644 --- a/sys/boot/ofw/libofw/openfirm.c +++ b/sys/boot/ofw/libofw/openfirm.c @@ -862,7 +862,7 @@ OF_boot(char *bootspec) for (;;); /* just in case */ } -/* Suspend and drop back to the OpenFirmware interface. */ +/* Suspend and drop back to the Open Firmware interface. */ void OF_enter() { @@ -879,7 +879,7 @@ OF_enter() openfirmware(&args); } -/* Shut down and drop back to the OpenFirmware interface. */ +/* Shut down and drop back to the Open Firmware interface. */ void OF_exit() { diff --git a/sys/boot/ofw/libofw/openfirm.h b/sys/boot/ofw/libofw/openfirm.h index e060117..40382cd 100644 --- a/sys/boot/ofw/libofw/openfirm.h +++ b/sys/boot/ofw/libofw/openfirm.h @@ -59,7 +59,7 @@ #ifndef _OPENFIRM_H_ #define _OPENFIRM_H_ /* - * Prototypes for Openfirmware Interface Routines + * Prototypes for Open Firmware Interface Routines */ #include @@ -74,7 +74,7 @@ extern phandle_t chosen; extern ihandle_t memory, mmu; /* - * This isn't actually an OpenFirmware function, but it seemed like the right + * This isn't actually an Open Firmware function, but it seemed like the right * place for it to go. */ void OF_init(int (*openfirm)(void *)); diff --git a/sys/boot/powerpc/loader/Makefile b/sys/boot/powerpc/loader/Makefile index 92714a3..d39c815 100644 --- a/sys/boot/powerpc/loader/Makefile +++ b/sys/boot/powerpc/loader/Makefile @@ -2,7 +2,7 @@ PROG= loader NOMAN= -NEWVERSWHAT= "bootstrap loader" OpenFirmware/PowerPC +NEWVERSWHAT= "bootstrap loader" "Open Firmware/PowerPC" BINDIR?= /boot INSTALLFLAGS= -b @@ -76,7 +76,7 @@ CFLAGS+= -Wa,-mppc64bridge .PATH: ${.CURDIR}/../../ofw/common .include "${.CURDIR}/../../ofw/common/Makefile.inc" -# OpenFirmware standalone support library +# Open Firmware standalone support library LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a CFLAGS+= -I${.CURDIR}/../../ofw/libofw diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile index 92714a3..d39c815 100644 --- a/sys/boot/powerpc/ofw/Makefile +++ b/sys/boot/powerpc/ofw/Makefile @@ -2,7 +2,7 @@ PROG= loader NOMAN= -NEWVERSWHAT= "bootstrap loader" OpenFirmware/PowerPC +NEWVERSWHAT= "bootstrap loader" "Open Firmware/PowerPC" BINDIR?= /boot INSTALLFLAGS= -b @@ -76,7 +76,7 @@ CFLAGS+= -Wa,-mppc64bridge .PATH: ${.CURDIR}/../../ofw/common .include "${.CURDIR}/../../ofw/common/Makefile.inc" -# OpenFirmware standalone support library +# Open Firmware standalone support library LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a CFLAGS+= -I${.CURDIR}/../../ofw/libofw diff --git a/sys/boot/sparc64/boot1/boot1.c b/sys/boot/sparc64/boot1/boot1.c index 685e33f..4c2786f 100644 --- a/sys/boot/sparc64/boot1/boot1.c +++ b/sys/boot/sparc64/boot1/boot1.c @@ -432,7 +432,7 @@ static int dskread(void *buf, u_int64_t lba, int nblk) { /* - * The OpenFirmware should open the correct partition for us. + * The Open Firmware should open the correct partition for us. * That means, if we read from offset zero on an open instance handle, * we should read from offset zero of that partition. */ diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile index 44c6c1b..31129cd 100644 --- a/sys/boot/sparc64/loader/Makefile +++ b/sys/boot/sparc64/loader/Makefile @@ -58,7 +58,7 @@ CLEANFILES+= vers.c loader.help LDFLAGS= -static -# Openfirmware standalone support library +# Open Firmware standalone support library LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c index 95790f1..9a8a8fa 100644 --- a/sys/boot/sparc64/loader/main.c +++ b/sys/boot/sparc64/loader/main.c @@ -369,7 +369,7 @@ main(int (*openfirm)(void *)) phandle_t chosenh; /* - * Tell the OpenFirmware functions where they find the ofw gate. + * Tell the Open Firmware functions where they find the ofw gate. */ OF_init(openfirm); diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c index 24f7653..fa6ef22 100644 --- a/sys/dev/ofw/ofw_disk.c +++ b/sys/dev/ofw/ofw_disk.c @@ -139,7 +139,7 @@ ofwd_strategy(struct bio *bp) } /* - * Attach the OpenFirmware disk to nexus if present + * Attach the Open Firmware disk to nexus if present. */ static void ofwd_identify(driver_t *driver, device_t parent) @@ -162,7 +162,7 @@ ofwd_identify(driver_t *driver, device_t parent) } /* - * Probe for an OpenFirmware disk. + * Probe for an Open Firmware disk. */ static int ofwd_probe(device_t dev) @@ -181,7 +181,7 @@ ofwd_probe(device_t dev) if (OF_getprop(node, "file", fname, sizeof(fname)) == -1) return (ENXIO); - device_set_desc(dev, "OpenFirmware disk"); + device_set_desc(dev, "Open Firmware disk"); return (0); } diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c index 07ff8d2..db87a4a 100644 --- a/sys/dev/ofw/openfirm.c +++ b/sys/dev/ofw/openfirm.c @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); #include -MALLOC_DEFINE(M_OFWPROP, "openfirm", "OpenFirmware properties"); +MALLOC_DEFINE(M_OFWPROP, "openfirm", "Open Firmware properties"); static ihandle_t stdin; static ihandle_t stdout; @@ -743,7 +743,7 @@ OF_boot(char *bootspec) for (;;); /* just in case */ } -/* Suspend and drop back to the OpenFirmware interface. */ +/* Suspend and drop back to the Open Firmware interface. */ void OF_enter() { @@ -761,7 +761,7 @@ OF_enter() return; /* We may come back. */ } -/* Shut down and drop back to the OpenFirmware interface. */ +/* Shut down and drop back to the Open Firmware interface. */ void OF_exit() { diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h index 77223c8..acbaad7 100644 --- a/sys/dev/ofw/openfirm.h +++ b/sys/dev/ofw/openfirm.h @@ -61,7 +61,7 @@ #define _OPENFIRM_H_ /* - * Prototypes for Openfirmware Interface Routines + * Prototypes for Open Firmware Interface Routines */ typedef unsigned long cell_t; @@ -77,13 +77,13 @@ typedef unsigned int phandle_t; MALLOC_DECLARE(M_OFWPROP); /* - * Stuff that is used by the OpenFirmware code. + * Stuff that is used by the Open Firmware code. */ void set_openfirm_callback(int (*)(void *)); int openfirmware(void *); /* - * This isn't actually an OpenFirmware function, but it seemed like the right + * This isn't actually an Open Firmware function, but it seemed like the right * place for it to go. */ void OF_init(int (*openfirm)(void *)); diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c index 4839428..b67a1f8 100644 --- a/sys/dev/ofw/openfirmio.c +++ b/sys/dev/ofw/openfirmio.c @@ -277,7 +277,7 @@ openfirm_modevent(module_t mod, int type, void *data) switch(type) { case MOD_LOAD: if (bootverbose) - printf("openfirm: \n"); + printf("openfirm: \n"); /* * Allow only root access by default; this device may allow * users to peek into firmware passwords, and likely to crash diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c index b2e3454..07a0791 100644 --- a/sys/dev/ofw/openpromio.c +++ b/sys/dev/ofw/openpromio.c @@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$"); #include /* - * This provides a solaris compatible character device interface to - * openfirmware. It exists entirely for compatibility with software + * This provides a Solaris compatible character device interface to + * Open Firmware. It exists entirely for compatibility with software * like X11, and only the features that are actually needed for that * are implemented. The interface sucks too much to actually use, * new code should use the /dev/openfirm device. diff --git a/sys/powerpc/aim/locore.S b/sys/powerpc/aim/locore.S index fb12dea..53ff043 100644 --- a/sys/powerpc/aim/locore.S +++ b/sys/powerpc/aim/locore.S @@ -102,7 +102,7 @@ GLOBAL(eintrcnt) idle_u: .long 0 /* fake uarea during idle after exit */ openfirmware_entry: - .long 0 /* openfirmware entry point */ + .long 0 /* Open Firmware entry point */ srsave: .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index 08d7275..87be1ce 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -689,7 +689,7 @@ pmap_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) pmap_vsid_bitmap[0] |= 1; /* - * Set up the OpenFirmware pmap and add it's mappings. + * Set up the Open Firmware pmap and add it's mappings. */ pmap_pinit(&ofw_pmap); ofw_pmap.pm_sr[KERNEL_SR] = KERNEL_SEGMENT; diff --git a/sys/powerpc/aim/nexus.c b/sys/powerpc/aim/nexus.c index bed24d6..0df66db 100644 --- a/sys/powerpc/aim/nexus.c +++ b/sys/powerpc/aim/nexus.c @@ -78,11 +78,11 @@ /* * The nexus (which is a pseudo-bus actually) iterates over the nodes that - * exist in OpenFirmware and adds them as devices to this bus so that drivers + * exist in Open Firmware and adds them as devices to this bus so that drivers * can be attached to them. * * Maybe this code should get into dev/ofw to some extent, as some of it should - * work for all OpenFirmware based machines... + * work for all Open Firmware based machines... */ static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information"); @@ -190,7 +190,7 @@ nexus_probe(device_t dev) (void)nexus_device_from_node(dev, child); } - device_set_desc(dev, "OpenFirmware Nexus device"); + device_set_desc(dev, "Open Firmware Nexus device"); return (0); } diff --git a/sys/powerpc/aim/ofw_machdep.c b/sys/powerpc/aim/ofw_machdep.c index c00ca86..876f885 100644 --- a/sys/powerpc/aim/ofw_machdep.c +++ b/sys/powerpc/aim/ofw_machdep.c @@ -178,7 +178,7 @@ openfirmware(void *args) if (pmap_bootstrapped) { /* - * Swap the kernel's address space with OpenFirmware's + * Swap the kernel's address space with Open Firmware's */ for (i = 0; i < 16; i++) { srsave[i] = mfsrin(i << ADDR_SR_SHFT); diff --git a/sys/powerpc/aim/ofwmagic.S b/sys/powerpc/aim/ofwmagic.S index 033a5fe..55af6d2 100644 --- a/sys/powerpc/aim/ofwmagic.S +++ b/sys/powerpc/aim/ofwmagic.S @@ -38,7 +38,7 @@ */ /* - * Magic note section used by OpenFirmware. + * Magic note section used by Open Firmware. */ .section ".note" diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index bbd5ca3..35eec94 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -111,7 +111,7 @@ device ppp # Kernel PPP device tun # Packet tunnel. device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" -device ofwd # OpenFirmware disks +device ofwd # Open Firmware disks device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying/(translation) diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c index 6cf5cb8..6307d05 100644 --- a/sys/powerpc/ofw/ofw_pcib_pci.c +++ b/sys/powerpc/ofw/ofw_pcib_pci.c @@ -95,7 +95,7 @@ ofw_pcib_pci_probe(device_t dev) return (ENXIO); } - device_set_desc(dev, "OpenFirmware PCI-PCI bridge"); + device_set_desc(dev, "Open Firmware PCI-PCI bridge"); return (-1000); } diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c index 47d8115..6558095 100644 --- a/sys/powerpc/powermac/ata_kauai.c +++ b/sys/powerpc/powermac/ata_kauai.c @@ -141,7 +141,7 @@ ata_kauai_probe(device_t dev) * This device seems to ignore writes to the interrupt * config register, resulting in interrupt resources * not being attached. If this is the case, use - * OpenFirmware to determine the irq, and then attach + * Open Firmware to determine the irq, and then attach * the resource. This allows the ATA common code to * allocate the irq. */ diff --git a/sys/powerpc/powermac/hrowpic.c b/sys/powerpc/powermac/hrowpic.c index 0c1fd4b..3c657d8 100644 --- a/sys/powerpc/powermac/hrowpic.c +++ b/sys/powerpc/powermac/hrowpic.c @@ -32,7 +32,7 @@ * This was superseded by an OpenPIC in the Keylargo and beyond * MacIO versions. * - * The device is initially located in the OpenFirmware device tree + * The device is initially located in the Open Firmware device tree * in the earliest stage of the nexus probe. However, no device registers * are touched until the actual h/w is probed later on during the * MacIO probe. At that point, any interrupt sources that were allocated diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c index 1bf007d..0bc7a71 100644 --- a/sys/powerpc/powermac/macio.c +++ b/sys/powerpc/powermac/macio.c @@ -243,7 +243,7 @@ macio_probe(device_t dev) } /* - * PCI attach: scan OpenFirmware child nodes, and attach these as children + * PCI attach: scan Open Firmware child nodes, and attach these as children * of the macio bus */ static int diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c index c609a00..1eca880 100644 --- a/sys/powerpc/powermac/uninorth.c +++ b/sys/powerpc/powermac/uninorth.c @@ -230,8 +230,8 @@ uninorth_attach(device_t dev) } /* - * Enable the GMAC ethernet cell if OpenFirmware says it is - * used + * Enable the GMAC Ethernet cell if Open Firmware says it is + * used. */ for (child = OF_child(node); child; child = OF_peer(child)) { char compat[32]; diff --git a/sys/powerpc/powerpc/locore.S b/sys/powerpc/powerpc/locore.S index fb12dea..53ff043 100644 --- a/sys/powerpc/powerpc/locore.S +++ b/sys/powerpc/powerpc/locore.S @@ -102,7 +102,7 @@ GLOBAL(eintrcnt) idle_u: .long 0 /* fake uarea during idle after exit */ openfirmware_entry: - .long 0 /* openfirmware entry point */ + .long 0 /* Open Firmware entry point */ srsave: .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c index 08d7275..87be1ce 100644 --- a/sys/powerpc/powerpc/mmu_oea.c +++ b/sys/powerpc/powerpc/mmu_oea.c @@ -689,7 +689,7 @@ pmap_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) pmap_vsid_bitmap[0] |= 1; /* - * Set up the OpenFirmware pmap and add it's mappings. + * Set up the Open Firmware pmap and add it's mappings. */ pmap_pinit(&ofw_pmap); ofw_pmap.pm_sr[KERNEL_SR] = KERNEL_SEGMENT; diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index bed24d6..0df66db 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -78,11 +78,11 @@ /* * The nexus (which is a pseudo-bus actually) iterates over the nodes that - * exist in OpenFirmware and adds them as devices to this bus so that drivers + * exist in Open Firmware and adds them as devices to this bus so that drivers * can be attached to them. * * Maybe this code should get into dev/ofw to some extent, as some of it should - * work for all OpenFirmware based machines... + * work for all Open Firmware based machines... */ static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information"); @@ -190,7 +190,7 @@ nexus_probe(device_t dev) (void)nexus_device_from_node(dev, child); } - device_set_desc(dev, "OpenFirmware Nexus device"); + device_set_desc(dev, "Open Firmware Nexus device"); return (0); } diff --git a/sys/powerpc/powerpc/ofw_machdep.c b/sys/powerpc/powerpc/ofw_machdep.c index c00ca86..876f885 100644 --- a/sys/powerpc/powerpc/ofw_machdep.c +++ b/sys/powerpc/powerpc/ofw_machdep.c @@ -178,7 +178,7 @@ openfirmware(void *args) if (pmap_bootstrapped) { /* - * Swap the kernel's address space with OpenFirmware's + * Swap the kernel's address space with Open Firmware's */ for (i = 0; i < 16; i++) { srsave[i] = mfsrin(i << ADDR_SR_SHFT); diff --git a/sys/powerpc/powerpc/ofwmagic.S b/sys/powerpc/powerpc/ofwmagic.S index 033a5fe..55af6d2 100644 --- a/sys/powerpc/powerpc/ofwmagic.S +++ b/sys/powerpc/powerpc/ofwmagic.S @@ -38,7 +38,7 @@ */ /* - * Magic note section used by OpenFirmware. + * Magic note section used by Open Firmware. */ .section ".note" diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c index 08d7275..87be1ce 100644 --- a/sys/powerpc/powerpc/pmap.c +++ b/sys/powerpc/powerpc/pmap.c @@ -689,7 +689,7 @@ pmap_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) pmap_vsid_bitmap[0] |= 1; /* - * Set up the OpenFirmware pmap and add it's mappings. + * Set up the Open Firmware pmap and add it's mappings. */ pmap_pinit(&ofw_pmap); ofw_pmap.pm_sr[KERNEL_SR] = KERNEL_SEGMENT; diff --git a/sys/sparc64/include/ofw_bus.h b/sys/sparc64/include/ofw_bus.h index bc766b4..1e9004e 100644 --- a/sys/sparc64/include/ofw_bus.h +++ b/sys/sparc64/include/ofw_bus.h @@ -32,8 +32,8 @@ #define ORIR_NOTFOUND 0xffffffff /* - * Other than in OpenFirmware calls, the size of a bus cell seems to be always - * the same. + * Other than in Open Firmware calls, the size of a bus cell seems to be + * always the same. */ typedef u_int32_t pcell_t; diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c index e7a933b..2cfa3d1 100644 --- a/sys/sparc64/sparc64/machdep.c +++ b/sys/sparc64/sparc64/machdep.c @@ -241,7 +241,7 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec) cpu_impl = VER_IMPL(rdpr(ver)); /* - * Initialize openfirmware (needed for console). + * Initialize Open Firmware (needed for console). */ OF_init(vec); diff --git a/sys/sparc64/sparc64/nexus.c b/sys/sparc64/sparc64/nexus.c index 6469f7f..7f130c2 100644 --- a/sys/sparc64/sparc64/nexus.c +++ b/sys/sparc64/sparc64/nexus.c @@ -55,7 +55,7 @@ /* * The nexus (which is a pseudo-bus actually) iterates over the nodes that - * hang from the OpenFirmware root node and adds them as devices to this bus + * hang from the Open Firmware root node and adds them as devices to this bus * (except some special nodes which are excluded) so that drivers can be * attached to them. * @@ -63,7 +63,7 @@ * done at this level. * * Maybe this code should get into dev/ofw to some extent, as some of it should - * work for all OpenFirmware based machines... + * work for all Open Firmware based machines... */ static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information"); @@ -169,7 +169,7 @@ nexus_probe(device_t dev) { /* Nexus does always match. */ - device_set_desc(dev, "OpenFirmware Nexus device"); + device_set_desc(dev, "Open Firmware Nexus device"); return (0); } diff --git a/sys/sparc64/sparc64/ofw_bus.c b/sys/sparc64/sparc64/ofw_bus.c index c1fcfcb..844e55b 100644 --- a/sys/sparc64/sparc64/ofw_bus.c +++ b/sys/sparc64/sparc64/ofw_bus.c @@ -58,8 +58,8 @@ */ /* - * OpenFirmware bus support code that is (hopefully) independent from the used - * hardware. + * Open Firmware bus support code that is (hopefully) independent from the + * used hardware. * Maybe this should go into dev/ofw/; there may however be sparc specific * bits left. */ diff --git a/sys/sparc64/sparc64/ofw_machdep.c b/sys/sparc64/sparc64/ofw_machdep.c index 74a6176..3bd7394 100644 --- a/sys/sparc64/sparc64/ofw_machdep.c +++ b/sys/sparc64/sparc64/ofw_machdep.c @@ -26,7 +26,7 @@ */ /* - * Some OpenFirmware helper functions that are likely machine dependent. + * Some Open Firmware helper functions that are likely machine dependent. */ #include -- cgit v1.1