diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-05-29 02:21:01 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-05-29 02:21:01 +0000 |
| commit | abbb8eba7a43e3bdbc4a0987fc824a6850d1d944 (patch) | |
| tree | 2c54282ba5a8104b907abe286d1e761c1e8242d3 /sys | |
| parent | bacc98f181eebfe79f7ea8dbf3dde61b4ac26086 (diff) | |
add S3 ViRGE detect
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/isa/pcvt/Util/scon/scon.c | 1 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pcvt/pcvt_ext.c | 7 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pcvt/pcvt_ioctl.h | 31 |
3 files changed, 23 insertions, 16 deletions
diff --git a/sys/arch/i386/isa/pcvt/Util/scon/scon.c b/sys/arch/i386/isa/pcvt/Util/scon/scon.c index 08e555703cf..c6ec1056a3f 100644 --- a/sys/arch/i386/isa/pcvt/Util/scon/scon.c +++ b/sys/arch/i386/isa/pcvt/Util/scon/scon.c @@ -653,6 +653,7 @@ char *vga_type(int number) "S3 868", "S3 968", "S3 765 (Trio64 V+)", + "S3 ViRGE", "Unknown S3", "CL-GD5402", "CL-GD5402r1", diff --git a/sys/arch/i386/isa/pcvt/pcvt_ext.c b/sys/arch/i386/isa/pcvt/pcvt_ext.c index e745060f3ae..6e3a8f9e582 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.9 1997/04/15 15:22:35 deraadt Exp $ */ +/* $OpenBSD: pcvt_ext.c,v 1.10 1997/05/29 02:20:57 mickey Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -473,6 +473,10 @@ vga_chipset(void) return VGA_S3_765; else return VGA_S3_764; + case 0x3d: + outb(addr_6845, 0x38); + outb(addr_6845+1, old1byte); + return VGA_S3_ViRGE; case 0x80: outb(addr_6845, 0x38); outb(addr_6845+1, old1byte); @@ -640,6 +644,7 @@ vga_string(int number) "s3 868", "s3 968", "s3 765 (Trio64 V+)", + "s3 ViRGE", "unknown s3", "cl-gd5402", "cl-gd5402r1", diff --git a/sys/arch/i386/isa/pcvt/pcvt_ioctl.h b/sys/arch/i386/isa/pcvt/pcvt_ioctl.h index 79190435b86..bfceea0551e 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.5 1996/07/18 15:37:11 shawn Exp $ */ +/* $OpenBSD: pcvt_ioctl.h,v 1.6 1997/05/29 02:20:59 mickey Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -276,22 +276,23 @@ struct mousedefs { #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_UNKNOWN 33 /* unknown S3 chipset */ +#define VGA_S3_ViRGE 33 /* S3 ViRGE */ +#define VGA_S3_UNKNOWN 34 /* unknown S3 chipset */ #define VGA_F_CIR 6 /* FAMILY CIRRUS */ -#define VGA_CL_GD5402 34 /* Cirrus CL-GD5402 */ -#define VGA_CL_GD5402r1 35 /* Cirrus CL-GD5402r1 */ -#define VGA_CL_GD5420 36 /* Cirrus CL-GD5420 */ -#define VGA_CL_GD5420r1 37 /* Cirrus CL-GD5420r1 */ -#define VGA_CL_GD5422 38 /* Cirrus CL-GD5422 */ -#define VGA_CL_GD5424 39 /* Cirrus CL-GD5424 */ -#define VGA_CL_GD5426 40 /* Cirrus CL-GD5426 */ -#define VGA_CL_GD5428 41 /* Cirrus CL-GD5428 */ -#define VGA_CL_GD5430 42 /* Cirrus CL-GD543x */ -#define VGA_CL_GD6225 43 /* Cirrus CL-GD62x5 */ -#define VGA_CL_UNKNOWN 44 /* Unknown Cirrus CL */ - -#define VGA_MAX_CHIPSET 45 /* max no of chips */ +#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 */ /*****************************************************************************/ /* NOTE: update the 'scon' utility when adding support for more chipsets !!! */ |