Clean up Cirrus a bit more aggressively, no one is using this ISA / VLB stuff any more. Remove some X options that haven't existed since 3.3

2 files changed, 23 insertions, 74 deletions

diff --git a/lst/Cards+ b/lst/Cards+
index d09c3833..6c7d4f6a 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -107,7 +107,6 @@ SEE Chips & Technologies CT64200
 
 # Cirrus Logic
 
-#tested
 NAME Cirrus Logic GD542x-based cards
 DRIVER vga
 LINE # Device section for Cirrus Logic GD5420/2/4/6/8/9-based cards.
@@ -115,49 +114,8 @@ LINE     #MemBase 0x00e00000
 LINE     #MemBase 0x04e00000
 LINE     #Option "linear"
 
-#tested
-NAME Cirrus Logic GD543x-based cards
+NAME Cirrus Logic GD54xx-based cards
 DRIVER cirrus
-LINE # Device section for Cirrus Logic GD5430/34-based cards.
-LINE     #MemBase 0x00e00000		# ISA card that maps to 14Mb
-LINE     #MemBase 0x04000000		# VLB card that maps to 64Mb
-LINE     #MemBase 0x80000000		# VLB card that maps to 2048Mb
-LINE     #MemBase 0x02000000		# VLB card that maps to 32Mb
-LINE     #Option "linear"
-
-NAME Cirrus Logic GD544x-based cards
-DRIVER cirrus
-
-#tested
-NAME Cirrus Logic GD546x-based cards
-DRIVER cirrus
-LINE #Option "fifo_conservative"
-
-# reported not working on SGI 1200 as of 02/22/2001 (RH)
-# reported working on XF 4.2.0 by Juan (MDK)
-NAME Cirrus Logic GD5480
-DRIVER cirrus
-
-NAME Orchid Kelvin 64 VLB
-DRIVER cirrus
-LINE # Device section for Orchid Kelvin 64 VLB
-LINE # Linear framebuffer maps at 2048Mb. Some motherboards make linear addressing
-LINE # impossible. Some cards map at 32Mb.
-LINE     #MemBase 0x02000000		# VLB card that maps to 32Mb
-LINE     #MemBase 0x04000000		# VLB card that maps to 64Mb
-LINE     MemBase 0x80000000		# VLB card that maps to 2048Mb
-LINE     #Option "linear"
-
-NAME Cirrus Logic GD6xxx / GD7xxx (laptop)
-DRIVER vga
-
-NAME PixelView Combo TV Pro (Prolink)
-DRIVER vga
-LINE # COMMENT on card TV Tuner
-
-NAME PixelView Combo TV 3D AGP (Prolink)
-DRIVER vga
-LINE # COMMENT on card TV+FM Tuner
 
 # S3
 
@@ -215,20 +173,12 @@ 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
-LINE      #Option "xaa_benchmark"
-LINE      #Option "fifo_moderate"
-LINE      #Option "pci_burst_on"
-LINE      #Option "pci_retry"
 
 NAME S3 ViRGE/MX-based cards
 DRIVER s3virge
 NEEDVIDEORAM
 LINE      #Option "lcd_center"
 LINE      #Set_LCDClk  <pixel_clock_for_LCD>
-LINE      #Option "xaa_benchmark"
-LINE      #Option "fifo_moderate"
-LINE      #Option "pci_burst_on"
-LINE      #Option "pci_retry"
 
 NAME S3 Trio3D-based cards
 DRIVER s3virge
@@ -242,7 +192,6 @@ SEE S3 ViRGE-based cards
 NAME S3 Savage-based cards
 DRIVER savage
 NEEDVIDEORAM
-LINE      #Option "xaa_benchmark"
 
 # S3 UniChrome (via)
 
diff --git a/lst/pcitable b/lst/pcitable
index 6a0bc2c2..b377b2fa 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -910,33 +910,33 @@
 0x1011	0x4051	"cpqarray"	"Digital Equipment Corp.|Integrated Smart Array"
 0x1011	0x4058	"cpqarray"	"Digital Equipment Corp.|Integrated Smart Array"
 0x1011	0x9005	"aacraid"	"Digital Equipment Corp.|5400S"
-0x1013	0x0038	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD 7548"
-0x1013	0x0040	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD7555 Flat Panel GUI Accelerator"
+0x1013	0x0038	"Card:VGA driver (generic)"	"Cirrus Logic|GD 7548"
+0x1013	0x0040	"Card:VGA driver (generic)"	"Cirrus Logic|GD7555 Flat Panel GUI Accelerator"
 0x1013	0x0045	"unknown"	"Cirrus Logic|A CL-MD5620DT-QC-B WINCOM V9.0 56K"
-0x1013	0x004c	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD7556 Video/Graphics LCD/CRT Ctrlr"
-0x1013	0x00a0	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5430/40 [Alpine]"
-0x1013	0x00a2	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5432 [Alpine]"
-0x1013	0x00a4	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5434-4 [Alpine]"
-0x1013	0x00a8	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5434-8 [Alpine]"
-0x1013	0x00ac	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5436 [Alpine]"
-0x1013	0x00b0	"Card:Cirrus Logic GD544x-based cards"	"Cirrus Logic|GD 5440"
-0x1013	0x00b8	"Card:Cirrus Logic GD544x-based cards"	"Cirrus Logic|GD 5446"
-0x1013	0x00bc	"Card:Cirrus Logic GD5480"	"Cirrus Logic|GD 5480"
-0x1013	0x00d0	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD 5462"
-0x1013	0x00d2	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD 5462 [Laguna I]"
-0x1013	0x00d4	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD 5464 [Laguna]"
-0x1013	0x00d5	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD5464BD"
-0x1013	0x00d6	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD 5465 [Laguna]"
-0x1013	0x00e8	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5436U"
+0x1013	0x004c	"Card:VGA driver (generic)"	"Cirrus Logic|GD7556 Video/Graphics LCD/CRT Ctrlr"
+0x1013	0x00a0	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5430/40 [Alpine]"
+0x1013	0x00a2	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5432 [Alpine]"
+0x1013	0x00a4	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5434-4 [Alpine]"
+0x1013	0x00a8	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5434-8 [Alpine]"
+0x1013	0x00ac	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5436 [Alpine]"
+0x1013	0x00b0	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5440"
+0x1013	0x00b8	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5446"
+0x1013	0x00bc	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5480"
+0x1013	0x00d0	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5462"
+0x1013	0x00d2	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5462 [Laguna I]"
+0x1013	0x00d4	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5464 [Laguna]"
+0x1013	0x00d5	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD5464BD"
+0x1013	0x00d6	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5465 [Laguna]"
+0x1013	0x00e8	"Card:Cirrus Logic GD54xx-based cards"	"Cirrus Logic|GD 5436U"
 0x1013	0x1010	"cs46xx"	"Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
 0x1013	0x1014	"cs46xx"	"Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
 0x1013	0x1100	"pd6729"	"Cirrus Logic|CL 6729"
 0x1013	0x1110	"yenta_socket"	"Cirrus Logic|PD 6832"
 0x1013	0x1112	"yenta_socket"	"Cirrus Logic|PD 6834 PCMCIA/CardBus Ctrlr"
 0x1013	0x1113	"yenta_socket"	"Cirrus Logic|PD 6833 PCMCIA/CardBus Ctrlr"
-0x1013	0x1200	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD 7542 [Nordic]"
-0x1013	0x1202	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD 7543 [Viking]"
-0x1013	0x1204	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD 7541 [Nordic Light]"
+0x1013	0x1200	"Card:VGA driver (generic)"	"Cirrus Logic|GD 7542 [Nordic]"
+0x1013	0x1202	"Card:VGA driver (generic)"	"Cirrus Logic|GD 7543 [Viking]"
+0x1013	0x1204	"Card:VGA driver (generic)"	"Cirrus Logic|GD 7541 [Nordic Light]"
 0x1013	0x4000	"unknown"	"Cirrus Logic|MD 5620 [CLM Data Fax Voice]"
 0x1013	0x4400	"unknown"	"Cirrus Logic|CD 4400"
 0x1013	0x6001	"cs46xx"	"Cirrus Logic|Cirrus CS4610/1 CrystalClear SoundFusion Audio"
@@ -2318,8 +2318,8 @@
 0x1091	0x0720	"unknown"	"Intergraph Corp.|Motion JPEG codec"
 0x1091	0x07a0	"unknown"	"Intergraph Corp.|Sun Expert3D-Lite Graphics Accelerator"
 0x1091	0x1091	"unknown"	"Intergraph Corp.|Sun Expert3D Graphics Accelerator"
-0x1092	0x00a0	"Card:Cirrus Logic GD543x-based cards"	"Diamond Multimedia Systems|Speedstar Pro SE"
-0x1092	0x00a8	"Card:Cirrus Logic GD543x-based cards"	"Diamond Multimedia Systems|Speedstar 64"
+0x1092	0x00a0	"Card:Cirrus Logic GD54xx-based cards"	"Diamond Multimedia Systems|Speedstar Pro SE"
+0x1092	0x00a8	"Card:Cirrus Logic GD54xx-based cards"	"Diamond Multimedia Systems|Speedstar 64"
 0x1092	0x0550	"Card:NVIDIA RIVA TNT to GeForce 2 (71xx)"	"Diamond Multimedia Systems||Viper 550"
 0x1092	0x08d4	"unknown"	"Diamond Multimedia Systems|Supra 2260 Modem"
 0x1092	0x094c	"unknown"	"Diamond Multimedia Systems|SupraExpress 56i Pro"