Module Name: src
Committed By: macallan
Date: Thu Apr 21 17:59:18 UTC 2016
Modified Files:
src/sys/arch/sparc/dev: cgsix_obio.c
Log Message:
RASTERCONSOLE is no more
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/dev/cgsix_obio.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/sparc/dev/cgsix_obio.c
diff -u src/sys/arch/sparc/dev/cgsix_obio.c:1.26 src/sys/arch/sparc/dev/cgsix_obio.c:1.27
--- src/sys/arch/sparc/dev/cgsix_obio.c:1.26 Sat Oct 27 17:18:11 2012
+++ src/sys/arch/sparc/dev/cgsix_obio.c Thu Apr 21 17:59:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix_obio.c,v 1.26 2012/10/27 17:18:11 chs Exp $ */
+/* $NetBSD: cgsix_obio.c,v 1.27 2016/04/21 17:59:18 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.26 2012/10/27 17:18:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.27 2016/04/21 17:59:18 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -204,17 +204,15 @@ cgsixattach(device_t parent, device_t se
else
isconsole = 0;
- if (isconsole && cgsix_use_rasterconsole) {
- if (bus_space_map(oba->oba_bustag,
- oba->oba_paddr + CGSIX_RAM_OFFSET,
- sc->sc_ramsize,
- BUS_SPACE_MAP_LINEAR,
- &bh) != 0) {
- printf("%s: cannot map pixels\n", device_xname(self));
- return;
- }
- sc->sc_fb.fb_pixels = (void *)bh;
+ if (bus_space_map(oba->oba_bustag,
+ oba->oba_paddr + CGSIX_RAM_OFFSET,
+ sc->sc_ramsize,
+ BUS_SPACE_MAP_LINEAR,
+ &bh) != 0) {
+ printf("%s: cannot map pixels\n", device_xname(self));
+ return;
}
+ sc->sc_fb.fb_pixels = (void *)bh;
cg6attach(sc, name, isconsole);
}
