svn commit: r209804 - head/sys/powerpc/ofw

[Nathan Whitehorn]

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);