summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2014-02-01 10:14:41 +0100
committercinap_lenrek <cinap_lenrek@felloff.net>2014-02-01 10:14:41 +0100
commit88476df5416ba346c060727d38b9bc35c5f70015 (patch)
treeb83fa2404f1865d23611fbed1e3b50fa2d080da6
parent090fd6ec0cf1c2cb48d826058b3b8208f22128b5 (diff)
downloadplan9front-88476df5416ba346c060727d38b9bc35c5f70015.tar.xz
vesa: explicitely use /386/include/ureg.h
-rw-r--r--sys/src/9/pc/vgavesa.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/sys/src/9/pc/vgavesa.c b/sys/src/9/pc/vgavesa.c
index b2748b4af..794533a9d 100644
--- a/sys/src/9/pc/vgavesa.c
+++ b/sys/src/9/pc/vgavesa.c
@@ -8,7 +8,10 @@
#include "fns.h"
#include "io.h"
#include "../port/error.h"
-#include "ureg.h"
+
+#define Ureg Ureg386
+#include "/386/include/ureg.h"
+typedef struct Ureg386 Ureg386;
#define Image IMAGE
#include <draw.h>
@@ -36,7 +39,7 @@ static int vesactl;
#define PLONG(p, v) (p)[0] = (v); (p)[1] = (v)>>8; (p)[2] = (v)>>16; (p)[3] = (v)>>24
static uchar*
-vbesetup(Ureg *u, int ax)
+vbesetup(Ureg386 *u, int ax)
{
memset(modebuf, 0, sizeof modebuf);
memset(u, 0, sizeof *u);
@@ -47,7 +50,7 @@ vbesetup(Ureg *u, int ax)
}
static void
-vbecall(Ureg *u)
+vbecall(Ureg386 *u)
{
if(devtab[cmem->type]->write(cmem, modebuf, sizeof(modebuf), RealModeBuf) != sizeof(modebuf))
error("write modebuf");
@@ -65,7 +68,7 @@ vbecall(Ureg *u)
static void
vbecheck(void)
{
- Ureg u;
+ Ureg386 u;
uchar *p;
p = vbesetup(&u, 0x4F00);
@@ -80,7 +83,7 @@ vbecheck(void)
static int
vbegetmode(void)
{
- Ureg u;
+ Ureg386 u;
vbesetup(&u, 0x4F03);
vbecall(&u);
@@ -91,7 +94,7 @@ static uchar*
vbemodeinfo(int mode)
{
uchar *p;
- Ureg u;
+ Ureg386 u;
p = vbesetup(&u, 0x4F01);
u.cx = mode;
@@ -171,7 +174,7 @@ gotctl(void *arg)
static void
vesaproc(void*)
{
- Ureg u;
+ Ureg386 u;
int ctl;
ctl = Cenable;