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

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

Ok'ed by:	tmm

5 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c
index 24f7653ebf42..fa6ef22ca537 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 07ff8d23a1ff..db87a4a2da5c 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -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()
 {
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index 77223c87c34e..acbaad741564 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 483942831275..b67a1f8fb015 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: <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
diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c
index b2e3454ff885..07a079151552 100644
--- a/sys/dev/ofw/openpromio.c
+++ b/sys/dev/ofw/openpromio.c
@@ -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.