summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Williamson <awilliamson@mandriva.org>2007-04-25 04:19:02 +0000
committerAdam Williamson <awilliamson@mandriva.org>2007-04-25 04:19:02 +0000
commita503e0e13b85dde333fb737123efe86ab167d887 (patch)
tree2d565567e78509b1247c50928cf3a362282ba2c8
parent455d92d513afa4bdd1eb58b6be348cea3bdc4985 (diff)
downloadldetect-lst-a503e0e13b85dde333fb737123efe86ab167d887.tar
ldetect-lst-a503e0e13b85dde333fb737123efe86ab167d887.tar.gz
ldetect-lst-a503e0e13b85dde333fb737123efe86ab167d887.tar.bz2
ldetect-lst-a503e0e13b85dde333fb737123efe86ab167d887.tar.xz
ldetect-lst-a503e0e13b85dde333fb737123efe86ab167d887.zip
- further rationalize old S3 entries
-rw-r--r--lst/Cards+51
-rw-r--r--lst/pcitable110
2 files changed, 57 insertions, 104 deletions
diff --git a/lst/Cards+ b/lst/Cards+
index 3aa795de..2b8646f5 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -26,7 +26,7 @@
######################################################################
-# VESA driver
+# Generic drivers
NAME VESA driver (generic)
CHIPSET VESA VBE 2.0
DRIVER vesa
@@ -65,57 +65,10 @@ DRIVER cirrus
# S3
-NAME S3 8xx / 9xx / Trio-based cards
+NAME S3 8xx / 9xx / Trio / Aurora64V+-based cards
DRIVER s3
NEEDVIDEORAM
-NAME S3 Aurora64V+-based cards
-DRIVER s3
-NEEDVIDEORAM
-LINE # Option "lcd_center"
-LINE # Set_LCDClk <pixel_clock_for_LCD>
-
-NAME Genoa VideoBlitz III AV
-LINE #s3RefClk 50
-LINE #DACspeed 170
-SEE S3 8xx / 9xx / Trio-based cards
-
-NAME STB Velocity 64 Video
-LINE #s3RefClk 24
-LINE #DACspeed 220
-SEE S3 8xx / 9xx / Trio-based cards
-
-NAME Hercules Graphite Terminator Pro 64
-LINE #s3RefClk 16
-LINE #DACspeed 220
-SEE S3 8xx / 9xx / Trio-based cards
-
-NAME Number Nine FX Motion 771
-LINE #s3RefClk 16
-SEE S3 8xx / 9xx / Trio-based cards
-
-NAME Elsa Winner 2000PRO-2 / 2000PRO-4
-DRIVER s3
-NEEDVIDEORAM
-LINE #Option "ELSA_w2000pro"
-
-NAME Elsa Winner 2000PROX-2 / X-4 / X-8 / AVI
-DRIVER s3
-NEEDVIDEORAM
-LINE #Option "sync_on_green"
-
-NAME Elsa Gloria-4 / Gloria-8
-DRIVER s3
-NEEDVIDEORAM
-LINE #Option "sync_on_green"
-
-NAME S3 924 with SC1148 DAC
-DRIVER s3
-NEEDVIDEORAM
-LINE #Probable clocks:
-LINE #Clocks 25.2 28.3 39.7 1.7 49.9 76.7 35.7 44
-LINE #Clocks 130.2 119.5 79.4 31.2 110.0 65.2 74.9 71.3
-
NAME S3 ViRGE-based cards
DRIVER s3virge
NEEDVIDEORAM
diff --git a/lst/pcitable b/lst/pcitable
index 62a1f363..1622eb24 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -2330,18 +2330,18 @@
0x1092 0x09c8 "unknown" "Diamond Computer Systems|SUP2760 SupraExpress 56i Pro VCC"
0x1092 0x1092 "Card:NVIDIA RIVA TNT - GeForce 2 (71xx)" "Diamond Multimedia Systems|Viper V330"
0x1092 0x6120 "unknown" "Diamond Multimedia Systems|Maximum DVD"
-0x1092 0x8810 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth SE"
-0x1092 0x8811 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth 64/SE"
-0x1092 0x8880 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth"
-0x1092 0x8881 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth"
-0x1092 0x88b0 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth 64"
-0x1092 0x88b1 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth 64"
-0x1092 0x88c0 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth 64"
-0x1092 0x88c1 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth 64"
-0x1092 0x88d0 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth 64"
-0x1092 0x88d1 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth 64"
-0x1092 0x88f0 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth 64"
-0x1092 0x88f1 "Card:S3 8xx / 9xx / Trio-based cards" "Diamond Multimedia Systems|Stealth 64"
+0x1092 0x8810 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth SE"
+0x1092 0x8811 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth 64/SE"
+0x1092 0x8880 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth"
+0x1092 0x8881 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth"
+0x1092 0x88b0 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth 64"
+0x1092 0x88b1 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth 64"
+0x1092 0x88c0 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth 64"
+0x1092 0x88c1 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth 64"
+0x1092 0x88d0 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth 64"
+0x1092 0x88d1 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth 64"
+0x1092 0x88f0 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth 64"
+0x1092 0x88f1 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "Diamond Multimedia Systems|Stealth 64"
0x1092 0x9876 "unknown" "Diamond Multimedia Systems|Supra Express 56i Pro CW #2"
0x1092 0x9999 "unknown" "Diamond Multimedia Systems|DMD-I0928-1 Monster sound sound chip"
0x1093 0x0160 "unknown" "National Instruments|PCI-DIO-96"
@@ -6690,54 +6690,54 @@
0x5213 0x0510 "snd-fm801" "Gallant|Odyssey Sound 4"
0x5301 0x0001 "Card:Alliance ProMotion-based cards" "Alliance Semiconductor|ProMotion aT3D"
0x5333 0x0551 "Card:S3 Trio3D-based cards" "S3 Inc.|Plato/PX (system)"
-0x5333 0x0e11 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c775/86c785 [Trio 64V2/DX or /GX]"
+0x5333 0x0e11 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c775/86c785 [Trio 64V2/DX or /GX]"
0x5333 0x5631 "Card:S3 ViRGE-based cards" "S3 Inc.|86c325 [ViRGE]"
-0x5333 0x8800 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c866 [Vision 866]"
-0x5333 0x8801 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c964 [Vision 964]"
-0x5333 0x8810 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c764_0 [Trio 32 vers 0]"
-0x5333 0x8811 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c764/765 [Trio32/64/64V+]"
-0x5333 0x8812 "Card:S3 Aurora64V+-based cards" "S3 Inc.|86cM65 [Aurora64V+]"
-0x5333 0x8813 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c764_3 [Trio 32/64 vers 3]"
-0x5333 0x8814 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c767 [Trio 64UV+]"
-0x5333 0x8815 "Card:S3 Aurora64V+-based cards" "S3 Inc.|86cM65 [Aurora 128]"
+0x5333 0x8800 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c866 [Vision 866]"
+0x5333 0x8801 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c964 [Vision 964]"
+0x5333 0x8810 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c764_0 [Trio 32 vers 0]"
+0x5333 0x8811 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c764/765 [Trio32/64/64V+]"
+0x5333 0x8812 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86cM65 [Aurora64V+]"
+0x5333 0x8813 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c764_3 [Trio 32/64 vers 3]"
+0x5333 0x8814 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c767 [Trio 64UV+]"
+0x5333 0x8815 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86cM65 [Aurora 128]"
0x5333 0x883d "Card:S3 ViRGE-based cards" "S3 Inc.|86c988 [ViRGE/VX]"
0x5333 0x8870 "unknown" "S3 Inc.|FireGL"
-0x5333 0x8880 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c868 [Vision 868 VRAM] vers 0"
-0x5333 0x8881 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c868 [Vision 868 VRAM] vers 1"
-0x5333 0x8882 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c868 [Vision 868 VRAM] vers 2"
-0x5333 0x8883 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c868 [Vision 868 VRAM] vers 3"
-0x5333 0x88b0 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c928 [Vision 928 VRAM] vers 0"
-0x5333 0x88b1 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c928 [Vision 928 VRAM] vers 1"
-0x5333 0x88b2 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c928 [Vision 928 VRAM] vers 2"
-0x5333 0x88b3 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c928 [Vision 928 VRAM] vers 3"
-0x5333 0x88c0 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c864 [Vision 864 DRAM] vers 0"
-0x5333 0x88c1 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c864 [Vision 864 DRAM] vers 1"
-0x5333 0x88c2 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c864 [Vision 864-P DRAM] vers 2"
-0x5333 0x88c3 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c864 [Vision 864-P DRAM] vers 3"
-0x5333 0x88d0 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c964 [Vision 964 VRAM] vers 0"
-0x5333 0x88d1 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c964 [Vision 964 VRAM] vers 1"
-0x5333 0x88d2 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c964 [Vision 964-P VRAM] vers 2"
-0x5333 0x88d3 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c964 [Vision 964-P VRAM] vers 3"
-0x5333 0x88f0 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c968 [Vision 968 VRAM] rev 0"
-0x5333 0x88f1 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c968 [Vision 968 VRAM] rev 1"
-0x5333 0x88f2 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c968 [Vision 968 VRAM] rev 2"
-0x5333 0x88f3 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c968 [Vision 968 VRAM] rev 3"
-0x5333 0x8900 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c755 [Trio 64V2/DX]"
-0x5333 0x8901 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V2/DX or /GX"
+0x5333 0x8880 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c868 [Vision 868 VRAM] vers 0"
+0x5333 0x8881 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c868 [Vision 868 VRAM] vers 1"
+0x5333 0x8882 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c868 [Vision 868 VRAM] vers 2"
+0x5333 0x8883 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c868 [Vision 868 VRAM] vers 3"
+0x5333 0x88b0 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c928 [Vision 928 VRAM] vers 0"
+0x5333 0x88b1 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c928 [Vision 928 VRAM] vers 1"
+0x5333 0x88b2 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c928 [Vision 928 VRAM] vers 2"
+0x5333 0x88b3 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c928 [Vision 928 VRAM] vers 3"
+0x5333 0x88c0 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c864 [Vision 864 DRAM] vers 0"
+0x5333 0x88c1 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c864 [Vision 864 DRAM] vers 1"
+0x5333 0x88c2 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c864 [Vision 864-P DRAM] vers 2"
+0x5333 0x88c3 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c864 [Vision 864-P DRAM] vers 3"
+0x5333 0x88d0 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c964 [Vision 964 VRAM] vers 0"
+0x5333 0x88d1 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c964 [Vision 964 VRAM] vers 1"
+0x5333 0x88d2 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c964 [Vision 964-P VRAM] vers 2"
+0x5333 0x88d3 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c964 [Vision 964-P VRAM] vers 3"
+0x5333 0x88f0 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c968 [Vision 968 VRAM] rev 0"
+0x5333 0x88f1 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c968 [Vision 968 VRAM] rev 1"
+0x5333 0x88f2 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c968 [Vision 968 VRAM] rev 2"
+0x5333 0x88f3 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c968 [Vision 968 VRAM] rev 3"
+0x5333 0x8900 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c755 [Trio 64V2/DX]"
+0x5333 0x8901 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V2/DX or /GX"
0x5333 0x8902 "Card:S3 Trio3D-based cards" "S3 Inc.|Plato/PX (graphics)"
0x5333 0x8903 "Card:S3 Trio3D-based cards" "S3 Inc.|Trio 3D business multimedia"
0x5333 0x8904 "Card:S3 Trio3D-based cards" "S3 Inc.|Trio 64 3D"
-0x5333 0x8905 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x8906 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x8907 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x8908 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x8909 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x890a "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x890b "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x890c "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x890d "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x890e "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
-0x5333 0x890f "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x8905 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x8906 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x8907 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x8908 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x8909 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x890a "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x890b "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x890c "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x890d "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x890e "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
+0x5333 0x890f "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|Trio 64V+ family"
0x5333 0x8a01 "Card:S3 ViRGE-based cards" "S3 Inc.|ViRGE/DX or /GX"
0x5333 0x8a10 "Card:S3 ViRGE-based cards" "S3 Inc.|ViRGE/GX2"
0x5333 0x8a11 "Card:S3 ViRGE-based cards" "S3 Incorporated|86C359 ViRGE /GX2+ Macrovision"
@@ -6771,7 +6771,7 @@
0x5333 0x8d03 "Card:S3 Savage-based cards" "S3 Inc.|VT8751 [ProSavageDDR P4M266]"
0x5333 0x8d04 "Card:S3 Savage-based cards" "S3 Inc.|VT8751 [ProSavageDDR P4M266] VGA Controller"
0x5333 0x9102 "Card:S3 Savage-based cards" "S3 Inc.|86C410 Savage 2000"
-0x5333 0xb031 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c775/86c785 [Trio 64V2/DX or /GX]"
+0x5333 0xb031 "Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards" "S3 Inc.|86c775/86c785 [Trio 64V2/DX or /GX]"
0x5333 0xca00 "sonicvibes" "S3 Inc.|SonicVibes"
0x5401 0x0101 "unknown" "Ericsson|DSSS Wireless LAN PCI Card"
0x5430 0x0100 "unknown" "Evergreen Technologies Inc.|AcceleraPCI Upgrade Card Adapter"