summaryrefslogtreecommitdiffstats
path: root/sys/powerpc
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2010-07-08 14:40:46 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2010-07-08 14:40:46 +0000
commit4e687ef5c7e93f46480469e803cc4911c39d8254 (patch)
tree09cda9d83c6ea1c44fb63dc7e9bbe3323d652cdf /sys/powerpc
parenteddb9f922e228f95579e4973b4705fdb83f70a9e (diff)
downloadFreeBSD-src-4e687ef5c7e93f46480469e803cc4911c39d8254.zip
FreeBSD-src-4e687ef5c7e93f46480469e803cc4911c39d8254.tar.gz
Make ofw_syscons work on 64-bit systems.
Diffstat (limited to 'sys/powerpc')
-rw-r--r--sys/powerpc/ofw/ofw_syscons.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c
index 65277cc..47a9a8b 100644
--- a/sys/powerpc/ofw/ofw_syscons.c
+++ b/sys/powerpc/ofw/ofw_syscons.c
@@ -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_offset_t off, uint8_t c, uint8_t a)
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, int y, uint8_t *pixel_image,
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);
OpenPOWER on IntegriCloud