From 3a10d30a5cfe030d51b5c17af41f7256ef248dd0 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 21 Jul 2000 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2000-07-21

---
 pc/main.c  | 4 ++--
 pc/vgas3.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pc/main.c b/pc/main.c
index 3823b523c0fd80955cf79f2368dd49f281287580..9f230c69cac827f422f6519182b1e698912ff6c7 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -16,12 +16,12 @@ static  uchar *sp;	/* stack pointer for /boot */
  * Where configuration info is left for the loaded programme.
  * This will turn into a structure as more is done by the boot loader
  * (e.g. why parse the .ini file twice?).
- * There are 1024 bytes available at CONFADDR.
+ * There are XXX bytes available at CONFADDR.
  */
 #define BOOTLINE	((char*)CONFADDR)
 #define BOOTLINELEN	64
 #define BOOTARGS	((char*)(CONFADDR+BOOTLINELEN))
-#define	BOOTARGSLEN	(1024-BOOTLINELEN)
+#define	BOOTARGSLEN	(4096-0x200-BOOTLINELEN)
 #define	MAXCONF		32
 
 char bootdisk[NAMELEN];
diff --git a/pc/vgas3.c b/pc/vgas3.c
index a2d348cf7c323e2c3e3f3f4f387e540e52daf457..2aaf4d979935a952c098a315ccebc23b9fdc7c1f 100644
--- a/pc/vgas3.c
+++ b/pc/vgas3.c
@@ -197,7 +197,7 @@ s3load(VGAscr* scr, Cursor* curs)
 	switch(id){
 
 	case 0xE131:				/* ViRGE */
-	case 0xE18A:				/* ViRGE/[DG]X */
+	case 0xE101:				/* ViRGE/[DG]X */
 	case 0xE110:				/* ViRGE/GX2 */
 	case 0xE13D:				/* ViRGE/VX */
 	case 0xE112:				/* Savage4/IX-MV */
@@ -213,8 +213,8 @@ s3load(VGAscr* scr, Cursor* curs)
 	}
 
 	/*
-	 * The cursor is set in Microsoft Windows format (the ViRGE/GX2 no
-	 * longer supports the X11 format) which gives the following truth table:
+	 * The cursor is set in Microsoft Windows format (the ViRGE/GX2 doesn't
+	 * support the X11 format) which gives the following truth table:
 	 *	and xor	colour
 	 *	 0   0	background colour
 	 *	 0   1	foreground colour
@@ -245,7 +245,7 @@ s3load(VGAscr* scr, Cursor* curs)
 	switch(id){
 
 	case 0xE131:				/* ViRGE */
-	case 0xE18A:				/* ViRGE/[DG]X */
+	case 0xE101:				/* ViRGE/[DG]X */
 	case 0xE110:				/* ViRGE/GX2 */
 	case 0xE13D:				/* ViRGE/VX */
 	case 0xE112:				/* Savage4/IX-MV */