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

3 files changed, 6 insertions, 59 deletions

diff --git a/sys/src/9/pc/devvga.c b/sys/src/9/pc/devvga.c
index 918da32b0..3867d36dc 100644
--- a/sys/src/9/pc/devvga.c
+++ b/sys/src/9/pc/devvga.c
@@ -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))
diff --git a/sys/src/9/pc/screen.h b/sys/src/9/pc/screen.h
index 7928ca616..bbe6b2512 100644
--- a/sys/src/9/pc/screen.h
+++ b/sys/src/9/pc/screen.h
@@ -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 {
diff --git a/sys/src/9/pc/vgavesa.c b/sys/src/9/pc/vgavesa.c
index 4eeffbe85..794533a9d 100644
--- a/sys/src/9/pc/vgavesa.c
+++ b/sys/src/9/pc/vgavesa.c
@@ -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
@@ -261,21 +253,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)
 {
 	scr->blank = vesablank;
@@ -285,12 +262,7 @@ VGAdev vgavesadev = {
 	"vesa",
 	vesaenable,
 	vesadisable,
-	nil,
+	0,
 	vesalinear,
 	vesadrawinit,
-	nil,
-	nil,
-	nil,
-	nil,
-	vesascaling,
 };