Clean up SiS definitions in line with driver documentation

2 files changed, 28 insertions, 160 deletions

diff --git a/lst/Cards+ b/lst/Cards+
index 6c7d4f6a..63131e9d 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -258,147 +258,15 @@ DRIVER trident
 NAME SiS USB
 DRIVER sisusb
 
-NAME SiS generic
+NAME SiS (old series)
 DRIVER sis
 
-NAME SiS SG86C205
-DRIVER sis
-BAD_FB_RESTORE
-LINE     # Option "no_accel" # Use this if acceleration is causing problems
-LINE     # Option "fifo_moderate" 
-LINE     # Option "fifo_conserv" 
-LINE     # Option "fifo_aggresive" 
-
-NAME SiS SG86C215
-DRIVER sis
-BAD_FB_RESTORE
-LINE     # This is a cheap version of 86c205. I am not sure if acceleration works
-LINE     # Option "no_accel" # Use this if acceleration is causing problems
-LINE     # Option "no_BitBlt" # Use this if acceleration is causing problems
-LINE     # Option "fifo_moderate" 
-LINE     # Option "fifo_conserv" 
-LINE     # Option "fifo_aggresive" 
-
-NAME SiS SG86C225
-DRIVER sis
-BAD_FB_RESTORE
-LINE     # Option "no_accel" # Use this if acceleration is causing problems
-LINE     # Option "fifo_moderate" 
-LINE     # Option "fifo_conserv" 
-LINE     # Option "fifo_aggresive" 
-
-NAME SiS 5597
-DRIVER sis
-BAD_FB_RESTORE
-LINE     # Option "no_accel" # Use this if acceleration is causing problems
-LINE     # Option "fifo_moderate" 
-LINE     # Option "fifo_conserv" 
-LINE     # Option "fifo_aggresive" 
-LINE     # Option "fast_vram"
-LINE     # Option "pci_burst_on"
-LINE     # Option "xaa_benchmark" # DON'T use with "ext_eng_queue" !!!
-LINE     # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
-LINE                              # errors, but gives some accel
-
-NAME SiS 5598
-DRIVER sis
-BAD_FB_RESTORE
-LINE     # Option "no_accel" # Use this if acceleration is causing problems
-LINE     # Option "fifo_moderate" 
-LINE     # Option "fifo_conserv" 
-LINE     # Option "fifo_aggresive" 
-LINE     # Option "fast_vram"
-LINE     # Option "pci_burst_on"
-LINE     # Option "xaa_benchmark" # DON'T use with "ext_eng_queue" !!!
-LINE     # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
-LINE                              # errors, but gives some accel
-
-NAME SiS 6326
-DRIVER sis
-DRI_GLX_EXPERIMENTAL
-BAD_FB_RESTORE
-LINE     Option "sw_cursor"
-LINE     # Option "no_accel" # Use this if acceleration is causing problems
-LINE     # Option "fifo_moderate" 
-LINE     # Option "fifo_conserv" 
-LINE     # Option "fifo_aggresive" 
-LINE     # Option "fast_vram"
-LINE     # Option "pci_burst_on"
-LINE     # Option "xaa_benchmark" # DON'T use with "ext_eng_queue" !!!
-LINE     # Option "ext_eng_queue" # Turbo-queue. This can cause drawing 
-LINE                              # errors, but gives some accel
-
-NAME SiS 6326 no_accel
-SEE SiS 6326
-LINE     Option "no_accel" # Use this if acceleration is causing problems
-
-NAME SiS Real256E
-DRIVER sis
-
-NAME SiS 530
-DRIVER sis
-
-NAME SiS 540
-DRIVER sis
-BAD_FB_RESTORE
-
-NAME SiS 620
-DRIVER sis
-
-NAME SiS 630
-DRIVER sis
-DRI_GLX_EXPERIMENTAL
-
-NAME SiS 650
+NAME SiS (300 series)
 DRIVER sis
+DRI_GLX
 
-NAME SiS 300
+NAME SiS / XGI (315 / 330 / 340 series)
 DRIVER sis
-BAD_FB_RESTORE
-
-NAME MSI MS-4417
-SEE SiS 6326
-
-NAME SiS 3D PRO AGP
-SEE SiS 6326
-
-NAME Miro Crystal DVD
-SEE SiS 6326
-
-NAME PC-Chips M567 Mainboard
-SEE SiS 5597
-
-NAME Diamond SpeedStar A50
-SEE SiS 6326
-LINE     Option "no_imageblt"
-LINE     Option "no_bitblt"
-
-NAME AOpen PA50D
-SEE SiS 6326
-
-NAME AOpen PA50V
-SEE SiS 6326
-
-NAME AOpen PA50E
-SEE SiS 6326
-
-NAME AOpen PA80/DVD
-SEE SiS 6326
-
-NAME AOpen PA45
-SEE SiS 6326
-
-NAME AOpen PT80
-SEE SiS 6326
-
-NAME Chaintech Tornado S6000
-SEE SiS 6326
-
-NAME Chaintech Desperado SI21
-SEE SiS 6326
-
-NAME Chaintech Desperado SI31
-SEE SiS 6326
 
 # Cyrix
 
diff --git a/lst/pcitable b/lst/pcitable
index dc0e8c97..b3c5a909 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -1516,18 +1516,18 @@
 0x1039	0x0186	"ahci"	"Silicon Integrated Systems [SiS]|AHCI Controller (0106)"
 0x1039	0x0190	"sis190"	"Silicon Integrated Systems [SiS]|190 Gigabit Ethernet Adapter"
 0x1039	0x0191	"sis190"	"Silicon Integrated Systems [SiS]|191 Gigabit Ethernet Adapter"
-0x1039	0x0200	"Card:SiS 5598"	"Silicon Integrated Systems [SiS]|5597/5598/6326 VGA"
+0x1039	0x0200	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|5597/5598/6326 VGA"
 0x1039	0x0204	"Card:VESA driver (generic)"	"Silicon Integrated Systems [SiS]|82C204"
-0x1039	0x0205	"Card:SiS SG86C205"	"Silicon Integrated Systems [SiS]|SG86C205"
-0x1039	0x0215	"Card:SiS SG86C215"	"Silicon Integrated Systems [SiS]|SG86C215"
-0x1039	0x0225	"Card:SiS SG86C225"	"Silicon Integrated Systems [SiS]|SG86C225"
-0x1039	0x0300	"Card:SiS 300"	"Silicon Integrated Systems [SiS]|300"
-0x1039	0x0305	"unknown"	"Silicon Integrated Systems [SiS]|SiS305 2D/3D/Video/DVD Accelerator"
-0x1039	0x0310	"Card:SiS generic"	"Silicon Integrated Systems [SiS]|SiS315H PCI/AGP VGA Display Adapter"
-0x1039	0x0315	"Card:SiS generic"	"Silicon Integrated Systems [SiS]|SiS 315"
-0x1039	0x0325	"Card:SiS generic"	"Silicon Integrated Systems [SiS]|SiS325 2D/3D Accelerator"
-0x1039	0x0330	"Card:SiS generic"	"Silicon Integrated Systems [SiS]|SiS330 Xabre 2D/3D Accelerator"
-0x1039	0x0340	"Card:SiS generic"	"Silicon Integrated Systems [SiS]|"
+0x1039	0x0205	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|SG86C205"
+0x1039	0x0215	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|SG86C215"
+0x1039	0x0225	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|SG86C225"
+0x1039	0x0300	"Card:SiS (300 series)"	"Silicon Integrated Systems [SiS]|300"
+0x1039	0x0305	"Card:SiS / XGI (315 / 330 / 340 series)"	"Silicon Integrated Systems [SiS]|SiS305 2D/3D/Video/DVD Accelerator"
+0x1039	0x0310	"Card:SiS / XGI (315 / 330 / 340 series)"	"Silicon Integrated Systems [SiS]|SiS315H PCI/AGP VGA Display Adapter"
+0x1039	0x0315	"Card:SiS / XGI (315 / 330 / 340 series)"	"Silicon Integrated Systems [SiS]|SiS 315"
+0x1039	0x0325	"Card:SiS / XGI (315 / 330 / 340 series)"	"Silicon Integrated Systems [SiS]|SiS325 2D/3D Accelerator"
+0x1039	0x0330	"Card:SiS / XGI (315 / 330 / 340 series)"	"Silicon Integrated Systems [SiS]|SiS330 Xabre 2D/3D Accelerator"
+0x1039	0x0340	"Card:SiS / XGI (315 / 330 / 340 series)"	"Silicon Integrated Systems [SiS]|"
 0x1039	0x0406	"unknown"	"Silicon Integrated Systems [SiS]|85C501/2"
 0x1039	0x0496	"unknown"	"Silicon Integrated Systems [SiS]|85C496"
 0x1039	0x0530	"sis-agp"	"Silicon Integrated Systems [SiS]|530 Host"
@@ -1586,8 +1586,8 @@
 0x1039	0x1185	"ahci"	"Silicon Integrated Systems [SiS]|AHCI IDE Controller (0106)"
 0x1039	0x3602	"unknown"	"Silicon Integrated Systems [SiS]|83C602"
 0x1039	0x5107	"unknown"	"Silicon Integrated Systems [SiS]|5107"
-0x1039	0x5300	"Card:SiS 540"	"Silicon Integrated Systems [SiS]|SiS540 PCI Display Adapter"
-0x1039	0x5315	"Card:SiS generic"	"Silicon Integrated Systems [SiS]|SiS550/1/2 GUI Accelerator"
+0x1039	0x5300	"Card:SiS (300 series)"	"Silicon Integrated Systems [SiS]|SiS540 PCI Display Adapter"
+0x1039	0x5315	"Card:SiS / XGI (315 / 330 / 340 series)"	"Silicon Integrated Systems [SiS]|SiS550/1/2 GUI Accelerator"
 0x1039	0x5401	"unknown"	"Silicon Integrated Systems [SiS]|486 PCI Chipset"
 0x1039	0x5511	"unknown"	"Silicon Integrated Systems [SiS]|5511/5512"
 0x1039	0x5513	"sis5513"	"Silicon Integrated Systems [SiS]|5513 [IDE]"
@@ -1598,20 +1598,20 @@
 0x1039	0x5582	"unknown"	"Silicon Integrated Systems [SiS]|PCI to ISA Bridge"
 0x1039	0x5591	"unknown"	"Silicon Integrated Systems [SiS]|5591/5592 Host"
 0x1039	0x5596	"unknown"	"Silicon Integrated Systems [SiS]|SiS5596 Pentium Chipset"
-0x1039	0x5597	"Card:SiS 5597"	"Silicon Integrated Systems [SiS]|5597 [SiS5582]"
+0x1039	0x5597	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|5597 [SiS5582]"
 0x1039	0x5600	"unknown"	"Silicon Integrated Systems [SiS]|5600 Host"
 0x1039	0x5630	"unknown"	"Silicon Integrated Systems [SiS]|SiS630 Host-to-PCI Bridge"
 0x1039	0x5811	"unknown"	"Silicon Integrated Systems [SiS]| "
 0x1039	0x6204	"unknown"	"Silicon Integrated Systems [SiS]|Video decoder & MPEG interface"
 0x1039	0x6205	"unknown"	"Silicon Integrated Systems [SiS]|VGA Controller"
 0x1039	0x6225	"unknown"	"Silicon Integrated Systems [SiS]|SiS 6225 PCI Graphics & Video Accelerator"
-0x1039	0x6226	"Card:SiS 6326"	"Silicon Integrated Systems [SiS]|6326 3D-AGP"
-0x1039	0x6236	"Card:SiS 6326"	"Silicon Integrated Systems [SiS]|6236 3D-AGP"
-0x1039	0x6300	"Card:SiS 630"	"Silicon Integrated Systems [SiS]|SiS630 GUI Accelerator+3D"
-0x1039	0x6306	"Card:SiS 530"	"Silicon Integrated Systems [SiS]|SiS530 3D PCI/AGP"
-0x1039	0x6325	"Card:SiS 650"	"Silicon Integrated Systems [SiS]|SiS650/651/740 GUI 2D/3D Accelerator"
-0x1039	0x6326	"Card:SiS 6326"	"Silicon Integrated Systems [SiS]|86C326"
-0x1039	0x6330	"Card:SiS Real256E"	"Silicon Integrated Systems [SiS]|SiS Real256E"
+0x1039	0x6226	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|6326 3D-AGP"
+0x1039	0x6236	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|6236 3D-AGP"
+0x1039	0x6300	"Card:SiS (300 series)"	"Silicon Integrated Systems [SiS]|SiS630 GUI Accelerator+3D"
+0x1039	0x6306	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|SiS530 3D PCI/AGP"
+0x1039	0x6325	"Card:SiS / XGI (315 / 330 / 340 series)"	"Silicon Integrated Systems [SiS]|SiS650/651/740 GUI 2D/3D Accelerator"
+0x1039	0x6326	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|86C326"
+0x1039	0x6330	"Card:SiS (old series)"	"Silicon Integrated Systems [SiS]|SiS Real256E"
 0x1039	0x6350	"unknown"	"Silicon Integrated Systems [SiS]|770/670 PCIE VGA Display Adapter"
 0x1039	0x6351	"unknown"	"Silicon Integrated Systems [SiS]|771/671 PCIE VGA Display Adapter"
 0x1039	0x6972	"unknown"	"Silicon Integrated Systems [SiS]| "
@@ -1625,7 +1625,7 @@
 0x1039	0x7016	"sis900"	"Silicon Integrated Systems [SiS]|SiS900 10/100 Ethernet"
 0x1039	0x7018	"snd-trident"	"Silicon Integrated Systems [SiS]|7018 PCI Audio"
 0x1039	0x7019	"unknown"	"Silicon Integrated Systems [SiS]|SiS550/1/2 Hardware Audio"
-0x1039	0x7300	"Card:SiS generic"	"Silicon Integrated Systems [SiS]|SiS730 GUI Accelerator+3D"
+0x1039	0x7300	"Card:SiS (300 series)"	"Silicon Integrated Systems [SiS]|SiS730 GUI Accelerator+3D"
 0x1039	0x7502	"snd-hda-intel"	"Silicon Integrated Systems [SiS]|SiS966"
 0x1039	0x8139	"unknown"	"Silicon Integrated Systems [SiS]| "
 0x103c	0x002a	"unknown"	"Hewlett-Packard Company|NX9000 Notebook"
@@ -6457,8 +6457,8 @@
 0x18ac	0xd810	"unknown"	"DViCO Corp.|FusionHDTV 3 Gold"
 0x18ac	0xd820	"unknown"	"DViCO Corp.|FusionHDTV 3 Gold-T"
 0x18b8	0xb001	"iw_c2"	"Ammasso|AMSO 1100 iWARP/RDMA Gigabit Ethernet Coprocessor"
-0x18ca	0x0020	"Card:SiS generic"	"XGI - Xabre Graphics Inc.|Volari Z7"
-0x18ca	0x0040	"Card:SiS generic"	"XGI - Xabre Graphics Inc.|Volari V8"
+0x18ca	0x0020	"Card:SiS / XGI (315 / 330 / 340 series)"	"XGI - Xabre Graphics Inc.|Volari Z7"
+0x18ca	0x0040	"Card:SiS / XGI (315 / 330 / 340 series)"	"XGI - Xabre Graphics Inc.|Volari V8"
 0x18d2	0x3069	"unknown"	"Sitecom|DC-105v2 ISDN controller"
 0x18dd	0x4c6f	"unknown"	"Artimi Inc.|Artimi RTMI-100 UWB adapter"
 0x18e6	0x0001	"unknown"	"MPL AG|OSCI [Octal Serial Communication Interface]"