summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormacallan <macallan@NetBSD.org>2006-08-19 04:39:32 +0000
committermacallan <macallan@NetBSD.org>2006-08-19 04:39:32 +0000
commitea7df82ebc50c5dd949636ce4128234cc7ef404f (patch)
treefcae798b54ce6b1cf3347983b40e0456da7c0e2c /sys/dev
parentf5804719cd0c5edb4acb2c3240436ae7c413f0b6 (diff)
fix some typos, add mmap() support for X
needs options RADEONFB_MMAP_BARS for now
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/radeonfb.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/sys/dev/pci/radeonfb.c b/sys/dev/pci/radeonfb.c
index 25d9f80e7c7..9020235bb9f 100644
--- a/sys/dev/pci/radeonfb.c
+++ b/sys/dev/pci/radeonfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.2 2006/08/19 04:00:15 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.3 2006/08/19 04:39:32 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.2 2006/08/19 04:00:15 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.3 2006/08/19 04:39:32 macallan Exp $");
#define RADEONFB_DEFAULT_DEPTH 32
@@ -787,7 +787,6 @@ radeonfb_attach(struct device *parent, struct device *dev, void *aux)
#endif
if (dp->rd_console) {
- ri->ri_height, ri->ri_cols, ri->ri_rows);
wsdisplay_cnattach(dp->rd_wsscreens, ri, 0, 0,
defattr);
#ifdef SPLASHSCREEN
@@ -985,6 +984,20 @@ radeonfb_mmap(void *v, void *vs, off_t offset, int prot)
return pa;
}
+#ifdef RADEONFB_MMAP_BARS
+ if ((offset >= sc->sc_regaddr) &&
+ (offset < sc->sc_regaddr + sc->sc_regsz)) {
+ return bus_space_mmap(sc->sc_regt, offset, 0, prot,
+ BUS_SPACE_MAP_LINEAR);
+ }
+
+ if ((offset >= sc->sc_memaddr) &&
+ (offset < sc->sc_memaddr + sc->sc_memsz)) {
+ return bus_space_mmap(sc->sc_memt, offset, 0, prot,
+ BUS_SPACE_MAP_LINEAR);
+ }
+#endif /* RADEONFB_MMAP_BARS */
+
return -1;
}