Module Name: src
Committed By: macallan
Date: Wed Oct 16 09:56:34 UTC 2024
Modified Files:
src/sys/arch/hppa/dev: gftfb.c hyperfb.c
Log Message:
fix tpyo, now we can actually map registers from userland
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hppa/dev/gftfb.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hppa/dev/hyperfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/dev/gftfb.c
diff -u src/sys/arch/hppa/dev/gftfb.c:1.22 src/sys/arch/hppa/dev/gftfb.c:1.23
--- src/sys/arch/hppa/dev/gftfb.c:1.22 Tue Oct 1 07:02:14 2024
+++ src/sys/arch/hppa/dev/gftfb.c Wed Oct 16 09:56:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gftfb.c,v 1.22 2024/10/01 07:02:14 macallan Exp $ */
+/* $NetBSD: gftfb.c,v 1.23 2024/10/16 09:56:34 macallan Exp $ */
/* $OpenBSD: sti_pci.c,v 1.7 2009/02/06 22:51:04 miod Exp $ */
@@ -903,7 +903,7 @@ gftfb_mmap(void *v, void *vs, off_t offs
/* framebuffer */
pa = bus_space_mmap(rom->memt, sc->sc_scr.fbaddr, offset,
prot, BUS_SPACE_MAP_LINEAR);
- } else if (offset >= 0x80000000 && offset < 0x8040000) {
+ } else if (offset >= 0x80000000 && offset < 0x80400000) {
/* blitter registers etc. */
pa = bus_space_mmap(rom->memt, rom->regh[2],
offset - 0x80000000, prot, BUS_SPACE_MAP_LINEAR);
Index: src/sys/arch/hppa/dev/hyperfb.c
diff -u src/sys/arch/hppa/dev/hyperfb.c:1.17 src/sys/arch/hppa/dev/hyperfb.c:1.18
--- src/sys/arch/hppa/dev/hyperfb.c:1.17 Tue Oct 1 07:44:22 2024
+++ src/sys/arch/hppa/dev/hyperfb.c Wed Oct 16 09:56:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: hyperfb.c,v 1.17 2024/10/01 07:44:22 macallan Exp $ */
+/* $NetBSD: hyperfb.c,v 1.18 2024/10/16 09:56:34 macallan Exp $ */
/*
* Copyright (c) 2024 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hyperfb.c,v 1.17 2024/10/01 07:44:22 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperfb.c,v 1.18 2024/10/16 09:56:34 macallan Exp $");
#include "opt_cputype.h"
#include "opt_hyperfb.h"
@@ -705,7 +705,7 @@ hyperfb_mmap(void *v, void *vs, off_t of
pa = bus_space_mmap(sc->sc_iot, sc->sc_base + HCRX_FBOFFSET,
offset, prot,
BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE);
- } else if (offset >= 0x80000000 && offset < 0x8040000) {
+ } else if (offset >= 0x80000000 && offset < 0x80400000) {
/* blitter registers etc. */
pa = bus_space_mmap(sc->sc_iot, sc->sc_base + HCRX_REGOFFSET,
offset - 0x80000000, prot, BUS_SPACE_MAP_LINEAR);
