Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove shadow framebuffer support, use VCONS_DONT_READ instead

This commit is contained in:
macallan 2010-08-31 21:14:57 +00:00
parent 7ada74d7c0
commit 3337b3cd99
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/arch/sparc/dev/cgfourteen.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cgfourteen.c,v 1.64 2010/06/10 13:21:13 macallan Exp $ */
/* $NetBSD: cgfourteen.c,v 1.65 2010/08/31 21:14:57 macallan Exp $ */
/*
* Copyright (c) 1996
@ -366,8 +366,6 @@ cgfourteenattach(device_t parent, device_t self, void *aux)
sc->sc_fb.fb_pixels = (void *)fbva[1];
}
sc->sc_shadowfb = kmem_alloc(ramsize, KM_NOSLEEP);
if (isconsole)
printf(" (console)\n");
else
@ -785,10 +783,6 @@ cg14_setup_wsdisplay(struct cgfourteen_softc *sc, int is_cons)
memset(sc->sc_fb.fb_pixels,
(defattr >> 16) & 0xff,
ri->ri_stride * ri->ri_height);
if (sc->sc_shadowfb != NULL)
memset(sc->sc_shadowfb,
(defattr >> 16) & 0xff,
ri->ri_stride * ri->ri_height);
sc->sc_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
sc->sc_defaultscreen_descr.textops = &ri->ri_ops;
@ -1019,11 +1013,8 @@ cg14_init_screen(void *cookie, struct vcons_screen *scr,
ri->ri_stride = ri->ri_width;
ri->ri_flg = RI_CENTER | RI_FULLCLEAR;
if (sc->sc_shadowfb != NULL) {
ri->ri_bits = sc->sc_shadowfb;
ri->ri_hwbits = (char *)sc->sc_fb.fb_pixels;
} else
ri->ri_bits = (char *)sc->sc_fb.fb_pixels;
ri->ri_bits = (char *)sc->sc_fb.fb_pixels;
scr->scr_flags |= VCONS_DONT_READ;
if (existing) {
ri->ri_flg |= RI_CLEAR;

13
sys/arch/sparc/dev/cgfourteenvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cgfourteenvar.h,v 1.12 2010/06/10 13:21:13 macallan Exp $ */
/* $NetBSD: cgfourteenvar.h,v 1.13 2010/08/31 21:14:57 macallan Exp $ */
/*
* Copyright (c) 1996
@ -87,15 +87,14 @@ struct cgfourteen_softc {
struct cg14_cursor sc_cursor; /* Hardware cursor state */
union cg14cmap sc_saveclut; /* a place to stash PROM state */
size_t sc_vramsize;
int sc_depth; /* current colour depth */
#if NWSDISPLAY > 0
struct vcons_data sc_vd;
struct vcons_screen sc_console_screen;
struct wsscreen_descr sc_defaultscreen_descr;
struct vcons_screen sc_console_screen;
struct wsscreen_descr sc_defaultscreen_descr;
const struct wsscreen_descr *sc_screens[1];
struct wsscreen_list sc_screenlist;
void *sc_shadowfb;
int sc_mode; /* wsdisplay mode - EMUL, DUMB etc. */
int sc_depth; /* current colour depth */
struct wsscreen_list sc_screenlist;
int sc_mode; /* wsdisplay mode - EMUL, DUMB etc. */
#endif
uint8_t sc_savexlut[256];