summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@centraldogma>2011-08-23 06:03:54 +0200
committercinap_lenrek <cinap_lenrek@centraldogma>2011-08-23 06:03:54 +0200
commitb25e48b949ad5be3429ad254b83bce59c063e149 (patch)
treecc6cd7f6f8fe26af0f82f173fa74327224ab90c1
parent54db805a16553ba1e8e2c5d1aeb06e0f62916465 (diff)
downloadplan9front-b25e48b949ad5be3429ad254b83bce59c063e149.tar.xz
vgavesa: cleanup
-rw-r--r--sys/src/9/pc/vgavesa.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/src/9/pc/vgavesa.c b/sys/src/9/pc/vgavesa.c
index d6e899890..9a260907f 100644
--- a/sys/src/9/pc/vgavesa.c
+++ b/sys/src/9/pc/vgavesa.c
@@ -53,15 +53,8 @@ vbesetup(Ureg *u, int ax)
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 @@ vbecall(Ureg *u)
if(devtab[cmem->type]->read(cmem, modebuf, sizeof(modebuf), pa) != sizeof(modebuf))
error("read modebuf");
-
- poperror();
- qunlock(&callq);
}
static void
@@ -229,12 +219,14 @@ vesaproc(void*)
while(vesactl != Cdisable){
if(!waserror()){
sleep(&vesar, vesadisabled, nil);
+
vbesetup(&u, 0x4f10);
if(vesactl == Cblank)
u.bx = 0x0101;
else
u.bx = 0x0001;
vbecall(&u);
+
poperror();
}
}