support Trident TVGA9440

2 files changed, 83 insertions, 77 deletions

diff --git a/sys/arch/i386/isa/pcvt/pcvt_ext.c b/sys/arch/i386/isa/pcvt/pcvt_ext.c
index 6e3a8f9e582..cf3f16746e7 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_ext.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_ext.c,v 1.10 1997/05/29 02:20:57 mickey Exp $	*/
+/*	$OpenBSD: pcvt_ext.c,v 1.11 1998/01/04 12:50:18 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -265,6 +265,10 @@ vga_chipset(void)
 			case 0x93:
 				return(VGA_TR9100);
 
+			case 0xe3:
+				can_do_132col = 1;
+				return(VGA_TR9440);
+
 			default:
 				return(VGA_TRUNKNOWN);
 		}
@@ -473,6 +477,7 @@ vga_chipset(void)
 							return VGA_S3_765;
 						else
 							return VGA_S3_764;
+					case 0x31:
 					case 0x3d:
 						outb(addr_6845, 0x38);
 						outb(addr_6845+1, old1byte);
@@ -611,52 +616,53 @@ char *
 vga_string(int number)
 {
 	static char *vga_tab[] = {
-		"generic",
-		"et4000",
-		"et3000",
-		"pvga1a",
-		"wd90c00",
-		"wd90c10",
-		"wd90c11",
-		"v7 vega",
-		"v7 fast",
-		"v7 ver5",
-		"v7 1024i",
-		"unknown v7",
-		"tvga 8800br",
-		"tvga 8800cs",
-		"tvga 8900b",
-		"tvga 8900c",
-		"tvga 8900cl",
-		"tvga 9000",
-		"tvga 9100",
-		"tvga 9200",
-		"unknown trident",
-		"s3 911",
-		"s3 924",
-		"s3 801/805",
-		"s3 928",
-		"s3 864",
-		"s3 964",
-		"s3 732 (Trio32)",
-		"s3 764 (Trio64)",
-		"s3 866",
-		"s3 868",
-		"s3 968",
-		"s3 765 (Trio64 V+)",
-		"s3 ViRGE",
-		"unknown s3",
-		"cl-gd5402",
-		"cl-gd5402r1",
-		"cl-gd5420",
-		"cl-gd5420r1",
-		"cl-gd5422",
-		"cl-gd5424",
-		"cl-gd5426",
-		"cl-gd5428",
-		"cl-gd5430",
-		"cl-gd62x5",
-		"unknown cirrus",
+		"generic VGA",
+		"ET4000",
+		"ET3000",
+		"PVGA1A",
+		"WD90C00",
+		"WD90C10",
+		"WD90C11",
+		"Video7 VEGA",
+		"Video7 FAST",
+		"Video7 VER5",
+		"Video7 1024i",
+		"unknown Video7",
+		"TVGA 8800BR",
+		"TVGA 8800CS",
+		"TVGA 8900B",
+		"TVGA 8900C",
+		"TVGA 8900CL",
+		"TVGA 9000",
+		"TVGA 9100",
+		"TVGA 9200",
+		"TVGA 9440",
+		"unknown Trident",
+		"S3 911",
+		"S3 924",
+		"S3 801/805",
+		"S3 928",
+		"S3 864",
+		"S3 964",
+		"S3 732 (Trio32)",
+		"S3 764 (Trio64)",
+		"S3 866",
+		"S3 868",
+		"S3 968",
+		"S3 765 (Trio64 V+)",
+		"S3 ViRGE",
+		"unknown S3",
+		"CL-GD5402",
+		"CL-GD5402r1",
+		"CL-GD5420",
+		"CL-GD5420r1",
+		"CL-GD5422",
+		"CL-GD5424",
+		"CL-GD5426",
+		"CL-GD5428",
+		"CL-GD5430",
+		"CL-GD62x5",
+		"unknown Cirrus",
 						/* VGA_MAX_CHIPSET */
 		"vga_string: chipset name table ptr overflow!"
 	};
@@ -2961,4 +2967,3 @@ usl_vt_ioctl(Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
 #endif	/* NVT > 0 */
 
 /* ------------------------- E O F ------------------------------------------*/
-
diff --git a/sys/arch/i386/isa/pcvt/pcvt_ioctl.h b/sys/arch/i386/isa/pcvt/pcvt_ioctl.h
index bfceea0551e..3294c561831 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_ioctl.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_ioctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_ioctl.h,v 1.6 1997/05/29 02:20:59 mickey Exp $	*/
+/*	$OpenBSD: pcvt_ioctl.h,v 1.7 1998/01/04 12:50:19 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -261,38 +261,39 @@ struct mousedefs {
 #define VGA_TR9000	17	/* Trident TVGA 9000   */
 #define VGA_TR9100	18	/* Trident TVGA 9100   */
 #define VGA_TR9200	19	/* Trident TVGA 9200   */
-#define VGA_TRUNKNOWN	20	/* Trident unknown     */
+#define VGA_TR9440	20	/* Trident TVGA 9440   */
+#define VGA_TRUNKNOWN	21	/* Trident unknown     */
 
 #define VGA_F_S3	5	/* FAMILY S3  */
-#define VGA_S3_911	21	/* S3 911 */
-#define VGA_S3_924	22	/* S3 924 */
-#define VGA_S3_80x	23	/* S3 801/805 */
-#define VGA_S3_928	24	/* S3 928 */
-#define	VGA_S3_864	25	/* S3 864 */
-#define	VGA_S3_964	26	/* S3 964 */
-#define	VGA_S3_732	27	/* S3 732 (Trio32) */
-#define	VGA_S3_764	28	/* S3 764 (Trio64) */
-#define	VGA_S3_866	29	/* S3 866 */
-#define VGA_S3_868	30	/* S3 868 */
-#define VGA_S3_968	31	/* S3 968 */
-#define VGA_S3_765	32	/* S3 765 (Trio64 V+) */
-#define VGA_S3_ViRGE	33	/* S3 ViRGE */
-#define VGA_S3_UNKNOWN	34	/* unknown S3 chipset */
+#define VGA_S3_911	22	/* S3 911 */
+#define VGA_S3_924	23	/* S3 924 */
+#define VGA_S3_80x	24	/* S3 801/805 */
+#define VGA_S3_928	25	/* S3 928 */
+#define	VGA_S3_864	26	/* S3 864 */
+#define	VGA_S3_964	27	/* S3 964 */
+#define	VGA_S3_732	28	/* S3 732 (Trio32) */
+#define	VGA_S3_764	29	/* S3 764 (Trio64) */
+#define	VGA_S3_866	30	/* S3 866 */
+#define VGA_S3_868	31	/* S3 868 */
+#define VGA_S3_968	32	/* S3 968 */
+#define VGA_S3_765	33	/* S3 765 (Trio64 V+) */
+#define VGA_S3_ViRGE	34	/* S3 ViRGE */
+#define VGA_S3_UNKNOWN	35	/* unknown S3 chipset */
 
 #define VGA_F_CIR	6	/* FAMILY CIRRUS */
-#define VGA_CL_GD5402	35	/* Cirrus CL-GD5402	*/
-#define VGA_CL_GD5402r1	36	/* Cirrus CL-GD5402r1	*/
-#define VGA_CL_GD5420	37	/* Cirrus CL-GD5420	*/
-#define VGA_CL_GD5420r1	38	/* Cirrus CL-GD5420r1	*/
-#define VGA_CL_GD5422	39	/* Cirrus CL-GD5422	*/
-#define VGA_CL_GD5424	40	/* Cirrus CL-GD5424	*/
-#define VGA_CL_GD5426	41	/* Cirrus CL-GD5426	*/
-#define VGA_CL_GD5428	42	/* Cirrus CL-GD5428	*/
-#define VGA_CL_GD5430	43	/* Cirrus CL-GD543x	*/
-#define	VGA_CL_GD6225	44	/* Cirrus CL-GD62x5	*/
-#define VGA_CL_UNKNOWN	45	/* Unknown Cirrus CL	*/
-
-#define VGA_MAX_CHIPSET	46	/* max no of chips	*/
+#define VGA_CL_GD5402	36	/* Cirrus CL-GD5402	*/
+#define VGA_CL_GD5402r1	37	/* Cirrus CL-GD5402r1	*/
+#define VGA_CL_GD5420	38	/* Cirrus CL-GD5420	*/
+#define VGA_CL_GD5420r1	39	/* Cirrus CL-GD5420r1	*/
+#define VGA_CL_GD5422	40	/* Cirrus CL-GD5422	*/
+#define VGA_CL_GD5424	41	/* Cirrus CL-GD5424	*/
+#define VGA_CL_GD5426	42	/* Cirrus CL-GD5426	*/
+#define VGA_CL_GD5428	43	/* Cirrus CL-GD5428	*/
+#define VGA_CL_GD5430	44	/* Cirrus CL-GD543x	*/
+#define	VGA_CL_GD6225	45	/* Cirrus CL-GD62x5	*/
+#define VGA_CL_UNKNOWN	46	/* Unknown Cirrus CL	*/
+
+#define VGA_MAX_CHIPSET	47	/* max no of chips	*/
 
 /*****************************************************************************/
 /* NOTE: update the 'scon' utility when adding support for more chipsets !!! */