changed all S3 card to use DRIVER s3 but keep UNSUPPORTED flag,

waiting for detailed documentation from XFree to choose the
chipset supported.

1 files changed, 60 insertions, 60 deletions

diff --git a/lst/Cards+ b/lst/Cards+
index f03f04cf..c1f79644 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -420,7 +420,7 @@ SEE Cirrus Logic GD542x
 NAME S3 801/805 (generic)
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 
 NAME S3 86C801 (generic)
@@ -433,7 +433,7 @@ SEE S3 801/805 (generic)
 NAME S3 801/805 with ATT20c490 RAMDAC
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c490
 LINE     #Option "dac_8_bit"		# Not supported by some 20c490 clones
@@ -441,21 +441,21 @@ LINE     #Option "dac_8_bit"		# Not supported by some 20c490 clones
 NAME S3 801/805 with SC1148{2,3,4} RAMDAC
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC sc11482
 
 NAME S3 801/805 with SC1148{5,7,9} RAMDAC
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC sc11485
 
 NAME S3 801/805 with S3 GenDAC
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC s3gendac
 CLOCKCHIP s3gendac
@@ -463,7 +463,7 @@ CLOCKCHIP s3gendac
 NAME S3 801/805 with ATT20c490 RAMDAC and ICD2061A
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c490
 CLOCKCHIP icd2061a
@@ -472,7 +472,7 @@ LINE     #Option "dac_8_bit"		# Not supported by some 20c490 clones
 NAME S3 801/805 with Chrontel 8391
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c490
 CLOCKCHIP ch8391
@@ -482,7 +482,7 @@ LINE     Option "dac_8_bit"
 NAME Actix GE32+ 2MB
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c490
 LINE     #Option "dac_8_bit"
@@ -490,20 +490,20 @@ LINE     #Option "dac_8_bit"
 NAME Actix GE32i
 CHIPSET S3 805i
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 
 NAME Orchid Fahrenheit VA
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c490
 
 NAME Orchid Fahrenheit 1280
 CHIPSET S3 801
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Probable clocks:
 LINE     #Clocks 25.20 28.32 32.50 0.00 40.00 44.90 50.40 65.00
@@ -512,7 +512,7 @@ LINE     #Clocks 78.00 56.70 63.10 75.10 80.00 89.90 100.90 31.50
 NAME Orchid Fahrenheit-1280+
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20C490
 LINE     Dacspeed   110
@@ -525,7 +525,7 @@ LINE     #Clocks     130.0 120.20 80.0 31.50 110.30 65.0 75.0 94.60
 NAME Diamond Stealth 24
 CHIPSET S3 801/805
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP icd2061a
 LINE     #Option    "nolinear"
@@ -557,7 +557,7 @@ SEE S3 801/805 with Chrontel 8391
 NAME S3 864 (generic)
 CHIPSET S3 864
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 
 NAME S3 86C864 (generic)
@@ -569,7 +569,7 @@ SEE S3 864 (generic)
 NAME S3 864 with SDAC (86C716)
 CHIPSET S3 864
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC s3_sdac
 CLOCKCHIP s3_sdac
@@ -578,14 +578,14 @@ NOCLOCKPROBE
 NAME S3 864 with ATT 20C498 or 21C498
 CHIPSET S3 864
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c498
 
 NAME S3 864 with STG1703
 CHIPSET S3 864
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC stg1703
 NOCLOCKPROBE
@@ -593,7 +593,7 @@ NOCLOCKPROBE
 NAME S3 868 (generic)
 CHIPSET S3 868
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 
 NAME S3 86C868 (generic)
@@ -605,21 +605,21 @@ SEE S3 868 (generic)
 NAME S3 868 with SDAC (86C716)
 CHIPSET S3 868
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
 NAME S3 868 with ATT 20C498 or 21C498
 CHIPSET S3 868
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c498
 
 NAME S3 868 with ATT 20C409
 CHIPSET S3 868
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c409
 NOCLOCKPROBE
@@ -631,7 +631,7 @@ SEE S3 868 with ATT 20C498 or 21C498
 NAME S3 Trio64 (generic)
 CHIPSET S3 Trio64
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
@@ -641,7 +641,7 @@ SEE S3 Trio64 (generic)
 NAME S3 Trio64V+ (generic)
 CHIPSET S3 Trio64V+
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
@@ -651,7 +651,7 @@ SEE S3 Trio64V+ (generic)
 NAME S3 Trio32 (generic)
 CHIPSET S3 Trio32
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
@@ -662,7 +662,7 @@ SEE S3 864 with SDAC (86C716)
 NAME Number Nine GXE64
 CHIPSET S3 864
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP icd2061a
 LINE     Option "number_nine"
@@ -700,7 +700,7 @@ SEE S3 864 with SDAC (86C716)
 NAME ELSA Winner 1000PRO with STG1700 or AT&T RAMDAC
 CHIPSET S3 864
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP icd2061a
 
@@ -710,7 +710,7 @@ SEE S3 868 with SDAC (86C716)
 NAME ELSA Winner 1000ISA
 CHIPSET S3 805i
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP icd2061a
 LINE     Option "dac_8_bit"
@@ -803,7 +803,7 @@ SEE S3 Trio64V+ (generic)
 NAME S3 Trio64V2 (generic)
 CHIPSET S3 Trio64V2
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
@@ -828,7 +828,7 @@ SEE S3 Trio64V2/DX (generic)
 NAME S3 Aurora64V+ (generic)
 CHIPSET S3 Aurora64V+
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 LINE     # Option "lcd_center"
@@ -855,7 +855,7 @@ SEE S3 Aurora64V+ (generic)
 NAME S3 964 (generic)
 CHIPSET S3 964
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
@@ -867,7 +867,7 @@ SEE S3 964 (generic)
 
 NAME S3 968 (generic)
 CHIPSET S3 968
-DRIVER vesa
+DRIVER s3
 
 NAME S3 86C968 (generic)
 SEE S3 968 (generic)
@@ -878,7 +878,7 @@ SEE S3 968 (generic)
 NAME Number Nine GXE64 Pro
 CHIPSET S3 964
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC ti3025
 LINE     Option "number_nine"
@@ -963,28 +963,28 @@ SEE S3 964 (generic)
 NAME Miro Crystal 20SV
 CHIPSET S3 964
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP icd2061a
 
 NAME Miro Crystal 40SV
 CHIPSET S3 964
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP ti3025
 
 NAME Miro Crystal 80SV
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
 NAME Miro Video 20SV
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c505
 LINE    #DacSpeed 150
@@ -993,7 +993,7 @@ CLOCKCHIP ics9161a
 NAME SPEA Mercury 64
 CHIPSET S3 964
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP ics9161a
 LINE     #Option "spea_mercury"
@@ -1001,7 +1001,7 @@ LINE     #Option "spea_mercury"
 NAME ELSA Winner 2000PRO-2
 CHIPSET S3 964
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Option "ELSA_w2000pro"
 NOCLOCKPROBE
@@ -1009,7 +1009,7 @@ NOCLOCKPROBE
 NAME ELSA Winner 2000PRO-4
 CHIPSET S3 964
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Option "ELSA_w2000pro"
 NOCLOCKPROBE
@@ -1017,7 +1017,7 @@ NOCLOCKPROBE
 NAME ELSA Winner 2000PRO/X-2
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Option "sync_on_green"
 NOCLOCKPROBE
@@ -1025,7 +1025,7 @@ NOCLOCKPROBE
 NAME ELSA Winner 2000PRO/X-4
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Option "sync_on_green"
 NOCLOCKPROBE
@@ -1033,7 +1033,7 @@ NOCLOCKPROBE
 NAME ELSA Winner 2000PRO/X-8
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Option "sync_on_green"
 NOCLOCKPROBE
@@ -1041,7 +1041,7 @@ NOCLOCKPROBE
 NAME ELSA Winner 2000AVI
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Option "sync_on_green"
 NOCLOCKPROBE
@@ -1049,7 +1049,7 @@ NOCLOCKPROBE
 NAME ELSA Gloria-4
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Option "sync_on_green"
 NOCLOCKPROBE
@@ -1057,7 +1057,7 @@ NOCLOCKPROBE
 NAME ELSA Gloria-8
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Option "sync_on_green"
 NOCLOCKPROBE
@@ -1065,14 +1065,14 @@ NOCLOCKPROBE
 NAME VideoLogic GrafixStar 700
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
 NAME LeadTek WinFast S430
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
@@ -1082,7 +1082,7 @@ SEE LeadTek WinFast S430
 NAME LeadTek WinFast S510
 CHIPSET S3 968
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 NOCLOCKPROBE
 
@@ -1094,7 +1094,7 @@ SEE LeadTek WinFast S510
 NAME S3 928 (generic)
 CHIPSET S3 928
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 
 NAME S3 86C928 (generic)
@@ -1103,7 +1103,7 @@ SEE S3 928 (generic)
 NAME Actix Ultra
 CHIPSET S3 928
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC att20c490
 LINE     #Option "dac_8_bit"
@@ -1111,7 +1111,7 @@ LINE     #Option "dac_8_bit"
 NAME Diamond Stealth Pro
 CHIPSET S3 928
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP icd2061a
 LINE     #Ramdac "att20c490" # The Diamond RAMDAC is reportedly compatible for 15bpp
@@ -1120,7 +1120,7 @@ LINE     #Option "no_linear" # Some VLB machines may require this
 NAME ELSA Winner 1000VL
 CHIPSET S3 928
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     # the following settings should be detected and set automatically by XF86_S3
 LINE     # if the serial number of the ELSA card is printed correctly:
@@ -1139,7 +1139,7 @@ SEE S3 928 (generic)
 NAME SPEA/V7 Mercury
 CHIPSET S3 928
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP sc11412
 LINE     Option "spea_mercury"
@@ -1147,7 +1147,7 @@ LINE     Option "spea_mercury"
 NAME STB Pegasus
 CHIPSET S3 928
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 RAMDAC bt485
 CLOCKCHIP icd2061a
@@ -1157,7 +1157,7 @@ LINE     #Option "sync_on_green"
 NAME Number Nine GXE Level 14/16
 CHIPSET S3 928
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 DACSPEED 200
 CLOCKCHIP icd2061a
@@ -1168,7 +1168,7 @@ LINE     #Option "nomemaccess"
 NAME Number Nine GXE Level 10/11/12
 CHIPSET S3 928
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP icd2061a
 LINE     Option "number_nine"
@@ -1176,7 +1176,7 @@ LINE     Option "number_nine"
 NAME 928Movie
 CHIPSET S3 928
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP icd2595
 RAMDAC bt485
@@ -1187,7 +1187,7 @@ LINE     # pixel multiplexing not supported
 NAME S3 911/924 (generic)
 CHIPSET S3 911/924
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 
 NAME S3 86C911 (generic)
@@ -1199,7 +1199,7 @@ SEE S3 911/924 (generic)
 NAME Diamond Stealth VRAM
 CHIPSET S3 911/924
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 CLOCKCHIP icd2061a
 
@@ -1209,7 +1209,7 @@ CLOCKCHIP icd2061a
 NAME S3 924 with SC1148 DAC
 CHIPSET S3 924
 SERVER S3
-DRIVER vga
+DRIVER s3
 UNSUPPORTED
 LINE     #Probable clocks:
 LINE     #Clocks 25.2 28.3 39.7 1.7 49.9 76.7 35.7 44