summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Williamson <awilliamson@mandriva.org>2008-06-17 23:41:33 +0000
committerAdam Williamson <awilliamson@mandriva.org>2008-06-17 23:41:33 +0000
commit7a269b14e99ff6de15e4348410b8c93ec649931a (patch)
tree264f91da90baa5688e7217b7fcec6155d8239cd5
parenta27c8b102a72d018c23d1f398ccbc2204a1dd17f (diff)
downloadldetect-lst-7a269b14e99ff6de15e4348410b8c93ec649931a.tar
ldetect-lst-7a269b14e99ff6de15e4348410b8c93ec649931a.tar.gz
ldetect-lst-7a269b14e99ff6de15e4348410b8c93ec649931a.tar.bz2
ldetect-lst-7a269b14e99ff6de15e4348410b8c93ec649931a.tar.xz
ldetect-lst-7a269b14e99ff6de15e4348410b8c93ec649931a.zip
split out Mach 64 and Rage 128 based cards again as the driver was split upstream, Mach 32 no longer supported so map to vga
-rw-r--r--Makefile2
-rw-r--r--lst/Cards+14
-rw-r--r--lst/pcitable186
3 files changed, 103 insertions, 99 deletions
diff --git a/Makefile b/Makefile
index d438c9e0..55f62ba0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
include Makefile.config
PACKAGE = ldetect-lst
-VERSION := 0.1.228
+VERSION := 0.1.229
SVN_URL := $(shell svn info | grep ^URL: | cut -f2 -d\ )
SVN_BASE := $(shell svn info | sed -n '/^URL: \(.*\/$(PACKAGE)\).*/s//\1/p')
diff --git a/lst/Cards+ b/lst/Cards+
index 1891b030..60fb202d 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -124,15 +124,19 @@ DRIVER geode
# ATI
-NAME ATI Mach / Rage-based cards
-DRIVER ati
+NAME ATI Mach 64-based cards
+DRIVER mach64
DRI_GLX
-NAME ATI Mach / Rage-based cards (no 3D acceleration)
-DRIVER ati
+NAME ATI Rage 128-based cards
+DRIVER r128
+DRI_GLX
+
+NAME ATI Mach 64-based cards (no 3D acceleration)
+DRIVER mach64
NAME ATI Rage 128 TV-out
-SEE ATI Mach / Rage-based cards
+SEE ATI Rage 128-based cards
FB_TVOUT
# Radeon cards not supported by proprietary driver: update name
diff --git a/lst/pcitable b/lst/pcitable
index 29dd0e6b..9434e680 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -20,8 +20,8 @@
0x1000 0x0630 "mptscsih"
0x1001 0x9100 "initio"
0x1002 0x000b "Card:ATI Radeon 9250 and earlier"
-0x1002 0x0084 "Card:ATI Mach / Rage-based cards"
-0x1002 0x0088 "Card:ATI Mach / Rage-based cards"
+0x1002 0x0084 "Card:VGA driver (generic)"
+0x1002 0x0088 "Card:VGA driver (generic)"
0x1002 0x010a "Card:ATI Radeon 9250 and earlier"
0x1002 0x013a "Card:ATI Radeon 9250 and earlier"
0x1002 0x0152 "Card:ATI Radeon 9250 and earlier"
@@ -39,7 +39,7 @@
0x1002 0x3e74 "unknown"
0x1002 0x4136 "Card:ATI Radeon 9250 and earlier"
0x1002 0x4137 "Card:ATI Radeon 9250 and earlier"
-0x1002 0x4141 "Card:ATI Mach / Rage-based cards"
+0x1002 0x4141 "Card:VGA driver (generic)"
0x1002 0x4144 "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x4145 "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x4146 "Card:ATI Radeon 9500 to Radeon X1050"
@@ -56,36 +56,36 @@
0x1002 0x4155 "Card:ATI r300 or r400 based FireGL"
0x1002 0x4156 "Card:ATI r300 or r400 based FireGL"
0x1002 0x4157 "Card:ATI r300 or r400 based FireGL"
-0x1002 0x4158 "Card:ATI Mach / Rage-based cards"
+0x1002 0x4158 "Card:ATI Mach 64-based cards"
0x1002 0x4237 "Card:ATI Radeon 9250 and earlier"
0x1002 0x4242 "Card:ATI Radeon 9250 and earlier"
0x1002 0x4243 "Card:ATI Radeon 9250 and earlier"
0x1002 0x4336 "Card:ATI Radeon 9250 and earlier"
0x1002 0x4337 "Card:ATI Radeon 9250 and earlier"
-0x1002 0x4354 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4358 "Card:ATI Mach / Rage-based cards"
+0x1002 0x4354 "Card:ATI Mach 64-based cards"
+0x1002 0x4358 "Card:ATI Mach 64-based cards"
0x1002 0x4437 "Card:ATI Radeon 9250 and earlier"
-0x1002 0x4554 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4654 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4742 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4744 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4747 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4749 "Card:ATI Mach / Rage-based cards"
-0x1002 0x474c "Card:ATI Mach / Rage-based cards"
-0x1002 0x474d "Card:ATI Mach / Rage-based cards"
-0x1002 0x474e "Card:ATI Mach / Rage-based cards"
-0x1002 0x474f "Card:ATI Mach / Rage-based cards"
-0x1002 0x4750 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4751 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4752 "Card:ATI Mach / Rage-based cards (no 3D acceleration)"
-0x1002 0x4753 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4754 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4755 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4756 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4757 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4758 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4759 "Card:ATI Mach / Rage-based cards"
-0x1002 0x475a "Card:ATI Mach / Rage-based cards"
+0x1002 0x4554 "Card:ATI Mach 64-based cards"
+0x1002 0x4654 "Card:ATI Mach 64-based cards"
+0x1002 0x4742 "Card:ATI Mach 64-based cards"
+0x1002 0x4744 "Card:ATI Mach 64-based cards"
+0x1002 0x4747 "Card:ATI Mach 64-based cards"
+0x1002 0x4749 "Card:ATI Mach 64-based cards"
+0x1002 0x474c "Card:ATI Mach 64-based cards"
+0x1002 0x474d "Card:ATI Mach 64-based cards"
+0x1002 0x474e "Card:ATI Mach 64-based cards"
+0x1002 0x474f "Card:ATI Mach 64-based cards"
+0x1002 0x4750 "Card:ATI Mach 64-based cards"
+0x1002 0x4751 "Card:ATI Mach 64-based cards"
+0x1002 0x4752 "Card:ATI Mach 64-based cards (no 3D acceleration)"
+0x1002 0x4753 "Card:ATI Mach 64-based cards"
+0x1002 0x4754 "Card:ATI Mach 64-based cards"
+0x1002 0x4755 "Card:ATI Mach 64-based cards"
+0x1002 0x4756 "Card:ATI Mach 64-based cards"
+0x1002 0x4757 "Card:ATI Mach 64-based cards"
+0x1002 0x4758 "Card:ATI Mach 64-based cards"
+0x1002 0x4759 "Card:ATI Mach 64-based cards"
+0x1002 0x475a "Card:ATI Mach 64-based cards"
0x1002 0x4844 "Card:ATI Radeon 9250 and earlier"
0x1002 0x4964 "Card:ATI Radeon 9250 and earlier"
0x1002 0x4965 "Card:ATI Radeon 9250 and earlier"
@@ -108,21 +108,21 @@
0x1002 0x4b4a "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x4b4b "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x4b4c "Card:ATI Radeon 9500 to Radeon X1050"
-0x1002 0x4c42 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c44 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c45 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c46 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c47 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c49 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c4b "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c4c "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c4d "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c4e "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c50 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c51 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c52 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c53 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4c54 "Card:ATI Mach / Rage-based cards"
+0x1002 0x4c42 "Card:ATI Mach 64-based cards"
+0x1002 0x4c44 "Card:ATI Mach 64-based cards"
+0x1002 0x4c45 "Card:ATI Mach 64-based cards"
+0x1002 0x4c46 "Card:ATI Mach 64-based cards"
+0x1002 0x4c47 "Card:ATI Mach 64-based cards"
+0x1002 0x4c49 "Card:ATI Mach 64-based cards"
+0x1002 0x4c4b "Card:ATI Mach 64-based cards"
+0x1002 0x4c4c "Card:ATI Mach 64-based cards"
+0x1002 0x4c4d "Card:ATI Mach 64-based cards"
+0x1002 0x4c4e "Card:ATI Mach 64-based cards"
+0x1002 0x4c50 "Card:ATI Mach 64-based cards"
+0x1002 0x4c51 "Card:ATI Mach 64-based cards"
+0x1002 0x4c52 "Card:ATI Mach 64-based cards"
+0x1002 0x4c53 "Card:ATI Mach 64-based cards"
+0x1002 0x4c54 "Card:ATI Mach 64-based cards"
0x1002 0x4c57 "Card:ATI Radeon 9250 and earlier"
0x1002 0x4c58 "Card:ATI Radeon 9250 and earlier"
0x1002 0x4c59 "Card:ATI Radeon 9250 and earlier"
@@ -136,8 +136,8 @@
0x1002 0x4c6e "Card:ATI Radeon 9250 and earlier"
0x1002 0x4c6f "Card:ATI Radeon 9250 and earlier"
0x1002 0x4d45 "Card:ATI Radeon 9250 and earlier"
-0x1002 0x4d46 "Card:ATI Mach / Rage-based cards"
-0x1002 0x4d4c "Card:ATI Mach / Rage-based cards"
+0x1002 0x4d46 "Card:ATI Mach 64-based cards"
+0x1002 0x4d4c "Card:ATI Mach 64-based cards"
0x1002 0x4e44 "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x4e45 "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x4e46 "Card:ATI Radeon 9500 to Radeon X1050"
@@ -153,30 +153,30 @@
0x1002 0x4e54 "Card:ATI r300 or r400 based FireGL"
0x1002 0x4e56 "Card:ATI r300 or r400 based FireGL"
0x1002 0x4f72 "Card:ATI Radeon 9250 and earlier"
-0x1002 0x5041 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5042 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5043 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5044 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5045 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5046 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5047 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5048 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5049 "Card:ATI Mach / Rage-based cards"
-0x1002 0x504a "Card:ATI Mach / Rage-based cards"
-0x1002 0x504b "Card:ATI Mach / Rage-based cards"
-0x1002 0x504c "Card:ATI Mach / Rage-based cards"
-0x1002 0x504d "Card:ATI Mach / Rage-based cards"
-0x1002 0x504e "Card:ATI Mach / Rage-based cards"
-0x1002 0x504f "Card:ATI Mach / Rage-based cards"
-0x1002 0x5050 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5051 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5052 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5053 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5054 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5055 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5056 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5057 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5058 "Card:ATI Mach / Rage-based cards"
+0x1002 0x5041 "Card:ATI Rage 128-based cards"
+0x1002 0x5042 "Card:ATI Rage 128-based cards"
+0x1002 0x5043 "Card:ATI Rage 128-based cards"
+0x1002 0x5044 "Card:ATI Rage 128-based cards"
+0x1002 0x5045 "Card:ATI Rage 128-based cards"
+0x1002 0x5046 "Card:ATI Rage 128-based cards"
+0x1002 0x5047 "Card:ATI Rage 128-based cards"
+0x1002 0x5048 "Card:ATI Rage 128-based cards"
+0x1002 0x5049 "Card:ATI Rage 128-based cards"
+0x1002 0x504a "Card:ATI Rage 128-based cards"
+0x1002 0x504b "Card:ATI Rage 128-based cards"
+0x1002 0x504c "Card:ATI Rage 128-based cards"
+0x1002 0x504d "Card:ATI Rage 128-based cards"
+0x1002 0x504e "Card:ATI Rage 128-based cards"
+0x1002 0x504f "Card:ATI Rage 128-based cards"
+0x1002 0x5050 "Card:ATI Rage 128-based cards"
+0x1002 0x5051 "Card:ATI Rage 128-based cards"
+0x1002 0x5052 "Card:ATI Rage 128-based cards"
+0x1002 0x5053 "Card:ATI Rage 128-based cards"
+0x1002 0x5054 "Card:ATI Rage 128-based cards"
+0x1002 0x5055 "Card:ATI Rage 128-based cards"
+0x1002 0x5056 "Card:ATI Rage 128-based cards"
+0x1002 0x5057 "Card:ATI Rage 128-based cards"
+0x1002 0x5058 "Card:ATI Rage 128-based cards"
0x1002 0x5144 "Card:ATI Radeon 9250 and earlier"
0x1002 0x5145 "Card:ATI Radeon 9250 and earlier"
0x1002 0x5146 "Card:ATI Radeon 9250 and earlier"
@@ -202,26 +202,26 @@
0x1002 0x516a "Card:ATI Radeon 9250 and earlier"
0x1002 0x516b "Card:ATI Radeon 9250 and earlier"
0x1002 0x516c "Card:ATI Radeon 9250 and earlier"
-0x1002 0x5245 "Card:ATI Mach / Rage-based cards"
+0x1002 0x5245 "Card:ATI Rage 128-based cards"
0x1002 0x5246 "Card:ATI Rage 128 TV-out"
-0x1002 0x5247 "Card:ATI Mach / Rage-based cards"
-0x1002 0x524b "Card:ATI Mach / Rage-based cards"
-0x1002 0x524c "Card:ATI Mach / Rage-based cards"
-0x1002 0x5345 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5346 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5347 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5348 "Card:ATI Mach / Rage-based cards"
-0x1002 0x534b "Card:ATI Mach / Rage-based cards"
-0x1002 0x534c "Card:ATI Mach / Rage-based cards"
-0x1002 0x534d "Card:ATI Mach / Rage-based cards"
-0x1002 0x534e "Card:ATI Mach / Rage-based cards"
-0x1002 0x5354 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5446 "Card:ATI Mach / Rage-based cards"
-0x1002 0x544c "Card:ATI Mach / Rage-based cards"
-0x1002 0x5452 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5453 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5454 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5455 "Card:ATI Mach / Rage-based cards"
+0x1002 0x5247 "Card:ATI Rage 128-based cards"
+0x1002 0x524b "Card:ATI Rage 128-based cards"
+0x1002 0x524c "Card:ATI Rage 128-based cards"
+0x1002 0x5345 "Card:ATI Rage 128-based cards"
+0x1002 0x5346 "Card:ATI Rage 128-based cards"
+0x1002 0x5347 "Card:ATI Rage 128-based cards"
+0x1002 0x5348 "Card:ATI Rage 128-based cards"
+0x1002 0x534b "Card:ATI Rage 128-based cards"
+0x1002 0x534c "Card:ATI Rage 128-based cards"
+0x1002 0x534d "Card:ATI Rage 128-based cards"
+0x1002 0x534e "Card:ATI Rage 128-based cards"
+0x1002 0x5354 "Card:ATI Mach 64-based cards"
+0x1002 0x5446 "Card:ATI Rage 128-based cards"
+0x1002 0x544c "Card:ATI Rage 128-based cards"
+0x1002 0x5452 "Card:ATI Rage 128-based cards"
+0x1002 0x5453 "Card:ATI Rage 128-based cards"
+0x1002 0x5454 "Card:ATI Rage 128-based cards"
+0x1002 0x5455 "Card:ATI Rage 128-based cards"
0x1002 0x5460 "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x5461 "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x5462 "Card:ATI Radeon 9500 to Radeon X1050"
@@ -244,16 +244,16 @@
0x1002 0x564f "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x5652 "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x5653 "Card:ATI Radeon 9500 to Radeon X1050"
-0x1002 0x5654 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5655 "Card:ATI Mach / Rage-based cards"
-0x1002 0x5656 "Card:ATI Mach / Rage-based cards"
+0x1002 0x5654 "Card:ATI Mach 64-based cards"
+0x1002 0x5655 "Card:ATI Mach 64-based cards"
+0x1002 0x5656 "Card:ATI Mach 64-based cards"
0x1002 0x5657 "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x5834 "Card:ATI Radeon 9250 and earlier"
0x1002 0x5835 "Card:ATI Radeon 9250 and earlier"
0x1002 0x5836 "Card:ATI Radeon 9250 and earlier"
0x1002 0x5837 "Card:ATI Radeon 9250 and earlier"
0x1002 0x5854 "Card:ATI Radeon 9500 to Radeon X1050"
-0x1002 0x5858 "Card:ATI Mach / Rage-based cards"
+0x1002 0x5858 "Card:ATI Mach 64-based cards"
0x1002 0x5874 "Card:ATI Radeon 9500 to Radeon X1050"
0x1002 0x5944 "Card:ATI Radeon 9250 and earlier"
0x1002 0x5954 "Card:ATI Radeon 9500 to Radeon X1050"
@@ -506,7 +506,7 @@
0x100b 0x0104 "Card:NSC"
0x100b 0x0502 "sc1200"
0x100b 0x0504 "Card:NSC"
-0x100b 0xd001 "Card:ATI Mach / Rage-based cards"
+0x100b 0xd001 "Card:ATI Mach 64-based cards"
0x100c 0x3202 "Card:Tseng ET4000W32p / ET6x00-based cards"
0x100c 0x3205 "Card:Tseng ET4000W32p / ET6x00-based cards"
0x100c 0x3206 "Card:Tseng ET4000W32p / ET6x00-based cards"
@@ -775,7 +775,7 @@
0x1039 0x7013 "slamr"
0x1039 0x7018 "snd_trident"
0x1039 0x7300 "Card:SiS 300 series-based cards"
-0x103c 0x1279 "Card:ATI Mach / Rage-based cards"
+0x103c 0x1279 "Card:ATI Mach 64-based cards"
0x1042 0x1000 "rz1000"
0x1042 0x1001 "rz1000"
0x1042 0x3020 "generic"