Instead of "OpenFirmware", "openfirmware", etc. use the official spelling

"Open Firmware" from IEEE 1275 and OpenFirmware.org (no pun intended).

Ok'ed by:	tmm
This commit is contained in:
Marius Strobl 2004-08-16 15:45:27 +00:00
parent 76c4b2cb5d
commit 39513fa664
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=133862
40 changed files with 60 additions and 60 deletions

View File

@ -451,7 +451,7 @@ tftp(struct tftphdr *tp, int size)
/*
* 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.
*/

View File

@ -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

View File

@ -5,7 +5,7 @@
SUBDIR+= ficl
.endif
# Build OpenFirmware library.
# Build Open Firmware library.
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
SUBDIR+= ofw
.endif

View File

@ -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);

View File

@ -47,7 +47,7 @@ static ihandle_t stdout;
struct console ofwconsole = {
"ofw",
"OpenFirmware console",
"Open Firmware console",
0,
ofw_cons_probe,
ofw_cons_init,

View File

@ -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__

View File

@ -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()
{

View File

@ -59,7 +59,7 @@
#ifndef _OPENFIRM_H_
#define _OPENFIRM_H_
/*
* Prototypes for Openfirmware Interface Routines
* Prototypes for Open Firmware Interface Routines
*/
#include <sys/cdefs.h>
@ -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 *));

View File

@ -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

View File

@ -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

View File

@ -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.
*/

View File

@ -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/

View File

@ -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);

View File

@ -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);
}

View File

@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/openfirm.h>
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()
{

View File

@ -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 *));

View File

@ -277,7 +277,7 @@ openfirm_modevent(module_t mod, int type, void *data)
switch(type) {
case MOD_LOAD:
if (bootverbose)
printf("openfirm: <OpenFirmware control device>\n");
printf("openfirm: <Open Firmware control device>\n");
/*
* Allow only root access by default; this device may allow
* users to peek into firmware passwords, and likely to crash

View File

@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/openpromio.h>
/*
* 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.

View File

@ -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

View File

@ -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;

View File

@ -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);
}

View File

@ -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);

View File

@ -38,7 +38,7 @@
*/
/*
* Magic note section used by OpenFirmware.
* Magic note section used by Open Firmware.
*/
.section ".note"

View File

@ -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)

View File

@ -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);
}

View File

@ -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.
*/

View File

@ -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

View File

@ -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

View File

@ -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];

View File

@ -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

View File

@ -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;

View File

@ -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);
}

View File

@ -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);

View File

@ -38,7 +38,7 @@
*/
/*
* Magic note section used by OpenFirmware.
* Magic note section used by Open Firmware.
*/
.section ".note"

View File

@ -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;

View File

@ -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;

View File

@ -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);

View File

@ -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);
}

View File

@ -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.
*/

View File

@ -26,7 +26,7 @@
*/
/*
* Some OpenFirmware helper functions that are likely machine dependent.
* Some Open Firmware helper functions that are likely machine dependent.
*/
#include <sys/param.h>