From owner-svn-src-projects@FreeBSD.ORG  Wed May 25 21:53:25 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2BE2106564A;
	Wed, 25 May 2011 21:53:25 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9399A8FC08;
	Wed, 25 May 2011 21:53:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4PLrPRM031808;
	Wed, 25 May 2011 21:53:25 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4PLrPCW031806;
	Wed, 25 May 2011 21:53:25 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201105252153.p4PLrPCW031806@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 25 May 2011 21:53:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222294 - projects/pseries/powerpc/ofw
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 May 2011 21:53:25 -0000

Author: nwhitehorn
Date: Wed May 25 21:53:25 2011
New Revision: 222294
URL: http://svn.freebsd.org/changeset/base/222294

Log:
  Add some better error handling/reporting.

Modified:
  projects/pseries/powerpc/ofw/rtas.c

Modified: projects/pseries/powerpc/ofw/rtas.c
==============================================================================
--- projects/pseries/powerpc/ofw/rtas.c	Wed May 25 21:49:56 2011	(r222293)
+++ projects/pseries/powerpc/ofw/rtas.c	Wed May 25 21:53:25 2011	(r222294)
@@ -77,12 +77,17 @@ rtas_setup(void *junk)
 	int result;
 
 	rtas = OF_finddevice("/rtas");
-	if (rtas == -1)
+	if (rtas == -1) {
+		rtas = 0;
 		return;
+	}
 	OF_package_to_path(rtas, path, sizeof(path));
 	rtasi = OF_open(path);
-	if (rtasi == -1 || rtasi == 0)
+	if (rtasi == -1 || rtasi == 0) {
+		rtas = 0;
+		printf("Error initializing RTAS: could not open node\n");
 		return;
+	}
 
 	mtx_init(&rtas_mtx, "RTAS", MTX_DEF, 0);
 
@@ -123,7 +128,7 @@ rtas_setup(void *junk)
 	if (result != 0) {
 		rtas = 0;
 		rtas_ptr = 0;
-		printf("Error initializing RTAS\n");
+		printf("Error initializing RTAS (%d)\n", result);
 		return;
 	}