Merge Trident definitions

2 files changed, 44 insertions, 145 deletions

diff --git a/lst/Cards+ b/lst/Cards+
index c70668bd..d09c3833 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -301,110 +301,9 @@ DRIVER nsc
 
 # Trident
 
-NAME Trident (generic)
+NAME Trident-based cards
 DRIVER trident
 
-NAME Trident 8900/9000 (generic)
-DRIVER trident
-
-NAME Trident 8900D (generic)
-DRIVER trident
-
-NAME Trident TVGA9200CXr (generic)
-DRIVER trident
-
-NAME Trident TGUI9400CXi (generic)
-DRIVER trident
-
-NAME Trident TGUI9420DGi (generic)
-DRIVER trident
-
-NAME Trident TGUI9430DGi (generic)
-DRIVER trident
-
-NAME Trident TGUI9420 (generic)
-DRIVER trident
-
-NAME Trident TGUI9440 (generic)
-DRIVER trident
-
-NAME Trident TGUI9660 (generic)
-DRIVER trident
-
-NAME Trident TGUI9680 (generic)
-DRIVER trident
-
-NAME Trident TGUI9682 (generic)
-DRIVER trident
-
-NAME Trident TGUI9685 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9320 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9382 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9385 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9388 (generic)
-DRIVER trident
-
-NAME Trident Cyber 939a (generic)
-DRIVER trident
-
-NAME Trident Cyber 9397 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9397 DVD (generic)
-DRIVER trident
-
-NAME Trident Cyber 9520 (generic)
-DRIVER trident
-
-NAME Trident Cyber 9325 (generic)
-DRIVER trident
-
-NAME Trident 3DImage975 (generic)
-DRIVER trident
-
-NAME Trident 3DImage975 AGP (generic)
-DRIVER trident
-
-NAME Trident 3DImage985 (generic)
-DRIVER trident
-
-NAME Trident Providia 9682 (generic)
-DRIVER trident
-
-NAME Trident Providia 9685 (generic)
-DRIVER trident
-
-NAME Trident Blade3D (generic)
-DRIVER trident
-
-NAME Trident CyberBlade (generic)
-DRIVER trident
-
-NAME Trident Cyber 9525 (generic)
-DRIVER trident
-LINE     # Option "accel" # Use this if acceleration works on your laptop
-
-NAME AOpen PG975
-SEE Trident 3DImage975 AGP (generic)
-
-NAME Toshiba Satellite 4030CDT
-LINE     Option "cyber_shadow"
-SEE Trident Cyber 9525 (generic)
-
-NAME Toshiba Satellite 4060CDT
-SEE Trident Cyber 9525 (generic)
-
-NAME Toshiba Satellite 4080CDT
-SEE Trident Cyber 9525 (generic)
-
 # SiS
 
 NAME SiS USB
diff --git a/lst/pcitable b/lst/pcitable
index 0fa59459..6a0bc2c2 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -1150,55 +1150,55 @@
 0x1023	0x0194	"unknown"	"Trident Microsystems|82C194"
 0x1023	0x2000	"snd-trident"	"Trident Microsystems|4DWave DX"
 0x1023	0x2001	"snd-trident"	"Trident Microsystems|4DWave NX"
-0x1023	0x2100	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|Cyber-XP4 Video Accelerator"
+0x1023	0x2100	"Card:Trident-based cards"	"Trident Microsystems|Cyber-XP4 Video Accelerator"
 0x1023	0x2200	"unknown"	"Trident Microsystems|XGI Volari XP5"
 0x1023	0x7018	"snd-trident"	"Silicon Integrated Systems [SiS]|SI7018 PCI Audio"
 0x1023	0x8200	"Card:VESA driver (generic)"	"Trident Microsystems|TVGA 8200LX"
-0x1023	0x8400	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|CyberBlade/i7"
-0x1023	0x8420	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|CyberBlade/i7d"
-0x1023	0x8500	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|CyberBlade/i1"
-0x1023	0x8520	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|CyberBlade i1"
-0x1023	0x8600	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|CyberBlade/Ai1"
-0x1023	0x8620	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|CyberBlade/DSTN/Ai1"
-0x1023	0x8800	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|CyberBlade/XP/Ai1"
-0x1023	0x8820	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|CyberBlade/XP/DSTN/Ai1"
-0x1023	0x8900	"Card:Trident 8900/9000 (generic)"	"Trident Microsystems|TVGA 8900B/8900C/8900CL"
+0x1023	0x8400	"Card:Trident-based cards"	"Trident Microsystems|CyberBlade/i7"
+0x1023	0x8420	"Card:Trident-based cards"	"Trident Microsystems|CyberBlade/i7d"
+0x1023	0x8500	"Card:Trident-based cards"	"Trident Microsystems|CyberBlade/i1"
+0x1023	0x8520	"Card:Trident-based cards"	"Trident Microsystems|CyberBlade i1"
+0x1023	0x8600	"Card:Trident-based cards"	"Trident Microsystems|CyberBlade/Ai1"
+0x1023	0x8620	"Card:Trident-based cards"	"Trident Microsystems|CyberBlade/DSTN/Ai1"
+0x1023	0x8800	"Card:Trident-based cards"	"Trident Microsystems|CyberBlade/XP/Ai1"
+0x1023	0x8820	"Card:Trident-based cards"	"Trident Microsystems|CyberBlade/XP/DSTN/Ai1"
+0x1023	0x8900	"Card:Trident-based cards"	"Trident Microsystems|TVGA 8900B/8900C/8900CL"
 0x1023	0x9000	"Card:VESA driver (generic)"	"Trident Microsystems|TVGA 9000/9000i"
 0x1023	0x9100	"Card:VESA driver (generic)"	"Trident Microsystems|TVGA 9100B"
 0x1023	0x9200	"Card:VESA driver (generic)"	"Trident Microsystems|TVGA 9400CXi/r"
-0x1023	0x9320	"Card:Trident Cyber 9320 (generic)"	"Trident Microsystems|TGUI 9320"
-0x1023	0x9350	"Card:Trident (generic)"	"Trident Microsystems|GUI Accelerator"
-0x1023	0x9360	"Card:Trident (generic)"	"Trident Microsystems|Flat panel GUI Accelerator"
-0x1023	0x9382	"Card:Trident Cyber 9382 (generic)"	"Trident Microsystems|Cyber 9382 [Reference design]"
-0x1023	0x9383	"Card:Trident (generic)"	"Trident Microsystems|Cyber 9383 [Reference design]"
-0x1023	0x9385	"Card:Trident Cyber 9385 (generic)"	"Trident Microsystems|Cyber 9385 [Reference design]"
-0x1023	0x9386	"Card:Trident (generic)"	"Trident Microsystems|Cyber 9386"
-0x1023	0x9388	"Card:Trident Cyber 9388 (generic)"	"Trident Microsystems|Cyber 9388"
-0x1023	0x9397	"Card:Trident Cyber 9397 (generic)"	"Trident Microsystems|Cyber 9397"
-0x1023	0x939a	"Card:Trident Cyber 9397 DVD (generic)"	"Trident Microsystems|Cyber 9397DVD"
-0x1023	0x9420	"Card:Trident TGUI9420DGi (generic)"	"Trident Microsystems|TGUI 9420"
-0x1023	0x9430	"Card:Trident TGUI9430DGi (generic)"	"Trident Microsystems|TGUI 9430"
-0x1023	0x9440	"Card:Trident TGUI9440 (generic)"	"Trident Microsystems|TGUI 9440"
-0x1023	0x9460	"Card:Trident (generic)"	"Trident Microsystems|TGUI 9460"
-0x1023	0x9470	"Card:Trident (generic)"	"Trident Microsystems|TGUI 9470"
-0x1023	0x9520	"Card:Trident Cyber 9520 (generic)"	"Trident Microsystems|Cyber 9520"
-0x1023	0x9525	"Card:Trident Cyber 9525 (generic)"	"Trident Microsystems|Cyber 9525"
-0x1023	0x9540	"Card:Trident (generic)"	"Trident Microsystems|Cyber 9540"
-0x1023	0x9660	"Card:Trident TGUI9660 (generic)"	"Trident Microsystems|TGUI 9660/968x/968x"
-0x1023	0x9680	"Card:Trident TGUI9680 (generic)"	"Trident Microsystems|TGUI 9680"
-0x1023	0x9682	"Card:Trident TGUI9682 (generic)"	"Trident Microsystems|TGUI 9682"
-0x1023	0x9683	"Card:Trident (generic)"	"Trident Microsystems|TGUI 9683"
-0x1023	0x9685	"Card:Trident TGUI9685 (generic)"	"Trident Microsystems|ProVIDIA 9685"
-0x1023	0x9750	"Card:Trident 3DImage975 (generic)"	"Trident Microsystems|3DImage 975"
-0x1023	0x9753	"Card:Trident (generic)"	"Trident Microsystems|TGUI 9753"
-0x1023	0x9754	"Card:Trident (generic)"	"Trident Microsystems|TGUI 9754"
-0x1023	0x9759	"Card:Trident 3DImage975 (generic)"	"Trident Microsystems|TGUI 975"
-0x1023	0x9783	"Card:Trident (generic)"	"Trident Microsystems|TGUI 9783"
-0x1023	0x9785	"Card:Trident (generic)"	"Trident Microsystems|TGUI 9785"
-0x1023	0x9850	"Card:Trident 3DImage985 (generic)"	"Trident Microsystems|3DImage 9850"
-0x1023	0x9880	"Card:Trident Blade3D (generic)"	"Trident Microsystems|Blade 3D PCI/AGP"
-0x1023	0x9910	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|Cyber/BladeXP"
-0x1023	0x9930	"Card:Trident CyberBlade (generic)"	"Trident Microsystems|CyberBlade/XPm"
+0x1023	0x9320	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9320"
+0x1023	0x9350	"Card:Trident-based cards"	"Trident Microsystems|GUI Accelerator"
+0x1023	0x9360	"Card:Trident-based cards"	"Trident Microsystems|Flat panel GUI Accelerator"
+0x1023	0x9382	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9382 [Reference design]"
+0x1023	0x9383	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9383 [Reference design]"
+0x1023	0x9385	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9385 [Reference design]"
+0x1023	0x9386	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9386"
+0x1023	0x9388	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9388"
+0x1023	0x9397	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9397"
+0x1023	0x939a	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9397DVD"
+0x1023	0x9420	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9420"
+0x1023	0x9430	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9430"
+0x1023	0x9440	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9440"
+0x1023	0x9460	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9460"
+0x1023	0x9470	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9470"
+0x1023	0x9520	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9520"
+0x1023	0x9525	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9525"
+0x1023	0x9540	"Card:Trident-based cards"	"Trident Microsystems|Cyber 9540"
+0x1023	0x9660	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9660/968x/968x"
+0x1023	0x9680	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9680"
+0x1023	0x9682	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9682"
+0x1023	0x9683	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9683"
+0x1023	0x9685	"Card:Trident-based cards"	"Trident Microsystems|ProVIDIA 9685"
+0x1023	0x9750	"Card:Trident-based cards"	"Trident Microsystems|3DImage 975"
+0x1023	0x9753	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9753"
+0x1023	0x9754	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9754"
+0x1023	0x9759	"Card:Trident-based cards"	"Trident Microsystems|TGUI 975"
+0x1023	0x9783	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9783"
+0x1023	0x9785	"Card:Trident-based cards"	"Trident Microsystems|TGUI 9785"
+0x1023	0x9850	"Card:Trident-based cards"	"Trident Microsystems|3DImage 9850"
+0x1023	0x9880	"Card:Trident-based cards"	"Trident Microsystems|Blade 3D PCI/AGP"
+0x1023	0x9910	"Card:Trident-based cards"	"Trident Microsystems|Cyber/BladeXP"
+0x1023	0x9930	"Card:Trident-based cards"	"Trident Microsystems|CyberBlade/XPm"
 0x1024	0x1024	"Hcf:www.linmodems.org"	"Zenith Data Systems|R6785-61 HCF 56k PCI Modem"
 0x1025	0x0028	"unknown"	"Acer Incorporated|AC97 ID:SIL REV:0x27, 06 Agere Systems soft modem chip"
 0x1025	0x0090	"unknown"	"Acer Incorporated [ALI]|BCM440x 100Base-TX Fast Ethernet"