- Use an ihandle_t to store the stdout instance handle instead of a

  phandle_t. Since both are typedefed to unsigned int, this is more
  or less cosmetic.
- Fix the code that determines whether a creator instance was used
  for firmware output (and should not be blanked on initialization).
  Since r1.2 of dev/fb/creator.c, this consisted comparing a handle of
  an instance of a package with a handle of the package itself.
  Use the test from r1.1, which utilizes OF_instance_to_package().

Submitted by:	Marius Strobl <marius@alchemy.franken.de>

2 files changed, 3 insertions, 3 deletions

diff --git a/sys/dev/fb/creator.c b/sys/dev/fb/creator.c
index 9bc0aed30444..172a341b0436 100644
--- a/sys/dev/fb/creator.c
+++ b/sys/dev/fb/creator.c
@@ -165,7 +165,7 @@ creator_configure(int flags)
 	struct upa_regs reg[FFB_NREG];
 	struct creator_softc *sc;
 	phandle_t chosen;
-	phandle_t stdout;
+	ihandle_t stdout;
 	phandle_t child;
 	char buf[32];
 	int i;
@@ -183,7 +183,7 @@ creator_configure(int flags)
 
 	chosen = OF_finddevice("/chosen");
 	OF_getprop(chosen, "stdout", &stdout, sizeof(stdout));
-	if (child == stdout)
+	if (child == OF_instance_to_package(stdout))
 		sc->sc_console = 1;
 
 	OF_getprop(child, "reg", reg, sizeof(reg));
diff --git a/sys/sparc64/creator/creator_upa.c b/sys/sparc64/creator/creator_upa.c
index ee7384214587..255d70160211 100644
--- a/sys/sparc64/creator/creator_upa.c
+++ b/sys/sparc64/creator/creator_upa.c
@@ -158,7 +158,7 @@ creator_upa_attach(device_t dev)
 	struct upa_regs *reg;
 	video_switch_t *sw;
 	phandle_t chosen;
-	phandle_t stdout;
+	ihandle_t stdout;
 	bus_addr_t phys;
 	bus_size_t size;
 	phandle_t node;