Remove PCI IDs and bus type from ati_pciids.csv

This cleans up the list of unique chipsets a little further.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

2 files changed, 388 insertions, 420 deletions

diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 55d7b1df..59b370aa 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -1,36 +1,36 @@
 "#pciid","define","family","mobility","igp","nocrtc2","Nointtvout","singledac","name"
-"0x3150","RV380_3150","RV380",1,,,,,"ATI Radeon Mobility X600 (M24) 3150 (PCIE)"
-"0x3151","RV380_3151","RV380",,,,,,"ATI FireMV 2400 (PCI)"
-"0x3152","RV380_3152","RV380",1,,,,,"ATI Radeon Mobility X300 (M24) 3152 (PCIE)"
-"0x3154","RV380_3154","RV380",1,,,,,"ATI FireGL M24 GL 3154 (PCIE)"
-"0x3155","RV380_3155","RV380",1,,,,,"ATI FireMV 2400 3155 (PCI)"
-"0x3E50","RV380_3E50","RV380",,,,,,"ATI Radeon X600 (RV380) 3E50 (PCIE)"
-"0x3E54","RV380_3E54","RV380",,,,,,"ATI FireGL V3200 (RV380) 3E54 (PCIE)"
-"0x4136","RS100_4136","RS100",,1,,,1,"ATI Radeon IGP320 (A3) 4136"
-"0x4137","RS200_4137","RS200",,1,,,1,"ATI Radeon IGP330/340/350 (A4) 4137"
-"0x4144","R300_AD","R300",,,,,,"ATI Radeon 9500 AD (AGP)"
-"0x4145","R300_AE","R300",,,,,,"ATI Radeon 9500 AE (AGP)"
-"0x4146","R300_AF","R300",,,,,,"ATI Radeon 9600TX AF (AGP)"
-"0x4147","R300_AG","R300",,,,,,"ATI FireGL Z1 AG (AGP)"
-"0x4148","R350_AH","R350",,,,,,"ATI Radeon 9800SE AH (AGP)"
-"0x4149","R350_AI","R350",,,,,,"ATI Radeon 9800 AI (AGP)"
-"0x414A","R350_AJ","R350",,,,,,"ATI Radeon 9800 AJ (AGP)"
-"0x414B","R350_AK","R350",,,,,,"ATI FireGL X2 AK (AGP)"
-"0x4150","RV350_AP","RV350",,,,,,"ATI Radeon 9600 AP (AGP)"
-"0x4151","RV350_AQ","RV350",,,,,,"ATI Radeon 9600SE AQ (AGP)"
-"0x4152","RV360_AR","RV350",,,,,,"ATI Radeon 9600XT AR (AGP)"
-"0x4153","RV350_AS","RV350",,,,,,"ATI Radeon 9600 AS (AGP)"
-"0x4154","RV350_AT","RV350",,,,,,"ATI FireGL T2 AT (AGP)"
+"0x3150","RV380_3150","RV380",1,,,,,"ATI Radeon Mobility X600 (M24)"
+"0x3151","RV380_3151","RV380",,,,,,"ATI FireMV 2400"
+"0x3152","RV380_3152","RV380",1,,,,,"ATI Radeon Mobility X300 (M24)"
+"0x3154","RV380_3154","RV380",1,,,,,"ATI FireGL M24 GL"
+"0x3155","RV380_3155","RV380",1,,,,,"ATI FireMV 2400"
+"0x3E50","RV380_3E50","RV380",,,,,,"ATI Radeon X600 (RV380)"
+"0x3E54","RV380_3E54","RV380",,,,,,"ATI FireGL V3200 (RV380)"
+"0x4136","RS100_4136","RS100",,1,,,1,"ATI Radeon IGP320 (A3)"
+"0x4137","RS200_4137","RS200",,1,,,1,"ATI Radeon IGP330/340/350 (A4)"
+"0x4144","R300_AD","R300",,,,,,"ATI Radeon 9500"
+"0x4145","R300_AE","R300",,,,,,"ATI Radeon 9500"
+"0x4146","R300_AF","R300",,,,,,"ATI Radeon 9600TX"
+"0x4147","R300_AG","R300",,,,,,"ATI FireGL Z1"
+"0x4148","R350_AH","R350",,,,,,"ATI Radeon 9800SE"
+"0x4149","R350_AI","R350",,,,,,"ATI Radeon 9800"
+"0x414A","R350_AJ","R350",,,,,,"ATI Radeon 9800"
+"0x414B","R350_AK","R350",,,,,,"ATI FireGL X2"
+"0x4150","RV350_AP","RV350",,,,,,"ATI Radeon 9600"
+"0x4151","RV350_AQ","RV350",,,,,,"ATI Radeon 9600SE"
+"0x4152","RV360_AR","RV350",,,,,,"ATI Radeon 9600XT"
+"0x4153","RV350_AS","RV350",,,,,,"ATI Radeon 9600"
+"0x4154","RV350_AT","RV350",,,,,,"ATI FireGL T2"
 "0x4155","RV350_4155","RV350",,,,,,"ATI Radeon 9650"
-"0x4156","RV350_AV","RV350",,,,,,"ATI FireGL RV360 AV (AGP)"
+"0x4156","RV350_AV","RV350",,,,,,"ATI FireGL RV360"
 "0x4158","MACH32","MACH32",,,,,,
-"0x4237","RS250_4237","RS200",,1,,,1,"ATI Radeon 7000 IGP (A4+) 4237"
-"0x4242","R200_BB","R200",,,,1,,"ATI Radeon 8500 AIW BB (AGP)"
-"0x4336","RS100_4336","RS100",1,1,,,1,"ATI Radeon IGP320M (U1) 4336"
-"0x4337","RS200_4337","RS200",1,1,,,1,"ATI Radeon IGP330M/340M/350M (U2) 4337"
+"0x4237","RS250_4237","RS200",,1,,,1,"ATI Radeon 7000 IGP (A4+)"
+"0x4242","R200_BB","R200",,,,1,,"ATI Radeon 8500 AIW"
+"0x4336","RS100_4336","RS100",1,1,,,1,"ATI Radeon IGP320M (U1)"
+"0x4337","RS200_4337","RS200",1,1,,,1,"ATI Radeon IGP330M/340M/350M (U2)"
 "0x4354","MACH64CT","MACH64",,,,,,
 "0x4358","MACH64CX","MACH64",,,,,,
-"0x4437","RS250_4437","RS200",1,1,,,1,"ATI Radeon Mobility 7000 IGP 4437"
+"0x4437","RS250_4437","RS200",1,1,,,1,"ATI Radeon Mobility 7000 IGP"
 "0x4554","MACH64ET","MACH64",,,,,,
 "0x4742","MACH64GB","MACH64",,,,,,
 "0x4744","MACH64GD","MACH64",,,,,,
@@ -50,23 +50,23 @@
 "0x4758","MACH64GX","MACH64",,,,,,
 "0x4759","MACH64GY","MACH64",,,,,,
 "0x475A","MACH64GZ","MACH64",,,,,,
-"0x4966","RV250_If","RV250",,,,,,"ATI Radeon 9000/PRO If (AGP/PCI)"
-"0x4967","RV250_Ig","RV250",,,,,,"ATI Radeon 9000 Ig (AGP/PCI)"
-"0x4A48","R420_JH","R420",,,,,,"ATI Radeon X800 (R420) JH (AGP)"
-"0x4A49","R420_JI","R420",,,,,,"ATI Radeon X800PRO (R420) JI (AGP)"
-"0x4A4A","R420_JJ","R420",,,,,,"ATI Radeon X800SE (R420) JJ (AGP)"
-"0x4A4B","R420_JK","R420",,,,,,"ATI Radeon X800 (R420) JK (AGP)"
-"0x4A4C","R420_JL","R420",,,,,,"ATI Radeon X800 (R420) JL (AGP)"
-"0x4A4D","R420_JM","R420",,,,,,"ATI FireGL X3 (R420) JM (AGP)"
-"0x4A4E","R420_JN","R420",1,,,,,"ATI Radeon Mobility 9800 (M18) JN (AGP)"
-"0x4A4F","R420_4A4F","R420",,,,,,"ATI Radeon X800 SE (R420) (AGP)"
-"0x4A50","R420_JP","R420",,,,,,"ATI Radeon X800XT (R420) JP (AGP)"
-"0x4A54","R420_JT","R420",,,,,,"ATI Radeon X800 VE (R420) JT (AGP)"
-"0x4B48","R481_4B48","R420",,,,,,"ATI Radeon X850 (R480) (AGP)"
-"0x4B49","R481_4B49","R420",,,,,,"ATI Radeon X850 XT (R480) (AGP)"
-"0x4B4A","R481_4B4A","R420",,,,,,"ATI Radeon X850 SE (R480) (AGP)"
-"0x4B4B","R481_4B4B","R420",,,,,,"ATI Radeon X850 PRO (R480) (AGP)"
-"0x4B4C","R481_4B4C","R420",,,,,,"ATI Radeon X850 XT PE (R480) (AGP)"
+"0x4966","RV250_If","RV250",,,,,,"ATI Radeon 9000/PRO"
+"0x4967","RV250_Ig","RV250",,,,,,"ATI Radeon 9000"
+"0x4A48","R420_JH","R420",,,,,,"ATI Radeon X800 (R420)"
+"0x4A49","R420_JI","R420",,,,,,"ATI Radeon X800PRO (R420)"
+"0x4A4A","R420_JJ","R420",,,,,,"ATI Radeon X800SE (R420)"
+"0x4A4B","R420_JK","R420",,,,,,"ATI Radeon X800 (R420)"
+"0x4A4C","R420_JL","R420",,,,,,"ATI Radeon X800 (R420)"
+"0x4A4D","R420_JM","R420",,,,,,"ATI FireGL X3 (R420)"
+"0x4A4E","R420_JN","R420",1,,,,,"ATI Radeon Mobility 9800 (M18)"
+"0x4A4F","R420_4A4F","R420",,,,,,"ATI Radeon X800 SE (R420)"
+"0x4A50","R420_JP","R420",,,,,,"ATI Radeon X800XT (R420)"
+"0x4A54","R420_JT","R420",,,,,,"ATI Radeon X800 VE (R420)"
+"0x4B48","R481_4B48","R420",,,,,,"ATI Radeon X850 (R480)"
+"0x4B49","R481_4B49","R420",,,,,,"ATI Radeon X850 XT (R480)"
+"0x4B4A","R481_4B4A","R420",,,,,,"ATI Radeon X850 SE (R480)"
+"0x4B4B","R481_4B4B","R420",,,,,,"ATI Radeon X850 PRO (R480)"
+"0x4B4C","R481_4B4C","R420",,,,,,"ATI Radeon X850 XT PE (R480)"
 "0x4C42","MACH64LB","MACH64",,,,,,
 "0x4C44","MACH64LD","MACH64",,,,,,
 "0x4C45","RAGE128LE","R128",,,,,,
@@ -79,30 +79,30 @@
 "0x4C51","MACH64LQ","MACH64",,,,,,
 "0x4C52","MACH64LR","MACH64",,,,,,
 "0x4C53","MACH64LS","MACH64",,,,,,
-"0x4C57","RADEON_LW","RV200",1,,,,,"ATI Radeon Mobility M7 LW (AGP)"
-"0x4C58","RADEON_LX","RV200",1,,,,,"ATI Mobility FireGL 7800 M7 LX (AGP)"
-"0x4C59","RADEON_LY","RV100",1,,,,,"ATI Radeon Mobility M6 LY (AGP)"
-"0x4C5A","RADEON_LZ","RV100",1,,,,,"ATI Radeon Mobility M6 LZ (AGP)"
-"0x4C64","RV250_Ld","RV250",1,,,,,"ATI FireGL Mobility 9000 (M9) Ld (AGP)"
-"0x4C66","RV250_Lf","RV250",1,,,,,"ATI Radeon Mobility 9000 (M9) Lf (AGP)"
-"0x4C67","RV250_Lg","RV250",1,,,,,"ATI Radeon Mobility 9000 (M9) Lg (AGP)"
-"0x4C6E","RV280_4C6E","RV280",1,,,,,"ATI FireMV 2400 PCI"
+"0x4C57","RADEON_LW","RV200",1,,,,,"ATI Radeon Mobility M7"
+"0x4C58","RADEON_LX","RV200",1,,,,,"ATI Mobility FireGL 7800 M7"
+"0x4C59","RADEON_LY","RV100",1,,,,,"ATI Radeon Mobility M6"
+"0x4C5A","RADEON_LZ","RV100",1,,,,,"ATI Radeon Mobility M6"
+"0x4C64","RV250_Ld","RV250",1,,,,,"ATI FireGL Mobility 9000 (M9)"
+"0x4C66","RV250_Lf","RV250",1,,,,,"ATI Radeon Mobility 9000 (M9)"
+"0x4C67","RV250_Lg","RV250",1,,,,,"ATI Radeon Mobility 9000 (M9)"
+"0x4C6E","RV280_4C6E","RV280",1,,,,,"ATI FireMV 2400"
 "0x4D46","RAGE128MF","R128",,,,,,
 "0x4D4C","RAGE128ML","R128",,,,,,
-"0x4E44","R300_ND","R300",,,,,,"ATI Radeon 9700 Pro ND (AGP)"
-"0x4E45","R300_NE","R300",,,,,,"ATI Radeon 9700/9500Pro NE (AGP)"
-"0x4E46","R300_NF","R300",,,,,,"ATI Radeon 9600TX NF (AGP)"
-"0x4E47","R300_NG","R300",,,,,,"ATI FireGL X1 NG (AGP)"
-"0x4E48","R350_NH","R350",,,,,,"ATI Radeon 9800PRO NH (AGP)"
-"0x4E49","R350_NI","R350",,,,,,"ATI Radeon 9800 NI (AGP)"
-"0x4E4A","R360_NJ","R350",,,,,,"ATI FireGL X2 NK (AGP)"
-"0x4E4B","R350_NK","R350",,,,,,"ATI Radeon 9800XT NJ (AGP)"
-"0x4E50","RV350_NP","RV350",1,,,,,"ATI Radeon Mobility 9600/9700 (M10/M11) NP (AGP)"
-"0x4E51","RV350_NQ","RV350",1,,,,,"ATI Radeon Mobility 9600 (M10) NQ (AGP)"
-"0x4E52","RV350_NR","RV350",1,,,,,"ATI Radeon Mobility 9600 (M11) NR (AGP)"
-"0x4E53","RV350_NS","RV350",1,,,,,"ATI Radeon Mobility 9600 (M10) NS (AGP)"
-"0x4E54","RV350_NT","RV350",1,,,,,"ATI FireGL Mobility T2 (M10) NT (AGP)"
-"0x4E56","RV350_NV","RV350",1,,,,,"ATI FireGL Mobility T2e (M11) NV (AGP)"
+"0x4E44","R300_ND","R300",,,,,,"ATI Radeon 9700 Pro"
+"0x4E45","R300_NE","R300",,,,,,"ATI Radeon 9700/9500Pro"
+"0x4E46","R300_NF","R300",,,,,,"ATI Radeon 9600TX"
+"0x4E47","R300_NG","R300",,,,,,"ATI FireGL X1"
+"0x4E48","R350_NH","R350",,,,,,"ATI Radeon 9800PRO"
+"0x4E49","R350_NI","R350",,,,,,"ATI Radeon 9800"
+"0x4E4A","R360_NJ","R350",,,,,,"ATI FireGL X2"
+"0x4E4B","R350_NK","R350",,,,,,"ATI Radeon 9800XT"
+"0x4E50","RV350_NP","RV350",1,,,,,"ATI Radeon Mobility 9600/9700 (M10/M11)"
+"0x4E51","RV350_NQ","RV350",1,,,,,"ATI Radeon Mobility 9600 (M10)"
+"0x4E52","RV350_NR","RV350",1,,,,,"ATI Radeon Mobility 9600 (M11)"
+"0x4E53","RV350_NS","RV350",1,,,,,"ATI Radeon Mobility 9600 (M10)"
+"0x4E54","RV350_NT","RV350",1,,,,,"ATI FireGL Mobility T2 (M10)"
+"0x4E56","RV350_NV","RV350",1,,,,,"ATI FireGL Mobility T2e (M11)"
 "0x5041","RAGE128PA","R128",,,,,,
 "0x5042","RAGE128PB","R128",,,,,,
 "0x5043","RAGE128PC","R128",,,,,,
@@ -127,18 +127,18 @@
 "0x5056","RAGE128PV","R128",,,,,,
 "0x5057","RAGE128PW","R128",,,,,,
 "0x5058","RAGE128PX","R128",,,,,,
-"0x5144","RADEON_QD","RADEON",,,1,1,,"ATI Radeon QD (AGP)"
-"0x5145","RADEON_QE","RADEON",,,1,1,,"ATI Radeon QE (AGP)"
-"0x5146","RADEON_QF","RADEON",,,1,1,,"ATI Radeon QF (AGP)"
-"0x5147","RADEON_QG","RADEON",,,1,1,,"ATI Radeon QG (AGP)"
-"0x5148","R200_QH","R200",,,,1,,"ATI FireGL 8700/8800 QH (AGP)"
-"0x514C","R200_QL","R200",,,,1,,"ATI Radeon 8500 QL (AGP)"
-"0x514D","R200_QM","R200",,,,1,,"ATI Radeon 9100 QM (AGP)"
-"0x5157","RV200_QW","RV200",,,,,,"ATI Radeon 7500 QW (AGP/PCI)"
-"0x5158","RV200_QX","RV200",,,,,,"ATI Radeon 7500 QX (AGP/PCI)"
-"0x5159","RV100_QY","RV100",,,,,,"ATI Radeon VE/7000 QY (AGP/PCI)"
-"0x515A","RV100_QZ","RV100",,,,,,"ATI Radeon VE/7000 QZ (AGP/PCI)"
-"0x515E","RN50_515E","RV100",,,1,,,"ATI ES1000 515E (PCI)"
+"0x5144","RADEON_QD","RADEON",,,1,1,,"ATI Radeon"
+"0x5145","RADEON_QE","RADEON",,,1,1,,"ATI Radeon"
+"0x5146","RADEON_QF","RADEON",,,1,1,,"ATI Radeon"
+"0x5147","RADEON_QG","RADEON",,,1,1,,"ATI Radeon"
+"0x5148","R200_QH","R200",,,,1,,"ATI FireGL 8700/8800"
+"0x514C","R200_QL","R200",,,,1,,"ATI Radeon 8500"
+"0x514D","R200_QM","R200",,,,1,,"ATI Radeon 9100"
+"0x5157","RV200_QW","RV200",,,,,,"ATI Radeon 7500"
+"0x5158","RV200_QX","RV200",,,,,,"ATI Radeon 7500"
+"0x5159","RV100_QY","RV100",,,,,,"ATI Radeon VE/7000"
+"0x515A","RV100_QZ","RV100",,,,,,"ATI Radeon VE/7000"
+"0x515E","RN50_515E","RV100",,,1,,,"ATI ES1000"
 "0x5245","RAGE128RE","R128",,,,,,
 "0x5246","RAGE128RF","R128",,,,,,
 "0x5247","RAGE128RG","R128",,,,,,
@@ -158,69 +158,69 @@
 "0x5453","RAGE128TS","R128",,,,,,
 "0x5454","RAGE128TT","R128",,,,,,
 "0x5455","RAGE128TU","R128",,,,,,
-"0x5460","RV370_5460","RV380",1,,,,,"ATI Radeon Mobility X300 (M22) 5460 (PCIE)"
-"0x5462","RV370_5462","RV380",1,,,,,"ATI Radeon Mobility X600 SE (M24C) 5462 (PCIE)"
-"0x5464","RV370_5464","RV380",1,,,,,"ATI FireGL M22 GL 5464 (PCIE)"
-"0x5548","R423_UH","R420",,,,,,"ATI Radeon X800 (R423) UH (PCIE)"
-"0x5549","R423_UI","R420",,,,,,"ATI Radeon X800PRO (R423) UI (PCIE)"
-"0x554A","R423_UJ","R420",,,,,,"ATI Radeon X800LE (R423) UJ (PCIE)"
-"0x554B","R423_UK","R420",,,,,,"ATI Radeon X800SE (R423) UK (PCIE)"
-"0x554C","R430_554C","R420",,,,,,"ATI Radeon X800 XTP (R430) (PCIE)"
-"0x554D","R430_554D","R420",,,,,,"ATI Radeon X800 XL (R430) (PCIE)"
-"0x554E","R430_554E","R420",,,,,,"ATI Radeon X800 SE (R430) (PCIE)"
-"0x554F","R430_554F","R420",,,,,,"ATI Radeon X800 (R430) (PCIE)"
-"0x5550","R423_5550","R420",,,,,,"ATI FireGL V7100 (R423) (PCIE)"
-"0x5551","R423_UQ","R420",,,,,,"ATI FireGL V5100 (R423) UQ (PCIE)"
-"0x5552","R423_UR","R420",,,,,,"ATI FireGL unknown (R423) UR (PCIE)"
-"0x5554","R423_UT","R420",,,,,,"ATI FireGL unknown (R423) UT (PCIE)"
-"0x564A","RV410_564A","RV410",1,,,,,"ATI Mobility FireGL V5000 (M26) (PCIE)"
-"0x564B","RV410_564B","RV410",1,,,,,"ATI Mobility FireGL V5000 (M26) (PCIE)"
-"0x564F","RV410_564F","RV410",1,,,,,"ATI Mobility Radeon X700 XL (M26) (PCIE)"
-"0x5652","RV410_5652","RV410",1,,,,,"ATI Mobility Radeon X700 (M26) (PCIE)"
-"0x5653","RV410_5653","RV410",1,,,,,"ATI Mobility Radeon X700 (M26) (PCIE)"
-"0x5657","RV410_5657","RV410",,,,,,"ATI Radeon X550XTX 5657 (PCIE)"
+"0x5460","RV370_5460","RV380",1,,,,,"ATI Radeon Mobility X300 (M22)"
+"0x5462","RV370_5462","RV380",1,,,,,"ATI Radeon Mobility X600 SE (M24C)"
+"0x5464","RV370_5464","RV380",1,,,,,"ATI FireGL M22 GL"
+"0x5548","R423_UH","R420",,,,,,"ATI Radeon X800 (R423)"
+"0x5549","R423_UI","R420",,,,,,"ATI Radeon X800PRO (R423)"
+"0x554A","R423_UJ","R420",,,,,,"ATI Radeon X800LE (R423)"
+"0x554B","R423_UK","R420",,,,,,"ATI Radeon X800SE (R423)"
+"0x554C","R430_554C","R420",,,,,,"ATI Radeon X800 XTP (R430)"
+"0x554D","R430_554D","R420",,,,,,"ATI Radeon X800 XL (R430)"
+"0x554E","R430_554E","R420",,,,,,"ATI Radeon X800 SE (R430)"
+"0x554F","R430_554F","R420",,,,,,"ATI Radeon X800 (R430)"
+"0x5550","R423_5550","R420",,,,,,"ATI FireGL V7100 (R423)"
+"0x5551","R423_UQ","R420",,,,,,"ATI FireGL V5100 (R423)"
+"0x5552","R423_UR","R420",,,,,,"ATI FireGL unknown (R423)"
+"0x5554","R423_UT","R420",,,,,,"ATI FireGL unknown (R423)"
+"0x564A","RV410_564A","RV410",1,,,,,"ATI Mobility FireGL V5000 (M26)"
+"0x564B","RV410_564B","RV410",1,,,,,"ATI Mobility FireGL V5000 (M26)"
+"0x564F","RV410_564F","RV410",1,,,,,"ATI Mobility Radeon X700 XL (M26)"
+"0x5652","RV410_5652","RV410",1,,,,,"ATI Mobility Radeon X700 (M26)"
+"0x5653","RV410_5653","RV410",1,,,,,"ATI Mobility Radeon X700 (M26)"
+"0x5657","RV410_5657","RV410",,,,,,"ATI Radeon X550XTX"
 "0x5654","MACH64VT","MACH64",,,,,,
 "0x5655","MACH64VU","MACH64",,,,,,
 "0x5656","MACH64VV","MACH64",,,,,,
-"0x5834","RS300_5834","RS300",,1,,,1,"ATI Radeon 9100 IGP (A5) 5834"
-"0x5835","RS300_5835","RS300",1,1,,,1,"ATI Radeon Mobility 9100 IGP (U3) 5835"
-"0x5954","RS480_5954","RS480",,1,,,1,"ATI Radeon XPRESS 200 5954 (PCIE)"
-"0x5955","RS480_5955","RS480",1,1,,,1,"ATI Radeon XPRESS 200M 5955 (PCIE)"
-"0x5960","RV280_5960","RV280",,,,,,"ATI Radeon 9250 5960 (AGP)"
-"0x5961","RV280_5961","RV280",,,,,,"ATI Radeon 9200 5961 (AGP)"
-"0x5962","RV280_5962","RV280",,,,,,"ATI Radeon 9200 5962 (AGP)"
-"0x5964","RV280_5964","RV280",,,,,,"ATI Radeon 9200SE 5964 (AGP)"
-"0x5965","RV280_5965","RV280",,,,,,"ATI FireMV 2200 (PCI)"
-"0x5969","RN50_5969","RV100",,,1,,,"ATI ES1000 5969 (PCI)"
-"0x5974","RS482_5974","RS480",1,1,,,1,"ATI Radeon XPRESS 200 5974 (PCIE)"
-"0x5975","RS485_5975","RS480",1,1,,,1,"ATI Radeon XPRESS 200M 5975 (PCIE)"
-"0x5A41","RS400_5A41","RS400",,1,,,1,"ATI Radeon XPRESS 200 5A41 (PCIE)"
-"0x5A42","RS400_5A42","RS400",1,1,,,1,"ATI Radeon XPRESS 200M 5A42 (PCIE)"
-"0x5A61","RC410_5A61","RS400",,1,,,1,"ATI Radeon XPRESS 200 5A61 (PCIE)"
-"0x5A62","RC410_5A62","RS400",1,1,,,1,"ATI Radeon XPRESS 200M 5A62 (PCIE)"
-"0x5B60","RV370_5B60","RV380",,,,,,"ATI Radeon X300 (RV370) 5B60 (PCIE)"
-"0x5B62","RV370_5B62","RV380",,,,,,"ATI Radeon X600 (RV370) 5B62 (PCIE)"
-"0x5B63","RV370_5B63","RV380",,,,,,"ATI Radeon X550 (RV370) 5B63 (PCIE)"
-"0x5B64","RV370_5B64","RV380",,,,,,"ATI FireGL V3100 (RV370) 5B64 (PCIE)"
-"0x5B65","RV370_5B65","RV380",,,,,,"ATI FireMV 2200 PCIE (RV370) 5B65 (PCIE)"
-"0x5C61","RV280_5C61","RV280",1,,,,,"ATI Radeon Mobility 9200 (M9+) 5C61 (AGP)"
-"0x5C63","RV280_5C63","RV280",1,,,,,"ATI Radeon Mobility 9200 (M9+) 5C63 (AGP)"
-"0x5D48","R430_5D48","R420",1,,,,,"ATI Mobility Radeon X800 XT (M28) (PCIE)"
-"0x5D49","R430_5D49","R420",1,,,,,"ATI Mobility FireGL V5100 (M28) (PCIE)"
-"0x5D4A","R430_5D4A","R420",1,,,,,"ATI Mobility Radeon X800 (M28) (PCIE)"
-"0x5D4C","R480_5D4C","R420",,,,,,"ATI Radeon X850 5D4C (PCIE)"
-"0x5D4D","R480_5D4D","R420",,,,,,"ATI Radeon X850 XT PE (R480) (PCIE)"
-"0x5D4E","R480_5D4E","R420",,,,,,"ATI Radeon X850 SE (R480) (PCIE)"
-"0x5D4F","R480_5D4F","R420",,,,,,"ATI Radeon X850 PRO (R480) (PCIE)"
-"0x5D50","R480_5D50","R420",,,,,,"ATI unknown Radeon / FireGL (R480) 5D50 (PCIE)"
-"0x5D52","R480_5D52","R420",,,,,,"ATI Radeon X850 XT (R480) (PCIE)"
-"0x5D57","R423_5D57","R420",,,,,,"ATI Radeon X800XT (R423) 5D57 (PCIE)"
-"0x5E48","RV410_5E48","RV410",,,,,,"ATI FireGL V5000 (RV410) (PCIE)"
-"0x5E4A","RV410_5E4A","RV410",,,,,,"ATI Radeon X700 XT (RV410) (PCIE)"
-"0x5E4B","RV410_5E4B","RV410",,,,,,"ATI Radeon X700 PRO (RV410) (PCIE)"
-"0x5E4C","RV410_5E4C","RV410",,,,,,"ATI Radeon X700 SE (RV410) (PCIE)"
-"0x5E4D","RV410_5E4D","RV410",,,,,,"ATI Radeon X700 (RV410) (PCIE)"
-"0x5E4F","RV410_5E4F","RV410",,,,,,"ATI Radeon X700 SE (RV410) (PCIE)"
+"0x5834","RS300_5834","RS300",,1,,,1,"ATI Radeon 9100 IGP (A5)"
+"0x5835","RS300_5835","RS300",1,1,,,1,"ATI Radeon Mobility 9100 IGP (U3)"
+"0x5954","RS480_5954","RS480",,1,,,1,"ATI Radeon XPRESS 200"
+"0x5955","RS480_5955","RS480",1,1,,,1,"ATI Radeon XPRESS 200M"
+"0x5960","RV280_5960","RV280",,,,,,"ATI Radeon 9250"
+"0x5961","RV280_5961","RV280",,,,,,"ATI Radeon 9200"
+"0x5962","RV280_5962","RV280",,,,,,"ATI Radeon 9200"
+"0x5964","RV280_5964","RV280",,,,,,"ATI Radeon 9200SE"
+"0x5965","RV280_5965","RV280",,,,,,"ATI FireMV 2200"
+"0x5969","RN50_5969","RV100",,,1,,,"ATI ES1000"
+"0x5974","RS482_5974","RS480",1,1,,,1,"ATI Radeon XPRESS 200"
+"0x5975","RS485_5975","RS480",1,1,,,1,"ATI Radeon XPRESS 200M"
+"0x5A41","RS400_5A41","RS400",,1,,,1,"ATI Radeon XPRESS 200"
+"0x5A42","RS400_5A42","RS400",1,1,,,1,"ATI Radeon XPRESS 200M"
+"0x5A61","RC410_5A61","RS400",,1,,,1,"ATI Radeon XPRESS 200"
+"0x5A62","RC410_5A62","RS400",1,1,,,1,"ATI Radeon XPRESS 200M"
+"0x5B60","RV370_5B60","RV380",,,,,,"ATI Radeon X300 (RV370)"
+"0x5B62","RV370_5B62","RV380",,,,,,"ATI Radeon X600 (RV370)"
+"0x5B63","RV370_5B63","RV380",,,,,,"ATI Radeon X550 (RV370)"
+"0x5B64","RV370_5B64","RV380",,,,,,"ATI FireGL V3100 (RV370)"
+"0x5B65","RV370_5B65","RV380",,,,,,"ATI FireMV 2200 PCIE (RV370)"
+"0x5C61","RV280_5C61","RV280",1,,,,,"ATI Radeon Mobility 9200 (M9+)"
+"0x5C63","RV280_5C63","RV280",1,,,,,"ATI Radeon Mobility 9200 (M9+)"
+"0x5D48","R430_5D48","R420",1,,,,,"ATI Mobility Radeon X800 XT (M28)"
+"0x5D49","R430_5D49","R420",1,,,,,"ATI Mobility FireGL V5100 (M28)"
+"0x5D4A","R430_5D4A","R420",1,,,,,"ATI Mobility Radeon X800 (M28)"
+"0x5D4C","R480_5D4C","R420",,,,,,"ATI Radeon X850"
+"0x5D4D","R480_5D4D","R420",,,,,,"ATI Radeon X850 XT PE (R480)"
+"0x5D4E","R480_5D4E","R420",,,,,,"ATI Radeon X850 SE (R480)"
+"0x5D4F","R480_5D4F","R420",,,,,,"ATI Radeon X850 PRO (R480)"
+"0x5D50","R480_5D50","R420",,,,,,"ATI unknown Radeon / FireGL (R480)"
+"0x5D52","R480_5D52","R420",,,,,,"ATI Radeon X850 XT (R480)"
+"0x5D57","R423_5D57","R420",,,,,,"ATI Radeon X800XT (R423)"
+"0x5E48","RV410_5E48","RV410",,,,,,"ATI FireGL V5000 (RV410)"
+"0x5E4A","RV410_5E4A","RV410",,,,,,"ATI Radeon X700 XT (RV410)"
+"0x5E4B","RV410_5E4B","RV410",,,,,,"ATI Radeon X700 PRO (RV410)"
+"0x5E4C","RV410_5E4C","RV410",,,,,,"ATI Radeon X700 SE (RV410)"
+"0x5E4D","RV410_5E4D","RV410",,,,,,"ATI Radeon X700 (RV410)"
+"0x5E4F","RV410_5E4F","RV410",,,,,,"ATI Radeon X700 SE (RV410)"
 "0x7100","R520_7100","R520",,,,,,"ATI Radeon X1800"
 "0x7101","R520_7101","R520",1,,,,,"ATI Mobility Radeon X1800 XT"
 "0x7102","R520_7102","R520",1,,,,,"ATI Mobility Radeon X1800"
@@ -316,8 +316,8 @@
 "0x7291","RV560_7291","RV560",,,,,,"ATI Radeon X1650"
 "0x7293","RV560_7293","RV560",,,,,,"ATI Radeon X1650"
 "0x7297","RV560_7297","RV560",,,,,,"ATI RV560"
-"0x7834","RS350_7834","RS300",,1,,,1,"ATI Radeon 9100 PRO IGP 7834"
-"0x7835","RS350_7835","RS300",1,1,,,1,"ATI Radeon Mobility 9200 IGP 7835"
+"0x7834","RS350_7834","RS300",,1,,,1,"ATI Radeon 9100 PRO IGP"
+"0x7835","RS350_7835","RS300",1,1,,,1,"ATI Radeon Mobility 9200 IGP"
 "0x791E","RS690_791E","RS690",,1,,,1,"ATI Radeon X1200"
 "0x791F","RS690_791F","RS690",,1,,,1,"ATI Radeon X1200"
 "0x793F","RS600_793F","RS600",,1,,,1,"ATI Radeon X1200"
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index f68c2ea2..496dee6a 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -1,145 +1,145 @@
 /* This file is autogenerated please do not edit */
 SymTabRec RADEONChipsets[] = {
-  { PCI_CHIP_RV380_3150, "ATI Radeon Mobility X600 (M24) 3150 (PCIE)" },
-  { PCI_CHIP_RV380_3151, "ATI FireMV 2400 (PCI)" },
-  { PCI_CHIP_RV380_3152, "ATI Radeon Mobility X300 (M24) 3152 (PCIE)" },
-  { PCI_CHIP_RV380_3154, "ATI FireGL M24 GL 3154 (PCIE)" },
-  { PCI_CHIP_RV380_3155, "ATI FireMV 2400 3155 (PCI)" },
-  { PCI_CHIP_RV380_3E50, "ATI Radeon X600 (RV380) 3E50 (PCIE)" },
-  { PCI_CHIP_RV380_3E54, "ATI FireGL V3200 (RV380) 3E54 (PCIE)" },
-  { PCI_CHIP_RS100_4136, "ATI Radeon IGP320 (A3) 4136" },
-  { PCI_CHIP_RS200_4137, "ATI Radeon IGP330/340/350 (A4) 4137" },
-  { PCI_CHIP_R300_AD, "ATI Radeon 9500 AD (AGP)" },
-  { PCI_CHIP_R300_AE, "ATI Radeon 9500 AE (AGP)" },
-  { PCI_CHIP_R300_AF, "ATI Radeon 9600TX AF (AGP)" },
-  { PCI_CHIP_R300_AG, "ATI FireGL Z1 AG (AGP)" },
-  { PCI_CHIP_R350_AH, "ATI Radeon 9800SE AH (AGP)" },
-  { PCI_CHIP_R350_AI, "ATI Radeon 9800 AI (AGP)" },
-  { PCI_CHIP_R350_AJ, "ATI Radeon 9800 AJ (AGP)" },
-  { PCI_CHIP_R350_AK, "ATI FireGL X2 AK (AGP)" },
-  { PCI_CHIP_RV350_AP, "ATI Radeon 9600 AP (AGP)" },
-  { PCI_CHIP_RV350_AQ, "ATI Radeon 9600SE AQ (AGP)" },
-  { PCI_CHIP_RV360_AR, "ATI Radeon 9600XT AR (AGP)" },
-  { PCI_CHIP_RV350_AS, "ATI Radeon 9600 AS (AGP)" },
-  { PCI_CHIP_RV350_AT, "ATI FireGL T2 AT (AGP)" },
+  { PCI_CHIP_RV380_3150, "ATI Radeon Mobility X600 (M24)" },
+  { PCI_CHIP_RV380_3151, "ATI FireMV 2400" },
+  { PCI_CHIP_RV380_3152, "ATI Radeon Mobility X300 (M24)" },
+  { PCI_CHIP_RV380_3154, "ATI FireGL M24 GL" },
+  { PCI_CHIP_RV380_3155, "ATI FireMV 2400" },
+  { PCI_CHIP_RV380_3E50, "ATI Radeon X600 (RV380)" },
+  { PCI_CHIP_RV380_3E54, "ATI FireGL V3200 (RV380)" },
+  { PCI_CHIP_RS100_4136, "ATI Radeon IGP320 (A3)" },
+  { PCI_CHIP_RS200_4137, "ATI Radeon IGP330/340/350 (A4)" },
+  { PCI_CHIP_R300_AD, "ATI Radeon 9500" },
+  { PCI_CHIP_R300_AE, "ATI Radeon 9500" },
+  { PCI_CHIP_R300_AF, "ATI Radeon 9600TX" },
+  { PCI_CHIP_R300_AG, "ATI FireGL Z1" },
+  { PCI_CHIP_R350_AH, "ATI Radeon 9800SE" },
+  { PCI_CHIP_R350_AI, "ATI Radeon 9800" },
+  { PCI_CHIP_R350_AJ, "ATI Radeon 9800" },
+  { PCI_CHIP_R350_AK, "ATI FireGL X2" },
+  { PCI_CHIP_RV350_AP, "ATI Radeon 9600" },
+  { PCI_CHIP_RV350_AQ, "ATI Radeon 9600SE" },
+  { PCI_CHIP_RV360_AR, "ATI Radeon 9600XT" },
+  { PCI_CHIP_RV350_AS, "ATI Radeon 9600" },
+  { PCI_CHIP_RV350_AT, "ATI FireGL T2" },
   { PCI_CHIP_RV350_4155, "ATI Radeon 9650" },
-  { PCI_CHIP_RV350_AV, "ATI FireGL RV360 AV (AGP)" },
-  { PCI_CHIP_RS250_4237, "ATI Radeon 7000 IGP (A4+) 4237" },
-  { PCI_CHIP_R200_BB, "ATI Radeon 8500 AIW BB (AGP)" },
-  { PCI_CHIP_RS100_4336, "ATI Radeon IGP320M (U1) 4336" },
-  { PCI_CHIP_RS200_4337, "ATI Radeon IGP330M/340M/350M (U2) 4337" },
-  { PCI_CHIP_RS250_4437, "ATI Radeon Mobility 7000 IGP 4437" },
-  { PCI_CHIP_RV250_If, "ATI Radeon 9000/PRO If (AGP/PCI)" },
-  { PCI_CHIP_RV250_Ig, "ATI Radeon 9000 Ig (AGP/PCI)" },
-  { PCI_CHIP_R420_JH, "ATI Radeon X800 (R420) JH (AGP)" },
-  { PCI_CHIP_R420_JI, "ATI Radeon X800PRO (R420) JI (AGP)" },
-  { PCI_CHIP_R420_JJ, "ATI Radeon X800SE (R420) JJ (AGP)" },
-  { PCI_CHIP_R420_JK, "ATI Radeon X800 (R420) JK (AGP)" },
-  { PCI_CHIP_R420_JL, "ATI Radeon X800 (R420) JL (AGP)" },
-  { PCI_CHIP_R420_JM, "ATI FireGL X3 (R420) JM (AGP)" },
-  { PCI_CHIP_R420_JN, "ATI Radeon Mobility 9800 (M18) JN (AGP)" },
-  { PCI_CHIP_R420_4A4F, "ATI Radeon X800 SE (R420) (AGP)" },
-  { PCI_CHIP_R420_JP, "ATI Radeon X800XT (R420) JP (AGP)" },
-  { PCI_CHIP_R420_JT, "ATI Radeon X800 VE (R420) JT (AGP)" },
-  { PCI_CHIP_R481_4B48, "ATI Radeon X850 (R480) (AGP)" },
-  { PCI_CHIP_R481_4B49, "ATI Radeon X850 XT (R480) (AGP)" },
-  { PCI_CHIP_R481_4B4A, "ATI Radeon X850 SE (R480) (AGP)" },
-  { PCI_CHIP_R481_4B4B, "ATI Radeon X850 PRO (R480) (AGP)" },
-  { PCI_CHIP_R481_4B4C, "ATI Radeon X850 XT PE (R480) (AGP)" },
-  { PCI_CHIP_RADEON_LW, "ATI Radeon Mobility M7 LW (AGP)" },
-  { PCI_CHIP_RADEON_LX, "ATI Mobility FireGL 7800 M7 LX (AGP)" },
-  { PCI_CHIP_RADEON_LY, "ATI Radeon Mobility M6 LY (AGP)" },
-  { PCI_CHIP_RADEON_LZ, "ATI Radeon Mobility M6 LZ (AGP)" },
-  { PCI_CHIP_RV250_Ld, "ATI FireGL Mobility 9000 (M9) Ld (AGP)" },
-  { PCI_CHIP_RV250_Lf, "ATI Radeon Mobility 9000 (M9) Lf (AGP)" },
-  { PCI_CHIP_RV250_Lg, "ATI Radeon Mobility 9000 (M9) Lg (AGP)" },
-  { PCI_CHIP_RV280_4C6E, "ATI FireMV 2400 PCI" },
-  { PCI_CHIP_R300_ND, "ATI Radeon 9700 Pro ND (AGP)" },
-  { PCI_CHIP_R300_NE, "ATI Radeon 9700/9500Pro NE (AGP)" },
-  { PCI_CHIP_R300_NF, "ATI Radeon 9600TX NF (AGP)" },
-  { PCI_CHIP_R300_NG, "ATI FireGL X1 NG (AGP)" },
-  { PCI_CHIP_R350_NH, "ATI Radeon 9800PRO NH (AGP)" },
-  { PCI_CHIP_R350_NI, "ATI Radeon 9800 NI (AGP)" },
-  { PCI_CHIP_R360_NJ, "ATI FireGL X2 NK (AGP)" },
-  { PCI_CHIP_R350_NK, "ATI Radeon 9800XT NJ (AGP)" },
-  { PCI_CHIP_RV350_NP, "ATI Radeon Mobility 9600/9700 (M10/M11) NP (AGP)" },
-  { PCI_CHIP_RV350_NQ, "ATI Radeon Mobility 9600 (M10) NQ (AGP)" },
-  { PCI_CHIP_RV350_NR, "ATI Radeon Mobility 9600 (M11) NR (AGP)" },
-  { PCI_CHIP_RV350_NS, "ATI Radeon Mobility 9600 (M10) NS (AGP)" },
-  { PCI_CHIP_RV350_NT, "ATI FireGL Mobility T2 (M10) NT (AGP)" },
-  { PCI_CHIP_RV350_NV, "ATI FireGL Mobility T2e (M11) NV (AGP)" },
-  { PCI_CHIP_RADEON_QD, "ATI Radeon QD (AGP)" },
-  { PCI_CHIP_RADEON_QE, "ATI Radeon QE (AGP)" },
-  { PCI_CHIP_RADEON_QF, "ATI Radeon QF (AGP)" },
-  { PCI_CHIP_RADEON_QG, "ATI Radeon QG (AGP)" },
-  { PCI_CHIP_R200_QH, "ATI FireGL 8700/8800 QH (AGP)" },
-  { PCI_CHIP_R200_QL, "ATI Radeon 8500 QL (AGP)" },
-  { PCI_CHIP_R200_QM, "ATI Radeon 9100 QM (AGP)" },
-  { PCI_CHIP_RV200_QW, "ATI Radeon 7500 QW (AGP/PCI)" },
-  { PCI_CHIP_RV200_QX, "ATI Radeon 7500 QX (AGP/PCI)" },
-  { PCI_CHIP_RV100_QY, "ATI Radeon VE/7000 QY (AGP/PCI)" },
-  { PCI_CHIP_RV100_QZ, "ATI Radeon VE/7000 QZ (AGP/PCI)" },
-  { PCI_CHIP_RN50_515E, "ATI ES1000 515E (PCI)" },
-  { PCI_CHIP_RV370_5460, "ATI Radeon Mobility X300 (M22) 5460 (PCIE)" },
-  { PCI_CHIP_RV370_5462, "ATI Radeon Mobility X600 SE (M24C) 5462 (PCIE)" },
-  { PCI_CHIP_RV370_5464, "ATI FireGL M22 GL 5464 (PCIE)" },
-  { PCI_CHIP_R423_UH, "ATI Radeon X800 (R423) UH (PCIE)" },
-  { PCI_CHIP_R423_UI, "ATI Radeon X800PRO (R423) UI (PCIE)" },
-  { PCI_CHIP_R423_UJ, "ATI Radeon X800LE (R423) UJ (PCIE)" },
-  { PCI_CHIP_R423_UK, "ATI Radeon X800SE (R423) UK (PCIE)" },
-  { PCI_CHIP_R430_554C, "ATI Radeon X800 XTP (R430) (PCIE)" },
-  { PCI_CHIP_R430_554D, "ATI Radeon X800 XL (R430) (PCIE)" },
-  { PCI_CHIP_R430_554E, "ATI Radeon X800 SE (R430) (PCIE)" },
-  { PCI_CHIP_R430_554F, "ATI Radeon X800 (R430) (PCIE)" },
-  { PCI_CHIP_R423_5550, "ATI FireGL V7100 (R423) (PCIE)" },
-  { PCI_CHIP_R423_UQ, "ATI FireGL V5100 (R423) UQ (PCIE)" },
-  { PCI_CHIP_R423_UR, "ATI FireGL unknown (R423) UR (PCIE)" },
-  { PCI_CHIP_R423_UT, "ATI FireGL unknown (R423) UT (PCIE)" },
-  { PCI_CHIP_RV410_564A, "ATI Mobility FireGL V5000 (M26) (PCIE)" },
-  { PCI_CHIP_RV410_564B, "ATI Mobility FireGL V5000 (M26) (PCIE)" },
-  { PCI_CHIP_RV410_564F, "ATI Mobility Radeon X700 XL (M26) (PCIE)" },
-  { PCI_CHIP_RV410_5652, "ATI Mobility Radeon X700 (M26) (PCIE)" },
-  { PCI_CHIP_RV410_5653, "ATI Mobility Radeon X700 (M26) (PCIE)" },
-  { PCI_CHIP_RV410_5657, "ATI Radeon X550XTX 5657 (PCIE)" },
-  { PCI_CHIP_RS300_5834, "ATI Radeon 9100 IGP (A5) 5834" },
-  { PCI_CHIP_RS300_5835, "ATI Radeon Mobility 9100 IGP (U3) 5835" },
-  { PCI_CHIP_RS480_5954, "ATI Radeon XPRESS 200 5954 (PCIE)" },
-  { PCI_CHIP_RS480_5955, "ATI Radeon XPRESS 200M 5955 (PCIE)" },
-  { PCI_CHIP_RV280_5960, "ATI Radeon 9250 5960 (AGP)" },
-  { PCI_CHIP_RV280_5961, "ATI Radeon 9200 5961 (AGP)" },
-  { PCI_CHIP_RV280_5962, "ATI Radeon 9200 5962 (AGP)" },
-  { PCI_CHIP_RV280_5964, "ATI Radeon 9200SE 5964 (AGP)" },
-  { PCI_CHIP_RV280_5965, "ATI FireMV 2200 (PCI)" },
-  { PCI_CHIP_RN50_5969, "ATI ES1000 5969 (PCI)" },
-  { PCI_CHIP_RS482_5974, "ATI Radeon XPRESS 200 5974 (PCIE)" },
-  { PCI_CHIP_RS485_5975, "ATI Radeon XPRESS 200M 5975 (PCIE)" },
-  { PCI_CHIP_RS400_5A41, "ATI Radeon XPRESS 200 5A41 (PCIE)" },
-  { PCI_CHIP_RS400_5A42, "ATI Radeon XPRESS 200M 5A42 (PCIE)" },
-  { PCI_CHIP_RC410_5A61, "ATI Radeon XPRESS 200 5A61 (PCIE)" },
-  { PCI_CHIP_RC410_5A62, "ATI Radeon XPRESS 200M 5A62 (PCIE)" },
-  { PCI_CHIP_RV370_5B60, "ATI Radeon X300 (RV370) 5B60 (PCIE)" },
-  { PCI_CHIP_RV370_5B62, "ATI Radeon X600 (RV370) 5B62 (PCIE)" },
-  { PCI_CHIP_RV370_5B63, "ATI Radeon X550 (RV370) 5B63 (PCIE)" },
-  { PCI_CHIP_RV370_5B64, "ATI FireGL V3100 (RV370) 5B64 (PCIE)" },
-  { PCI_CHIP_RV370_5B65, "ATI FireMV 2200 PCIE (RV370) 5B65 (PCIE)" },
-  { PCI_CHIP_RV280_5C61, "ATI Radeon Mobility 9200 (M9+) 5C61 (AGP)" },
-  { PCI_CHIP_RV280_5C63, "ATI Radeon Mobility 9200 (M9+) 5C63 (AGP)" },
-  { PCI_CHIP_R430_5D48, "ATI Mobility Radeon X800 XT (M28) (PCIE)" },
-  { PCI_CHIP_R430_5D49, "ATI Mobility FireGL V5100 (M28) (PCIE)" },
-  { PCI_CHIP_R430_5D4A, "ATI Mobility Radeon X800 (M28) (PCIE)" },
-  { PCI_CHIP_R480_5D4C, "ATI Radeon X850 5D4C (PCIE)" },
-  { PCI_CHIP_R480_5D4D, "ATI Radeon X850 XT PE (R480) (PCIE)" },
-  { PCI_CHIP_R480_5D4E, "ATI Radeon X850 SE (R480) (PCIE)" },
-  { PCI_CHIP_R480_5D4F, "ATI Radeon X850 PRO (R480) (PCIE)" },
-  { PCI_CHIP_R480_5D50, "ATI unknown Radeon / FireGL (R480) 5D50 (PCIE)" },
-  { PCI_CHIP_R480_5D52, "ATI Radeon X850 XT (R480) (PCIE)" },
-  { PCI_CHIP_R423_5D57, "ATI Radeon X800XT (R423) 5D57 (PCIE)" },
-  { PCI_CHIP_RV410_5E48, "ATI FireGL V5000 (RV410) (PCIE)" },
-  { PCI_CHIP_RV410_5E4A, "ATI Radeon X700 XT (RV410) (PCIE)" },
-  { PCI_CHIP_RV410_5E4B, "ATI Radeon X700 PRO (RV410) (PCIE)" },
-  { PCI_CHIP_RV410_5E4C, "ATI Radeon X700 SE (RV410) (PCIE)" },
-  { PCI_CHIP_RV410_5E4D, "ATI Radeon X700 (RV410) (PCIE)" },
-  { PCI_CHIP_RV410_5E4F, "ATI Radeon X700 SE (RV410) (PCIE)" },
+  { PCI_CHIP_RV350_AV, "ATI FireGL RV360" },
+  { PCI_CHIP_RS250_4237, "ATI Radeon 7000 IGP (A4+)" },
+  { PCI_CHIP_R200_BB, "ATI Radeon 8500 AIW" },
+  { PCI_CHIP_RS100_4336, "ATI Radeon IGP320M (U1)" },
+  { PCI_CHIP_RS200_4337, "ATI Radeon IGP330M/340M/350M (U2)" },
+  { PCI_CHIP_RS250_4437, "ATI Radeon Mobility 7000 IGP" },
+  { PCI_CHIP_RV250_If, "ATI Radeon 9000/PRO" },
+  { PCI_CHIP_RV250_Ig, "ATI Radeon 9000" },
+  { PCI_CHIP_R420_JH, "ATI Radeon X800 (R420)" },
+  { PCI_CHIP_R420_JI, "ATI Radeon X800PRO (R420)" },
+  { PCI_CHIP_R420_JJ, "ATI Radeon X800SE (R420)" },
+  { PCI_CHIP_R420_JK, "ATI Radeon X800 (R420)" },
+  { PCI_CHIP_R420_JL, "ATI Radeon X800 (R420)" },
+  { PCI_CHIP_R420_JM, "ATI FireGL X3 (R420)" },
+  { PCI_CHIP_R420_JN, "ATI Radeon Mobility 9800 (M18)" },
+  { PCI_CHIP_R420_4A4F, "ATI Radeon X800 SE (R420)" },
+  { PCI_CHIP_R420_JP, "ATI Radeon X800XT (R420)" },
+  { PCI_CHIP_R420_JT, "ATI Radeon X800 VE (R420)" },
+  { PCI_CHIP_R481_4B48, "ATI Radeon X850 (R480)" },
+  { PCI_CHIP_R481_4B49, "ATI Radeon X850 XT (R480)" },
+  { PCI_CHIP_R481_4B4A, "ATI Radeon X850 SE (R480)" },
+  { PCI_CHIP_R481_4B4B, "ATI Radeon X850 PRO (R480)" },
+  { PCI_CHIP_R481_4B4C, "ATI Radeon X850 XT PE (R480)" },
+  { PCI_CHIP_RADEON_LW, "ATI Radeon Mobility M7" },
+  { PCI_CHIP_RADEON_LX, "ATI Mobility FireGL 7800 M7" },
+  { PCI_CHIP_RADEON_LY, "ATI Radeon Mobility M6" },
+  { PCI_CHIP_RADEON_LZ, "ATI Radeon Mobility M6" },
+  { PCI_CHIP_RV250_Ld, "ATI FireGL Mobility 9000 (M9)" },
+  { PCI_CHIP_RV250_Lf, "ATI Radeon Mobility 9000 (M9)" },
+  { PCI_CHIP_RV250_Lg, "ATI Radeon Mobility 9000 (M9)" },
+  { PCI_CHIP_RV280_4C6E, "ATI FireMV 2400" },
+  { PCI_CHIP_R300_ND, "ATI Radeon 9700 Pro" },
+  { PCI_CHIP_R300_NE, "ATI Radeon 9700/9500Pro" },
+  { PCI_CHIP_R300_NF, "ATI Radeon 9600TX" },
+  { PCI_CHIP_R300_NG, "ATI FireGL X1" },
+  { PCI_CHIP_R350_NH, "ATI Radeon 9800PRO" },
+  { PCI_CHIP_R350_NI, "ATI Radeon 9800" },
+  { PCI_CHIP_R360_NJ, "ATI FireGL X2" },
+  { PCI_CHIP_R350_NK, "ATI Radeon 9800XT" },
+  { PCI_CHIP_RV350_NP, "ATI Radeon Mobility 9600/9700 (M10/M11)" },
+  { PCI_CHIP_RV350_NQ, "ATI Radeon Mobility 9600 (M10)" },
+  { PCI_CHIP_RV350_NR, "ATI Radeon Mobility 9600 (M11)" },
+  { PCI_CHIP_RV350_NS, "ATI Radeon Mobility 9600 (M10)" },
+  { PCI_CHIP_RV350_NT, "ATI FireGL Mobility T2 (M10)" },
+  { PCI_CHIP_RV350_NV, "ATI FireGL Mobility T2e (M11)" },
+  { PCI_CHIP_RADEON_QD, "ATI Radeon" },
+  { PCI_CHIP_RADEON_QE, "ATI Radeon" },
+  { PCI_CHIP_RADEON_QF, "ATI Radeon" },
+  { PCI_CHIP_RADEON_QG, "ATI Radeon" },
+  { PCI_CHIP_R200_QH, "ATI FireGL 8700/8800" },
+  { PCI_CHIP_R200_QL, "ATI Radeon 8500" },
+  { PCI_CHIP_R200_QM, "ATI Radeon 9100" },
+  { PCI_CHIP_RV200_QW, "ATI Radeon 7500" },
+  { PCI_CHIP_RV200_QX, "ATI Radeon 7500" },
+  { PCI_CHIP_RV100_QY, "ATI Radeon VE/7000" },
+  { PCI_CHIP_RV100_QZ, "ATI Radeon VE/7000" },
+  { PCI_CHIP_RN50_515E, "ATI ES1000" },
+  { PCI_CHIP_RV370_5460, "ATI Radeon Mobility X300 (M22)" },
+  { PCI_CHIP_RV370_5462, "ATI Radeon Mobility X600 SE (M24C)" },
+  { PCI_CHIP_RV370_5464, "ATI FireGL M22 GL" },
+  { PCI_CHIP_R423_UH, "ATI Radeon X800 (R423)" },
+  { PCI_CHIP_R423_UI, "ATI Radeon X800PRO (R423)" },
+  { PCI_CHIP_R423_UJ, "ATI Radeon X800LE (R423)" },
+  { PCI_CHIP_R423_UK, "ATI Radeon X800SE (R423)" },
+  { PCI_CHIP_R430_554C, "ATI Radeon X800 XTP (R430)" },
+  { PCI_CHIP_R430_554D, "ATI Radeon X800 XL (R430)" },
+  { PCI_CHIP_R430_554E, "ATI Radeon X800 SE (R430)" },
+  { PCI_CHIP_R430_554F, "ATI Radeon X800 (R430)" },
+  { PCI_CHIP_R423_5550, "ATI FireGL V7100 (R423)" },
+  { PCI_CHIP_R423_UQ, "ATI FireGL V5100 (R423)" },
+  { PCI_CHIP_R423_UR, "ATI FireGL unknown (R423)" },
+  { PCI_CHIP_R423_UT, "ATI FireGL unknown (R423)" },
+  { PCI_CHIP_RV410_564A, "ATI Mobility FireGL V5000 (M26)" },
+  { PCI_CHIP_RV410_564B, "ATI Mobility FireGL V5000 (M26)" },
+  { PCI_CHIP_RV410_564F, "ATI Mobility Radeon X700 XL (M26)" },
+  { PCI_CHIP_RV410_5652, "ATI Mobility Radeon X700 (M26)" },
+  { PCI_CHIP_RV410_5653, "ATI Mobility Radeon X700 (M26)" },
+  { PCI_CHIP_RV410_5657, "ATI Radeon X550XTX" },
+  { PCI_CHIP_RS300_5834, "ATI Radeon 9100 IGP (A5)" },
+  { PCI_CHIP_RS300_5835, "ATI Radeon Mobility 9100 IGP (U3)" },
+  { PCI_CHIP_RS480_5954, "ATI Radeon XPRESS 200" },
+  { PCI_CHIP_RS480_5955, "ATI Radeon XPRESS 200M" },
+  { PCI_CHIP_RV280_5960, "ATI Radeon 9250" },
+  { PCI_CHIP_RV280_5961, "ATI Radeon 9200" },
+  { PCI_CHIP_RV280_5962, "ATI Radeon 9200" },
+  { PCI_CHIP_RV280_5964, "ATI Radeon 9200SE" },
+  { PCI_CHIP_RV280_5965, "ATI FireMV 2200" },
+  { PCI_CHIP_RN50_5969, "ATI ES1000" },
+  { PCI_CHIP_RS482_5974, "ATI Radeon XPRESS 200" },
+  { PCI_CHIP_RS485_5975, "ATI Radeon XPRESS 200M" },
+  { PCI_CHIP_RS400_5A41, "ATI Radeon XPRESS 200" },
+  { PCI_CHIP_RS400_5A42, "ATI Radeon XPRESS 200M" },
+  { PCI_CHIP_RC410_5A61, "ATI Radeon XPRESS 200" },
+  { PCI_CHIP_RC410_5A62, "ATI Radeon XPRESS 200M" },
+  { PCI_CHIP_RV370_5B60, "ATI Radeon X300 (RV370)" },
+  { PCI_CHIP_RV370_5B62, "ATI Radeon X600 (RV370)" },
+  { PCI_CHIP_RV370_5B63, "ATI Radeon X550 (RV370)" },
+  { PCI_CHIP_RV370_5B64, "ATI FireGL V3100 (RV370)" },
+  { PCI_CHIP_RV370_5B65, "ATI FireMV 2200 PCIE (RV370)" },
+  { PCI_CHIP_RV280_5C61, "ATI Radeon Mobility 9200 (M9+)" },
+  { PCI_CHIP_RV280_5C63, "ATI Radeon Mobility 9200 (M9+)" },
+  { PCI_CHIP_R430_5D48, "ATI Mobility Radeon X800 XT (M28)" },
+  { PCI_CHIP_R430_5D49, "ATI Mobility FireGL V5100 (M28)" },
+  { PCI_CHIP_R430_5D4A, "ATI Mobility Radeon X800 (M28)" },
+  { PCI_CHIP_R480_5D4C, "ATI Radeon X850" },
+  { PCI_CHIP_R480_5D4D, "ATI Radeon X850 XT PE (R480)" },
+  { PCI_CHIP_R480_5D4E, "ATI Radeon X850 SE (R480)" },
+  { PCI_CHIP_R480_5D4F, "ATI Radeon X850 PRO (R480)" },
+  { PCI_CHIP_R480_5D50, "ATI unknown Radeon / FireGL (R480)" },
+  { PCI_CHIP_R480_5D52, "ATI Radeon X850 XT (R480)" },
+  { PCI_CHIP_R423_5D57, "ATI Radeon X800XT (R423)" },
+  { PCI_CHIP_RV410_5E48, "ATI FireGL V5000 (RV410)" },
+  { PCI_CHIP_RV410_5E4A, "ATI Radeon X700 XT (RV410)" },
+  { PCI_CHIP_RV410_5E4B, "ATI Radeon X700 PRO (RV410)" },
+  { PCI_CHIP_RV410_5E4C, "ATI Radeon X700 SE (RV410)" },
+  { PCI_CHIP_RV410_5E4D, "ATI Radeon X700 (RV410)" },
+  { PCI_CHIP_RV410_5E4F, "ATI Radeon X700 SE (RV410)" },
   { PCI_CHIP_R520_7100, "ATI Radeon X1800" },
   { PCI_CHIP_R520_7101, "ATI Mobility Radeon X1800 XT" },
   { PCI_CHIP_R520_7102, "ATI Mobility Radeon X1800" },
@@ -235,8 +235,8 @@ SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_RV560_7291, "ATI Radeon X1650" },
   { PCI_CHIP_RV560_7293, "ATI Radeon X1650" },
   { PCI_CHIP_RV560_7297, "ATI RV560" },
-  { PCI_CHIP_RS350_7834, "ATI Radeon 9100 PRO IGP 7834" },
-  { PCI_CHIP_RS350_7835, "ATI Radeon Mobility 9200 IGP 7835" },
+  { PCI_CHIP_RS350_7834, "ATI Radeon 9100 PRO IGP" },
+  { PCI_CHIP_RS350_7835, "ATI Radeon Mobility 9200 IGP" },
   { PCI_CHIP_RS690_791E, "ATI Radeon X1200" },
   { PCI_CHIP_RS690_791F, "ATI Radeon X1200" },
   { PCI_CHIP_RS600_793F, "ATI Radeon X1200" },
@@ -704,143 +704,111 @@ SymTabRec RADEONChipsets[] = {
 };
 
 SymTabRec RADEONUniqueChipsets[] = {
-  { 0, "ATI Radeon Mobility X600 (M24) 3150 (PCIE)" },
-  { 0, "ATI FireMV 2400 (PCI)" },
-  { 0, "ATI Radeon Mobility X300 (M24) 3152 (PCIE)" },
-  { 0, "ATI FireGL M24 GL 3154 (PCIE)" },
-  { 0, "ATI FireMV 2400 3155 (PCI)" },
-  { 0, "ATI Radeon X600 (RV380) 3E50 (PCIE)" },
-  { 0, "ATI FireGL V3200 (RV380) 3E54 (PCIE)" },
-  { 0, "ATI Radeon IGP320 (A3) 4136" },
-  { 0, "ATI Radeon IGP330/340/350 (A4) 4137" },
-  { 0, "ATI Radeon 9500 AD (AGP)" },
-  { 0, "ATI Radeon 9500 AE (AGP)" },
-  { 0, "ATI Radeon 9600TX AF (AGP)" },
-  { 0, "ATI FireGL Z1 AG (AGP)" },
-  { 0, "ATI Radeon 9800SE AH (AGP)" },
-  { 0, "ATI Radeon 9800 AI (AGP)" },
-  { 0, "ATI Radeon 9800 AJ (AGP)" },
-  { 0, "ATI FireGL X2 AK (AGP)" },
-  { 0, "ATI Radeon 9600 AP (AGP)" },
-  { 0, "ATI Radeon 9600SE AQ (AGP)" },
-  { 0, "ATI Radeon 9600XT AR (AGP)" },
-  { 0, "ATI Radeon 9600 AS (AGP)" },
-  { 0, "ATI FireGL T2 AT (AGP)" },
+  { 0, "ATI Radeon Mobility X600 (M24)" },
+  { 0, "ATI FireMV 2400" },
+  { 0, "ATI Radeon Mobility X300 (M24)" },
+  { 0, "ATI FireGL M24 GL" },
+  { 0, "ATI Radeon X600 (RV380)" },
+  { 0, "ATI FireGL V3200 (RV380)" },
+  { 0, "ATI Radeon IGP320 (A3)" },
+  { 0, "ATI Radeon IGP330/340/350 (A4)" },
+  { 0, "ATI Radeon 9500" },
+  { 0, "ATI Radeon 9600TX" },
+  { 0, "ATI FireGL Z1" },
+  { 0, "ATI Radeon 9800SE" },
+  { 0, "ATI Radeon 9800" },
+  { 0, "ATI FireGL X2" },
+  { 0, "ATI Radeon 9600" },
+  { 0, "ATI Radeon 9600SE" },
+  { 0, "ATI Radeon 9600XT" },
+  { 0, "ATI FireGL T2" },
   { 0, "ATI Radeon 9650" },
-  { 0, "ATI FireGL RV360 AV (AGP)" },
-  { 0, "ATI Radeon 7000 IGP (A4+) 4237" },
-  { 0, "ATI Radeon 8500 AIW BB (AGP)" },
-  { 0, "ATI Radeon IGP320M (U1) 4336" },
-  { 0, "ATI Radeon IGP330M/340M/350M (U2) 4337" },
-  { 0, "ATI Radeon Mobility 7000 IGP 4437" },
-  { 0, "ATI Radeon 9000/PRO If (AGP/PCI)" },
-  { 0, "ATI Radeon 9000 Ig (AGP/PCI)" },
-  { 0, "ATI Radeon X800 (R420) JH (AGP)" },
-  { 0, "ATI Radeon X800PRO (R420) JI (AGP)" },
-  { 0, "ATI Radeon X800SE (R420) JJ (AGP)" },
-  { 0, "ATI Radeon X800 (R420) JK (AGP)" },
-  { 0, "ATI Radeon X800 (R420) JL (AGP)" },
-  { 0, "ATI FireGL X3 (R420) JM (AGP)" },
-  { 0, "ATI Radeon Mobility 9800 (M18) JN (AGP)" },
-  { 0, "ATI Radeon X800 SE (R420) (AGP)" },
-  { 0, "ATI Radeon X800XT (R420) JP (AGP)" },
-  { 0, "ATI Radeon X800 VE (R420) JT (AGP)" },
-  { 0, "ATI Radeon X850 (R480) (AGP)" },
-  { 0, "ATI Radeon X850 XT (R480) (AGP)" },
-  { 0, "ATI Radeon X850 SE (R480) (AGP)" },
-  { 0, "ATI Radeon X850 PRO (R480) (AGP)" },
-  { 0, "ATI Radeon X850 XT PE (R480) (AGP)" },
-  { 0, "ATI Radeon Mobility M7 LW (AGP)" },
-  { 0, "ATI Mobility FireGL 7800 M7 LX (AGP)" },
-  { 0, "ATI Radeon Mobility M6 LY (AGP)" },
-  { 0, "ATI Radeon Mobility M6 LZ (AGP)" },
-  { 0, "ATI FireGL Mobility 9000 (M9) Ld (AGP)" },
-  { 0, "ATI Radeon Mobility 9000 (M9) Lf (AGP)" },
-  { 0, "ATI Radeon Mobility 9000 (M9) Lg (AGP)" },
-  { 0, "ATI FireMV 2400 PCI" },
-  { 0, "ATI Radeon 9700 Pro ND (AGP)" },
-  { 0, "ATI Radeon 9700/9500Pro NE (AGP)" },
-  { 0, "ATI Radeon 9600TX NF (AGP)" },
-  { 0, "ATI FireGL X1 NG (AGP)" },
-  { 0, "ATI Radeon 9800PRO NH (AGP)" },
-  { 0, "ATI Radeon 9800 NI (AGP)" },
-  { 0, "ATI FireGL X2 NK (AGP)" },
-  { 0, "ATI Radeon 9800XT NJ (AGP)" },
-  { 0, "ATI Radeon Mobility 9600/9700 (M10/M11) NP (AGP)" },
-  { 0, "ATI Radeon Mobility 9600 (M10) NQ (AGP)" },
-  { 0, "ATI Radeon Mobility 9600 (M11) NR (AGP)" },
-  { 0, "ATI Radeon Mobility 9600 (M10) NS (AGP)" },
-  { 0, "ATI FireGL Mobility T2 (M10) NT (AGP)" },
-  { 0, "ATI FireGL Mobility T2e (M11) NV (AGP)" },
-  { 0, "ATI Radeon QD (AGP)" },
-  { 0, "ATI Radeon QE (AGP)" },
-  { 0, "ATI Radeon QF (AGP)" },
-  { 0, "ATI Radeon QG (AGP)" },
-  { 0, "ATI FireGL 8700/8800 QH (AGP)" },
-  { 0, "ATI Radeon 8500 QL (AGP)" },
-  { 0, "ATI Radeon 9100 QM (AGP)" },
-  { 0, "ATI Radeon 7500 QW (AGP/PCI)" },
-  { 0, "ATI Radeon 7500 QX (AGP/PCI)" },
-  { 0, "ATI Radeon VE/7000 QY (AGP/PCI)" },
-  { 0, "ATI Radeon VE/7000 QZ (AGP/PCI)" },
-  { 0, "ATI ES1000 515E (PCI)" },
-  { 0, "ATI Radeon Mobility X300 (M22) 5460 (PCIE)" },
-  { 0, "ATI Radeon Mobility X600 SE (M24C) 5462 (PCIE)" },
-  { 0, "ATI FireGL M22 GL 5464 (PCIE)" },
-  { 0, "ATI Radeon X800 (R423) UH (PCIE)" },
-  { 0, "ATI Radeon X800PRO (R423) UI (PCIE)" },
-  { 0, "ATI Radeon X800LE (R423) UJ (PCIE)" },
-  { 0, "ATI Radeon X800SE (R423) UK (PCIE)" },
-  { 0, "ATI Radeon X800 XTP (R430) (PCIE)" },
-  { 0, "ATI Radeon X800 XL (R430) (PCIE)" },
-  { 0, "ATI Radeon X800 SE (R430) (PCIE)" },
-  { 0, "ATI Radeon X800 (R430) (PCIE)" },
-  { 0, "ATI FireGL V7100 (R423) (PCIE)" },
-  { 0, "ATI FireGL V5100 (R423) UQ (PCIE)" },
-  { 0, "ATI FireGL unknown (R423) UR (PCIE)" },
-  { 0, "ATI FireGL unknown (R423) UT (PCIE)" },
-  { 0, "ATI Mobility FireGL V5000 (M26) (PCIE)" },
-  { 0, "ATI Mobility Radeon X700 XL (M26) (PCIE)" },
-  { 0, "ATI Mobility Radeon X700 (M26) (PCIE)" },
-  { 0, "ATI Radeon X550XTX 5657 (PCIE)" },
-  { 0, "ATI Radeon 9100 IGP (A5) 5834" },
-  { 0, "ATI Radeon Mobility 9100 IGP (U3) 5835" },
-  { 0, "ATI Radeon XPRESS 200 5954 (PCIE)" },
-  { 0, "ATI Radeon XPRESS 200M 5955 (PCIE)" },
-  { 0, "ATI Radeon 9250 5960 (AGP)" },
-  { 0, "ATI Radeon 9200 5961 (AGP)" },
-  { 0, "ATI Radeon 9200 5962 (AGP)" },
-  { 0, "ATI Radeon 9200SE 5964 (AGP)" },
-  { 0, "ATI FireMV 2200 (PCI)" },
-  { 0, "ATI ES1000 5969 (PCI)" },
-  { 0, "ATI Radeon XPRESS 200 5974 (PCIE)" },
-  { 0, "ATI Radeon XPRESS 200M 5975 (PCIE)" },
-  { 0, "ATI Radeon XPRESS 200 5A41 (PCIE)" },
-  { 0, "ATI Radeon XPRESS 200M 5A42 (PCIE)" },
-  { 0, "ATI Radeon XPRESS 200 5A61 (PCIE)" },
-  { 0, "ATI Radeon XPRESS 200M 5A62 (PCIE)" },
-  { 0, "ATI Radeon X300 (RV370) 5B60 (PCIE)" },
-  { 0, "ATI Radeon X600 (RV370) 5B62 (PCIE)" },
-  { 0, "ATI Radeon X550 (RV370) 5B63 (PCIE)" },
-  { 0, "ATI FireGL V3100 (RV370) 5B64 (PCIE)" },
-  { 0, "ATI FireMV 2200 PCIE (RV370) 5B65 (PCIE)" },
-  { 0, "ATI Radeon Mobility 9200 (M9+) 5C61 (AGP)" },
-  { 0, "ATI Radeon Mobility 9200 (M9+) 5C63 (AGP)" },
-  { 0, "ATI Mobility Radeon X800 XT (M28) (PCIE)" },
-  { 0, "ATI Mobility FireGL V5100 (M28) (PCIE)" },
-  { 0, "ATI Mobility Radeon X800 (M28) (PCIE)" },
-  { 0, "ATI Radeon X850 5D4C (PCIE)" },
-  { 0, "ATI Radeon X850 XT PE (R480) (PCIE)" },
-  { 0, "ATI Radeon X850 SE (R480) (PCIE)" },
-  { 0, "ATI Radeon X850 PRO (R480) (PCIE)" },
-  { 0, "ATI unknown Radeon / FireGL (R480) 5D50 (PCIE)" },
-  { 0, "ATI Radeon X850 XT (R480) (PCIE)" },
-  { 0, "ATI Radeon X800XT (R423) 5D57 (PCIE)" },
-  { 0, "ATI FireGL V5000 (RV410) (PCIE)" },
-  { 0, "ATI Radeon X700 XT (RV410) (PCIE)" },
-  { 0, "ATI Radeon X700 PRO (RV410) (PCIE)" },
-  { 0, "ATI Radeon X700 SE (RV410) (PCIE)" },
-  { 0, "ATI Radeon X700 (RV410) (PCIE)" },
+  { 0, "ATI FireGL RV360" },
+  { 0, "ATI Radeon 7000 IGP (A4+)" },
+  { 0, "ATI Radeon 8500 AIW" },
+  { 0, "ATI Radeon IGP320M (U1)" },
+  { 0, "ATI Radeon IGP330M/340M/350M (U2)" },
+  { 0, "ATI Radeon Mobility 7000 IGP" },
+  { 0, "ATI Radeon 9000/PRO" },
+  { 0, "ATI Radeon 9000" },
+  { 0, "ATI Radeon X800 (R420)" },
+  { 0, "ATI Radeon X800PRO (R420)" },
+  { 0, "ATI Radeon X800SE (R420)" },
+  { 0, "ATI FireGL X3 (R420)" },
+  { 0, "ATI Radeon Mobility 9800 (M18)" },
+  { 0, "ATI Radeon X800 SE (R420)" },
+  { 0, "ATI Radeon X800XT (R420)" },
+  { 0, "ATI Radeon X800 VE (R420)" },
+  { 0, "ATI Radeon X850 (R480)" },
+  { 0, "ATI Radeon X850 XT (R480)" },
+  { 0, "ATI Radeon X850 SE (R480)" },
+  { 0, "ATI Radeon X850 PRO (R480)" },
+  { 0, "ATI Radeon X850 XT PE (R480)" },
+  { 0, "ATI Radeon Mobility M7" },
+  { 0, "ATI Mobility FireGL 7800 M7" },
+  { 0, "ATI Radeon Mobility M6" },
+  { 0, "ATI FireGL Mobility 9000 (M9)" },
+  { 0, "ATI Radeon Mobility 9000 (M9)" },
+  { 0, "ATI Radeon 9700 Pro" },
+  { 0, "ATI Radeon 9700/9500Pro" },
+  { 0, "ATI FireGL X1" },
+  { 0, "ATI Radeon 9800PRO" },
+  { 0, "ATI Radeon 9800XT" },
+  { 0, "ATI Radeon Mobility 9600/9700 (M10/M11)" },
+  { 0, "ATI Radeon Mobility 9600 (M10)" },
+  { 0, "ATI Radeon Mobility 9600 (M11)" },
+  { 0, "ATI FireGL Mobility T2 (M10)" },
+  { 0, "ATI FireGL Mobility T2e (M11)" },
+  { 0, "ATI Radeon" },
+  { 0, "ATI FireGL 8700/8800" },
+  { 0, "ATI Radeon 8500" },
+  { 0, "ATI Radeon 9100" },
+  { 0, "ATI Radeon 7500" },
+  { 0, "ATI Radeon VE/7000" },
+  { 0, "ATI ES1000" },
+  { 0, "ATI Radeon Mobility X300 (M22)" },
+  { 0, "ATI Radeon Mobility X600 SE (M24C)" },
+  { 0, "ATI FireGL M22 GL" },
+  { 0, "ATI Radeon X800 (R423)" },
+  { 0, "ATI Radeon X800PRO (R423)" },
+  { 0, "ATI Radeon X800LE (R423)" },
+  { 0, "ATI Radeon X800SE (R423)" },
+  { 0, "ATI Radeon X800 XTP (R430)" },
+  { 0, "ATI Radeon X800 XL (R430)" },
+  { 0, "ATI Radeon X800 SE (R430)" },
+  { 0, "ATI Radeon X800 (R430)" },
+  { 0, "ATI FireGL V7100 (R423)" },
+  { 0, "ATI FireGL V5100 (R423)" },
+  { 0, "ATI FireGL unknown (R423)" },
+  { 0, "ATI Mobility FireGL V5000 (M26)" },
+  { 0, "ATI Mobility Radeon X700 XL (M26)" },
+  { 0, "ATI Mobility Radeon X700 (M26)" },
+  { 0, "ATI Radeon X550XTX" },
+  { 0, "ATI Radeon 9100 IGP (A5)" },
+  { 0, "ATI Radeon Mobility 9100 IGP (U3)" },
+  { 0, "ATI Radeon XPRESS 200" },
+  { 0, "ATI Radeon XPRESS 200M" },
+  { 0, "ATI Radeon 9250" },
+  { 0, "ATI Radeon 9200" },
+  { 0, "ATI Radeon 9200SE" },
+  { 0, "ATI FireMV 2200" },
+  { 0, "ATI Radeon X300 (RV370)" },
+  { 0, "ATI Radeon X600 (RV370)" },
+  { 0, "ATI Radeon X550 (RV370)" },
+  { 0, "ATI FireGL V3100 (RV370)" },
+  { 0, "ATI FireMV 2200 PCIE (RV370)" },
+  { 0, "ATI Radeon Mobility 9200 (M9+)" },
+  { 0, "ATI Mobility Radeon X800 XT (M28)" },
+  { 0, "ATI Mobility FireGL V5100 (M28)" },
+  { 0, "ATI Mobility Radeon X800 (M28)" },
+  { 0, "ATI Radeon X850" },
+  { 0, "ATI unknown Radeon / FireGL (R480)" },
+  { 0, "ATI Radeon X800XT (R423)" },
+  { 0, "ATI FireGL V5000 (RV410)" },
+  { 0, "ATI Radeon X700 XT (RV410)" },
+  { 0, "ATI Radeon X700 PRO (RV410)" },
+  { 0, "ATI Radeon X700 SE (RV410)" },
+  { 0, "ATI Radeon X700 (RV410)" },
   { 0, "ATI Radeon X1800" },
   { 0, "ATI Mobility Radeon X1800 XT" },
   { 0, "ATI Mobility Radeon X1800" },
@@ -884,8 +852,8 @@ SymTabRec RADEONUniqueChipsets[] = {
   { 0, "ATI Radeon X1950 GT" },
   { 0, "ATI RV570" },
   { 0, "ATI FireGL V7400" },
-  { 0, "ATI Radeon 9100 PRO IGP 7834" },
-  { 0, "ATI Radeon Mobility 9200 IGP 7835" },
+  { 0, "ATI Radeon 9100 PRO IGP" },
+  { 0, "ATI Radeon Mobility 9200 IGP" },
   { 0, "ATI Radeon X1200" },
   { 0, "ATI RS740" },
   { 0, "ATI RS740M" },