xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vesa: explicitely use /386/include/ureg.h

Browse source
This commit is contained in:
cinap_lenrek 2014-02-01 10:14:41 +01:00
parent 090fd6ec0c
commit 88476df541
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/src/9/pc/vgavesa.c
View file

@ -8,7 +8,10 @@
#include "fns.h" #include "fns.h"
#include "io.h" #include "io.h"
#include "../port/error.h" #include "../port/error.h"
#include "ureg.h"
#define Ureg Ureg386
#include "/386/include/ureg.h"
typedef struct Ureg386 Ureg386;
#define Image IMAGE #define Image IMAGE
#include <draw.h> #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 #define PLONG(p, v) (p)[0] = (v); (p)[1] = (v)>>8; (p)[2] = (v)>>16; (p)[3] = (v)>>24
static uchar* static uchar*
vbesetup(Ureg *u, int ax) vbesetup(Ureg386 *u, int ax)
{ {
memset(modebuf, 0, sizeof modebuf); memset(modebuf, 0, sizeof modebuf);
memset(u, 0, sizeof *u); memset(u, 0, sizeof *u);
@ -47,7 +50,7 @@ vbesetup(Ureg *u, int ax)
} }
static void static void
vbecall(Ureg *u) vbecall(Ureg386 *u)
{ {
if(devtab[cmem->type]->write(cmem, modebuf, sizeof(modebuf), RealModeBuf) != sizeof(modebuf)) if(devtab[cmem->type]->write(cmem, modebuf, sizeof(modebuf), RealModeBuf) != sizeof(modebuf))
error("write modebuf"); error("write modebuf");
@ -65,7 +68,7 @@ vbecall(Ureg *u)
static void static void
vbecheck(void) vbecheck(void)
{ {
Ureg u; Ureg386 u;
uchar *p; uchar *p;
p = vbesetup(&u, 0x4F00); p = vbesetup(&u, 0x4F00);
@ -80,7 +83,7 @@ vbecheck(void)
static int static int
vbegetmode(void) vbegetmode(void)
{ {
Ureg u; Ureg386 u;
vbesetup(&u, 0x4F03); vbesetup(&u, 0x4F03);
vbecall(&u); vbecall(&u);
@ -91,7 +94,7 @@ static uchar*
vbemodeinfo(int mode) vbemodeinfo(int mode)
{ {
uchar *p; uchar *p;
Ureg u; Ureg386 u;
p = vbesetup(&u, 0x4F01); p = vbesetup(&u, 0x4F01);
u.cx = mode; u.cx = mode;
@ -171,7 +174,7 @@ gotctl(void *arg)
static void static void
vesaproc(void*) vesaproc(void*)
{ {
Ureg u; Ureg386 u;
int ctl; int ctl;
ctl = Cenable; ctl = Cenable;