Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix another typo, now wsfb on ofb should work properly

This commit is contained in:
macallan 2007-08-05 04:36:18 +00:00
parent 84b4b152a9
commit 0591adcde1
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/arch/macppc/dev/ofb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofb.c,v 1.60 2007/07/24 20:09:57 macallan Exp $ */
/* $NetBSD: ofb.c,v 1.61 2007/08/05 04:36:18 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.60 2007/07/24 20:09:57 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.61 2007/08/05 04:36:18 macallan Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -79,7 +79,8 @@ struct ofb_softc {
int sc_node, sc_ih, sc_mode;
paddr_t sc_fbaddr;
uint32_t sc_fbsize;
struct vcons_data vd;
};
@ -199,7 +200,8 @@ ofbattach(struct device *parent, struct device *self, void *aux)
sc->sc_dev.dv_xname);
return;
}
sc->sc_fbsize = round_page(ri->ri_stride * ri->ri_height);
/* XXX */
if (OF_getprop(sc->sc_node, "assigned-addresses", sc->sc_addrs,
sizeof(sc->sc_addrs)) == -1) {
@ -258,8 +260,8 @@ ofb_ioctl(void *v, void *vs, u_long cmd, void *data, int flag, struct lwp *l)
/* we won't get here without any screen anyway */
if (ms != NULL) {
wdf = (void *)data;
wdf->height = ms->scr_ri.ri_width;
wdf->width = ms->scr_ri.ri_height;
wdf->height = ms->scr_ri.ri_height;
wdf->width = ms->scr_ri.ri_width;
wdf->depth = ms->scr_ri.ri_depth;
wdf->cmsize = 256;
return 0;
@ -328,8 +330,9 @@ ofb_mmap(void *v, void *vs, off_t offset, int prot)
ri = &vd->active->scr_ri;
/* framebuffer at offset 0 */
if (offset >=0 && offset < (ri->ri_stride * ri->ri_height))
return sc->sc_fbaddr + offset;
if ((offset >= 0) && (offset < sc->sc_fbsize))
return bus_space_mmap(sc->sc_memt, sc->sc_fbaddr, offset, prot,
BUS_SPACE_MAP_LINEAR);
/*
* restrict all other mappings to processes with superuser privileges
@ -365,7 +368,6 @@ ofb_mmap(void *v, void *vs, off_t offset, int prot)
}
ap += 5;
}
return -1;
}