summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Williamson <awilliamson@mandriva.org>2007-03-06 22:58:43 +0000
committerAdam Williamson <awilliamson@mandriva.org>2007-03-06 22:58:43 +0000
commit7fac016da59c8524064672b90f755dca8a6d9289 (patch)
treea22bee506c5b9f1e7f3ca9ddb165a9a3e3d30eee
parent455037f9f79a61252ac2b46aeebab9a7c6d96a75 (diff)
downloadldetect-lst-7fac016da59c8524064672b90f755dca8a6d9289.tar
ldetect-lst-7fac016da59c8524064672b90f755dca8a6d9289.tar.gz
ldetect-lst-7fac016da59c8524064672b90f755dca8a6d9289.tar.bz2
ldetect-lst-7fac016da59c8524064672b90f755dca8a6d9289.tar.xz
ldetect-lst-7fac016da59c8524064672b90f755dca8a6d9289.zip
merge C&T to lowest possible number of definitions
-rw-r--r--lst/Cards+34
-rw-r--r--lst/pcitable20
2 files changed, 15 insertions, 39 deletions
diff --git a/lst/Cards+ b/lst/Cards+
index 2dc45f5a..56f02b68 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -50,24 +50,21 @@ LINE # Option "use_modeline"
LINE # Option "fix_panel_size"
LINE # videoram 512
-NAME Chips & Technologies CT65525
+NAME Chips & Technologies CT65525 / CT65530
LINE # Option "nolinear"
LINE # MemBase 0x03b00000
SEE Chips & Technologies CT65520
-NAME Chips & Technologies CT65530
-SEE Chips & Technologies CT65525
-
NAME Chips & Technologies CT65535
LINE # Option "hw_clocks"
LINE # Textclockfreq 25.175
-SEE Chips & Technologies CT65530
+SEE Chips & Technologies CT65525 / CT65530
NAME Chips & Technologies CT65540
LINE # Option "use_18bit_bus"
SEE Chips & Technologies CT65535
-NAME Chips & Technologies CT65545
+NAME Chips & Technologies CT65545 / CT65546 / CT65548
LINE # Option "noaccel"
LINE # Option "no_bitblt"
LINE # Option "xaa_no_color_exp"
@@ -76,13 +73,7 @@ LINE # Option "hw_cursor"
LINE # Option "mmio"
SEE Chips & Technologies CT65540
-NAME Chips & Technologies CT65546
-SEE Chips & Technologies CT65545
-
-NAME Chips & Technologies CT65548
-SEE Chips & Technologies CT65545
-
-NAME Chips & Technologies CT65550
+NAME Chips & Technologies CT6555x / CT68xxx / CT69xxx
LINE # Option "noaccel"
LINE # Option "no_bitblt"
LINE # Option "xaa_no_color_exp"
@@ -92,22 +83,7 @@ LINE # Option "sync_on_green"
LINE # Option "fast_dram"
LINE # Option "use_vclk1"
LINE # Textclockfreq 25.175
-SEE Chips & Technologies CT65530
-
-NAME Chips & Technologies CT65554
-SEE Chips & Technologies CT65550
-
-NAME Chips & Technologies CT65555
-SEE Chips & Technologies CT65550
-
-NAME Chips & Technologies CT68554
-SEE Chips & Technologies CT65550
-
-NAME Chips & Technologies CT69000
-SEE Chips & Technologies CT65550
-
-NAME Chips & Technologies CT69030
-SEE Chips & Technologies CT65550
+SEE Chips & Technologies CT65525 / CT65530
NAME Chips & Technologies CT64200
DRIVER chips
diff --git a/lst/pcitable b/lst/pcitable
index 2634ff64..27224336 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -1424,18 +1424,18 @@
0x102b 0xff03 "Card:Matrox Mystique" "Matrox Electronic Systems Ltd.|Millennium G200 SG"
0x102b 0xff04 "Card:Matrox Mystique" "Matrox Electronic Systems Ltd.|Marvel G200 SD"
0x102c 0x00b8 "Card:Chips & Technologies CT64300" "C&T|64310"
-0x102c 0x00c0 "Card:Chips & Technologies CT69000" "C&T|F69000 HiQVideo"
-0x102c 0x00d0 "Card:Chips & Technologies CT65545" "C&T|F65545"
-0x102c 0x00d8 "Card:Chips & Technologies CT65545" "C&T|F65545"
-0x102c 0x00dc "Card:Chips & Technologies CT65548" "C&T|F65548"
-0x102c 0x00e0 "Card:Chips & Technologies CT65550" "C&T|F65550"
-0x102c 0x00e4 "Card:Chips & Technologies CT65554" "C&T|F65554"
-0x102c 0x00e5 "Card:Chips & Technologies CT65555" "C&T|F65555 HiQVPro"
-0x102c 0x00f0 "Card:Chips & Technologies CT68554" "C&T|F68554"
-0x102c 0x00f4 "Card:Chips & Technologies CT68554" "C&T|F68554 HiQVision"
+0x102c 0x00c0 "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|F69000 HiQVideo"
+0x102c 0x00d0 "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|F65545"
+0x102c 0x00d8 "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|F65545"
+0x102c 0x00dc "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|F65548"
+0x102c 0x00e0 "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|F65550"
+0x102c 0x00e4 "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|F65554"
+0x102c 0x00e5 "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|F65555 HiQVPro"
+0x102c 0x00f0 "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|F68554"
+0x102c 0x00f4 "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|F68554 HiQVision"
0x102c 0x00f5 "unknown" "C&T|F68555"
0x102c 0x01e0 "unknown" "Chips And Technologies|65560 PCI Flat Panel/CRT VGA Accelerator"
-0x102c 0x0c30 "Card:Chips & Technologies CT69030" "C&T|69030"
+0x102c 0x0c30 "Card:Chips & Technologies CT6555x / CT68xxx / CT69xxx" "C&T|69030"
0x102d 0x50dc "unknown" "Wyse Technology Inc.|3328 Audio"
0x102f 0x0009 "unknown" "Toshiba America|r4x00"
0x102f 0x000a "unknown" "Toshiba America|TX3927 MIPS RISC PCI Controller"