diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-08-25 08:26:44 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-08-25 08:26:44 +0000 |
| commit | 1819af27a48172c6658bdb220a4920839ae7c19d (patch) | |
| tree | 0c2a8f5e6e8e05a8580b19676e54bf2913f94ed7 | |
| parent | b2aa7be5b0ff88283687185f132ad5ad2631cce4 (diff) | |
better mmap support, what fun
| -rw-r--r-- | sys/arch/alpha/dev/vga.c | 30 | ||||
| -rw-r--r-- | sys/dev/ic/vga.c | 30 |
2 files changed, 34 insertions, 26 deletions
diff --git a/sys/arch/alpha/dev/vga.c b/sys/arch/alpha/dev/vga.c index 6c3c5171674..1891f8a18f4 100644 --- a/sys/arch/alpha/dev/vga.c +++ b/sys/arch/alpha/dev/vga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga.c,v 1.7 1997/08/22 22:25:59 deraadt Exp $ */ +/* $OpenBSD: vga.c,v 1.8 1997/08/25 08:26:43 deraadt Exp $ */ /* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */ /* @@ -233,18 +233,22 @@ vgammap(v, offset, prot) int prot; { struct vga_config *vc = v; - - if (offset >= 0xb8000 && offset < 0xc0000) { - printf("%p\n", alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_memh) + offset - 0xb8000)); - return alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_memh) + offset - 0xb8000); - } - if (offset >= 0x0000 && offset < 0x2000) - return alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_ioh_b)); - if (offset >= 0x2000 && offset < 0x4000) - return alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_ioh_c)); - if (offset >= 0x4000 && offset < 0x6000) - return alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_ioh_d)); - return -1; + bus_space_handle_t h; + u_int32_t *port; + + if (offset >= 0x00000 && offset < 0x100000) /* 1MB of mem */ + h = vc->vc_memh + offset; + else if (offset >= 0x10000 && offset < 0x140000) /* 256KB of iohb */ + h = vc->vc_ioh_b; + else if (offset >= 0x140000 && offset < 0x180000) /* 256KB of iohc */ + h = vc->vc_ioh_c; + else if (offset >= 0x180000 && offset < 0x1c0000) /* 256KB of iohd */ + h = vc->vc_ioh_d; + else + return (-1); + + port = (u_int32_t *)(h << 5); + return alpha_btop(port); } /* diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c index 6c3c5171674..1891f8a18f4 100644 --- a/sys/dev/ic/vga.c +++ b/sys/dev/ic/vga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga.c,v 1.7 1997/08/22 22:25:59 deraadt Exp $ */ +/* $OpenBSD: vga.c,v 1.8 1997/08/25 08:26:43 deraadt Exp $ */ /* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */ /* @@ -233,18 +233,22 @@ vgammap(v, offset, prot) int prot; { struct vga_config *vc = v; - - if (offset >= 0xb8000 && offset < 0xc0000) { - printf("%p\n", alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_memh) + offset - 0xb8000)); - return alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_memh) + offset - 0xb8000); - } - if (offset >= 0x0000 && offset < 0x2000) - return alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_ioh_b)); - if (offset >= 0x2000 && offset < 0x4000) - return alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_ioh_c)); - if (offset >= 0x4000 && offset < 0x6000) - return alpha_btop(ALPHA_K0SEG_TO_PHYS(vc->vc_ioh_d)); - return -1; + bus_space_handle_t h; + u_int32_t *port; + + if (offset >= 0x00000 && offset < 0x100000) /* 1MB of mem */ + h = vc->vc_memh + offset; + else if (offset >= 0x10000 && offset < 0x140000) /* 256KB of iohb */ + h = vc->vc_ioh_b; + else if (offset >= 0x140000 && offset < 0x180000) /* 256KB of iohc */ + h = vc->vc_ioh_c; + else if (offset >= 0x180000 && offset < 0x1c0000) /* 256KB of iohd */ + h = vc->vc_ioh_d; + else + return (-1); + + port = (u_int32_t *)(h << 5); + return alpha_btop(port); } /* |