git: 9front

Info  •  Files  •  Log  •  Branches

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

--- a/sys/src/9/pc/vgavesa.c

+++ b/sys/src/9/pc/vgavesa.c

@@ -17,8 +17,6 @@

 #include "screen.h"

 enum {

-	Usesoftscreen = 1,

-

 	Cdisable = 0,

 	Cenable,

 	Cblank,

@@ -112,9 +110,9 @@

 vesalinear(VGAscr *scr, int, int)

 {

 	int i, mode, size, havesize;

-	uchar *p;

 	ulong paddr;

 	Pcidev *pci;

+	uchar *p;

 	if(hardscreen) {

 		scr->vaddr = hardscreen;

@@ -170,8 +168,7 @@

 	vgalinearaddr(scr, paddr, size);

 	if(scr->apsize)

 		addvgaseg("vesascreen", scr->paddr, scr->apsize);

-

-	if(Usesoftscreen){

+	if(getconf("*vesashadow")){

 		hardscreen = scr->vaddr;

 		scr->paddr = scr->apsize = 0;

 	}

-- 

⑨