Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sgimips/gio - pass the right address to bus_space_m...
details: https://anonhg.NetBSD.org/src/rev/beda3be08739
branches: trunk
changeset: 340165:beda3be08739
user: macallan <macallan%NetBSD.org@localhost>
date: Tue Aug 25 02:09:18 2015 +0000
description:
- pass the right address to bus_space_mmap() so this works on N32 kernels
- don't mess with XMAP9 when switching to graphics mode
diffstat:
sys/arch/sgimips/gio/newport.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diffs (50 lines):
diff -r fd2c4af32db3 -r beda3be08739 sys/arch/sgimips/gio/newport.c
--- a/sys/arch/sgimips/gio/newport.c Tue Aug 25 00:08:56 2015 +0000
+++ b/sys/arch/sgimips/gio/newport.c Tue Aug 25 02:09:18 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: newport.c,v 1.18 2014/06/02 15:16:23 macallan Exp $ */
+/* $NetBSD: newport.c,v 1.19 2015/08/25 02:09:18 macallan Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.18 2014/06/02 15:16:23 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.19 2015/08/25 02:09:18 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,10 +58,9 @@
};
struct newport_devconfig {
- uint32_t dc_addr;
-
bus_space_tag_t dc_st;
bus_space_handle_t dc_sh;
+ bus_addr_t dc_addr;
int dc_boardrev;
int dc_vc2rev;
@@ -909,12 +908,6 @@
rex3_wait_gfifo(dc);
newport_setup_hw(dc);
vcons_redraw_screen(vd->active);
- } else {
- xmap9_write_mode(dc, 0,
- XMAP9_MODE_GAMMA_BYPASS |
- XMAP9_CONFIG_RGBMAP_2 |
- XMAP9_MODE_PIXSIZE_24BPP);
- xmap9_write(dc, XMAP9_DCBCRS_MODE_SELECT, 0);
}
}
return 0;
@@ -934,5 +927,5 @@
if ( offset >= 0xfffff)
return -1;
- return bus_space_mmap(dc->dc_st, dc->dc_sh, offset, prot, 0);
+ return bus_space_mmap(dc->dc_st, dc->dc_addr, offset, prot, 0);
}
Home |
Main Index |
Thread Index |
Old Index