Fix PCI IDs for BSD.

6 files changed, 54 insertions, 92 deletions

diff --git a/bsd-core/mga_drv.c b/bsd-core/mga_drv.c
index 04b0b0d8..8b69b41b 100644
--- a/bsd-core/mga_drv.c
+++ b/bsd-core/mga_drv.c
@@ -43,7 +43,8 @@
 drm_chipinfo_t DRM(devicelist)[] = {
 	{0x102b, 0x0520, 0, "Matrox G200 (PCI)"},
 	{0x102b, 0x0521, 1, "Matrox G200 (AGP)"},
-	{0x102b, 0x0525, 1, "Matrox G400 (AGP)"},
+	{0x102b, 0x0525, 1, "Matrox G400/G450 (AGP)"},
+	{0x102b, 0x2527, 1, "Matrox G550 (AGP)"},
 	{0, 0, 0, NULL}
 };
 
diff --git a/bsd-core/r128_drv.c b/bsd-core/r128_drv.c
index 5e739f19..1a8046fb 100644
--- a/bsd-core/r128_drv.c
+++ b/bsd-core/r128_drv.c
@@ -45,46 +45,23 @@
  * Please report to eta@lclark.edu inaccuracies or if a chip you have works that is marked unsupported here.
  */
 drm_chipinfo_t DRM(devicelist)[] = {
-	{0x1002, 0x4c45, 1, "ATI Rage 128 Mobility LE"},
-	{0x1002, 0x4c46, 1, "ATI Rage 128 Mobility LF"},
-	{0x1002, 0x4d46, 1, "ATI Rage 128 Mobility MF (AGP 4x)"},
-	{0x1002, 0x4d4c, 1, "ATI Rage 128 Mobility ML"},
-	{0x1002, 0x5041, __REALLY_HAVE_SG, "ATI Rage 128 Pro PA (PCI)"},
-	{0x1002, 0x5042, 1, "ATI Rage 128 Pro PB (AGP 2x)"},
-	{0x1002, 0x5043, 1, "ATI Rage 128 Pro PC (AGP 4x)"},
+	{0x1002, 0x4c45, __REALLY_HAVE_SG, "ATI Rage 128 Mobility LE (PCI)"},
+	{0x1002, 0x4c46, 1, "ATI Rage 128 Mobility LF (AGP)"},
+	{0x1002, 0x4d46, 1, "ATI Rage 128 Mobility MF (AGP)"},
+	{0x1002, 0x4d4c, 1, "ATI Rage 128 Mobility ML (AGP)"},
 	{0x1002, 0x5044, __REALLY_HAVE_SG, "ATI Rage 128 Pro PD (PCI)"},
-	{0x1002, 0x5045, 1, "ATI Rage 128 Pro PE (AGP 2x)"},
-	{0x1002, 0x5046, 1, "ATI Rage 128 Pro PF (AGP 4x)"},
-	{0x1002, 0x5047, __REALLY_HAVE_SG, "ATI Rage 128 Pro PG (PCI)"},
-	{0x1002, 0x5048, 1, "ATI Rage 128 Pro PH (AGP)"},
-	{0x1002, 0x5049, 1, "ATI Rage 128 Pro PI (AGP)"},
-	{0x1002, 0x504a, __REALLY_HAVE_SG, "ATI Rage 128 Pro PJ (PCI)"},
-	{0x1002, 0x504b, 1, "ATI Rage 128 Pro PK (AGP)"},
-	{0x1002, 0x504c, 1, "ATI Rage 128 Pro PL (AGP)"},
-	{0x1002, 0x504d, __REALLY_HAVE_SG, "ATI Rage 128 Pro PM (PCI)"},
-	{0x1002, 0x504e, 1, "ATI Rage 128 Pro PN (AGP)"},
-	{0x1002, 0x505f, 1, "ATI Rage 128 Pro PO (AGP)"},
+	{0x1002, 0x5046, 1, "ATI Rage 128 Pro PF (AGP)"},
 	{0x1002, 0x5050, __REALLY_HAVE_SG, "ATI Rage 128 Pro PP (PCI)"},
-	{0x1002, 0x5051, 1, "ATI Rage 128 Pro PQ (AGP)"},
-	{0x1002, 0x5052, 1, "ATI Rage 128 Pro PR (AGP)"},
-	{0x1002, 0x5053, __REALLY_HAVE_SG, "ATI Rage 128 Pro PS (PCI)"},
-	{0x1002, 0x5054, 1, "ATI Rage 128 Pro PT (AGP)"},
-	{0x1002, 0x5055, 1, "ATI Rage 128 Pro PU (AGP)"},
-	{0x1002, 0x5056, __REALLY_HAVE_SG, "ATI Rage 128 Pro PV (PCI)"},
-	{0x1002, 0x5057, 1, "ATI Rage 128 Pro PW (AGP)"},
-	{0x1002, 0x5058, 1, "ATI Rage 128 Pro PX (AGP)"},
-	{0x1002, 0x5245, __REALLY_HAVE_SG, "ATI Rage 128 GL (PCI)"},
-	{0x1002, 0x5246, 1, "ATI Rage 128 GL (AGP 2x)"},
-	{0x1002, 0x524b, __REALLY_HAVE_SG, "ATI Rage 128 VR (PCI)"},
-	{0x1002, 0x524c, 1, "ATI Rage 128 VR (AGP 2x)"},
-	{0x1002, 0x5345, __REALLY_HAVE_SG, "ATI Rage 128 SE (PCI)"},
-	{0x1002, 0x5346, 1, "ATI Rage 128 SF (AGP 2x)"},
-	{0x1002, 0x5347, 1, "ATI Rage 128 SG (AGP 4x)"},
-	{0x1002, 0x5348, 0, "ATI Rage 128 SH (unknown)"},
-	{0x1002, 0x534b, __REALLY_HAVE_SG, "ATI Rage 128 SK (PCI)"},
-	{0x1002, 0x534c, 1, "ATI Rage 128 SL (AGP 2x)"},
-	{0x1002, 0x534d, 1, "ATI Rage 128 SM (AGP 4x)"},
-	{0x1002, 0x534e, 1, "ATI Rage 128 (AGP 4x?)"},
+	{0x1002, 0x5052, __REALLY_HAVE_SG, "ATI Rage 128 Pro PR (PCI)"},
+	{0x1002, 0x5245, __REALLY_HAVE_SG, "ATI Rage 128 RE (PCI)"},
+	{0x1002, 0x5246, 1, "ATI Rage 128 RF (AGP)"},
+	{0x1002, 0x5247, 1, "ATI Rage 128 RG (AGP)"},
+	{0x1002, 0x524b, __REALLY_HAVE_SG, "ATI Rage 128 RK (PCI)"},
+	{0x1002, 0x524c, 1, "ATI Rage 128 RL (AGP)"},
+	{0x1002, 0x534d, 1, "ATI Rage 128 SM (AGP)"},
+	{0x1002, 0x5446, 1, "ATI Rage 128 Pro Ultra TF (AGP)"},
+	{0x1002, 0x544C, 1, "ATI Rage 128 Pro Ultra TL (AGP)"},
+	{0x1002, 0x5452, 1, "ATI Rage 128 Pro Ultra TR (AGP)"},
 	{0, 0, 0, NULL}
 };
 
diff --git a/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c
index 8efa3131..fe69fbb8 100644
--- a/bsd-core/radeon_drv.c
+++ b/bsd-core/radeon_drv.c
@@ -42,13 +42,16 @@
  * Please report to eta@lclark.edu inaccuracies or if a chip you have works that is marked unsupported here.
  */
 drm_chipinfo_t DRM(devicelist)[] = {
-	{0x1002, 0x5144, 1, "ATI Radeon QD"},
-	{0x1002, 0x5145, 1, "ATI Radeon QE"},
-	{0x1002, 0x5146, 1, "ATI Radeon QF"},
-	{0x1002, 0x5147, 1, "ATI Radeon QG"},
-	{0x1002, 0x5157, 1, "ATI Radeon 7500"},
-	{0x1002, 0x5159, 1, "ATI Radeon VE"},
-	{0x1002, 0x5159, 1, "ATI Radeon VE"},
+	{0x1002, 0x4C57, 1, "ATI Radeon LW Mobility 7 (AGP)"},
+	{0x1002, 0x4C59, 1, "ATI Radeon LY Mobility 6 (AGP)"},
+	{0x1002, 0x4C5A, 1, "ATI Radeon LZ Mobility 6 (AGP)"},
+	{0x1002, 0x5144, 1, "ATI Radeon QD (AGP)"},
+	{0x1002, 0x5145, 1, "ATI Radeon QE (AGP)"},
+	{0x1002, 0x5146, 1, "ATI Radeon QF (AGP)"},
+	{0x1002, 0x5147, 1, "ATI Radeon QG (AGP)"},
+	{0x1002, 0x5157, 1, "ATI Radeon QW 7500 (AGP)"},
+	{0x1002, 0x5159, 1, "ATI Radeon QY VE (AGP)"},
+	{0x1002, 0x515A, 1, "ATI Radeon QZ VE (AGP)"},
 	{0, 0, 0, NULL}
 };
 
diff --git a/bsd/mga_drv.c b/bsd/mga_drv.c
index 04b0b0d8..8b69b41b 100644
--- a/bsd/mga_drv.c
+++ b/bsd/mga_drv.c
@@ -43,7 +43,8 @@
 drm_chipinfo_t DRM(devicelist)[] = {
 	{0x102b, 0x0520, 0, "Matrox G200 (PCI)"},
 	{0x102b, 0x0521, 1, "Matrox G200 (AGP)"},
-	{0x102b, 0x0525, 1, "Matrox G400 (AGP)"},
+	{0x102b, 0x0525, 1, "Matrox G400/G450 (AGP)"},
+	{0x102b, 0x2527, 1, "Matrox G550 (AGP)"},
 	{0, 0, 0, NULL}
 };
 
diff --git a/bsd/r128_drv.c b/bsd/r128_drv.c
index 5e739f19..1a8046fb 100644
--- a/bsd/r128_drv.c
+++ b/bsd/r128_drv.c
@@ -45,46 +45,23 @@
  * Please report to eta@lclark.edu inaccuracies or if a chip you have works that is marked unsupported here.
  */
 drm_chipinfo_t DRM(devicelist)[] = {
-	{0x1002, 0x4c45, 1, "ATI Rage 128 Mobility LE"},
-	{0x1002, 0x4c46, 1, "ATI Rage 128 Mobility LF"},
-	{0x1002, 0x4d46, 1, "ATI Rage 128 Mobility MF (AGP 4x)"},
-	{0x1002, 0x4d4c, 1, "ATI Rage 128 Mobility ML"},
-	{0x1002, 0x5041, __REALLY_HAVE_SG, "ATI Rage 128 Pro PA (PCI)"},
-	{0x1002, 0x5042, 1, "ATI Rage 128 Pro PB (AGP 2x)"},
-	{0x1002, 0x5043, 1, "ATI Rage 128 Pro PC (AGP 4x)"},
+	{0x1002, 0x4c45, __REALLY_HAVE_SG, "ATI Rage 128 Mobility LE (PCI)"},
+	{0x1002, 0x4c46, 1, "ATI Rage 128 Mobility LF (AGP)"},
+	{0x1002, 0x4d46, 1, "ATI Rage 128 Mobility MF (AGP)"},
+	{0x1002, 0x4d4c, 1, "ATI Rage 128 Mobility ML (AGP)"},
 	{0x1002, 0x5044, __REALLY_HAVE_SG, "ATI Rage 128 Pro PD (PCI)"},
-	{0x1002, 0x5045, 1, "ATI Rage 128 Pro PE (AGP 2x)"},
-	{0x1002, 0x5046, 1, "ATI Rage 128 Pro PF (AGP 4x)"},
-	{0x1002, 0x5047, __REALLY_HAVE_SG, "ATI Rage 128 Pro PG (PCI)"},
-	{0x1002, 0x5048, 1, "ATI Rage 128 Pro PH (AGP)"},
-	{0x1002, 0x5049, 1, "ATI Rage 128 Pro PI (AGP)"},
-	{0x1002, 0x504a, __REALLY_HAVE_SG, "ATI Rage 128 Pro PJ (PCI)"},
-	{0x1002, 0x504b, 1, "ATI Rage 128 Pro PK (AGP)"},
-	{0x1002, 0x504c, 1, "ATI Rage 128 Pro PL (AGP)"},
-	{0x1002, 0x504d, __REALLY_HAVE_SG, "ATI Rage 128 Pro PM (PCI)"},
-	{0x1002, 0x504e, 1, "ATI Rage 128 Pro PN (AGP)"},
-	{0x1002, 0x505f, 1, "ATI Rage 128 Pro PO (AGP)"},
+	{0x1002, 0x5046, 1, "ATI Rage 128 Pro PF (AGP)"},
 	{0x1002, 0x5050, __REALLY_HAVE_SG, "ATI Rage 128 Pro PP (PCI)"},
-	{0x1002, 0x5051, 1, "ATI Rage 128 Pro PQ (AGP)"},
-	{0x1002, 0x5052, 1, "ATI Rage 128 Pro PR (AGP)"},
-	{0x1002, 0x5053, __REALLY_HAVE_SG, "ATI Rage 128 Pro PS (PCI)"},
-	{0x1002, 0x5054, 1, "ATI Rage 128 Pro PT (AGP)"},
-	{0x1002, 0x5055, 1, "ATI Rage 128 Pro PU (AGP)"},
-	{0x1002, 0x5056, __REALLY_HAVE_SG, "ATI Rage 128 Pro PV (PCI)"},
-	{0x1002, 0x5057, 1, "ATI Rage 128 Pro PW (AGP)"},
-	{0x1002, 0x5058, 1, "ATI Rage 128 Pro PX (AGP)"},
-	{0x1002, 0x5245, __REALLY_HAVE_SG, "ATI Rage 128 GL (PCI)"},
-	{0x1002, 0x5246, 1, "ATI Rage 128 GL (AGP 2x)"},
-	{0x1002, 0x524b, __REALLY_HAVE_SG, "ATI Rage 128 VR (PCI)"},
-	{0x1002, 0x524c, 1, "ATI Rage 128 VR (AGP 2x)"},
-	{0x1002, 0x5345, __REALLY_HAVE_SG, "ATI Rage 128 SE (PCI)"},
-	{0x1002, 0x5346, 1, "ATI Rage 128 SF (AGP 2x)"},
-	{0x1002, 0x5347, 1, "ATI Rage 128 SG (AGP 4x)"},
-	{0x1002, 0x5348, 0, "ATI Rage 128 SH (unknown)"},
-	{0x1002, 0x534b, __REALLY_HAVE_SG, "ATI Rage 128 SK (PCI)"},
-	{0x1002, 0x534c, 1, "ATI Rage 128 SL (AGP 2x)"},
-	{0x1002, 0x534d, 1, "ATI Rage 128 SM (AGP 4x)"},
-	{0x1002, 0x534e, 1, "ATI Rage 128 (AGP 4x?)"},
+	{0x1002, 0x5052, __REALLY_HAVE_SG, "ATI Rage 128 Pro PR (PCI)"},
+	{0x1002, 0x5245, __REALLY_HAVE_SG, "ATI Rage 128 RE (PCI)"},
+	{0x1002, 0x5246, 1, "ATI Rage 128 RF (AGP)"},
+	{0x1002, 0x5247, 1, "ATI Rage 128 RG (AGP)"},
+	{0x1002, 0x524b, __REALLY_HAVE_SG, "ATI Rage 128 RK (PCI)"},
+	{0x1002, 0x524c, 1, "ATI Rage 128 RL (AGP)"},
+	{0x1002, 0x534d, 1, "ATI Rage 128 SM (AGP)"},
+	{0x1002, 0x5446, 1, "ATI Rage 128 Pro Ultra TF (AGP)"},
+	{0x1002, 0x544C, 1, "ATI Rage 128 Pro Ultra TL (AGP)"},
+	{0x1002, 0x5452, 1, "ATI Rage 128 Pro Ultra TR (AGP)"},
 	{0, 0, 0, NULL}
 };
 
diff --git a/bsd/radeon_drv.c b/bsd/radeon_drv.c
index 8efa3131..fe69fbb8 100644
--- a/bsd/radeon_drv.c
+++ b/bsd/radeon_drv.c
@@ -42,13 +42,16 @@
  * Please report to eta@lclark.edu inaccuracies or if a chip you have works that is marked unsupported here.
  */
 drm_chipinfo_t DRM(devicelist)[] = {
-	{0x1002, 0x5144, 1, "ATI Radeon QD"},
-	{0x1002, 0x5145, 1, "ATI Radeon QE"},
-	{0x1002, 0x5146, 1, "ATI Radeon QF"},
-	{0x1002, 0x5147, 1, "ATI Radeon QG"},
-	{0x1002, 0x5157, 1, "ATI Radeon 7500"},
-	{0x1002, 0x5159, 1, "ATI Radeon VE"},
-	{0x1002, 0x5159, 1, "ATI Radeon VE"},
+	{0x1002, 0x4C57, 1, "ATI Radeon LW Mobility 7 (AGP)"},
+	{0x1002, 0x4C59, 1, "ATI Radeon LY Mobility 6 (AGP)"},
+	{0x1002, 0x4C5A, 1, "ATI Radeon LZ Mobility 6 (AGP)"},
+	{0x1002, 0x5144, 1, "ATI Radeon QD (AGP)"},
+	{0x1002, 0x5145, 1, "ATI Radeon QE (AGP)"},
+	{0x1002, 0x5146, 1, "ATI Radeon QF (AGP)"},
+	{0x1002, 0x5147, 1, "ATI Radeon QG (AGP)"},
+	{0x1002, 0x5157, 1, "ATI Radeon QW 7500 (AGP)"},
+	{0x1002, 0x5159, 1, "ATI Radeon QY VE (AGP)"},
+	{0x1002, 0x515A, 1, "ATI Radeon QZ VE (AGP)"},
 	{0, 0, 0, NULL}
 };