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

vga, vesa: revert. this needs to be in aux/vga instead

Browse source
This commit is contained in:
ftrvxmtrx 2014-12-26 16:10:45 +01:00
parent 2cc7c72f8e
commit 04ec990b67
4 changed files with 6 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/man/3/vga
View file

@ -198,17 +198,6 @@ enable or disable the use of DPMS blanking
.B blank
above).
.TP
.BI scaling " mode"
Set the GPU scaling
.I mode
to
.BR off ,
.B full
or
.B aspect
to either disable scaling, scale to full screen, or
to scale while preserving aspect ratio.
.TP
.BI linear " size align"
Use a linear screen aperture of size
.I size

15
sys/src/9/pc/devvga.c
View file

@ -48,7 +48,6 @@ enum {
CMunblank,
CMsoftscreen,
CMpcidev,
CMscaling,
};
static Cmdtab vgactlmsg[] = {
@ -68,7 +67,6 @@ static Cmdtab vgactlmsg[] = {
CMunblank, "unblank", 1,
CMsoftscreen, "softscreen", 2,
CMpcidev, "pcidev", 2,
CMscaling, "scaling", 2,
};
static void
@ -307,19 +305,6 @@ vgactl(Cmdbuf *cb)
error(Ebadarg);
return;
case CMscaling:
if(scr != nil && scr->dev != nil){
if(scr->dev->scaling == nil)
error("scaling not supported");
else if(strcmp(cb->f[1], "aspect") == 0)
scr->dev->scaling(scr, Saspect);
else if(strcmp(cb->f[1], "full") == 0)
scr->dev->scaling(scr, Sfull);
else if(strcmp(cb->f[1], "off") == 0)
scr->dev->scaling(scr, Soff);
}
return;
case CMtype:
for(i = 0; vgadev[i]; i++){
if(strcmp(cb->f[1], vgadev[i]->name))

10
sys/src/9/pc/screen.h
View file

@ -49,15 +49,6 @@ enum {
Pwhite = 0xFF,
};
/*
* Scaling modes.
*/
enum {
Soff,
Sfull,
Saspect,
};
#define VGAMEM() 0xA0000
#define vgai(port) inb(port)
#define vgao(port, data) outb(port, data)
@ -83,7 +74,6 @@ struct VGAdev {
void (*ovlctl)(VGAscr*, Chan*, void*, int);
int (*ovlwrite)(VGAscr*, void*, int, vlong);
void (*flush)(VGAscr*, Rectangle);
void (*scaling)(VGAscr*, int);
};
struct VGAcur {

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

@ -23,7 +23,6 @@ enum {
Cdisable = 0,
Cenable,
Cblank,
Cscaling,
RealModeBuf = 0x9000,
};
@ -33,7 +32,6 @@ static Chan *creg, *cmem;
static QLock vesaq;
static Rendez vesar;
static int vesactl;
static int scaling;
#define WORD(p) ((p)[0] | ((p)[1]<<8))
#define LONG(p) ((p)[0] | ((p)[1]<<8) | ((p)[2]<<16) | ((p)[3]<<24))
@ -185,17 +183,11 @@ vesaproc(void*)
sleep(&vesar, gotctl, &ctl);
ctl = vesactl;
if(ctl == Cscaling){
vbesetup(&u, 0x4f14);
u.bx = 0x102;
u.cx = scaling;
}else{
vbesetup(&u, 0x4f10);
if(ctl == Cblank)
u.bx = 0x0101;
else
u.bx = 0x0001;
}
vbesetup(&u, 0x4f10);
if(ctl == Cblank)
u.bx = 0x0101;
else
u.bx = 0x0001;
/*
* dont wait forever here. some BIOS get stuck
@ -260,21 +252,6 @@ vesablank(VGAscr *, int blank)
}
}
static void
vesascaling(VGAscr *, int mode)
{
if(vesactl != Cdisable){
vesactl = Cscaling;
if(mode == Soff)
scaling = 1;
else if(mode == Saspect)
scaling = 3;
else if(mode == Sfull)
scaling = 0;
wakeup(&vesar);
}
}
static void
vesadrawinit(VGAscr *scr)
{
@ -285,12 +262,7 @@ VGAdev vgavesadev = {
"vesa",
vesaenable,
vesadisable,
nil,
0,
vesalinear,
vesadrawinit,
nil,
nil,
nil,
nil,
vesascaling,
};