vesa: make softscreen optional (has to be enabled with *vesashadow= option now in plan9.ini)

This commit is contained in:
cinap_lenrek 2011-11-05 05:16:50 +01:00
parent 199b37d2d1
commit 0bddb7e28d

View file

@ -17,8 +17,6 @@
#include "screen.h" #include "screen.h"
enum { enum {
Usesoftscreen = 1,
Cdisable = 0, Cdisable = 0,
Cenable, Cenable,
Cblank, Cblank,
@ -112,9 +110,9 @@ static void
vesalinear(VGAscr *scr, int, int) vesalinear(VGAscr *scr, int, int)
{ {
int i, mode, size, havesize; int i, mode, size, havesize;
uchar *p;
ulong paddr; ulong paddr;
Pcidev *pci; Pcidev *pci;
uchar *p;
if(hardscreen) { if(hardscreen) {
scr->vaddr = hardscreen; scr->vaddr = hardscreen;
@ -170,8 +168,7 @@ vesalinear(VGAscr *scr, int, int)
vgalinearaddr(scr, paddr, size); vgalinearaddr(scr, paddr, size);
if(scr->apsize) if(scr->apsize)
addvgaseg("vesascreen", scr->paddr, scr->apsize); addvgaseg("vesascreen", scr->paddr, scr->apsize);
if(getconf("*vesashadow")){
if(Usesoftscreen){
hardscreen = scr->vaddr; hardscreen = scr->vaddr;
scr->paddr = scr->apsize = 0; scr->paddr = scr->apsize = 0;
} }