From owner-svn-src-all@FreeBSD.ORG  Thu Jul  8 14:40:46 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 81207106564A;
	Thu,  8 Jul 2010 14:40:46 +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 705AE8FC13;
	Thu,  8 Jul 2010 14:40:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o68EekX9039776;
	Thu, 8 Jul 2010 14:40:46 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o68EekBp039774;
	Thu, 8 Jul 2010 14:40:46 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007081440.o68EekBp039774@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 8 Jul 2010 14:40:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209804 - head/sys/powerpc/ofw
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jul 2010 14:40:46 -0000

Author: nwhitehorn
Date: Thu Jul  8 14:40:46 2010
New Revision: 209804
URL: http://svn.freebsd.org/changeset/base/209804

Log:
  Make ofw_syscons work on 64-bit systems.

Modified:
  head/sys/powerpc/ofw/ofw_syscons.c

Modified: head/sys/powerpc/ofw/ofw_syscons.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_syscons.c	Thu Jul  8 14:35:35 2010	(r209803)
+++ head/sys/powerpc/ofw/ofw_syscons.c	Thu Jul  8 14:40:46 2010	(r209804)
@@ -216,7 +216,7 @@ ofwfb_configure(int flags)
         phandle_t chosen;
         ihandle_t stdout;
 	phandle_t node;
-	bus_addr_t fb_phys;
+	uint32_t fb_phys;
 	int depth;
 	int disable;
 	int len;
@@ -748,7 +748,7 @@ ofwfb_putc8(video_adapter_t *adp, vm_off
         row = (off / adp->va_info.vi_width) * adp->va_info.vi_cheight;
         col = (off % adp->va_info.vi_width) * adp->va_info.vi_cwidth;
 	p = sc->sc_font + c*sc->sc_font_height;
-	addr = (u_int32_t *)((int)sc->sc_addr
+	addr = (u_int32_t *)((uintptr_t)sc->sc_addr
 		+ (row + sc->sc_ymargin)*sc->sc_stride
 		+ col + sc->sc_xmargin);
 
@@ -860,7 +860,7 @@ ofwfb_putm8(video_adapter_t *adp, int x,
 	u_char fg, bg;
 
 	sc = (struct ofwfb_softc *)adp;
-	addr = (u_int8_t *)((int)sc->sc_addr
+	addr = (u_int8_t *)((uintptr_t)sc->sc_addr
 		+ (y + sc->sc_ymargin)*sc->sc_stride
 		+ x + sc->sc_xmargin);