- add Apple FW PCI id

- add ATI 9600 LE Secondary PCI id
- make ATI Secondary PCI entries more consistent in naming

1 files changed, 12 insertions, 10 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index a82c245a7e6..d4c8ba3f2df 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.913 2005/09/10 00:37:10 brad Exp $
+$OpenBSD: pcidevs,v 1.914 2005/09/10 01:04:45 brad Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
 /*
@@ -621,6 +621,7 @@ product APPLE HEATHROW		0x0010	Heathrow
 product APPLE PADDINGTON	0x0017	Paddington
 product APPLE UNINORTHETH	0x001e	Uni-N Eth
 product APPLE UNINORTH		0x001f	Uni-N
+product APPLE UNINORTHETH_FW	0x0018	Uni-N Eth Firewire
 product APPLE USB		0x0019	USB
 product APPLE UNINORTHAGP	0x0020	Uni-N AGP
 product APPLE GMAC		0x0021	GMAC
@@ -665,11 +666,12 @@ product ASUSTEK HFCPCI		0x0675	ISDN
 /* ATI Technologies */
 product ATI RADEON_M241P	0x3150	Radeon Mobility X600
 product ATI RADEON_9600PRO	0x4150	Radeon 9600 Pro
-product ATI RADEON_9600		0x4151	Radeon 9600
+product ATI RADEON_9600LE	0x4151	Radeon 9600 LE
 product ATI RADEON_9600XT	0x4152	Radeon 9600 XT
 product ATI MACH32		0x4158	Mach32
 product ATI RADEON_9600PRO_S	0x4170	Radeon 9600 Pro Sec
-product ATI RADEON_9600XT_2	0x4172	Radeon 9600 XT 2nd
+product ATI RADEON_9600LE_S	0x4171	Radeon 9600 LE Sec
+product ATI RADEON_9600XT_S	0x4172	Radeon 9600 XT Sec
 product ATI R200_BB		0x4242	Radeon 8500 BB
 product ATI RADEON_IGP320M	0x4336	Radeon IGP 320M
 product ATI MOBILITY_M6		0x4337	Mobility M6
@@ -739,7 +741,7 @@ product ATI RADEON_9800XT	0x4e4a	Radeon 9800 XT
 product ATI R350		0x4e48  Radeon 9800 Pro
 product ATI RV350		0x4e50	Radeon Mobility M10 NP
 product ATI R300_S		0x4e64	Radeon 9500/9700 Sec
-product ATI R350_2		0x4e68  Radeon 9800 Pro Sec
+product ATI R350_S		0x4e68  Radeon 9800 Pro Sec
 product ATI RAGE128_PD		0x5044	Rage 128 Pro PD
 product ATI RAGE_FURY		0x5046	Rage Fury
 product ATI RAGE128_PK		0x5052	Rage 128 PK
@@ -775,15 +777,15 @@ product ATI RS300_HB		0x5831	RS300 Host
 product ATI RADEON_IGP9100_HB	0x5833	Radeon IGP 9100 Host
 product ATI RADEON_IGP9100	0x5835	Radeon Mobility IGP 9100
 product ATI RADEON_IGP9100_AGP	0x5838	Radeon IGP 9100 AGP
-product ATI RADEON_RV280_PRO_2	0x5940	Radeon 9200 PRO 2nd
-product ATI RADEON_RV280_2	0x5941	Radeon 9200 2nd
+product ATI RADEON_RV280_PRO_S	0x5940	Radeon 9200 PRO Sec
+product ATI RADEON_RV280_S	0x5941	Radeon 9200 Sec
 product ATI RADEON_RS480_HB	0x5950	RS480 Host
 product ATI RADEON_RS480	0x5954	Radeon XPRESS 200
 product ATI RADEON_RS480_B	0x5955	Radeon XPRESS 200M
 product ATI RADEON_RV280_PRO	0x5960	Radeon 9200 PRO
 product ATI RADEON_RV280	0x5961	Radeon 9200
 product ATI RADEON_RV280_B	0x5962	Radeon 9200
-product ATI RADEON_RV280_SE_2	0x5964	Radeon 9200 SE 2nd
+product ATI RADEON_RV280_SE_S	0x5964	Radeon 9200 SE Sec
 product ATI RADEON_RS482	0x5974	Radeon XPRESS 200
 product ATI RADEON_RS482_B	0x5975	Radeon XPRESS 200M
 product ATI RADEON_RS480_PCIE	0x5a3f	RS480 PCIE
@@ -794,9 +796,9 @@ product ATI RADEON_RC410_B	0x5a62	Radeon XPRESS 200M
 product ATI RADEON_X300		0x5b60	Radeon X300
 product ATI RADEON_X600		0x5b62	Radeon X600
 product ATI FIREGL_RV370	0x5b64	FireGL V3100
-product ATI RADEON_X300_2	0x5b70	Radeon X300 Sec
-product ATI RADEON_X600_2	0x5b72	Radeon X600 Sec
-product ATI FIREGL_RV370_2	0x5b74	FireGL V3100 Sec
+product ATI RADEON_X300_S	0x5b70	Radeon X300 Sec
+product ATI RADEON_X600_S	0x5b72	Radeon X600 Sec
+product ATI FIREGL_RV370_S	0x5b74	FireGL V3100 Sec
 product ATI RADEON_RV280_M	0x5c61	Radeon Mobility 9200
 product ATI RADEON_M9PLUS	0x5c63	Radeon Mobility 9200 (M9+)
 product ATI RADEON_RV280_SE	0x5d44	Radeon 9200 SE