Need to cast a bus_space_addr_t to (u_long) before gcc allows us to cast
it to a pointer on 32bit spacr64 kernels. Sigh.
This commit is contained in:
parent
8cc4a98ea3
commit
b78c3d23e1
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: machfb.c,v 1.7 2002/10/31 14:10:07 martin Exp $ */
|
/* $NetBSD: machfb.c,v 1.8 2002/11/02 15:54:10 martin Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2002 Bang Jun-Young
|
* Copyright (c) 2002 Bang Jun-Young
|
||||||
@ -535,7 +535,7 @@ mach64_attach(struct device *parent, struct device *self, void *aux)
|
|||||||
mach64_get_mode(sc, &default_mode);
|
mach64_get_mode(sc, &default_mode);
|
||||||
setmode = 0;
|
setmode = 0;
|
||||||
} else {
|
} else {
|
||||||
memcpy(&default_mode, &mach64_modes[0], sizeof(struct videomode));
|
memcpy(&default_mode, &mach64_modes[4], sizeof(struct videomode));
|
||||||
setmode = 1;
|
setmode = 1;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
@ -565,7 +565,7 @@ mach64_attach(struct device *parent, struct device *self, void *aux)
|
|||||||
|
|
||||||
mach64_console_screen.ri.ri_hw = sc;
|
mach64_console_screen.ri.ri_hw = sc;
|
||||||
mach64_console_screen.ri.ri_depth = sc->bits_per_pixel;
|
mach64_console_screen.ri.ri_depth = sc->bits_per_pixel;
|
||||||
mach64_console_screen.ri.ri_bits = (void *)sc->sc_aperbase;
|
mach64_console_screen.ri.ri_bits = (void*)(u_long)sc->sc_aperbase;
|
||||||
mach64_console_screen.ri.ri_width = default_mode.hdisplay;
|
mach64_console_screen.ri.ri_width = default_mode.hdisplay;
|
||||||
mach64_console_screen.ri.ri_height = default_mode.vdisplay;
|
mach64_console_screen.ri.ri_height = default_mode.vdisplay;
|
||||||
mach64_console_screen.ri.ri_stride = mach64_console_screen.ri.ri_width;
|
mach64_console_screen.ri.ri_stride = mach64_console_screen.ri.ri_width;
|
||||||
|
Loading…
Reference in New Issue
Block a user