- drop CardsNames (not used anymore by drakx)

- Cards+: add Option "XaaNoPixmapCache" for i810 as suggested on cooker.
          to be removed when the kernel works ok
- Cards+ (and pcitable): to cleanup the tree in XFdrake
  - remove "Spacewalker HOT", "Octek", "Creative Blaster Exxtreme",
    "Atrend", "ATrend", "SPEA", "Spider", "Actix", "Canopus", "Cardex"
    entries
  - remove "Generic VGA compatible" and entries using it
  - remove "Unsupported VGA compatible"
  - replace "SMI" by "Silicon Motion"
  - replace "ELSA" by "Elsa"
  - replace "LeadTek" by "Leadtek"

2 files changed, 2 insertions, 73 deletions

diff --git a/convert/Cards2CardsNames.pl b/convert/Cards2CardsNames.pl
deleted file mode 100755
index 9196c4ce..00000000
--- a/convert/Cards2CardsNames.pl
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/perl
-
-$vendors = join '|', map { chomp; quotemeta } <DATA>;
-
-%substs = (
-"3Dlabs" => "3DLabs",
-"COMPAQ" => "Compaq",
-"Creative Blaster Exxtreme" => "Creative Labs Blaster Exxtreme",
-"ELSA" => "Elsa",
-"ATrend" => "Atrend",
-"Ocean (octek)" => "Octek",
-"HOT" => "Spacewalker Hot",
-);
-
-print "# This file is auto-generated from Cards+, DO NOT MODIFY\n";
-print "#\n";
-
-foreach (<>) {
-    my ($n) = /^NAME (.*)/ or next;
-    $_ = $n;
-    while (my ($k, $v) = each %substs) { s/^\Q$k/$v/; }
-
-    if (my ($v, $more) = /^($vendors)\s*-?(.*)/) {
-	$_ = "$v|$more";
-    } else {
-	$_ = "Other|$_";
-    }
-    print qq{$_=>$n\n};
-}
-
-__DATA__
-3DLabs
-Compaq
-Dell
-Elsa
-Rendition Verite
-Intel
-Oak
-Ark Logic
-Cardex
-Digital
-RIVA
-Spider
-Canopus
-Leadtek
-NVIDIA
-Octek
-ASUS
-Actix
-Avance Logic
-ET
-Genoa
-SMI
-SPEA
-VideoLogic
-Creative Labs
-Toshiba
-Orchid
-Chaintech
-Cirrus Logic
-AOpen
-SiS
-Chips & Technologies
-Number Nine
-Miro
-STB
-Matrox
-Hercules
-Trident
-Sun
-Diamond
-S3
-ATI
diff --git a/convert/README.pcitable b/convert/README.pcitable
index 747a4f98..b89e5a8c 100644
--- a/convert/README.pcitable
+++ b/convert/README.pcitable
@@ -16,6 +16,8 @@ rm -f pcids.html ; wget http://www.begent.co.uk/pcids.htm
 # you can also try the following. BUT be careful when choosing cards needing subids. Ask pixel@mandrakesoft.com first!
 ./merge2pcitable.pl --keep-subids begent_pcids_htm pcids.htm pcitable > pcitable.new
 
+# http://members.hyperlink.net.au/~chart/download/pcidevs.txt
+
 
 # with redhat's pcitable in /tmp/rh_pcitable (from kudzu or anaconda)
 ./merge2pcitable.pl pcitable /tmp/rh_pcitable pcitable > pcitable.new