shithub: riscv

Info  •  Files  •  Log  •  Branches

vgavesa: cleanup

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

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

@@ -53,15 +53,8 @@

 static void

 vbecall(Ureg *u)

 {

-	static QLock callq;

 	ulong pa;

-	eqlock(&callq);

-	if(waserror()){

-		qunlock(&callq);

-		nexterror();

-	}

-

 	pa = PADDR(RMBUF);

 	if(devtab[cmem->type]->write(cmem, modebuf, sizeof(modebuf), pa) != sizeof(modebuf))

 		error("write modebuf");

@@ -76,9 +69,6 @@

 	if(devtab[cmem->type]->read(cmem, modebuf, sizeof(modebuf), pa) != sizeof(modebuf))

 		error("read modebuf");

-

-	poperror();

-	qunlock(&callq);

 }

 static void

@@ -229,6 +219,7 @@

 	while(vesactl != Cdisable){

 		if(!waserror()){

 			sleep(&vesar, vesadisabled, nil);

+

 			vbesetup(&u, 0x4f10);

 			if(vesactl == Cblank)

 				u.bx = 0x0101;

@@ -235,6 +226,7 @@

 			else	

 				u.bx = 0x0001;

 			vbecall(&u);

+

 			poperror();

 		}

 	}