From owner-svn-src-head@FreeBSD.ORG  Sun Dec  1 19:05:33 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3D55FFCA;
 Sun,  1 Dec 2013 19:05:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A2D015C1;
 Sun,  1 Dec 2013 19:05:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB1J5X7g065739;
 Sun, 1 Dec 2013 19:05:33 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rB1J5XwN065738;
 Sun, 1 Dec 2013 19:05:33 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201312011905.rB1J5XwN065738@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 1 Dec 2013 19:05:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258806 - head/sys/dev/uart
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Dec 2013 19:05:33 -0000

Author: nwhitehorn
Date: Sun Dec  1 19:05:32 2013
New Revision: 258806
URL: http://svnweb.freebsd.org/changeset/base/258806

Log:
  Real OF systems have an ihandle under /chosen/stdout, not a phandle. Use
  the right type.

Modified:
  head/sys/dev/uart/uart_cpu_powerpc.c

Modified: head/sys/dev/uart/uart_cpu_powerpc.c
==============================================================================
--- head/sys/dev/uart/uart_cpu_powerpc.c	Sun Dec  1 19:03:20 2013	(r258805)
+++ head/sys/dev/uart/uart_cpu_powerpc.c	Sun Dec  1 19:05:32 2013	(r258806)
@@ -89,13 +89,13 @@ ofw_get_console_phandle_path(phandle_t n
 		return (ENXIO);
 	OF_getprop(node, prop, &field, sizeof(field));
 
-	/* This property might be a phandle or might be a path. Hooray. */
+	/* This property might be either a ihandle or path. Hooray. */
 
 	output = -1;
 	if (field.buf[size - 1] == 0)
 		output = OF_finddevice(field.buf);
 	if (output == -1 && size == 4)
-		output = OF_xref_phandle(field.ref);
+		output = OF_instance_to_package(field.ref);
 	
 	if (output != -1) {
 		*result = output;